OBJ should really be a scene loader in the future (just no lights)

devsh · devsh · commit e21766549b57 · 2025-06-03T12:38:56.000+02:00
diff --git a/include/nbl/asset/metadata/COBJMetadata.h b/include/nbl/asset/metadata/COBJMetadata.h
diff --git a/src/nbl/asset/interchange/COBJMeshFileLoader.cpp b/src/nbl/asset/interchange/COBJMeshFileLoader.cpp
@@ -13,7 +13,6 @@
 #include "nbl/system/ISystem.h"
 #include "nbl/system/IFile.h"
 
-#include "nbl/asset/metadata/COBJMetadata.h"
 #include "nbl/asset/utils/CQuantNormalCache.h"
 
 #include "COBJMeshFileLoader.h"
diff --git a/src/nbl/asset/interchange/COBJMeshFileLoader.h b/src/nbl/asset/interchange/COBJMeshFileLoader.h
@@ -52,7 +52,7 @@ class SObjVertex
 #include "nbl/nblunpack.h"
 
 //! Meshloader capable of loading obj meshes.
-class COBJMeshFileLoader : public asset::IAssetLoader
+class COBJMeshFileLoader : public IGeometryLoader
 {
     struct SContext
     {
@@ -90,8 +90,6 @@ class COBJMeshFileLoader : public asset::IAssetLoader
         return ext;
     }
 
-    virtual uint64_t getSupportedAssetTypesBitfield() const override { return asset::IAsset::ET_MESH; }
-
     virtual asset::SAssetBundle loadAsset(system::IFile* _file, const asset::IAssetLoader::SAssetLoadParams& _params, asset::IAssetLoader::IAssetLoaderOverride* _override = nullptr, uint32_t _hierarchyLevel = 0u) override;
 
 private:

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class SObjVertex`
`52`	`52`	`#include "nbl/nblunpack.h"`
`53`	`53`
`54`	`54`	`//! Meshloader capable of loading obj meshes.`
`55`		`-class COBJMeshFileLoader : public asset::IAssetLoader`
	`55`	`+class COBJMeshFileLoader : public IGeometryLoader`
`56`	`56`	`{`
`57`	`57`	`struct SContext`
`58`	`58`	`{`
`@@ -90,8 +90,6 @@ class COBJMeshFileLoader : public asset::IAssetLoader`
`90`	`90`	`return ext;`
`91`	`91`	`}`
`92`	`92`
`93`		`- virtual uint64_t getSupportedAssetTypesBitfield() const override { return asset::IAsset::ET_MESH; }`
`94`		`-`
`95`	`93`	`virtual asset::SAssetBundle loadAsset(system::IFile* _file, const asset::IAssetLoader::SAssetLoadParams& _params, asset::IAssetLoader::IAssetLoaderOverride* _override = nullptr, uint32_t _hierarchyLevel = 0u) override;`
`96`	`94`
`97`	`95`	`private:`