mirrors/raylib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated with some minor changes

Browse Source
This commit is contained in:
raysan5 2013-11-24 20:30:34 +01:00
parent 1a8cdc10b7
commit 8895a165b1
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -17,7 +17,7 @@ examples/*.o
Thumbs.db Thumbs.db
# Ignore files build by Visual Studio # Ignore files build by Visual Studio
*.obj # *.obj --> Can be confused with 3d model!
*.pdb *.pdb
*.aps *.aps
*.vcproj.*.user *.vcproj.*.user

BIN
release/win32-mingw/lib/libraylib.a
View File

Binary file not shown.

5
src/models.c
View File

@ -674,7 +674,6 @@ void UnloadModel(Model model)
void DrawModel(Model model, Vector3 position, float scale, Color color) void DrawModel(Model model, Vector3 position, float scale, Color color)
{ {
// NOTE: For models we use Vertex Arrays (OpenGL 1.1) // NOTE: For models we use Vertex Arrays (OpenGL 1.1)
static float rotation = 0;
glEnableClientState(GL_VERTEX_ARRAY); // Enable vertex array glEnableClientState(GL_VERTEX_ARRAY); // Enable vertex array
glEnableClientState(GL_TEXTURE_COORD_ARRAY); // Enable texture coords 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(); glPushMatrix();
glTranslatef(position.x, position.y, position.z); glTranslatef(position.x, position.y, position.z);
glRotatef(rotation * GetFrameTime(), 0, 1, 0); //glRotatef(rotation * GetFrameTime(), 0, 1, 0);
glScalef(scale, scale, scale); glScalef(scale, scale, scale);
glColor4ub(color.r, color.g, color.b, color.a); 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_VERTEX_ARRAY); // Disable vertex array
glDisableClientState(GL_TEXTURE_COORD_ARRAY); // Disable texture coords array glDisableClientState(GL_TEXTURE_COORD_ARRAY); // Disable texture coords array
glDisableClientState(GL_NORMAL_ARRAY); // Disable normals array glDisableClientState(GL_NORMAL_ARRAY); // Disable normals array
rotation += 10;
} }
// Draw a textured model // Draw a textured model