OBJ loader fixed

Author: devshgraphicsprogramming

examples_tests/31.SkinningDataBenchmark/main.cpp

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

examples_tests/40.GLITest/main.cpp

@@ -16,10 +16,10 @@ void loadAndWriteImageForTesting(const std::string_view& path, IAssetManager* as
 	auto fileName = std::string(io::IFileSystem::getFileBasename(path.data()).c_str());
 
 	asset::IAssetLoader::SAssetLoadParams loadingParams;
-	auto image_bundle = assetManager->getAsset(path.data(), loadingParams);
-	if (!image_bundle.isEmpty())
+	auto contents = assetManager->getAsset(path.data(), loadingParams).getContents();
+	if (!contents.empty())
 	{
-		auto image = image_bundle.getContents().begin()[0];
+		auto image = contents.begin()[0];
 
 		IAssetWriter::SAssetWriteParams writeParams(image.get());
 		assetManager->writeAsset(fileName, writeParams);

include/nbl/asset/utils/CCPUMeshPacker.h

@@ -6,7 +6,7 @@
 #define __NBL_ASSET_C_CPU_MESH_PACKER_H_INCLUDED__
 
 #include <nbl/asset/ICPUMesh.h>
-#include <nbl/asset/IMeshPacker.h>
+#include <nbl/asset/utils/IMeshPacker.h>
 #include <nbl/core/math/intutil.h>
 
 //AFTER SAFE SHRINK FIX TODO LIST:

include/nbl/builtin/glsl/loaders/mtl/common.glsl renamed to include/nbl/builtin/glsl/loader/mtl/common.glsl

@@ -31,7 +31,7 @@ layout (location = 0) out vec4 OutColor;
 #ifndef _NBL_FRAG_PUSH_CONSTANTS_DEFINED_
 #define _NBL_FRAG_PUSH_CONSTANTS_DEFINED_
 
-#include <nbl/builtin/glsl/loaders/mtl/common.glsl>
+#include <nbl/builtin/glsl/loader/mtl/common.glsl>
 
 layout (push_constant) uniform Block {
     nbl_glsl_MTLMaterialParameters params;

include/nbl/builtin/shader/loader/mtl/fragment_impl.glsl

@@ -11,6 +11,6 @@
 #define _NBL_FRAG_SET3_BINDINGS_DEFINED_
 #endif
 
-#include "nbl/builtin/shaders/loaders/mtl/fragment_impl.glsl"
+#include "nbl/builtin/shader/loader/mtl/fragment_impl.glsl"
 
 #undef _NO_UV

include/nbl/builtin/shader/loader/mtl/fragment_no_uv.frag

@@ -4,4 +4,4 @@
 
 #version 430 core
 
-#include "nbl/builtin/shaders/loaders/mtl/fragment_impl.glsl"
+#include "nbl/builtin/shader/loader/mtl/fragment_impl.glsl"

include/nbl/builtin/shader/loader/mtl/fragment_uv.frag

@@ -5,6 +5,6 @@
 #version 430 core
 #define _NO_UV
 
-#include "nbl/builtin/shaders/loaders/mtl/vertex_impl.glsl"
+#include "nbl/builtin/shader/loader/mtl/vertex_impl.glsl"
 
 #undef _NO_UV

include/nbl/builtin/shader/loader/mtl/vertex_no_uv.vert

@@ -4,4 +4,4 @@
 
 #version 430 core
 
-#include "nbl/builtin/shaders/loaders/mtl/vertex_impl.glsl"
+#include "nbl/builtin/shader/loader/mtl/vertex_impl.glsl"

include/nbl/builtin/shader/loader/mtl/vertex_uv.vert

@@ -22,9 +22,9 @@ inline auto createFullScreenTriangle(asset::IAssetManager* am, video::IVideoDriv
 	asset::IAsset::E_TYPE types[] = { asset::IAsset::ET_SPECIALIZED_SHADER,static_cast<asset::IAsset::E_TYPE>(0u) };
 	auto found = am->findAssets("nbl/builtin/specialized_shader/fullscreentriangle.vert",types);
 	assert(found->size());
-	auto first = found->begin();
-	assert(!first->isEmpty());
-	auto pShader = static_cast<asset::ICPUSpecializedShader*>((first->getContents().begin()->get()));
+	auto contents = found->begin()->getContents();
+	assert(!contents.empty());
+	auto pShader = static_cast<asset::ICPUSpecializedShader*>((contents.begin()->get()));
 	std::get<core::smart_refctd_ptr<video::IGPUSpecializedShader> >(retval) = driver->getGPUObjectsFromAssets<asset::ICPUSpecializedShader>(&pShader,&pShader+1u)->front();
 
 	auto& inputParams = std::get<asset::SVertexInputParams>(retval);