aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraysan5 <raysan5@gmail.com>2013-11-24 20:30:34 +0100
committerraysan5 <raysan5@gmail.com>2013-11-24 20:30:34 +0100
commit8895a165b1f975bb467c353284aafab4ef44447e (patch)
treedca55501dc43a55f63f6cf594a2b5eae95ee9411
parent1a8cdc10b7a5bd5cab40f705241f4c6ca0e3587e (diff)
downloadraylib-8895a165b1f975bb467c353284aafab4ef44447e.tar.gz
raylib-8895a165b1f975bb467c353284aafab4ef44447e.zip
Updated with some minor changes
-rw-r--r--.gitignore2
-rw-r--r--release/win32-mingw/lib/libraylib.abin130218 -> 129960 bytes
-rw-r--r--src/models.c5
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 1e3284f4..67917700 100644
--- a/release/win32-mingw/lib/libraylib.a
+++ b/release/win32-mingw/lib/libraylib.a
Binary files differ
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