bionickatana/starruler-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further changes

Browse Source
This commit is contained in:
David Carlier
2018-07-28 19:19:42 +01:00
parent 3dacda7522
commit 3928570ce4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game/render/obj_loader.cpp
+8 -8
View File
@@ -12,7 +12,7 @@ namespace render {
struct VertexIndex { struct VertexIndex {
unsigned int a, b, c; unsigned int a, b, c;
VertexIndex(int A, int B, int C) : a(A), b(B), c(C) {} VertexIndex(unsigned int A, unsigned int B, unsigned int C) : a(A), b(B), c(C) {}
bool operator<(const VertexIndex& other) const { bool operator<(const VertexIndex& other) const {
return memcmp(this, &other, sizeof(int) * 3) < 0; return memcmp(this, &other, sizeof(int) * 3) < 0;
@@ -74,11 +74,11 @@ void loadMeshOBJ(const char* filename, Mesh& mesh) {
case 'f': case 'f':
// Face // Face
int vertsThisLine = 3; int vertsThisLine = 3;
int vertexIndex[4]; unsigned int vertexIndex[4];
int uvIndex[4]; unsigned int uvIndex[4];
int normalIndex[4]; unsigned int normalIndex[4];
int elemIndex[4]; unsigned int elemIndex[4];
int items = sscanf(line.c_str(), "f %d/%d/%d %d/%d/%d %d/%d/%d %d/%d/%d", int items = sscanf(line.c_str(), "f %d/%d/%d %d/%d/%d %d/%d/%d %d/%d/%d",
&vertexIndex[0], &uvIndex[0], &normalIndex[0], &vertexIndex[0], &uvIndex[0], &normalIndex[0],
@@ -87,9 +87,9 @@ void loadMeshOBJ(const char* filename, Mesh& mesh) {
&vertexIndex[3], &uvIndex[3], &normalIndex[3]); &vertexIndex[3], &uvIndex[3], &normalIndex[3]);
vertsThisLine = items / 3; vertsThisLine = items / 3;
int vertCount = (int)vertices.size(); size_t vertCount = vertices.size();
int normCount = (int)normals.size(); size_t normCount = normals.size();
int uvCount = (int)ucoord.size(); size_t uvCount = ucoord.size();
for(int i = 0; i < vertsThisLine; ++i) { for(int i = 0; i < vertsThisLine; ++i) {
if(vertexIndex[i] > 0) if(vertexIndex[i] > 0)