Patch/v2.2.2 (#68)

* VMT context menu: Fix VTF generation

* VMF: Fix displacements processing

* Bump: v2.2.2

Author: H2xDev

addons/godotvmf/godotvmt/vmt_loader.gd

@@ -3,7 +3,7 @@ class_name VMTLoader extends RefCounted
 
 static var texture_sizes_cache: Dictionary = {};
 static var cached_materials: Dictionary = {};
-static var logged_materials: Array[String] = [];
+static var logged_materials: Array = [];
 
 static func is_file_valid(path: String):
 	var import_path = path + ".import";

addons/godotvmf/src/vmf_material_conversion_context_menu.gd renamed to addons/godotvmf/godotvmt/vmt_material_conversion_context_menu.gd

@@ -97,7 +97,7 @@ func generate_vtf_file(texture: Texture2D) -> PackedByteArray:
 	if not is_dxt:
 		image.decompress();
 		image.compress(Image.COMPRESS_S3TC);
-		image.convert(Image.FORMAT_DXT3);
+		image.convert(Image.FORMAT_DXT5);
 
 	image.clear_mipmaps();
 
@@ -106,12 +106,12 @@ func generate_vtf_file(texture: Texture2D) -> PackedByteArray:
 
 	bytes += int_to_int32(7); # version major
 	bytes += int_to_int32(1); # version minor
-	bytes += int_to_int32(63); # header size for version 7.1
+	bytes += int_to_int32(64); # header size for version 7.1
 
 	bytes += int_to_short(image.get_width()); # width
 	bytes += int_to_short(image.get_height()); # height
 
-	bytes += int_to_int32(VTFLoader.Flags.TEXTUREFLAGS_NOMIP); # flags
+	bytes += int_to_int32(VTFLoader.Flags.TEXTUREFLAGS_SRGB | VTFLoader.Flags.TEXTUREFLAGS_NOMIP);
 	bytes += int_to_short(1); # frames
 	bytes += int_to_short(0); # first frame
 	bytes += PackedByteArray([0, 0, 0, 0]); # padding
@@ -130,6 +130,7 @@ func generate_vtf_file(texture: Texture2D) -> PackedByteArray:
 	bytes += int_to_int32(format); # high res image format
 	bytes += int_to_byte(1) # mipmap count
 	bytes += int_to_int32(13) # low res image format
+	bytes += PackedByteArray([0]); # padding
 
 	var lowres_image := image.duplicate() as Image;
 	var lowres_width := 16;

addons/godotvmf/godotvmt/vtf_loader.gd

@@ -38,7 +38,7 @@ enum Flags
 	TEXTUREFLAGS_CLAMPT = 0x00000008,
 	TEXTUREFLAGS_ANISOTROPIC = 0x00000010,
 	TEXTUREFLAGS_HINT_DXT5 = 0x00000020,
-	TEXTUREFLAGS_PWL_CORRECTED = 0x00000040,
+	TEXTUREFLAGS_SRGB = 0x00000040,
 	TEXTUREFLAGS_NORMAL = 0x00000080,
 	TEXTUREFLAGS_NOMIP = 0x00000100,
 	TEXTUREFLAGS_NOLOD = 0x00000200,
@@ -266,6 +266,7 @@ func _init(path, duration):
 	self.frame_duration = duration;
 
 	file = FileAccess.open(path, FileAccess.READ);
+	prints('VTFFLAGS', flags);
 
 static func get_texture(texture: String):
 	texture = texture.to_lower();

addons/godotvmf/plugin.cfg

@@ -3,5 +3,5 @@
 name="GodotVMF"
 description="Allows use VMF files in Godot"
 author="H2xDev"
-version="2.2.1"
+version="2.2.2"
 script="godotvmf.gd"

addons/godotvmf/src/structs/vmf_displacement_info.gd

@@ -13,6 +13,7 @@ var start_point := Vector3(0, 0, 0);
 var side: VMFSide;
 var brush: VMFSolid;
 var vertices: PackedVector3Array;
+var elevation: float = 0.0;
 
 func _to_string() -> String:
 	return "VMFDisplacementInfo(verts_count=%d, edges_count=%d, start_point=%s, side_id=%d, brush_id=%d)" % [verts_count, edges_count, start_point, side.id, brush.id];
@@ -35,9 +36,13 @@ func _init(raw: Dictionary, side: VMFSide, brush: VMFSolid) -> void:
 	offsets = _parse_vectors('offsets');
 	offset_normals = _parse_vectors('offset_normals');
 	alphas = _parse_floats('alphas');
-	vertices = PackedVector3Array(get_vertices());
+	elevation = float(raw.get('elevation', 0.0));
 	disp_info = null;
 
+## Called from the VMFSide during the calculation of its vertices.
+func calculate_vertices() -> void:
+	vertices = PackedVector3Array(get_vertices());
+
 func get_normal(x: float, y: float) -> Vector3:
 	var index = y + x * verts_count;
 	if normals.size() == 0:
@@ -96,7 +101,7 @@ func get_vertices() -> Array[Vector3]:
 		var vr := tr.lerp(br, rblend);
 		var vert := vl.lerp(vr, cblend);
 
-		vert += get_distance(x, y) + get_offset(x, y) + side.plane.normal * disp_info.elevation;
+		vert += get_distance(x, y) + get_offset(x, y) + side.plane.normal * elevation;
 
 		res.append(vert);
 

addons/godotvmf/src/structs/vmf_side.gd

@@ -75,6 +75,9 @@ func calculate_vertices() -> void:
 
 	vertices = PackedVector3Array(raw_vertices);
 
+	if is_displacement:
+		dispinfo.calculate_vertices();
+
 ## Retrns the UV coordinates for the given vertex on this side
 func get_uv(vertex: Vector3) -> Vector2:
 	var uscale: float = uaxis.scale;