Patch/v2.2.3 (#69)

* VMT context menu: Fix VTF generation

* VMF: Fix displacements processing

* Bump: v2.2.2

* VTF: Add conversion to SRGB

* FGD Generator: Fix markers handling

* Update readme.md

* Fix duplicate sentence in legality section

Removed duplicate sentence about contacting Valve for commercial use of the Source Engine SDK.

* VMF: Fix displacement vertex generation for precised vertex data

Author: H2xDev

addons/godotfgd/main.gd

@@ -287,10 +287,9 @@ func get_prop_decorators(script: Script, property_name: String):
 	for line in lines:
 		line = line.trim_prefix(" ").trim_suffix(" ");
 		if not line.begins_with("@"): continue;
-		line = line.trim_prefix("@");
 
-		var name = line.split(" ")[0];
-		var value = line.split(name)[1].trim_prefix(" ").trim_suffix(" ");
+		var name = line.split(" ")[0].trim_prefix("@");
+		var value = line.split("@" + name)[1].trim_prefix(" ").trim_suffix(" ");
 
 		if name in decorators:
 			decorators[name] += "\n" + value;

addons/godotfgd/plugin.cfg

@@ -3,5 +3,5 @@
 name="GodotVMF - FGD Generator"
 description="Generates FGD file based on implemented entities"
 author="H2xDev"
-version="1.0.0"
+version="1.0.1"
 script="main.gd"

addons/godotvmf/godotvmt/vmt_material_conversion_context_menu.gd

@@ -150,4 +150,3 @@ func generate_vtf_file(texture: Texture2D) -> PackedByteArray:
 	bytes += image.get_data()
 
 	return bytes;
-

addons/godotvmf/godotvmt/vmt_transformer.gd

@@ -116,3 +116,13 @@ func basetexturetransform(material: Material, value: Variant):
 	var transform = VMTLoader.parse_transform(value);
 	material.uv1_scale = Vector3(transform.scale.x, transform.scale.y, 1);
 	material.uv1_offset = Vector3(transform.translate.x, transform.translate.y, 0);
+
+func blendmodulatetexture(material: Material, value: Variant):
+	if not "blend_modulate_texture" in material: return;
+	var texture: Texture = VTFLoader.get_texture(value);
+
+	if texture:
+		var process_srgb: bool = texture.get_meta("srgb_conversion_method", 0) == VTFLoader.SRGBConversionMethod.PROCESS_IN_SHADER;
+		material.set("convert_to_srgb", process_srgb);
+
+	material.set("blend_modulate_texture", VTFLoader.get_texture(value));

addons/godotvmf/godotvmt/vtf_import.gd

@@ -11,16 +11,27 @@ func _get_import_order(): return 0;
 func _get_priority(): return 1;
 func _can_import_threaded(): return false;
 
-func _get_import_options(str, int): return [];
+func _get_import_options(str, int): return [
+	{
+		name = "srgb_conversion_method",
+		default_value = 1,
+		type = TYPE_INT,
+		property_hint = PROPERTY_HINT_ENUM,
+		hint_string = "Disabled, During import, Process in shader",
+		description = "Perform conversion from SRGB to Linear"
+	}
+];
+
 func _get_option_visibility(path: String, optionName: StringName, options: Dictionary): return true;
 
-func _import(path: String, save_path: String, _a, _b, _c):
+func _import(path: String, save_path: String, options: Dictionary, _b, _c):
 	var path_to_save = save_path + '.' + _get_save_extension();
 	var vtf = VTFLoader.create(path, 0.033); # 30 FPS
 
 	if !vtf: return ERR_FILE_UNRECOGNIZED;
 
-	var texture = vtf.compile_texture();
+	var texture = vtf.compile_texture(options.srgb_conversion_method);
 	if not texture: return ERR_FILE_CORRUPT;
+	texture.set_meta("srgb_conversion_method", options.srgb_conversion_method);
 
 	return ResourceSaver.save(texture, path_to_save, ResourceSaver.FLAG_COMPRESS);

addons/godotvmf/godotvmt/vtf_loader.gd

@@ -1,4 +1,10 @@
 class_name VTFLoader extends RefCounted
+enum SRGBConversionMethod {
+	DISABLED,
+	DURING_IMPORT,
+	PROCESS_IN_SHADER
+}
+
 enum ImageFormat {
 	IMAGE_FORMAT_RGBA8888,
 	IMAGE_FORMAT_ABGR8888,
@@ -203,7 +209,7 @@ static func create(path: String, duration: float = 0):
 
 func done(): file.close();
 
-func compile_texture():
+func compile_texture(srgb_conversion_method: SRGBConversionMethod):
 	if width == 0 or height == 0:
 		push_error("Corrupted file: {0}".format([file.get_path()]));
 		return null;
@@ -215,11 +221,11 @@ func compile_texture():
 		tex.frames = frames;
 
 		for frame in range(0, frames):
-			tex.set_frame_texture(frame, _read_frame(frame));
+			tex.set_frame_texture(frame, _read_frame(frame, srgb_conversion_method));
 			tex.set_frame_duration(frame, frame_duration);
 
 	else:
-		tex = _read_frame(0);
+		tex = _read_frame(0, srgb_conversion_method);
 
 	if not tex: 
 		push_error("Texture not loaded: {0}".format([path]));
@@ -230,13 +236,12 @@ func compile_texture():
 static var normal_conversion_shader: Shader;
 static var shader_material: ShaderMaterial;
 
-func _read_frame(frame):
+func _read_frame(frame, srgb_conversion_method: SRGBConversionMethod):
 	var data = PackedByteArray();
 	var byteRead = 0;
 	var is_dxt_1 = hires_image_format == ImageFormat.IMAGE_FORMAT_DXT1;
 	var format = format_map[str(hires_image_format)];
 	var use_mipmaps = not (flags & Flags.TEXTUREFLAGS_NOMIP);
-
 	frame = frames - 1 - frame;
 
 	for i in range(mipmap_count):
@@ -251,7 +256,11 @@ func _read_frame(frame):
 
 		byteRead += mip_size + mip_size * (frames - 1);
 
-	var img = Image.create_from_data(width, height, use_mipmaps, format, data);
+	var img := Image.create_from_data(width, height, use_mipmaps, format, data);
+	
+	if srgb_conversion_method == SRGBConversionMethod.DURING_IMPORT:
+		img.decompress();
+		img.compress(Image.COMPRESS_S3TC);
 
 	alpha = flags & Flags.TEXTUREFLAGS_ONEBITALPHA or flags & Flags.TEXTUREFLAGS_EIGHTBITALPHA;
 
@@ -266,7 +275,6 @@ 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.2"
+version="2.2.3"
 script="godotvmf.gd"

addons/godotvmf/shaders/WorldVertexTransitionMaterial.gd

@@ -1,7 +1,19 @@
 @tool
 class_name WorldVertexTransitionMaterial extends ShaderMaterial
 
-@export_category("Albedo")
+@export var blend_modulate_texture: Texture = null:
+	set(value):
+		set_shader_parameter("blend_modulate_texture", value);
+		blend_modulate_texture = value;
+		emit_changed();
+
+@export var convert_to_srgb: bool = false:
+	set(value):
+		set_shader_parameter("convert_to_srgb", value);
+		convert_to_srgb = value;
+		emit_changed();
+
+@export_group("Albedo")
 @export var albedo_texture: Texture = null:
 	set(value):
 		set_shader_parameter("albedo_texture", value);
@@ -14,7 +26,7 @@ class_name WorldVertexTransitionMaterial extends ShaderMaterial
 		albedo_texture2 = value;
 		emit_changed();
 
-@export_category("Normal")
+@export_group("Normal")
 @export var normal_texture: Texture = null:
 	set(value):
 		set_shader_parameter("normal_texture", value);
@@ -27,7 +39,7 @@ class_name WorldVertexTransitionMaterial extends ShaderMaterial
 		normal_texture2 = value;
 		emit_changed();
 
-@export_category("Displacement")
+@export_group("Displacement")
 @export var displacement_texture: Texture = null:
 	set(value):
 		set_shader_parameter("displacement_texture", value);
@@ -40,8 +52,7 @@ class_name WorldVertexTransitionMaterial extends ShaderMaterial
 		displacement_texture2 = value;
 		emit_changed();
 
-@export_category("Metallic")
-
+@export_group("Metallic")
 @export_range(0, 1, 0.01) var metallic: float = 0.0:
 	set(value):
 		set_shader_parameter("metallic", value);
@@ -66,7 +77,7 @@ class_name WorldVertexTransitionMaterial extends ShaderMaterial
 		metallic_texture2 = value;
 		emit_changed();
 
-@export_category("Roughness")
+@export_group("Roughness")
 @export_range(0, 1, 0.01) var roughness: float = 0.0:
 	set(value):
 		set_shader_parameter("roughness", value);

addons/godotvmf/shaders/WorldVertexTransitionMaterial.gdshader

@@ -21,12 +21,22 @@ uniform vec4 metallic_texture_channel;
 uniform sampler2D roughness_texture : hint_roughness_r,filter_linear_mipmap,repeat_enable;
 uniform sampler2D roughness_texture2 : hint_roughness_r,filter_linear_mipmap,repeat_enable;
 
+uniform sampler2D blend_modulate_texture: source_color, filter_linear_mipmap, repeat_enable;
+
 uniform float specular;
 uniform vec3 uv1_scale = vec3(1.0);
 uniform vec3 uv1_offset = vec3(0.0);
 uniform vec3 uv2_scale = vec3(1.0);
 uniform vec3 uv2_offset = vec3(0.0);
+uniform bool convert_to_srgb = true;
+
+vec4 from_linear(vec4 linearRGB) {
+    bvec3 cutoff = lessThan(linearRGB.rgb, vec3(0.0031308));
+    vec3 higher = vec3(1.055)*pow(linearRGB.rgb, vec3(1.0/2.4)) - vec3(0.055);
+    vec3 lower = linearRGB.rgb * vec3(12.92);
 
+    return vec4(mix(higher, lower, cutoff), linearRGB.a);
+}
 
 void vertex() {
 	UV = UV * uv1_scale.xy + uv1_offset.xy;
@@ -37,8 +47,19 @@ void vertex() {
 void fragment() {
 	vec4 albedo_tex1 = texture(albedo_texture, UV);
 	vec4 albedo_tex2 = texture(albedo_texture2, UV);
-	vec4 albedo_tex = mix(albedo_tex1, albedo_tex2, COLOR.r);
-	vec4 albedo = mix(albedo_color, albedo_color2, COLOR.r);
+
+	vec4 modulate_value = convert_to_srgb
+		? from_linear(texture(blend_modulate_texture, UV))
+		: texture(blend_modulate_texture, UV);
+
+	float minb = max(modulate_value.g - modulate_value.r, 0.0);
+	float maxb = min(modulate_value.g + modulate_value.r, 1.0);
+
+	float blendfactor = COLOR.r;
+	blendfactor = smoothstep(minb, maxb, blendfactor);
+
+	vec4 albedo = mix(albedo_color, albedo_color2, blendfactor);
+	vec4 albedo_tex = mix(albedo_tex1, albedo_tex2, blendfactor);
 
 	ALBEDO = albedo_tex.rgb * albedo.rgb;
 

addons/godotvmf/src/structs/vmf_side.gd

@@ -41,7 +41,10 @@ func _init(raw: Dictionary, _solid: VMFSolid) -> void:
 ## Called automatically from VMFSolid
 func calculate_vertices() -> void:
 	# Already calculated
-	if vertices.size() > 0: return; 
+	if vertices.size() > 0: 
+		if is_displacement:
+			dispinfo.calculate_vertices();
+		return; 
 
 	var raw_vertices: Array[Vector3] = [];
 	var cache = {};