fight for more compilation

Author: devsh

src/nbl/asset/interchange/CSTLMeshFileLoader.h

@@ -1,19 +1,18 @@
-// Copyright (C) 2019 - DevSH Graphics Programming Sp. z O.O.
+// Copyright (C) 2019-2025 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine" and was originally part of the "Irrlicht Engine"
 // For conditions of distribution and use, see copyright notice in nabla.h
 // See the original file in irrlicht source for authors
+#ifndef _NBL_ASSET_C_STL_MESH_FILE_LOADER_H_INCLUDED_
+#define _NBL_ASSET_C_STL_MESH_FILE_LOADER_H_INCLUDED_
 
-#ifndef __NBL_ASSET_C_STL_MESH_FILE_LOADER_H_INCLUDED__
-#define __NBL_ASSET_C_STL_MESH_FILE_LOADER_H_INCLUDED__
 
 #include "nbl/core/declarations.h"
-#include "nbl/asset/interchange/IAssetLoader.h"
-#include "nbl/asset/ICPUPolygonGeometry.h"
+
+#include "nbl/asset/interchange/IGeometryLoader.h"
 #include "nbl/asset/metadata/CSTLMetadata.h"
 
-namespace nbl
-{
-namespace asset
+
+namespace nbl::asset
 {
 
 //! Meshloader capable of loading STL meshes.
@@ -33,10 +32,7 @@ class CSTLMeshFileLoader final : public IRenderpassIndependentPipelineLoader
 			return ext;
 		}
 
-		uint64_t getSupportedAssetTypesBitfield() const override { return IAsset::ET_MESH; }
-
 	private:
-
 		struct SContext
 		{
 			IAssetLoader::SAssetLoadContext inner;
@@ -69,8 +65,6 @@ class CSTLMeshFileLoader final : public IRenderpassIndependentPipelineLoader
 		asset::IAssetManager* m_assetMgr;
 };
 
-}	// end namespace scene
-}	// end namespace nbl
-
+}	// end namespace nbl::scene
 #endif
 

src/nbl/asset/utils/COverdrawMeshOptimizer.cpp

@@ -1,19 +1,16 @@
-// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
+// Copyright (C) 2018-2025 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
-#include "nbl/core/declarations.h"
 
 #include "COverdrawMeshOptimizer.h"
 
 #include <vector>
 #include <functional>
 
-#include "CMeshManipulator.h"
-
 namespace nbl::asset
 {
-
+#if 0
 void COverdrawMeshOptimizer::createOptimized(asset::ICPUMeshBuffer* _outbuffer, const asset::ICPUMeshBuffer* _inbuffer, float _threshold, const system::logger_opt_ptr logger)
 {
 	if (!_outbuffer || !_inbuffer)
@@ -267,5 +264,5 @@ size_t COverdrawMeshOptimizer::updateCache(uint32_t _a, uint32_t _b, uint32_t _c
 
 	return cacheMisses;
 }
-
+#endif
 } // nbl::asset

src/nbl/asset/utils/CPolygonGeometryManipulator.cpp

@@ -1,25 +1,26 @@
-// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
+// Copyright (C) 2018-2025 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
+
+#include "nbl/asset/asset.h"
+
 #include <vector>
 #include <numeric>
 #include <functional>
 #include <algorithm>
 #include <unordered_map>
 #include <unordered_set>
 
-
-#include "nbl/asset/asset.h"
-#include "nbl/asset/IRenderpassIndependentPipeline.h"
-#include "nbl/asset/utils/CMeshManipulator.h"
+#include "nbl/asset/utils/CPolygonGeometryManipulator.h"
 #include "nbl/asset/utils/CSmoothNormalGenerator.h"
 #include "nbl/asset/utils/CForsythVertexCacheOptimizer.h"
 #include "nbl/asset/utils/COverdrawMeshOptimizer.h"
 
+
 namespace nbl::asset
 {
-
+#if 0
 //! Flips the direction of surfaces. Changes backfacing triangles to frontfacing
 //! triangles and vice versa.
 //! \param mesh: Mesh on which the operation is performed.
@@ -1724,6 +1725,7 @@ core::matrix3x4SIMD IMeshManipulator::calculateOBB(const nbl::asset::ICPUMeshBuf
 
     return TransMat;
 }
+#endif
 
 } // end namespace nbl::asset