From 5df4a1d8d06ab837027a06c017d67f83b626670e Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Tue, 17 May 2016 10:42:06 +0200 Subject: [PATCH] Hotfix Main.cpp and Weapon.cpp --- Main.cpp | 2 +- Weapon.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Main.cpp b/Main.cpp index 9f47441..69197f5 100644 --- a/Main.cpp +++ b/Main.cpp @@ -160,7 +160,7 @@ void configureOpenGL() glEnable(GL_ALPHA_TEST); glAlphaFunc(GL_GREATER, 0.01f); - Lighting + //Lighting GLfloat mat_specular[] = { 1.0, 1.0, 1.0, 1.0 }; GLfloat mat_shininess[] = { 20.0 }; GLfloat light_position[] = { 30.0, 30.0, 30.0, 1.0 }; diff --git a/Weapon.cpp b/Weapon.cpp index 47e42ae..559062a 100644 --- a/Weapon.cpp +++ b/Weapon.cpp @@ -20,7 +20,7 @@ void Weapon::draw_weapon(void) if (weaponModel != nullptr) { glScalef(scale,scale,scale); - glRotatef(rotX, 1, 0, 0); + glRotatef(135, 1, 0, 0); weaponModel->draw(); } }