Sfoglia il codice sorgente

add trigger flag to shapes in PhysicsResource

mikymod 12 anni fa
parent
commit
441ad85b71

+ 2 - 0
engine/resource/PhysicsResource.cpp

@@ -135,6 +135,7 @@ void parse_shape(JSONElement e, PhysicsShape& shape)
 {
 {
 	JSONElement name = e.key("name");
 	JSONElement name = e.key("name");
 	JSONElement type = e.key("type");
 	JSONElement type = e.key("type");
+	JSONElement trigger = e.key("trigger");
 
 
 	DynamicString shape_name;
 	DynamicString shape_name;
 	DynamicString shape_type;
 	DynamicString shape_type;
@@ -143,6 +144,7 @@ void parse_shape(JSONElement e, PhysicsShape& shape)
 
 
 	shape.name = hash::murmur2_32(shape_name.c_str(), shape_name.length());
 	shape.name = hash::murmur2_32(shape_name.c_str(), shape_name.length());
 	shape.type = shape_type_to_enum(shape_type.c_str());
 	shape.type = shape_type_to_enum(shape_type.c_str());
+	shape.trigger = trigger.bool_value();
 
 
 	switch (shape.type)
 	switch (shape.type)
 	{
 	{

+ 1 - 0
engine/resource/PhysicsResource.h

@@ -145,6 +145,7 @@ struct PhysicsShape
 {
 {
 	StringId32 name;
 	StringId32 name;
 	uint32_t type;
 	uint32_t type;
+	bool trigger;
 
 
 	float data_0;
 	float data_0;
 	float data_1;
 	float data_1;