openexr upgrade from 2.0 to 3.0

Author: nahiim

src/nbl/CMakeLists.txt

@@ -496,29 +496,36 @@ endif()
 target_include_directories(Nabla PUBLIC ${THIRD_PARTY_SOURCE_DIR}/libpng)
 # OpenEXR
 if (_NBL_COMPILE_WITH_OPEN_EXR_)
-	add_dependencies(Nabla OpenEXR)
-	if(NBL_STATIC_BUILD)
-		target_link_libraries(Nabla INTERFACE OpenEXR)
-	else()
-		target_link_libraries(Nabla PRIVATE OpenEXR)
-	endif()
-	
-	target_include_directories(
-		Nabla PUBLIC $<TARGET_PROPERTY:OpenEXR,INCLUDE_DIRECTORIES>				   
-	)
+    add_dependencies(Nabla OpenEXR)
+    if(NBL_STATIC_BUILD)
+        target_link_libraries(Nabla INTERFACE OpenEXR)
+    else()
+        target_link_libraries(Nabla PRIVATE OpenEXR)
+    endif()
+    
+    target_include_directories(
+        Nabla PUBLIC $<TARGET_PROPERTY:OpenEXR,INCLUDE_DIRECTORIES>                   
+    )
+endif()
+
+add_dependencies(Nabla OpenEXRCore OpenEXRUtil)
+if(NBL_STATIC_BUILD)
+    target_link_libraries(Nabla INTERFACE 
+      OpenEXRCore
+      OpenEXRUtil
+)
 else()
-	add_dependencies(Nabla OpenEXRCore)
-	if(NBL_STATIC_BUILD)
-		target_link_libraries(Nabla INTERFACE OpenEXRCore)
-	else()
-		target_link_libraries(Nabla PRIVATE OpenEXRCore)
-	endif()
-	
-	target_include_directories(
-		Nabla PUBLIC $<TARGET_PROPERTY:OpenEXRCore,INCLUDE_DIRECTORIES> # for OpenEXR's Half-only dependency					   
-	)
+    target_link_libraries(Nabla PRIVATE 
+      OpenEXRCore
+      OpenEXRUtil  
+  )
 endif()
 
+target_include_directories(
+    Nabla PUBLIC $<TARGET_PROPERTY:OpenEXRCore,INCLUDE_DIRECTORIES> # for OpenEXR's core headers
+    Nabla PUBLIC $<TARGET_PROPERTY:OpenEXRUtil,INCLUDE_DIRECTORIES> # for OpenEXR's util headers                
+)
+
 # GLI
 if(_NBL_COMPILE_WITH_GLI_)
 	add_dependencies(Nabla gli)

src/nbl/asset/interchange/CImageLoaderOpenEXR.cpp

@@ -1,23 +1,7 @@
-/*
-MIT License
-Copyright (c) 2019 AnastaZIuk
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-#if 0 // oldie
+// Copyright (C) 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
+
 
 #include <algorithm>
 #include <iostream>
@@ -33,16 +17,15 @@ SOFTWARE.
 
 #include "CImageLoaderOpenEXR.h"
 
-#include "openexr/IlmBase/Imath/ImathBox.h"
-#include "openexr/OpenEXR/IlmImf/ImfRgbaFile.h"
-#include "openexr/OpenEXR/IlmImf/ImfInputFile.h"
-#include "openexr/OpenEXR/IlmImf/ImfChannelList.h"
-#include "openexr/OpenEXR/IlmImf/ImfChannelListAttribute.h"
-#include "openexr/OpenEXR/IlmImf/ImfStringAttribute.h"
-#include "openexr/OpenEXR/IlmImf/ImfMatrixAttribute.h"
-#include "openexr/OpenEXR/IlmImf/ImfArray.h"
+#include "ImfRgbaFile.h"
+#include "ImfInputFile.h"
+#include "ImfChannelList.h"
+#include "ImfChannelListAttribute.h"
+#include "ImfStringAttribute.h"
+#include "ImfMatrixAttribute.h"
+#include "ImfArray.h"
 
-#include "openexr/OpenEXR/IlmImf/ImfNamespace.h"
+#include "ImfNamespace.h"
 namespace IMF = Imf;
 namespace IMATH = Imath;
 
@@ -86,17 +69,17 @@ class nblIStream : public IMF::IStream
 		// read the first byte in the file, tellg() returns 0.
 		//--------------------------------------------------------
 
-		virtual IMF::Int64 tellg() override
+		virtual uint64_t tellg() override
 		{
-			return static_cast<IMF::Int64>(fileOffset);
+			return static_cast<uint64_t>(fileOffset);
 		}
 
 		//-------------------------------------------
 		// Set the current reading position.
 		// After calling seekg(i), tellg() returns i.
 		//-------------------------------------------
 
-		virtual void seekg(IMF::Int64 pos) override
+		virtual void seekg(uint64_t pos) override
 		{
 			fileOffset = static_cast<decltype(fileOffset)>(pos);
 		}
@@ -409,6 +392,11 @@ SAssetBundle CImageLoaderOpenEXR::loadAsset(system::IFile* _file, const asset::I
 	return SAssetBundle(std::move(meta),std::move(images));
 }
 
+bool isImfMagic(char* b)
+{
+	return b[0] == 0x76 && b[1] == 0x2f && b[2] == 0x31 && b[3] == 0x01;
+}
+
 bool CImageLoaderOpenEXR::isALoadableFileFormat(system::IFile* _file, const system::logger_opt_ptr logger) const
 {	
 	char magicNumberBuffer[sizeof(SContext::magicNumber)];
@@ -609,5 +597,4 @@ bool readHeader(IMF::IStream* nblIStream, SContext& ctx)
 }
 
 
-#endif // _NBL_COMPILE_WITH_OPENEXR_LOADER_
-#endif
+#endif // _NBL_COMPILE_WITH_OPENEXR_LOADER_

src/nbl/asset/interchange/CImageLoaderOpenEXR.h

@@ -25,10 +25,7 @@ class CImageLoaderOpenEXR final : public IImageLoader
 	public:
 		CImageLoaderOpenEXR(IAssetManager* _manager) : m_manager(_manager) {}
 
-		bool isALoadableFileFormat(system::IFile* _file, const system::logger_opt_ptr logger) const override
-		{
-			return false; // TODO: Nahim, implement in cpp file please
-		}
+		bool isALoadableFileFormat(system::IFile* _file, const system::logger_opt_ptr logger) const override;
 
 		const char** getAssociatedFileExtensions() const override
 		{
@@ -38,10 +35,7 @@ class CImageLoaderOpenEXR final : public IImageLoader
 
 		uint64_t getSupportedAssetTypesBitfield() const override { return asset::IAsset::ET_IMAGE; }
 
-		asset::SAssetBundle loadAsset(system::IFile* _file, const asset::IAssetLoader::SAssetLoadParams& _params, asset::IAssetLoader::IAssetLoaderOverride* _override = nullptr, uint32_t _hierarchyLevel = 0u) override
-		{
-			return {}; // TODO: Nahim, implement in cpp file please
-		}
+		asset::SAssetBundle loadAsset(system::IFile* _file, const asset::IAssetLoader::SAssetLoadParams& _params, asset::IAssetLoader::IAssetLoaderOverride* _override = nullptr, uint32_t _hierarchyLevel = 0u) override;
 
 	private: