Merge branch 'developer' into revertLoadingscreenShit

# Conflicts: # Weapon.cpp # World.cpp
2016-06-22 03:22:38 +02:00
parent 83240e2c57 b6b42b3afc
commit 3b131e949d
3 changed files with 3 additions and 20 deletions
@@ -91,27 +91,11 @@ void Weapon::draw(){
        glRotatef(rotationWeapon.z, 0, 0, 1);
        glRotatef(rotationWeapon.y, 0, 1, 0);
        glRotatef(rotationWeapon.x, 1, 0, 0);
-/*
-        glColor3ub(255, 255, 0);
-        glBegin(GL_LINES);
-        glVertex2f(0, 4);
-        glVertex2f(0, -4);
-        glVertex2f(4, 0);
-        glVertex2f(-4, 0);
-        glEnd();*/
-
        glTranslatef(-ankerPoint.x, -ankerPoint.y, -ankerPoint.z);

-        weaponmodel->draw();
-
-        //Test code for finding anchor point
-        glTranslatef(collisionPoint.x, collisionPoint.y, collisionPoint.z);
-
-        float matrix[16];
-        glGetFloatv(GL_MODELVIEW_MATRIX, matrix);
-
-        Vec3f point = multiply(matrix, Vec3f(1,1,1));
+        glScalef(scale, scale, scale);

+		weaponmodel->draw();

        glPopMatrix();