Fixed uvs and normals

Code/BlueprintConverter/ModelStorage.cpp

@@ -57,9 +57,6 @@ namespace SMBC
 		const std::size_t uv_offset     = model->uvs.size();
 		const std::size_t normal_offset = model->normals.size();
 
-		const bool has_uvs     = ConvertSettings::ExportUvs     && mesh->HasTextureCoords(0);
-		const bool has_normals = ConvertSettings::ExportNormals && mesh->HasNormals();
-
 		sub_mesh->DataIdx.reserve(mesh->mNumFaces);
 		for (unsigned int a = 0; a < mesh->mNumFaces; a++)
 		{
@@ -73,8 +70,8 @@ namespace SMBC
 
 				d_idx.push_back({
 					ind_idx + vertex_offset,
-					(has_uvs ? (ind_idx + uv_offset) : -1),
-					(has_normals ? (ind_idx + normal_offset) : -1)
+					(sub_mesh->has_uvs ? (ind_idx + uv_offset) : 0),
+					(sub_mesh->has_normals ? (ind_idx + normal_offset) : 0)
 				});
 			}
 
@@ -90,6 +87,9 @@ namespace SMBC
 			const aiMesh* cMesh = scene->mMeshes[a];
 			SubMeshData* cSubMesh = new SubMeshData(a);
 
+			cSubMesh->has_normals = ConvertSettings::ExportNormals && cMesh->HasNormals();
+			cSubMesh->has_uvs     = ConvertSettings::ExportUvs && cMesh->HasTextureCoords(0);
+
 			ModelStorage::LoadIndices(cMesh, model, cSubMesh);
 			ModelStorage::LoadVertices(cMesh, model);
 			ModelStorage::LoadMaterialName(scene, cMesh, cSubMesh);

Code/BlueprintConverter/ObjectDefinitions/BlockModel.cpp

@@ -48,6 +48,10 @@ namespace SMBC
 		}
 
 		SubMeshData* new_subMesh = new SubMeshData(0);
+
+		new_subMesh->has_normals = ConvertSettings::ExportNormals;
+		new_subMesh->has_uvs     = ConvertSettings::ExportUvs;
+
 		new_subMesh->DataIdx =
 		{
 			{{0, 0,  0}, {1, 1,  0}, {2, 2,  0}},

Code/BlueprintConverter/ObjectDefinitions/Model.cpp

@@ -124,21 +124,18 @@ namespace SMBC
 					if (mOffset.VertexMap.find(pVertex) != mOffset.VertexMap.end())
 						String::Combine(_f_str, " ", (mOffset.VertexMap.at(pVertex) + 1));
 
-					const bool has_uv     = (ConvertSettings::ExportUvs     && d_idx.m_Uv   > -1);
-					const bool has_normal = (ConvertSettings::ExportNormals && d_idx.m_Norm > -1);
-
-					if (!has_uv && !has_normal) continue;
+					if (!pSubMesh->has_uvs && !pSubMesh->has_normals) continue;
 
 					_f_str.append("/");
 
-					if (has_uv)
+					if (pSubMesh->has_uvs)
 					{
 						const glm::vec2& pUv = this->uvs[d_idx.m_Uv];
 						if (mOffset.UvMap.find(pUv) != mOffset.UvMap.end())
 							String::Combine(_f_str, (mOffset.UvMap.at(pUv) + 1));
 					}
 
-					if (has_normal)
+					if (pSubMesh->has_normals)
 					{
 						const glm::vec3& pNormal = translated_normals[d_idx.m_Norm];
 						if (mOffset.NormalMap.find(pNormal) != mOffset.NormalMap.end())

Code/BlueprintConverter/ObjectDefinitions/Model.h

@@ -22,6 +22,9 @@ namespace SMBC
 
 		std::vector<std::vector<VertexData>> DataIdx;
 
+		bool has_uvs;
+		bool has_normals;
+
 		bool IsEmpty();
 		SubMeshData(const int& sub_mesh_idx);
 		~SubMeshData() = default;

Code/Lib/BuildVersion.h

@@ -1,2 +1,2 @@
 #pragma once
-#define SMBC_BUILD_VERSION 856
+#define SMBC_BUILD_VERSION 858