Get IES cpps to compile

Author: AnastaZIuk

include/nbl/asset/asset.h

@@ -67,6 +67,6 @@
 #include "nbl/asset/metadata/CMTLMetadata.h"
 #include "nbl/asset/metadata/CPLYMetadata.h"
 #include "nbl/asset/metadata/CSTLMetadata.h"
-//#include "nbl/asset/metadata/CIESProfileMetadata.h"
+#include "nbl/asset/metadata/CIESProfileMetadata.h"
 
 #endif

src/nbl/CMakeLists.txt

@@ -221,6 +221,11 @@ set(NBL_ASSET_SOURCES
 	asset/interchange/CImageWriterTGA.cpp
 	asset/interchange/CImageWriterOpenEXR.cpp # TODO: Nahim
 	asset/interchange/CGLIWriter.cpp
+
+# IES profile loaders
+	asset/interchange/CIESProfileLoader.cpp
+	asset/utils/CIESProfileParser.cpp
+	asset/utils/CIESProfile.cpp
 )
 set(NBL_VIDEO_SOURCES
 # Utilities

src/nbl/asset/interchange/CIESProfileLoader.cpp

@@ -3,24 +3,53 @@
 using namespace nbl;
 using namespace asset;
 
-asset::SAssetBundle
-CIESProfileLoader::loadAsset(io::IReadFile* _file,
-    const asset::IAssetLoader::SAssetLoadParams& _params,
-    asset::IAssetLoader::IAssetLoaderOverride* _override,
-    uint32_t _hierarchyLevel) {
-    if (!_file)
+bool CIESProfileLoader::isALoadableFileFormat(system::IFile* _file, const system::logger_opt_ptr logger) const
+{
+    system::IFile::success_t success;
+    std::string versionBuffer(0x45, ' ');
+    const auto* fName = _file->getFileName().c_str();
+    _file->read(success, versionBuffer.data(), 0, versionBuffer.size());
+
+    if (success)
+    {
+        for (const auto& it : CIESProfileParser::VALID_SIGNATURES)
+            if (versionBuffer.find(it.data()) != std::string::npos)
+                return true;
+
+        logger.log("%s: Invalid IES signature for \"%s\" file!", system::ILogger::ELL_ERROR, __FUNCTION__, fName);
+    }
+    else
+        logger.log("%s: Failed to read \"%s\" file!", system::ILogger::ELL_ERROR, __FUNCTION__, fName);
+
+    return false;
+}
+
+asset::SAssetBundle CIESProfileLoader::loadAsset(system::IFile* _file, const asset::IAssetLoader::SAssetLoadParams& _params, asset::IAssetLoader::IAssetLoaderOverride* _override, uint32_t _hierarchyLevel)
+{
+    if (not _file)
+    {
+        _params.logger.log("%s: Nullptr system::IFile pointer!", system::ILogger::ELL_ERROR, __FUNCTION__);
         return {};
+    }
 
     IAssetLoader::SAssetLoadContext loadContex(_params, _file);
     core::vector<char> data(_file->getSize());
-    _file->read(data.data(), _file->getSize());
+    system::IFile::success_t success;
+    const auto* fName = _file->getFileName().c_str();
+    _file->read(success, data.data(), 0, _file->getSize());
+
+    if (not success)
+    {
+        _params.logger.log("%s: Failed to read \"%s\" file!", system::ILogger::ELL_ERROR, __FUNCTION__, fName);
+        return {};
+    }
 
     CIESProfileParser parser(data.data(), data.size());
     CIESProfile profile;
 
-    if (!parser.parse(profile)) 
+    if (not parser.parse(profile)) 
     {
-        os::Printer::log("ERROR: Emission profile parsing error: " + std::string(parser.getErrorMsg()), ELL_ERROR);
+        _params.logger.log("%s: Failed to parse emission profile for \"%s\" file!", system::ILogger::ELL_ERROR, __FUNCTION__, fName);
         return {};
     }
 

src/nbl/asset/interchange/CIESProfileLoader.h

@@ -5,8 +5,6 @@
 #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"
@@ -25,20 +23,7 @@ class CIESProfileLoader final : public asset::IAssetLoader
 			\return True if file seems to be loadable. 
 		*/
 
-		bool isALoadableFileFormat(io::IReadFile *_file) const override 
-		{
-			const size_t begginingOfFile = _file->getPos();
-			_file->seek(0ull);
-			std::string versionBuffer(0x45, ' ');
-			_file->read(versionBuffer.data(), versionBuffer.size());
-			_file->seek(begginingOfFile);
-
-			for (const auto& it : CIESProfileParser::VALID_SIGNATURES)
-				if (versionBuffer.find(it.data()) != std::string::npos)
-					return true;
-			
-			return false;
-		}
+		bool isALoadableFileFormat(system::IFile* _file, const system::logger_opt_ptr logger) const override;
 
 		//! Returns an array of string literals terminated by nullptr
 		const char **getAssociatedFileExtensions() const override 
@@ -55,11 +40,7 @@ class CIESProfileLoader final : public asset::IAssetLoader
 		uint64_t getSupportedAssetTypesBitfield() const override { return asset::IAsset::ET_IMAGE_VIEW; }
 
 		//! 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;
 };
 } // namespace nbl::asset
 #endif // __NBL_ASSET_C_IES_PROFILE_LOADER_H_INCLUDED__

src/nbl/asset/utils/CIESProfile.cpp

@@ -139,7 +139,9 @@ core::smart_refctd_ptr<asset::ICPUImageView> CIESProfile::createIESTexture(Execu
     region.bufferImageHeight = 0u;
     region.bufferOffset = 0u;
 
-    auto buffer = core::make_smart_refctd_ptr<asset::ICPUBuffer>(texelBytesz * bufferRowLength * height);
+    asset::ICPUBuffer::SCreationParams bParams;
+    bParams.size = texelBytesz * bufferRowLength * height;
+    auto buffer = asset::ICPUBuffer::create(std::move(bParams));
 
     if (!outImg->setBufferAndRegions(std::move(buffer), core::make_refctd_dynamic_array<core::smart_refctd_dynamic_array<asset::IImage::SBufferCopy>>(1ull, region)))
         return {};
@@ -189,7 +191,7 @@ core::smart_refctd_ptr<asset::ICPUImageView> CIESProfile::createIESTexture(Execu
 
         CBasicImageFilterCommon::clip_region_functor_t clip(state.subresource, state.outRange, creationParams.format);
         const auto& regions = outImg->getRegions(state.subresource.mipLevel);
-        CBasicImageFilterCommon::executePerRegion(std::forward<ExecutionPolicy>(policy), outImg.get(), fill, regions.begin(), regions.end(), clip);
+        CBasicImageFilterCommon::executePerRegion(std::forward<ExecutionPolicy>(policy), outImg.get(), fill, regions, clip);
     }
 
     ICPUImageView::SCreationParams viewParams = {};

src/nbl/asset/utils/CIESProfile.h

@@ -6,7 +6,6 @@
 #define __NBL_ASSET_C_IES_PROFILE_H_INCLUDED__
 
 #include "nbl/asset/metadata/CIESProfileMetadata.h"
-#include "nbl/core/Types.h"
 #include <sstream>
 
 namespace nbl 

src/nbl/asset/utils/CIESProfileParser.h

@@ -99,7 +99,7 @@ namespace nbl
                     if (!this->errorMsg)
                         this->errorMsg = errorMsg;
 
-                    if constexpr (std::is_same_v<typename T, double>)
+                    if constexpr (std::is_same_v<T, double>)
                         return -1.0;
                     else
                         return 0;