fortify OBJ loader against missing MTL files, change the type of PropertyElement after its converted from sRGB

temporarily disable the usage of NV barycentrics

Author: devshgraphicsprogramming

examples_tests/22.RaytracedAO/fillVisBuffer.frag

@@ -2,14 +2,13 @@
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 #version 430 core
-#extension GL_NV_fragment_shader_barycentric : require
 #extension GL_EXT_shader_16bit_storage : require
 
 
 #define _NBL_GLSL_EXT_MITSUBA_LOADER_INSTANCE_DATA_BINDING_ 0
 #include "virtualGeometry.glsl"
 
-
+#undef NBL_GL_NV_fragment_shader_barycentric
 #include <nbl/builtin/glsl/barycentric/frag.glsl>
 layout(location = 2) flat in uint BackfacingBit_BatchInstanceGUID;
 layout(location = 3) flat in uint drawCmdFirstIndex;

examples_tests/22.RaytracedAO/fillVisBuffer.vert

@@ -14,6 +14,7 @@ layout(set=2, binding=0, row_major) readonly restrict buffer PerInstancePerCamer
     DrawData_t data[];
 } instanceDataPerCamera;
 
+#undef NBL_GL_NV_fragment_shader_barycentric
 #include <nbl/builtin/glsl/barycentric/vert.glsl>
 layout(location = 2) flat out uint BackfacingBit_BatchInstanceGUID;
 layout(location = 3) flat out uint drawCmdFirstIndex;

src/nbl/asset/interchange/COBJMeshFileLoader.cpp

@@ -161,6 +161,9 @@ asset::SAssetBundle COBJMeshFileLoader::loadAsset(io::IReadFile* _file, const as
                 std::replace(mtllib.begin(), mtllib.end(), '\\', '/');
                 SAssetLoadParams loadParams;
                 auto bundle = interm_getAssetInHierarchy(AssetManager, mtllib, loadParams, _hierarchyLevel+ICPUMesh::PIPELINE_HIERARCHYLEVELS_BELOW, _override);
+				if (bundle.getContents().empty())
+					break;
+
 				auto meta = bundle.getMetadata()->selfCast<const CMTLMetadata>();
 				if (bundle.getAssetType()==IAsset::ET_RENDERPASS_INDEPENDENT_PIPELINE)
 				for (auto ass : bundle.getContents())
@@ -370,6 +373,20 @@ asset::SAssetBundle COBJMeshFileLoader::loadAsset(io::IReadFile* _file, const as
 		// eat up rest of line
 		bufPtr = goNextLine(bufPtr, bufEnd);
 	}	// end while(bufPtr && (bufPtr-buf<filesize))
+
+	// prune out invalid empty shape groups (TODO: convert to AoS and use an erase_if)
+	for (size_t i = 0ull; i < submeshes.size(); ++i)
+	if (indices[i].size())
+		i++;
+	else
+	{
+		submeshes.erase(submeshes.begin()+i);
+		indices.erase(indices.begin()+i);
+		recalcNormals.erase(recalcNormals.begin()+i);
+		submeshWasLoadedFromCache.erase(submeshWasLoadedFromCache.begin()+i);
+		submeshCacheKeys.erase(submeshCacheKeys.begin()+i);
+		submeshMaterialNames.erase(submeshMaterialNames.begin()+i);
+	}
 
     core::unordered_set<pipeline_meta_pair_t,hash_t,key_equal_t> usedPipelines;
     {

src/nbl/ext/MitsubaLoader/PropertyElement.cpp

@@ -130,6 +130,7 @@ std::pair<bool, SNamedPropertyElement> CPropertyElementManager::createPropertyDa
 					result.vvalue = retrieveHex(desiredAttributes[0], success);
 				for (auto i=0; i<3u; i++)
 					result.vvalue[i] = core::srgb2lin(result.vvalue[i]);
+				result.type = SPropertyElementData::Type::RGB; // now its an RGB value
 			}
 			break;
 		case SPropertyElementData::Type::VECTOR: