sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Utility/OBJParser: Prepare for saving

Browse Source 
Former-commit-id: 89d82ac533c72033927557251278dd1544002a54 [formerly dc3b1ff5e00608ed0dfdee9b57ff6986a1d5ac33]
Former-commit-id: ee2b46fbfb0a0f7cd96ae1b35ec1af30342cd2fb
This commit is contained in:
Lynix
2016-07-08 08:34:45 +02:00
parent 9a6de9f7ac
commit 26289139a3
5 changed files with 117 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Nazara/Utility/Formats/OBJLoader.cpp
View File

@@ -298,12 +298,12 @@ namespace Nz
namespace Loaders
{
void RegisterOBJ()
void RegisterOBJLoader()
{
MeshLoader::RegisterLoader(IsSupported, Check, Load);
}
void UnregisterOBJ()
void UnregisterOBJLoader()
{
MeshLoader::UnregisterLoader(IsSupported, Check, Load);
}

4
src/Nazara/Utility/Formats/OBJLoader.hpp
View File

@@ -13,8 +13,8 @@ namespace Nz
{
namespace Loaders
{
void RegisterOBJ();
void UnregisterOBJ();
void RegisterOBJLoader();
void UnregisterOBJLoader();
}
}

10
src/Nazara/Utility/Formats/OBJParser.cpp
View File

@@ -125,9 +125,9 @@ namespace Nz
for (unsigned int i = 0; i < vertexCount; ++i)
{
int offset;
int& n = currentMesh->vertices[face.firstVertex + i].normal;
int& p = currentMesh->vertices[face.firstVertex + i].position;
int& t = currentMesh->vertices[face.firstVertex + i].texCoord;
std::size_t n = 0;
std::size_t p = 0;
std::size_t t = 0;
if (std::sscanf(&m_currentLine[pos], "%d/%d/%d%n", &p, &t, &n, &offset) != 3)
{
@@ -199,6 +199,10 @@ namespace Nz
break;
}
currentMesh->vertices[face.firstVertex + i].normal = static_cast<std::size_t>(n);
currentMesh->vertices[face.firstVertex + i].position = static_cast<std::size_t>(p);
currentMesh->vertices[face.firstVertex + i].texCoord = static_cast<std::size_t>(t);
pos += offset;
}