start the loader

Author: devsh

examples_tests

@@ -61,6 +61,7 @@
 #include "nbl/asset/interchange/IAssetLoader.h"
 #include "nbl/asset/interchange/IImageLoader.h"
 #include "nbl/asset/interchange/IGeometryLoader.h"
+#include "nbl/asset/interchange/ISceneLoader.h"
 #include "nbl/asset/interchange/IAssetWriter.h"
 #include "nbl/asset/interchange/IImageWriter.h"
 #include "nbl/asset/metadata/COpenEXRMetadata.h"

include/nbl/asset/asset.h

@@ -86,8 +86,8 @@ class NBL_API2 IAssetLoader : public virtual core::IReferenceCounted
 		enum E_LOADER_PARAMETER_FLAGS : uint64_t
 		{
 			ELPF_NONE = 0,											//!< default value, it doesn't do anything
-			ELPF_RIGHT_HANDED_MESHES = 0x1,							//!< specifies that a mesh will be flipped in such a way that it'll look correctly in right-handed camera system
-			ELPF_DONT_COMPILE_GLSL = 0x2,							//!< it states that GLSL won't be compiled to SPIR-V if it is loaded or generated
+			/*deprecated*/ELPF_RIGHT_HANDED_MESHES = 0x1,							//!< specifies that a mesh will be flipped in such a way that it'll look correctly in right-handed camera system
+			/*deprecated*/ELPF_DONT_COMPILE_GLSL = 0x2,							//!< it states that GLSL won't be compiled to SPIR-V if it is loaded or generated
 			ELPF_LOAD_METADATA_ONLY = 0x4							//!< it forces the loader to not load the entire scene for performance in special cases to fetch metadata.
 		};
 

include/nbl/asset/interchange/IAssetLoader.h

@@ -1,9 +1,8 @@
 // Copyright (C) 2018-2020 - 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
-
-#ifndef __NBL_ASSET_I_IMAGE_LOADER_H_INCLUDED__
-#define __NBL_ASSET_I_IMAGE_LOADER_H_INCLUDED__
+#ifndef _NBL_ASSET_I_IMAGE_LOADER_H_INCLUDED_
+#define _NBL_ASSET_I_IMAGE_LOADER_H_INCLUDED_
 
 #include "nbl/core/declarations.h"
 

include/nbl/asset/interchange/IImageLoader.h

@@ -46,17 +46,15 @@ struct nbl_glsl_ext_Mitsuba_Loader_instance_data_t
 #undef mat4x3
 #undef nbl_glsl_MC_material_data_t
 using instance_data_t = nbl_glsl_ext_Mitsuba_Loader_instance_data_t;
-
+#endif
 
 class CMitsubaLoader : public asset::ISceneLoader
 {
-		friend class CMitsubaMaterialCompilerFrontend;
+//		friend class CMitsubaMaterialCompilerFrontend;
 	public:
 		//! Constructor
-		CMitsubaLoader(asset::IAssetManager* _manager, io::IFileSystem* _fs);
-
-		void initialize() override;
-
+		inline CMitsubaLoader() = default;
+#if 0
 	protected:
 		io::IFileSystem* m_filesystem;
 
@@ -78,24 +76,18 @@ class CMitsubaLoader : public asset::ISceneLoader
 		core::smart_refctd_ptr<asset::ICPUDescriptorSet> createDS0(const SContext& _ctx, asset::ICPUPipelineLayout* _layout, const asset::material_compiler::CMaterialCompilerGLSLBackendCommon::result_t& _compResult, Iter meshBegin, Iter meshEnd);
 
 	public:
-		//! Check if the file might be loaded by this class
-		/** Check might look into the file.
-		\param file File handle to check.
-		\return True if file seems to be loadable. */
-		bool isALoadableFileFormat(io::IReadFile* _file) const override;
-
-		//! Returns an array of string literals terminated by nullptr
-		const char** getAssociatedFileExtensions() const override;
+#endif
+		bool isALoadableFileFormat(system::IFile* _file, const system::logger_opt_ptr logger=nullptr) const override;
 
-		//! Returns the assets loaded by the loader
-		/** Bits of the returned value correspond to each IAsset::E_TYPE
-		enumeration member, and the return value cannot be 0. */
-		uint64_t getSupportedAssetTypesBitfield() const override { return asset::IAsset::ET_MESH/*|asset::IAsset::ET_SCENE|asset::IAsset::ET_IMPLEMENTATION_SPECIFIC_METADATA*/; }
+		inline const char** getAssociatedFileExtensions() const override
+		{
+			static const char* ext[]{ "xml", nullptr };
+			return ext;
+		}
 
 		//! Loads an asset from an opened file, returns nullptr in case of failure.
-		asset::SAssetBundle loadAsset(io::IReadFile* _file, const asset::IAssetLoader::SAssetLoadParams& _params, asset::IAssetLoader::IAssetLoaderOverride* _override = nullptr, uint32_t _hierarchyLevel = 0u) override;
+		asset::SAssetBundle loadAsset(system::IFile* _file, const asset::IAssetLoader::SAssetLoadParams& _params, asset::IAssetLoader::IAssetLoaderOverride* _override=nullptr, uint32_t _hierarchyLevel=0u) override;
 };
