Release 2.3.0

.gitattributes

@@ -6,3 +6,4 @@
 /addons/** !export-ignore
 /script_templates    !export-ignore
 /script_templates/** !export-ignore
+LICENSE        !export-ignore

.gitignore

@@ -4,5 +4,3 @@
 !script_templates/
 !addons/**/*
 !script_templates/**/*
-
-addons/**/*.uid

addons/godotfgd/main.gd.uid

@@ -0,0 +1 @@
+uid://bf3qmyehwiuea

addons/godotvmf/entities/func_detail.gd.uid

@@ -0,0 +1 @@
+uid://d2dc4sqf30jtj

addons/godotvmf/entities/func_instance.gd.uid

@@ -0,0 +1 @@
+uid://e2t7hchk4u82

addons/godotvmf/entities/light.gd.uid

@@ -0,0 +1 @@
+uid://c4wae4v6rpk72

addons/godotvmf/entities/light_environment.gd.uid

@@ -0,0 +1 @@
+uid://c6ylaipt6p030

addons/godotvmf/entities/light_spot.gd.uid

@@ -0,0 +1 @@
+uid://bqjn8xm2aihuw

addons/godotvmf/entities/prop_static.gd.uid

@@ -0,0 +1 @@
+uid://nswhg1njw5xv

addons/godotvmf/entities/prop_studio.gd

@@ -24,7 +24,8 @@ func _entity_setup(_entity: VMFEntity) -> void:
 
 	if not model_scene:
 		if not ResourceLoader.exists(model_path):
-			if VMFCache.is_file_logged(model): return
+			queue_free();
+			if VMFCache.is_file_logged(model):  return
 
 			VMFLogger.warn("Model not found: " + model_path);
 			VMFCache.add_logged_file(model);

addons/godotvmf/entities/prop_studio.gd.uid

@@ -0,0 +1 @@
+uid://bpw635t676c6s

addons/godotvmf/godotmdl/ani_reader.gd.uid

@@ -0,0 +1 @@
+uid://c0nnkq7jx5l8k

addons/godotvmf/godotmdl/import.gd

@@ -34,6 +34,18 @@ func _get_import_options(str, int): return [
 		default_value = false,
 		type = TYPE_BOOL,
 	},
