feat: update cars to latest cubos version

Author: RiscadoA

CMakeLists.txt

@@ -22,7 +22,7 @@ endfunction()
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize-recover=address")
 
-#add_subdirectory(cars)
+add_subdirectory(cars)
 #add_subdirectory(tanks)
 #add_subdirectory(scraps)
 #add_subdirectory(airships)

cars/CMakeLists.txt

@@ -1,8 +1,6 @@
 # cars/CMakeLists.txt
 # Cars demo build configuration
 
-option(CARS_DISTRIBUTE "Build the game for distribution" OFF)
-
 add_executable(cars
     src/car/car.cpp
     src/car/plugin.cpp
@@ -50,3 +48,17 @@ else()
         )
     endif()
 endif()
+
+# ------------------------ Configure game installation ------------------------
+
+if(DISTRIBUTE)
+    if(EMSCRIPTEN)
+        install(FILES $<TARGET_FILE_DIR:cars>/cars.html DESTINATION cars)
+        install(FILES $<TARGET_FILE_DIR:cars>/cars.wasm DESTINATION cars)
+        install(FILES $<TARGET_FILE_DIR:cars>/cars.js DESTINATION cars)
+    else()
+        install(TARGETS cars EXPORT cars RUNTIME DESTINATION cars)
+    endif()
+    install(DIRECTORY assets/ DESTINATION cars/assets)
+    install(DIRECTORY ${CUBOS_ENGINE_ASSETS_PATH}/ DESTINATION cars/builtin)
+endif()

cars/assets/scenes/car.cubos

@@ -1,101 +1,94 @@
 {
-  "entities": {
-    "car": {
-      "cubos::engine::BoxCollisionShape": {
-        "x": 7.5,
-        "y": 11.0,
-        "z": 16.0
-      },
-      "cubos::engine::Collider": {},
-      "cubos::engine::Position": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "cubos::engine::RenderVoxelGrid": {
-        "asset": "059c16e7-a439-44c7-9bdc-6e069dba0c75",
-        "offset": {
-          "x": -7.5,
-          "y": 0.0,
-          "z": -16.0
-        }
-      },
-      "cubos::engine::Rotation": {
-        "w": 1.0,
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "cubos::engine::Scale": 0.10000000149011612
+  "cubos::engine::CollisionLayers": 1,
+  "cubos::engine::CollisionMask": 3,
+  "cubos::engine::BoxCollisionShape": {
+    "x": 7.5,
+    "y": 11.0,
+    "z": 16.0
+  },
+  "cubos::engine::Position": {
+    "x": 0.0,
+    "y": 0.0,
+    "z": 0.0
+  },
+  "cubos::engine::RenderVoxelGrid": {
+    "asset": "059c16e7-a439-44c7-9bdc-6e069dba0c75",
+    "offset": {
+      "y": 0.0
+    }
+  },
+  "cubos::engine::Rotation": {
+    "w": 1.0,
+    "x": 0.0,
+    "y": 0.0,
+    "z": 0.0
+  },
+  "cubos::engine::Scale": 0.10000000149011612,
+  "#left-spot-light": {
+    "cubos::engine::Position": {
+      "x": -4.0,
+      "y": 4.0,
+      "z": 15.0
     },
-    "left-spot-light": {
-      "cubos::engine::Position": {
-        "x": -4.0,
-        "y": 4.0,
-        "z": 15.0
-      },
-      "cubos::engine::Rotation": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 1.0
-      },
-      "cubos::engine::Scale": 1.0,
-      "cubos::engine::SpotLight": {
-        "color": {
-          "x": 1.0,
-          "y": 1.0,
-          "z": 1.0
-        },
-        "innerSpotAngle": 60.0,
-        "intensity": 0.0,
-        "range": 50.0,
-        "spotAngle": 120.0
-      },
-      "cubos::engine::SpotShadowCaster": {},
-      "cubos::engine::ChildOf@car": {}
+    "cubos::engine::Rotation": {
+      "x": 0.0,
+      "y": 0.0,
+      "z": 0.0,
+      "w": 1.0
     },
-    "right-spot-light": {
-      "cubos::engine::Position": {
-        "x": 4.0,
-        "y": 4.0,
-        "z": 15.0
-      },
-      "cubos::engine::Rotation": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 1.0
-      },
-      "cubos::engine::Scale": 1.0,
-      "cubos::engine::SpotLight": {
-        "color": {
-          "x": 1.0,
-          "y": 1.0,
-          "z": 1.0
-        },
-        "innerSpotAngle": 60.0,
-        "intensity": 0.0,
-        "range": 50.0,
-        "spotAngle": 120.0
+    "cubos::engine::Scale": 1.0,
+    "cubos::engine::SpotLight": {
+      "color": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0
       },
-      "cubos::engine::ChildOf@car": {}
+      "innerSpotAngle": 60.0,
+      "intensity": 0.0,
+      "range": 50.0,
+      "spotAngle": 120.0
     },
-    "camera": {
-      "cubos::engine::Position": {
-        "x": 0.0,
-        "y": 30.0,
-        "z": -80.0
-      },
-      "cubos::engine::Rotation": {
-        "x": 0.0,
+    "cubos::engine::SpotShadowCaster": {}
+  },
+  "#right-spot-light": {
+    "cubos::engine::Position": {
+      "x": 4.0,
+      "y": 4.0,
+      "z": 15.0
+    },
+    "cubos::engine::Rotation": {
+      "x": 0.0,
+      "y": 0.0,
+      "z": 0.0,
+      "w": 1.0
+    },
+    "cubos::engine::Scale": 1.0,
+    "cubos::engine::SpotLight": {
+      "color": {
+        "x": 1.0,
         "y": 1.0,
-        "z": 0.0,
-        "w": 0.0
+        "z": 1.0
       },
-      "cubos::engine::PerspectiveCamera": 70.0,
-      "cubos::engine::ChildOf@car": {}
+      "innerSpotAngle": 60.0,
+      "intensity": 0.0,
+      "range": 50.0,
+      "spotAngle": 120.0
     }
   },
-  "imports": {}
+  "#camera": {
+    "cubos::engine::Position": {
+      "x": 0.0,
+      "y": 30.0,
+      "z": -80.0
+    },
+    "cubos::engine::Rotation": {
+      "x": 0.0,
+      "y": 1.0,
+      "z": 0.0,
+      "w": 0.0
+    },
+    "cubos::engine::PerspectiveCamera": {
+      "fovY": 70.0
+    }
+  }
 }