-#endif
 
 }
 #endif

include/nbl/ext/MitsubaLoader/CMitsubaLoader.h

@@ -1,13 +1,11 @@
 // Copyright (C) 2018-2020 - 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
+#ifndef _C_MITSUBA_MATERIAL_COMPILER_FRONTEND_H_INCLUDED_
+#define _C_MITSUBA_MATERIAL_COMPILER_FRONTEND_H_INCLUDED_
 
-#ifndef __C_MITSUBA_MATERIAL_COMPILER_FRONTEND_H_INCLUDED__
-#define __C_MITSUBA_MATERIAL_COMPILER_FRONTEND_H_INCLUDED__
 
-#include "nbl/core/Types.h"
-
-#include "nbl/asset/material_compiler/IR.h"
+//#include "nbl/asset/material_compiler/IR.h"
 
 #include "nbl/ext/MitsubaLoader/CElementBSDF.h"
 #include "nbl/ext/MitsubaLoader/CElementEmitter.h"
@@ -23,6 +21,7 @@ struct SContext;
 class CMitsubaMaterialCompilerFrontend
 {
     public:
+#ifdef 0
         using IRNode = asset::material_compiler::IR::INode;
         using EmitterNode = asset::material_compiler::IR::CEmitterNode;
         enum E_IMAGE_VIEW_SEMANTIC : uint8_t
@@ -60,8 +59,8 @@ class CMitsubaMaterialCompilerFrontend
         tex_ass_type getErrorTexture(const E_IMAGE_VIEW_SEMANTIC semantic) const;
 
         IRNode* createIRNode(asset::material_compiler::IR* ir, const CElementBSDF* _bsdf);
+#endif
 };
 
 }
-
 #endif

include/nbl/ext/MitsubaLoader/CMitsubaMaterialCompilerFrontend.h

@@ -21,7 +21,7 @@ class CSerializedLoader final : public asset::IGeometryLoader
 	public:
 		inline CSerializedLoader() = default;
 
-		inline bool isALoadableFileFormat(system::IFile* _file, const system::logger_opt_ptr logger = nullptr) const override
+		inline bool isALoadableFileFormat(system::IFile* _file, const system::logger_opt_ptr logger=nullptr) const override
 		{
 			FileHeader header;
 

include/nbl/ext/MitsubaLoader/CSerializedLoader.h

@@ -1,50 +1,39 @@
 // Copyright (C) 2018-2020 - 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
+#ifndef _NBL_EXT_MISTUBA_LOADER_I_PARSER_UTIL_H_INCLUDED_
+#define _NBL_EXT_MISTUBA_LOADER_I_PARSER_UTIL_H_INCLUDED_
 
-#ifndef __I_PARSER_UTIL_H_INCLUDED__
-#define __I_PARSER_UTIL_H_INCLUDED__
-
-//#include "nbl/core/core.h"
-
-//#include "IFileSystem.h"
 
 #include "nbl/asset/interchange/IAssetLoader.h"
 
-#include "nbl/ext/MitsubaLoader/CElementFactory.h"
-#include "nbl/ext/MitsubaLoader/CMitsubaMetadata.h"
+//#include "nbl/ext/MitsubaLoader/CElementFactory.h"
+//#include "nbl/ext/MitsubaLoader/CMitsubaMetadata.h"
 
 #include "expat/lib/expat.h"
 
 #include <stack>
 
 
-namespace nbl
-{
-namespace ext
-{
-namespace MitsubaLoader
+namespace nbl::ext::MitsubaLoader
 {
-
-	   	  
-
 class ParserLog
 {
-public:
-	static inline void setLogger(const system::logger_opt_ptr& logger) { ParserLog::logger = logger; };
+	public:
+		static inline void setLogger(const system::logger_opt_ptr& _logger) {logger=_logger;}
 
-	/*prints this message:
-	Mitsuba loader error:
-	Invalid .xml file structure: message */
-	static void invalidXMLFileStructure(const std::string& errorMessage);
+		/*prints this message:
+		Mitsuba loader error:
+		Invalid .xml file structure: message */
+		static void invalidXMLFileStructure(const std::string& errorMessage);
 
-private:
-	static system::logger_opt_ptr logger;
+	private:
+		static system::logger_opt_ptr logger;
 };
 
 
 template<typename... types>
-class ElementPool // : public std::tuple<core::vector<types>...>
+class ElementPool // similar to : public std::tuple<core::vector<types>...>
 {
 		core::SimpleBlockBasedAllocator<core::LinearAddressAllocator<uint32_t>,core::aligned_allocator> poolAllocator;
 	public:
@@ -68,7 +57,9 @@ class ParserManager
 			XML_Parser parser;
 			system::path currentXMLDir;
 		};
+
 	public:
+#if 0
 		//! Constructor 
 		ParserManager(system::ISystem* _system, asset::IAssetLoader::IAssetLoaderOverride* _override) :
 								m_system(_system), m_override(_override), m_sceneDeclCount(0),
@@ -127,12 +118,9 @@ class ParserManager
 		each element of index N is parent of the element of index N+1
 		the scene element is a parent of all elements of index 0 */
 		core::stack<std::pair<IElement*,std::string> > elements; 
-
+#endif
 		friend class CElementFactory;
 };
 
 }
-}
-}
-
 #endif