+	{
+		name = "collision_from_mesh",
+		description = "Creates a collision model from the mesh itself, not from PHY file",
+		default_value = false,
+		type = TYPE_BOOL,
+	},
+	{
+		name = "collision_from_mesh_simplify_level",
+		description = "Specifies how simple the collision mesh will be. 1.0 - most simple, 0.0 - original mesh",
+		default_value = 1.0,
+		type = TYPE_FLOAT,
+	},
 	{
 		name = "generate_lods",
 		default_value = true,

addons/godotvmf/godotmdl/import.gd.uid

@@ -0,0 +1 @@
+uid://bk28rdclb504g

addons/godotvmf/godotmdl/mdl_combiner.gd

@@ -22,7 +22,10 @@ var rotation_radians: Vector3:
 
 var additional_basis: Basis:
 	get: return Basis.from_euler(rotation_radians);
-
+
+var is_static_prop: bool:
+	get: return (mdl.header.flags & mdl.MDLFlag.STATIC_PROP) != 0;
+
 ## Apply a skin to a mesh instance
 ## directly means that skin is applied to internal mesh itself
 static func apply_skin(mesh_instance: MeshInstance3D, skin_id: int, directly: bool = false):
@@ -122,10 +125,16 @@ func create_occluder():
 		var begin_vid = 0;
 
 		st.begin(Mesh.PRIMITIVE_TRIANGLES);
-
 		for child in colliders:
-			var s: ConcavePolygonShape3D = child.shape;
-			var points = s.get_faces();
+			var s: Shape3D = child.shape;
+			var points = [];
+
+			if s is ConvexPolygonShape3D:
+				points = s.points;
+			elif s is ConcavePolygonShape3D:
+				points = s.get_faces();
+			else:
+				continue;
 
 			for p in points:
 				st.add_vertex(p);
@@ -152,8 +161,22 @@ func create_occluder():
 	mesh_instance.add_child(occluder);
 	occluder.set_owner(mesh_instance);
 
+func generate_collision_from_mesh():
+	var simplified_mesh := VMFMeshUtils.simplify_mesh(mesh_instance.mesh, options.collision_from_mesh_simplify_level).create_trimesh_shape();
+	var static_body := StaticBody3D.new();
+	var collision := CollisionShape3D.new();
+	collision.name = "collision";
+	collision.shape = simplified_mesh;
+	static_body.name = "static_body";
+	static_body.add_child(collision);
+	mesh_instance.add_child(static_body);
+	static_body.set_owner(mesh_instance);
+	collision.set_owner(mesh_instance);
+
 # TODO: For non-static props collision should be rotated by 90 degrees around y-axis
 func generate_collision():
+	if options.collision_from_mesh: return generate_collision_from_mesh();
+
 	var yup_to_zup = Basis().rotated(Vector3.RIGHT, PI / 2);
 	var yup_to_zup_transform = Transform3D(yup_to_zup, Vector3.ZERO);
 	var static_body: StaticBody3D;
@@ -203,8 +226,9 @@ func generate_collision():
 				static_body.set_owner(mesh_instance);
 			else:
 				# NOTE: We don't need bone attachment for static bodies since they has only one bone
-				mesh_instance.add_child(static_body);
-				static_body.set_owner(mesh_instance);
+				if static_body.get_parent() != mesh_instance:
+					mesh_instance.add_child(static_body);
+					static_body.set_owner(mesh_instance);
 
 			static_body.add_child(collision);
 			collision.set_owner(mesh_instance);
@@ -214,6 +238,8 @@ func generate_collision():
 		surface_index += 1;
 
 func setup_skeleton():
+	if is_static_prop: return;
+
 	if Engine.get_version_info().minor < 4: return;
 	if is_static_body: return;
 	skeleton.basis = additional_basis.inverse();

addons/godotvmf/godotmdl/mdl_combiner.gd.uid

@@ -0,0 +1 @@
+uid://bd4ctjcovsf7w

addons/godotvmf/godotmdl/mdl_reader.gd.uid

@@ -0,0 +1 @@
+uid://sj5ua4ctykyh

addons/godotvmf/godotmdl/mesh_generator.gd.uid

@@ -0,0 +1 @@
+uid://bfbefl04wexpp

addons/godotvmf/godotmdl/phy_reader.gd.uid

@@ -0,0 +1 @@
+uid://tbul0tcs2ot

addons/godotvmf/godotmdl/reader.gd

@@ -76,6 +76,10 @@ static func read_by_structure(file: FileAccess, Clazz, read_from = -1):
 
 	return result;
 
+static func read_char(file: FileAccess):
+	var byte = file.get_8();
+	return char(byte) if byte != 0 else "";
+
 static func _read_data(file: FileAccess, type: Type):
 	match type:
 		Type.FLOAT: 					return file.get_float();
@@ -84,10 +88,10 @@ static func _read_data(file: FileAccess, type: Type):
 		Type.SHORT: 					return read_signed_short(file);
 		Type.LONG: 						return file.get_64() - 0x80000000;
 		Type.UNSIGNED_SHORT: 			return file.get_16();
-		Type.UNSIGNED_CHAR: 			return file.get_8();
+		Type.UNSIGNED_CHAR: 			return read_char(file);
 
-		Type.STRING: 					return char(file.get_8());
-		Type.CHAR: 						return char(file.get_8());
+		Type.STRING: 					return read_char(file);
+		Type.CHAR: 						return read_char(file);
 		Type.VECTOR2: 					return Vector2(file.get_float(), file.get_float());
 		Type.VECTOR4: 					return Vector4(file.get_float(), file.get_float(), file.get_float(), file.get_float());
 

addons/godotvmf/godotmdl/reader.gd.uid

@@ -0,0 +1 @@
+uid://b8qxk8wgly1f4

addons/godotvmf/godotmdl/struct.gd.uid

@@ -0,0 +1 @@
+uid://begr2w44t20kb

addons/godotvmf/godotmdl/vtx_reader.gd.uid

@@ -0,0 +1 @@
+uid://c5n88vi41i5tu

addons/godotvmf/godotmdl/vvd_reader.gd.uid

@@ -0,0 +1 @@
+uid://daydea6sm0c2d

addons/godotvmf/godotvdf/vdf_parser.gd.uid

@@ -0,0 +1 @@
+uid://dljwvdlrqbe7s

addons/godotvmf/godotvmf.gd

@@ -23,6 +23,7 @@ func _enter_tree() -> void:
 	dock.get_node('ReimportGeometry').pressed.connect(ReimportGeometry);
 	dock.get_node('Docs').pressed.connect(func(): OS.shell_open("https://github.com/H2xDev/GodotVMF/wiki"));
 	dock.get_node('DiscordSupport').pressed.connect(func(): OS.shell_open("https://discord.gg/wtSK94fPxd"));
+	dock.get_node('ReimportDetailProps').pressed.connect(ReimportDetailProps);
 
 	mdl_import_plugin = preload("res://addons/godotvmf/godotmdl/import.gd").new();
 	vmt_import_plugin = preload("res://addons/godotvmf/godotvmt/vmt_import.gd").new();
@@ -90,14 +91,24 @@ func ReimportVMF():
 func ReimportEntities():
 	var nodes := GetExistingVMFNodes();
 
-	dock.get_node('ProgressBar').show();
 	dock.get_node('ProgressBar').show();
 	await get_tree().create_timer(0.1).timeout
 
 	for node in nodes: 
 		node.reimport_entities();
 	dock.get_node('ProgressBar').hide();
 
+func ReimportDetailProps():
+	var nodes := GetExistingVMFNodes();
+
+	dock.get_node('ProgressBar').show();
+	await get_tree().create_timer(0.1).timeout
+
+	for node in nodes:
+		node.reimport_detail_props();
+
+	dock.get_node('ProgressBar').hide();
+
 func ReimportGeometry():
 	var nodes := GetExistingVMFNodes();
 

addons/godotvmf/godotvmf.gd.uid

@@ -0,0 +1 @@
+uid://dlvt67aflbr5e

addons/godotvmf/godotvmt/formats/vtf_dxt.gd

@@ -0,0 +1,33 @@
+class_name VTFDXT extends VTFFrameReader
+
+static func read(vtf: VTFLoader, frame: int, srgb_conversion_method: VTFLoader.SRGBConversionMethod) -> ImageTexture:
+	var data = PackedByteArray();
+	var bytes_read := 0;
+	var is_dxt_1 := vtf.hires_image_format == vtf.ImageFormat.DXT1;
+	var multiplier = 8 if is_dxt_1 else 16;
+	var format := vtf.format_map[str(vtf.hires_image_format)] as Image.Format;
+	var use_mipmaps := not (vtf.flags & vtf.Flags.TEXTUREFLAGS_NOMIP);
+
+	frame = vtf.frames - 1 - frame;
+
+	for i in range(vtf.mipmap_count):
+		var mipWidth = max(1, vtf.width >> i);
+		var mipHeight = max(1, vtf.height >> i);
+
+		var mip_size = max(1, mipWidth / 4) * max(1, mipHeight / 4) * multiplier;
+
+		vtf.file.seek(vtf.file.get_length() - bytes_read - mip_size - mip_size * frame);
+		data += vtf.file.get_buffer(mip_size);
+
+		bytes_read += mip_size + mip_size * (vtf.frames - 1);
+
+	var img := Image.create_from_data(vtf.width, vtf.height, use_mipmaps, format, data);
+	if not img: return null;
+
+	if srgb_conversion_method == vtf.SRGBConversionMethod.DURING_IMPORT:
+		img.decompress();
+		img.compress(Image.COMPRESS_S3TC);
+
+	vtf.alpha = vtf.flags & vtf.Flags.TEXTUREFLAGS_ONEBITALPHA or vtf.flags & vtf.Flags.TEXTUREFLAGS_EIGHTBITALPHA;
+
+	return ImageTexture.create_from_image(img);

addons/godotvmf/godotvmt/formats/vtf_dxt.gd.uid

@@ -0,0 +1 @@
+uid://dphnyrf0rcafa

addons/godotvmf/godotvmt/formats/vtf_frame_reader.gd

@@ -0,0 +1,6 @@
+class_name VTFFrameReader extends RefCounted
+
+
+## Base class for reading frames from a VTF file. Each image format should have its own implementation of this class.
+static func read(vtf: VTFLoader, frame: int, srgb_conversion_method: VTFLoader.SRGBConversionMethod) -> ImageTexture:
+	return null;

addons/godotvmf/godotvmt/formats/vtf_frame_reader.gd.uid

@@ -0,0 +1 @@
+uid://b5ihhe3066q25

addons/godotvmf/godotvmt/formats/vtf_i8.gd

@@ -0,0 +1,27 @@
+class_name VTFI8 extends VTFFrameReader
+
+static func read(vtf: VTFLoader, frame: int, srgb_conversion_method: VTFLoader.SRGBConversionMethod) -> ImageTexture:
+	var data := PackedByteArray(); 
+	var bytes_read := 0;
+	var use_mipmaps := not (vtf.flags & vtf.Flags.TEXTUREFLAGS_NOMIP);
+	var multiplier := 1 if vtf.hires_image_format == vtf.ImageFormat.I8 else 2;
+	var output_format := Image.FORMAT_L8 if vtf.hires_image_format == vtf.ImageFormat.I8 else Image.FORMAT_LA8;
+
+	frame = vtf.frames - 1 - frame;
+
+	for i in range(vtf.mipmap_count):
+		var mip_width = max(1, vtf.width >> i);
+		var mip_height = max(1, vtf.height >> i);
+		var mip_size = mip_width * mip_height * multiplier; # I8 has 1 byte per pixel
+
+		vtf.file.seek(vtf.file.get_length() - bytes_read - mip_size - mip_size * frame);
+		var chunk := vtf.file.get_buffer(mip_size);
+
+		data += chunk;
+		bytes_read += mip_size + mip_size * (vtf.frames - 1);
+
+	var img := Image.create_from_data(vtf.width, vtf.height, use_mipmaps, output_format, data);
+
+	if not img: return null;
+
+	return ImageTexture.create_from_image(img);

addons/godotvmf/godotvmt/formats/vtf_i8.gd.uid

@@ -0,0 +1 @@
+uid://dd3xyrn3lduxg

addons/godotvmf/godotvmt/formats/vtf_rgba.gd

@@ -0,0 +1,36 @@
+class_name VTFRGBA extends VTFFrameReader
+
+static func read(vtf: VTFLoader, frame: int, srgb_conversion_method: VTFLoader.SRGBConversionMethod) -> ImageTexture:
+	var data := PackedByteArray(); 
+	var bytes_read := 0;
+	var use_mipmaps := not (vtf.flags & vtf.Flags.TEXTUREFLAGS_NOMIP);
+	var is_abgr := vtf.hires_image_format == vtf.ImageFormat.ABGR8888 || vtf.hires_image_format == vtf.ImageFormat.BGR888;
+	var is_no_alpha := vtf.hires_image_format >= vtf.ImageFormat.RGB888;
+	var channels_count := 3 if is_no_alpha else 4;
+	var output_format := Image.FORMAT_RGB8 if is_no_alpha else Image.FORMAT_RGBA8;
+
+
+	frame = vtf.frames - 1 - frame;
+
+	for i in range(vtf.mipmap_count):
+		var mip_width = max(1, vtf.width >> i);
+		var mip_height = max(1, vtf.height >> i);
+		var mip_size = mip_width * mip_height * channels_count; # RGBA8888 has 4 bytes per pixel
+
+		vtf.file.seek(vtf.file.get_length() - bytes_read - mip_size - mip_size * frame);
+		var chunk := vtf.file.get_buffer(mip_size);
+
+		if is_abgr: chunk.reverse();
+
+		data += chunk;
+		bytes_read += mip_size + mip_size * (vtf.frames - 1);
+
+	var img := Image.create_from_data(vtf.width, vtf.height, use_mipmaps, output_format, data);
+
+	if is_abgr:
+		img.flip_x();
+		img.flip_y();
+
+	if not img: return null;
+
+	return ImageTexture.create_from_image(img);

addons/godotvmf/godotvmt/formats/vtf_rgba.gd.uid

@@ -0,0 +1 @@
+uid://bolwkc1500o7x

addons/godotvmf/godotvmt/vmt_context_menu.gd.uid

@@ -0,0 +1 @@
+uid://d4en2bmq1eoyb

addons/godotvmf/godotvmt/vmt_import.gd.uid

@@ -0,0 +1 @@
+uid://b5c8p8i51m8mr