Bladeren bron

resource: fail on invalid collider types

Daniele Bartolini 1 jaar geleden
bovenliggende
commit
328f1f1af0
2 gewijzigde bestanden met toevoegingen van 6 en 1 verwijderingen
  1. 5 0
      src/resource/physics_resource.cpp
  2. 1 1
      src/resource/types.h

+ 5 - 0
src/resource/physics_resource.cpp

@@ -272,6 +272,9 @@ namespace physics_resource_internal
 			case ColliderType::HEIGHTFIELD:
 				DATA_COMPILER_ASSERT(false, opts, "Not implemented yet");
 				break;
+			default:
+				DATA_COMPILER_ASSERT(false, opts, "Invalid collider type");
+				break;
 			}
 		} else {
 			JsonObject collider_data(ta);
@@ -293,6 +296,8 @@ namespace physics_resource_internal
 			} else if (cd.type == ColliderType::CAPSULE) {
 				cd.capsule.radius = sjson::parse_float(collider_data["radius"]);
 				cd.capsule.height = sjson::parse_float(collider_data["height"]);
+			} else {
+				DATA_COMPILER_ASSERT(false, opts, "Invalid collider type");
 			}
 		}
 

+ 1 - 1
src/resource/types.h

@@ -77,7 +77,7 @@ struct Platform
 #define RESOURCE_VERSION_STATE_MACHINE    RESOURCE_VERSION(5)
 #define RESOURCE_VERSION_CONFIG           RESOURCE_VERSION(1)
 #define RESOURCE_VERSION_FONT             RESOURCE_VERSION(1)
-#define RESOURCE_VERSION_UNIT             RESOURCE_VERSION(9)
+#define RESOURCE_VERSION_UNIT             RESOURCE_VERSION(10)
 #define RESOURCE_VERSION_LEVEL            (RESOURCE_VERSION_UNIT + 4) //!< Level embeds UnitResource
 #define RESOURCE_VERSION_MATERIAL         RESOURCE_VERSION(4)
 #define RESOURCE_VERSION_MESH             RESOURCE_VERSION(5)