include/nbl/ext/MitsubaLoader/ParserUtil.h

@@ -15,6 +15,8 @@
 namespace nbl::ext::MitsubaLoader
 {
 
+class CMitsubaMetadata;
+
 struct SContext
 {
 	public:
@@ -23,14 +25,14 @@ struct SContext
 //			const asset::IMeshManipulator* _manipulator,
 			const asset::IAssetLoader::SAssetLoadContext& _params,
 			asset::IAssetLoader::IAssetLoaderOverride* _override,
-//			CMitsubaMetadata* _metadata
+			CMitsubaMetadata* _metadata
 		);
 
 //		const asset::IGeometryCreator* creator;
 //		const asset::IMeshManipulator* manipulator;
 		const asset::IAssetLoader::SAssetLoadContext inner;
 		asset::IAssetLoader::IAssetLoaderOverride* override_;
-//		CMitsubaMetadata* meta;
+		CMitsubaMetadata* meta;
 
 #if 0
 		//
@@ -192,8 +194,8 @@ struct SContext
 		core::unordered_map<SPipelineCacheKey, core::smart_refctd_ptr<asset::ICPURenderpassIndependentPipeline>, SPipelineCacheKey::hash> pipelineCache;
 #endif
 		//material compiler
-		core::smart_refctd_ptr<asset::material_compiler::IR> ir;
-		CMitsubaMaterialCompilerFrontend frontend;
+//		core::smart_refctd_ptr<asset::material_compiler::IR> ir;
+//		CMitsubaMaterialCompilerFrontend frontend;
 
 	private:
 };

include/nbl/ext/MitsubaLoader/SContext.h

@@ -1,16 +1,17 @@
 // Copyright (C) 2018-2023 - 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
-#ifndef __NBL_ASSET_C_IES_PROFILE_LOADER_H_INCLUDED__
-#define __NBL_ASSET_C_IES_PROFILE_LOADER_H_INCLUDED__
+#ifndef _NBL_ASSET_C_IES_PROFILE_LOADER_H_INCLUDED_
+#define _NBL_ASSET_C_IES_PROFILE_LOADER_H_INCLUDED_
 
 #include "nbl/asset/ICPUImage.h"
-#include "nbl/asset/ICPUShader.h"
 
 #include "nbl/asset/IAssetManager.h"
-
 #include "nbl/asset/interchange/IAssetLoader.h"
-#include "nbl/asset/utils/CIESProfileParser.h"
+
+#if 0 // TODO: Arek
+
+#include "nbl/asset/utils/CIESProfileParser.h" // TODO: move to `src/asset/interchange`
 #include "nbl/asset/metadata/CIESProfileMetadata.h"
 
 namespace nbl::asset 
@@ -62,4 +63,6 @@ class CIESProfileLoader final : public asset::IAssetLoader
 		uint32_t _hierarchyLevel = 0u) override;
 };
 } // namespace nbl::asset
+#endif // end TODO: Arek
+
 #endif // __NBL_ASSET_C_IES_PROFILE_LOADER_H_INCLUDED__