aboutsummaryrefslogtreecommitdiff
path: root/src/models.c
diff options
context:
space:
mode:
authorraysan5 <raysan5@gmail.com>2015-09-02 20:36:05 +0200
committerraysan5 <raysan5@gmail.com>2015-09-02 20:36:05 +0200
commit94d0e8320795aeba496dbda639a5430375fcce07 (patch)
treeb78f57eac63f8e2947d9c76c151d6ce314248ee0 /src/models.c
parentab459bf418c7d8d757045440bc868e196dac8daf (diff)
downloadraylib-94d0e8320795aeba496dbda639a5430375fcce07.tar.gz
raylib-94d0e8320795aeba496dbda639a5430375fcce07.zip
Corrected crazy bug about model textures
On OpenGL ES it was set to use GL_CLAMP_TO_EDGE wrap mode for textures. On LoadOBJ() texture coordinates were wrongly Y-flipped
Diffstat (limited to 'src/models.c')
-rw-r--r--src/models.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/models.c b/src/models.c
index b4dadbc7..4943aa5e 100644
--- a/src/models.c
+++ b/src/models.c
@@ -1731,7 +1731,7 @@ static VertexData LoadOBJ(const char *fileName)
int tcCounter = 0; // Used to count texcoords float by float
int nCounter = 0; // Used to count normals float by float
- int vNum[3], vtNum[3], vnNum[3];
+ int vNum[3], vtNum[3], vnNum[3]; // Used to store triangle indices for v, vt, vn
rewind(objFile); // Return to the beginning of the file, to read again
@@ -1803,14 +1803,16 @@ static VertexData LoadOBJ(const char *fileName)
if (numTexCoords > 0)
{
+ // NOTE: If using negative texture coordinates with a texture filter of GL_CLAMP_TO_EDGE doesn't work!
+ // NOTE: Texture coordinates are Y flipped upside-down
vData.texcoords[tcCounter] = midTexCoords[vtNum[0]-1].x;
- vData.texcoords[tcCounter + 1] = -midTexCoords[vtNum[0]-1].y;
+ vData.texcoords[tcCounter + 1] = 1.0f - midTexCoords[vtNum[0]-1].y;
tcCounter += 2;
vData.texcoords[tcCounter] = midTexCoords[vtNum[1]-1].x;
- vData.texcoords[tcCounter + 1] = -midTexCoords[vtNum[1]-1].y;
+ vData.texcoords[tcCounter + 1] = 1.0f - midTexCoords[vtNum[1]-1].y;
tcCounter += 2;
vData.texcoords[tcCounter] = midTexCoords[vtNum[2]-1].x;
- vData.texcoords[tcCounter + 1] = -midTexCoords[vtNum[2]-1].y;
+ vData.texcoords[tcCounter + 1] = 1.0f - midTexCoords[vtNum[2]-1].y;
tcCounter += 2;
}
} break;
@@ -1822,7 +1824,7 @@ static VertexData LoadOBJ(const char *fileName)
// Security check, just in case no normals or no texcoords defined in OBJ
if (numTexCoords == 0) for (int i = 0; i < (2*vData.vertexCount); i++) vData.texcoords[i] = 0.0f;
-
+
// NOTE: We set all vertex colors to white
// NOTE: Not used any more... just one plain color defined at DrawModel()
for (int i = 0; i < (4*vData.vertexCount); i++) vData.colors[i] = 255;