Fixed number of samples to new API and made sure OpenEXR loader works

Author: devshgraphicsprogramming

examples_tests/05.NablaTutorialExample/main.cpp

@@ -8,7 +8,6 @@
 #include <nabla.h>
 
 #include "../common/QToQuitEventReceiver.h"
-#include "nbl/asset/CGeometryCreator.h"
 
 /*
 	General namespaces. Entire engine consists of those bellow.
@@ -87,7 +86,7 @@ int main()
 
 	asset::IAssetLoader::SAssetLoadParams loadingParams;
 	auto images_bundle = assetManager->getAsset("../../media/color_space_test/R8G8B8A8_1.png", loadingParams);
-	assert(!images_bundle.isEmpty());
+	assert(!images_bundle.getContents().empty());
 	auto image = images_bundle.getContents().begin()[0];
 	auto image_raw = static_cast<asset::ICPUImage*>(image.get());
 
@@ -110,8 +109,8 @@ int main()
 
 	const IAsset::E_TYPE types[]{ IAsset::E_TYPE::ET_SPECIALIZED_SHADER, IAsset::E_TYPE::ET_SPECIALIZED_SHADER, static_cast<IAsset::E_TYPE>(0u) };
 
-	auto cpuVertexShader = core::smart_refctd_ptr_static_cast<ICPUSpecializedShader>(assetManager->findAssets("nbl/builtin/materials/lambertian/singletexture/specializedshader.vert", types)->front().getContents().begin()[0]);
-	auto cpuFragmentShader = core::smart_refctd_ptr_static_cast<ICPUSpecializedShader>(assetManager->findAssets("nbl/builtin/materials/lambertian/singletexture/specializedshader.frag", types)->front().getContents().begin()[0]);
+	auto cpuVertexShader = core::smart_refctd_ptr_static_cast<ICPUSpecializedShader>(assetManager->findAssets("nbl/builtin/material/lambertian/singletexture/specialized_shader.vert", types)->front().getContents().begin()[0]);
+	auto cpuFragmentShader = core::smart_refctd_ptr_static_cast<ICPUSpecializedShader>(assetManager->findAssets("nbl/builtin/material/lambertian/singletexture/specialized_shader.frag", types)->front().getContents().begin()[0]);
 
 	auto gpuVertexShader = driver->getGPUObjectsFromAssets(&cpuVertexShader.get(), &cpuVertexShader.get() + 1)->front();
 	auto gpuFragmentShader = driver->getGPUObjectsFromAssets(&cpuFragmentShader.get(), &cpuFragmentShader.get() + 1)->front();

examples_tests/31.SkinningDataBenchmark/main.cpp

@@ -32,7 +32,7 @@ struct Vertex
 } PACK_STRUCT;
 #include "nbl/nblunpack.h"
 
-#include <nbl/asset/CCPUMeshPacker.h>
+#include <nbl/asset/utils/CCPUMeshPacker>
 #include "common.glsl"
 
 template<typename T>

examples_tests/35.GeometryCreator/main.cpp

@@ -9,7 +9,6 @@
 
 //! I advise to check out this file, its a basic input handler
 #include "../common/QToQuitEventReceiver.h"
-#include "nbl/asset/CGeometryCreator.h"
 
 using namespace nbl;
 using namespace core;

examples_tests/38.EXRSplit/main.cpp

@@ -46,27 +46,33 @@ int main(int argc, char * argv[])
 	constexpr std::string_view defaultImagePath = "../../media/noises/spp_benchmark_4k_512.exr";
 	const auto filePath = std::string(isItDefaultImage ? defaultImagePath.data() : argv[1]);
 	auto image_bundle = am->getAsset(filePath, lp);
-	assert(!image_bundle.isEmpty());
+	auto contents = image_bundle.getContents();
+	assert(!contents.empty());
+	auto meta = image_bundle.getMetadata()->selfCast<const COpenEXRMetadata>();
+	assert(meta);
 
-	for (auto i = 0ul; i < image_bundle.getSize(); ++i)
+	uint32_t i=0u;
+	for (auto asset : contents)
 	{
+		auto image = IAsset::castDown<ICPUImage>(asset);
+		const auto* metadata = static_cast<const COpenEXRMetadata::CImage*>(meta->getAssetSpecificMetadata(image.get()));
+
 		ICPUImageView::SCreationParams imgViewParams;
 		imgViewParams.flags = static_cast<ICPUImageView::E_CREATE_FLAGS>(0u);
-		imgViewParams.image = IAsset::castDown<ICPUImage>(image_bundle.getContents().begin()[i]);
+		imgViewParams.image = std::move(image);
 		imgViewParams.format = imgViewParams.image->getCreationParameters().format;
 		imgViewParams.viewType = ICPUImageView::ET_2D;
 		imgViewParams.subresourceRange = { static_cast<IImage::E_ASPECT_FLAGS>(0u),0u,1u,0u,1u };
 		auto imageView = ICPUImageView::create(std::move(imgViewParams));
 
-		const auto* metadata = static_cast<const COpenEXRImageMetadata*>(imageView->getCreationParameters().image->getMetadata());
-		auto channelsName = metadata->getName();
+		auto channelsName = metadata->m_name;
 
 		io::path fileName, extension, finalFileNameWithExtension;
 		core::splitFilename(filePath.c_str(), nullptr, &fileName, &extension);
 		finalFileNameWithExtension = fileName + ".";
 		finalFileNameWithExtension += extension;
 
-		const std::string finalOutputPath = channelsName.empty() ? (std::string(fileName.c_str()) + "_" + std::to_string(i) + "." + std::string(extension.c_str())) : (std::string(fileName.c_str()) + "_" + channelsName + "." + std::string(extension.c_str()));
+		const std::string finalOutputPath = channelsName.empty() ? (std::string(fileName.c_str()) + "_" + std::to_string(i++) + "." + std::string(extension.c_str())) : (std::string(fileName.c_str()) + "_" + channelsName + "." + std::string(extension.c_str()));
 
 		const auto params = IAssetWriter::SAssetWriteParams(imageView.get(), EWF_BINARY);
 		am->writeAsset(finalOutputPath, params);

include/nbl/ext/ScreenShot/ScreenShot.h

@@ -9,7 +9,7 @@
 
 #include "../../../../source/Nabla/COpenGLBuffer.h"
 #include "../../../../source/Nabla/COpenGLExtensionHandler.h"
-#include "../../../nbl/asset/IImageAssetHandlerBase.h"
+#include "nbl/asset/interchange/IImageAssetHandlerBase.h"
 
 namespace nbl
 {

src/nbl/asset/interchange/COBJMeshFileLoader.cpp

@@ -493,7 +493,8 @@ asset::SAssetBundle COBJMeshFileLoader::loadAsset(io::IReadFile* _file, const as
         return {};
 
 	//
-	auto meta = core::make_smart_refctd_ptr<COBJMetadata>(usedPipelines.size()+1u);
+	auto meta = core::make_smart_refctd_ptr<COBJMetadata>(usedPipelines.size());
+	uint32_t metaOffset = 0u;
 	for (auto pipeAndMeta : usedPipelines)
 		meta->placeMeta(metaOffset++,pipeAndMeta.first.get(),*pipeAndMeta.second);