Quellcode durchsuchen

fix PhysicsResource

mikymod vor 12 Jahren
Ursprung
Commit
a327b59104
2 geänderte Dateien mit 9 neuen und 3 gelöschten Zeilen
  1. 8 2
      engine/resource/PhysicsResource.cpp
  2. 1 1
      engine/resource/PhysicsResource.h

+ 8 - 2
engine/resource/PhysicsResource.cpp

@@ -110,7 +110,7 @@ void parse_shapes(JSONElement e, List<PhysicsShape>& shapes)
 			{
 				JSONElement radius = shape.key("radius");
 				ps.data_0 = radius.to_float();
-				
+
 				break;
 			}
 			case PhysicsShapeType::CAPSULE:
@@ -152,7 +152,13 @@ void parse_shapes(JSONElement e, List<PhysicsShape>& shapes)
 			case PhysicsShapeType::CONVEX_MESH:
 			{
 				JSONElement resource = shape.key("mesh");
-				ps.resource = resource.to_string_id();
+				DynamicString mesh_name;
+				resource.to_string(mesh_name);
+				mesh_name += ".mesh";
+
+				StringId64 mesh_id = hash::murmur2_64(mesh_name.c_str(), string::strlen(mesh_name.c_str()), 0);
+
+				ps.resource.id = mesh_id;
 
 				break;
 			}

+ 1 - 1
engine/resource/PhysicsResource.h

@@ -94,7 +94,7 @@ struct PhysicsShape
 	StringId32 shape_class;		// Shape class from global.physics_config
 	StringId32 type;			// Type of the shape
 	StringId32 material;		// Material from global.physics_config
-	StringId32 resource;		// Resource such as .mesh or .heightmap
+	ResourceId resource;		// Resource such as .mesh or .heightmap
 	float data_0;
 	float data_1;
 	float data_2;