From 8895a165b1f975bb467c353284aafab4ef44447e Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sun, 24 Nov 2013 20:30:34 +0100 Subject: [PATCH] Updated with some minor changes --- .gitignore | 2 +- release/win32-mingw/lib/libraylib.a | Bin 130218 -> 129960 bytes src/models.c | 5 +---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bb9a58c3..ba897af5 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ examples/*.o Thumbs.db # Ignore files build by Visual Studio -*.obj +# *.obj --> Can be confused with 3d model! *.pdb *.aps *.vcproj.*.user diff --git a/release/win32-mingw/lib/libraylib.a b/release/win32-mingw/lib/libraylib.a index 1e3284f4aaea9cd9a0ebdf8d1e3a18ee8d97fba5..6791770053079ec0f456805a901280598a1c114f 100644 GIT binary patch delta 7851 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 delta 7982 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 a=~rg;}n*!@4@;!i99 diff --git a/src/models.c b/src/models.c index 12db08ba..e15ea31f 100644 --- a/src/models.c +++ b/src/models.c @@ -674,7 +674,6 @@ void UnloadModel(Model model) void DrawModel(Model model, Vector3 position, float scale, Color color) { // NOTE: For models we use Vertex Arrays (OpenGL 1.1) - static float rotation = 0; glEnableClientState(GL_VERTEX_ARRAY); // Enable vertex array glEnableClientState(GL_TEXTURE_COORD_ARRAY); // Enable texture coords array @@ -687,7 +686,7 @@ void DrawModel(Model model, Vector3 position, float scale, Color color) glPushMatrix(); glTranslatef(position.x, position.y, position.z); - glRotatef(rotation * GetFrameTime(), 0, 1, 0); + //glRotatef(rotation * GetFrameTime(), 0, 1, 0); glScalef(scale, scale, scale); glColor4ub(color.r, color.g, color.b, color.a); @@ -698,8 +697,6 @@ void DrawModel(Model model, Vector3 position, float scale, Color color) glDisableClientState(GL_VERTEX_ARRAY); // Disable vertex array glDisableClientState(GL_TEXTURE_COORD_ARRAY); // Disable texture coords array glDisableClientState(GL_NORMAL_ARRAY); // Disable normals array - - rotation += 10; } // Draw a textured model