Physics Asset Cleanup

docs/nc-convert.md

@@ -162,10 +162,10 @@ There is also support for external animations such as Mixamo.
 - [.nca File Format](#nca-file-format)
 - [Blob Formats](#blob-formats)
     - [AudioClip](#audioclip-blob-format)
-    - [ConcaveCollider](#concavecollider-blob-format)
+    - [ConvexHull](#convexhull-blob-format)
     - [Cubemap](#cubemap-blob-format)
-    - [HullCollider](#hullcollider-blob-format)
     - [Mesh](#mesh-blob-format)
+    - [MeshCollider](#meshcollider-blob-format)
     - [Shader](#shader-blob-format)
     - [SkeletalAnimation](#skeletalanimation-blob-format)
     - [Texture](#texture-blob-format)
@@ -192,16 +192,6 @@ an asset blob, the layout of which is determined by the asset type.
 | left channel        | double[] | 8 * samples per channel |
 | right channel       | double[] | 8 * samples per channel |
 
-### ConcaveCollider Blob Format
-> Magic Number: 'CONC'
-
-| Name           | Type       | Size                |
-|----------------|------------|---------------------|
-| extents        | Vector3    | 12                  |
-| max extent     | float      | 4                   |
-| triangle count | u64        | 8                   |
-| triangles      | Triangle[] | triangle count * 36 |
-
 ### Cubemap Blob Format
 > Magic Number: 'CUBE'
 
@@ -212,15 +202,15 @@ an asset blob, the layout of which is determined by the asset type.
 
 CubeMap faces in pixel data array are ordered: front, back, up, down, right, left.
 
-### HullCollider Blob Format
+### ConvexHull Blob Format
 > Magic number: 'HULL'
 
 | Name         | Type      | Size              |
 |--------------|-----------|-------------------|
 | extents      | Vector3   | 12                |
 | max extent   | float     | 4                 |
-| vertex count | u64       | 8                 |
-| vertex list  | Vector3[] | vertex count * 12 |
+| byte count   | u64       | 8                 |
+| bytes        | u8[]      | byte count        |
 
 ### Mesh Blob Format
 > Magic Number: 'MESH'
@@ -246,6 +236,17 @@ CubeMap faces in pixel data array are ordered: front, back, up, down, right, lef
 | vertexSpaceToBoneSpace       | VertexSpaceToBoneSpace[]                            | (72 + sizeof(boneName)) * vertexSpaceToBoneSpace count  |
 | boneSpaceToParentSpace       | BoneSpaceToParentSpace[]                            | (136 + sizeof(boneName)) * vertexSpaceToBoneSpace count |
 
+
+### MeshCollider Blob Format
+> Magic Number: 'CONC'
+
+| Name           | Type       | Size                |
+|----------------|------------|---------------------|
+| extents        | Vector3    | 12                  |
+| max extent     | float      | 4                   |
+| byte count     | u64        | 8                   |
+| bytes          | u8[]       | byte count          |
+
 ### Shader Blob Format
 > Magic Number: 'SHAD'
 

include/ncasset/AssetType.h

@@ -9,10 +9,10 @@ namespace nc::asset
 enum class AssetType
 {
     AudioClip,
+    ConvexHull,
     CubeMap,
-    ConcaveCollider,
-    HullCollider,
     Mesh,
+    MeshCollider,
     Shader,
     SkeletalAnimation,
     Texture,

include/ncasset/NcaHeader.h

@@ -19,10 +19,10 @@ constexpr auto currentVersion = version4;
 struct MagicNumber
 {
     static constexpr auto audioClip = std::string_view{"CLIP"};
-    static constexpr auto concaveCollider = std::string_view{"CONC"};
     static constexpr auto cubeMap = std::string_view{"CUBE"};
     static constexpr auto convexHull = std::string_view{"HULL"};
     static constexpr auto mesh = std::string_view{"MESH"};
+    static constexpr auto meshCollider = std::string_view{"CONC"};
     static constexpr auto shader = std::string_view{"SHAD"};
     static constexpr auto skeletalAnimation = std::string_view{"SKEL"};
     static constexpr auto texture = std::string_view{"TEXT"};

include/ncengine/asset/AssetViews.h

@@ -29,11 +29,6 @@ struct AudioClipView
     size_t samplesPerChannel = 0ull;
 };
 
-struct ConcaveColliderView
-{
-    AssetId id = NullAssetId;
-};
-
 struct ConvexHullView
 {
     AssetId id = NullAssetId;
@@ -62,6 +57,11 @@ struct MeshView
     float maxExtent = 0.0f;
 };
 
+struct MeshColliderView
+{
+    AssetId id = NullAssetId;
+};
+
 struct TextureView
 {
     AssetId id = NullAssetId;
@@ -122,11 +122,11 @@ struct FontView
 template<class T>
 concept AssetView = std::same_as<T, AudioClipView>         ||
                     std::same_as<T, ConvexHullView>        ||
-                    std::same_as<T, ConcaveColliderView>   ||
-                    std::same_as<T, MeshView>              ||
-                    std::same_as<T, TextureView>           ||
                     std::same_as<T, CubeMapView>           ||
+                    std::same_as<T, FontView>              ||
+                    std::same_as<T, MeshColliderView>      ||
+                    std::same_as<T, MeshView>              ||
                     std::same_as<T, ShaderView>            ||
                     std::same_as<T, SkeletalAnimationView> ||
-                    std::same_as<T, FontView>;
+                    std::same_as<T, TextureView>;
 } // namespace nc::asset

include/ncengine/asset/Assets.h

@@ -28,12 +28,12 @@ auto AcquireAudioClipAsset(const std::string& path) -> AudioClipView;
 auto AcquireAudioClipAsset(AssetId id) -> AudioClipView;
 
 /** Supported file types: .nca */
-bool LoadConcaveColliderAsset(const std::string& path, bool isExternal = false, asset_flags_type flags = AssetFlags::None);
-bool LoadConcaveColliderAssets(std::span<const std::string> paths, bool isExternal = false, asset_flags_type flags = AssetFlags::None);
-bool UnloadConcaveColliderAsset(const std::string& path, asset_flags_type flags = AssetFlags::None);
-void UnloadAllConcaveColliderAssets(asset_flags_type flags = AssetFlags::None);
-auto AcquireConcaveColliderAsset(const std::string& path) -> ConcaveColliderView;
-auto AcquireConcaveColliderAsset(AssetId id) -> ConcaveColliderView;
+bool LoadMeshColliderAsset(const std::string& path, bool isExternal = false, asset_flags_type flags = AssetFlags::None);
+bool LoadMeshColliderAssets(std::span<const std::string> paths, bool isExternal = false, asset_flags_type flags = AssetFlags::None);
+bool UnloadMeshColliderAsset(const std::string& path, asset_flags_type flags = AssetFlags::None);
+void UnloadAllMeshColliderAssets(asset_flags_type flags = AssetFlags::None);
+auto AcquireMeshColliderAsset(const std::string& path) -> MeshColliderView;
+auto AcquireMeshColliderAsset(AssetId id) -> MeshColliderView;
 
 /** Supported file types: .nca */
 bool LoadConvexHullAsset(const std::string& path, bool isExternal = false, asset_flags_type flags = AssetFlags::None);

include/ncengine/asset/DefaultAssets.h

@@ -51,9 +51,9 @@ constexpr auto DefaultSkyboxCubeMap = "DefaultSkyboxCubeMap.nca";
 /** @brief Name of the default empty audio clip asset. */
 constexpr auto DefaultAudioClip = "DefaultAudioClip.nca";
 
-/** @brief Name of the default plane-shaped concave collider asset. */
-constexpr auto DefaultConcaveCollider = "DefaultConcaveCollider.nca";
+/** @brief Name of the default plane-shaped mesh collider asset. */
+constexpr auto DefaultMeshCollider = "DefaultMeshCollider.nca";
 
-/** @brief Name of the default cube-shaped hull collider asset. */
-constexpr auto DefaultHullCollider = "DefaultHullCollider.nca";
+/** @brief Name of the default cube-shaped convex hull asset. */
+constexpr auto DefaultConvexHull = "DefaultConvexHull.nca";
 } // namespace nc::asset

include/ncengine/config/Config.h

@@ -32,15 +32,15 @@ struct EngineSettings
  */
 struct AssetSettings
 {
-    std::string audioClipsPath = "assets/audio_clips/";
-    std::string concaveCollidersPath = "assets/concave_colliders/";
-    std::string hullCollidersPath = "assets/hull_colliders/";
-    std::string meshesPath = "assets/meshes/";
-    std::string shadersPath = "assets/shaders/";
-    std::string skeletalAnimationsPath = "assets/skeletal_animations/";
-    std::string texturesPath = "assets/textures/";
-    std::string cubeMapsPath = "assets/cube_maps";
-    std::string fontsPath = "assets/fonts";
+    std::string audioClipsPath = "assets/audio_clip/";
+    std::string convexHullsPath = "assets/convex_hull/";
+    std::string cubeMapsPath = "assets/cube_map";
+    std::string fontsPath = "assets/font";
+    std::string meshesPath = "assets/mesh/";
+    std::string meshCollidersPath = "assets/mesh_collider/";
+    std::string shadersPath = "assets/shader/";
+    std::string skeletalAnimationsPath = "assets/skeletal_animation/";
+    std::string texturesPath = "assets/texture/";
 };
 
 /**

resources/manifest.json

@@ -8,10 +8,10 @@
             "assetName": "audio_clip/DefaultAudioClip"
         }
     ],
-    "concave-collider": [
+    "convex-hull": [
         {
-            "sourcePath": "raw/model/DefaultPlane.fbx",
-            "assetName": "concave_collider/DefaultConcaveCollider"
+            "sourcePath": "raw/model/DefaultCube.fbx",
+            "assetName": "convex_hull/DefaultConvexHull"
         }
     ],
     "cube-map": [
@@ -20,12 +20,6 @@
             "assetName": "cube_map/DefaultSkyboxCubeMap"
         }
     ],
-    "hull-collider": [
-        {
-            "sourcePath": "raw/model/DefaultCube.fbx",
-            "assetName": "hull_collider/DefaultHullCollider"
-        }
-    ],
     "mesh": [
         {
             "sourcePath": "raw/model/DefaultCapsule.fbx",
@@ -70,6 +64,12 @@
             }
         }
     ],
+    "mesh-collider": [
+        {
+            "sourcePath": "raw/model/DefaultPlane.fbx",
+            "assetName": "mesh_collider/DefaultMeshCollider"
+        }
+    ],
     "texture": [
         {
             "sourcePath": "raw/image/DefaultBaseColor.png",

sample/assets/manifest.json

@@ -12,10 +12,10 @@
             "assetName": "audio_clip/hit"
         }
     ],
-    "concave-collider": [
+    "convex-hull": [
         {
-            "sourcePath": "raw/model/halfpipe.fbx",
-            "assetName": "concave_collider/halfpipe"
+            "sourcePath": "raw/model/ramp.fbx",
+            "assetName": "convex_hull/ramp"
         }
     ],
     "cube-map": [
@@ -24,12 +24,6 @@
             "assetName": "cube_map/night_sky.nca"
           }
     ],
-    "hull-collider": [
-        {
-            "sourcePath": "raw/model/ramp.fbx",
-            "assetName": "hull_collider/ramp"
-        }
-    ],
     "mesh": [
         {
             "sourcePath": "raw/model/ogre.fbx",
@@ -67,6 +61,12 @@
             }
         }
     ],
+    "mesh-collider": [
+        {
+            "sourcePath": "raw/model/halfpipe.fbx",
+            "assetName": "mesh_collider/halfpipe"
+        }
+    ],
     "skeletal-animation": [
         {
             "sourcePath": "raw/skeletal_animation/skeleton.fbx",

sample/config.ini

@@ -7,14 +7,14 @@ thread_count=8
 build_tasks_on_init=1
 [asset_settings]
 audio_clips_path=nca/audio_clip/
-concave_colliders_path=nca/concave_collider/
-hull_colliders_path=nca/hull_collider/
+convex_hulls_path=nca/convex_hull/
+cubemaps_path=nca/cube_map/
+fonts_path=nca/font/
+mesh_colliders_path=nca/mesh_collider/
 meshes_path=nca/mesh/
 shaders_path=nca/shaders/
 skeletal_animations_path=nca/skeletal_animation/
 textures_path=nca/texture/
-cubemaps_path=nca/cube_map/
-fonts_path=nca/font/
 [memory_settings]
 max_rigid_bodies=15000
 max_particle_emitters=1000

sample/source/scenes/SmokeTest.cpp

@@ -94,12 +94,12 @@ void SmokeTest::Load(ecs::Ecs world, ModuleProvider modules)
     if (isSecondPass)
     {
         asset::UnloadAllAudioClipAssets();
-        asset::UnloadAllConcaveColliderAssets();
         asset::UnloadAllConvexHullAssets();
         asset::UnloadAllCubeMapAssets();
         asset::UnloadAllMeshAssets();
-        asset::UnloadAllTextureAssets();
+        asset::UnloadAllMeshColliderAssets();
         asset::UnloadAllSkeletalAnimationAssets();
+        asset::UnloadAllTextureAssets();
         ::LoadScene(world, modules);
     }
     else

sample/source/shared/Prefabs.cpp

@@ -106,10 +106,10 @@ void InitializeResources()
 
     const auto& assetSettings = config::GetAssetSettings();
     LoadAssets(assetSettings.audioClipsPath, asset::AssetFlags::None, &asset::LoadAudioClipAssets);
-    LoadAssets(assetSettings.concaveCollidersPath, asset::AssetFlags::None, &asset::LoadConcaveColliderAssets);
+    LoadAssets(assetSettings.convexHullsPath, asset::AssetFlags::None, &asset::LoadConvexHullAssets);
     LoadAssets(assetSettings.cubeMapsPath, asset::AssetFlags::None, &asset::LoadCubeMapAssets);
-    LoadAssets(assetSettings.hullCollidersPath, asset::AssetFlags::None, &asset::LoadConvexHullAssets);
     LoadAssets(assetSettings.meshesPath, asset::AssetFlags::None, &asset::LoadMeshAssets);
+    LoadAssets(assetSettings.meshCollidersPath, asset::AssetFlags::None, &asset::LoadMeshColliderAssets);
     LoadAssets(assetSettings.skeletalAnimationsPath, asset::AssetFlags::None, &asset::LoadSkeletalAnimationAssets);
     LoadFont(UIFont);
 

source/ncasset/Deserialize.cpp

@@ -64,7 +64,7 @@ auto DeserializeAudioClip(std::istream& stream) -> DeserializedResult<AudioClip>
 
 auto DeserializeMeshCollider(std::istream& stream) -> DeserializedResult<MeshCollider>
 {
-    return DeserializeImpl<MeshCollider>(stream, MagicNumber::concaveCollider);
+    return DeserializeImpl<MeshCollider>(stream, MagicNumber::meshCollider);
 }
 
 auto DeserializeCubeMap(std::istream& stream) -> DeserializedResult<CubeMap>

source/ncasset/NcaHeader.cpp

@@ -14,22 +14,22 @@ auto GetAssetType(const NcaHeader& header) -> AssetType
     {
         return AssetType::AudioClip;
     }
-    else if (magicNumber == MagicNumber::concaveCollider)
+    else if (magicNumber == MagicNumber::convexHull)
     {
-        return AssetType::ConcaveCollider;
+        return AssetType::ConvexHull;
     }
     else if (magicNumber == MagicNumber::cubeMap)
     {
         return AssetType::CubeMap;
     }
-    else if (magicNumber == MagicNumber::convexHull)
-    {
-        return AssetType::HullCollider;
-    }
     else if (magicNumber == MagicNumber::mesh)
     {
         return AssetType::Mesh;
     }
+    else if (magicNumber == MagicNumber::meshCollider)
+    {
+        return AssetType::MeshCollider;
+    }
     else if (magicNumber == MagicNumber::shader)
     {
         return AssetType::Shader;

source/ncconvert/Main.cpp

@@ -24,12 +24,12 @@ Options
   -i <assetPath>          Print details about an existing asset file.
 
 Asset types               Supported file types      Can produce multiple assets
+  audio-clip              wav                       false
+  convex-hull             fbx, obj                  false
+  cube-map                jpg, png, bmp             false
   mesh                    fbx, obj                  true
-  hull-collider           fbx, obj                  false
-  concave-collider        fbx, obj                  false
+  mesh-collider           fbx, obj                  false
   texture                 jpg, png, bmp             false
-  cube-map                jpg, png, bmp             false
-  audio-clip              wav                       false
 
 Asset names
   The provided asset name is used to construct the output file path. It may

source/ncconvert/builder/BuildInstructions.cpp

@@ -13,10 +13,10 @@ auto BuildTargetMap() -> std::unordered_map<nc::asset::AssetType, std::vector<nc
 {
     auto out = std::unordered_map<nc::asset::AssetType, std::vector<nc::convert::Target>>{};
     out.emplace(nc::asset::AssetType::AudioClip, std::vector<nc::convert::Target>{});
+    out.emplace(nc::asset::AssetType::ConvexHull, std::vector<nc::convert::Target>{});
     out.emplace(nc::asset::AssetType::CubeMap, std::vector<nc::convert::Target>{});
-    out.emplace(nc::asset::AssetType::ConcaveCollider, std::vector<nc::convert::Target>{});
-    out.emplace(nc::asset::AssetType::HullCollider, std::vector<nc::convert::Target>{});
     out.emplace(nc::asset::AssetType::Mesh, std::vector<nc::convert::Target>{});
+    out.emplace(nc::asset::AssetType::MeshCollider, std::vector<nc::convert::Target>{});
     out.emplace(nc::asset::AssetType::SkeletalAnimation, std::vector<nc::convert::Target>{});
     out.emplace(nc::asset::AssetType::Texture, std::vector<nc::convert::Target>{});
     return out;

source/ncconvert/builder/BuildOrchestrator.cpp

@@ -16,10 +16,10 @@ namespace
 {
 constexpr auto assetTypes = std::array<nc::asset::AssetType, 7>{
     nc::asset::AssetType::AudioClip,
+    nc::asset::AssetType::ConvexHull,
     nc::asset::AssetType::CubeMap,
-    nc::asset::AssetType::ConcaveCollider,
-    nc::asset::AssetType::HullCollider,
     nc::asset::AssetType::Mesh,
+    nc::asset::AssetType::MeshCollider,
     nc::asset::AssetType::SkeletalAnimation,
     nc::asset::AssetType::Texture
 };