Johan is love, Johan is life

2016-05-19 14:25:03 +02:00
parent a38a6d3c5f
commit 7c4ee37867
82 changed files with 550 additions and 1250 deletions
@@ -1,77 +1,15 @@
 #include "Player.h"
+#include <GL/freeglut.h>

 Player::Player()
 {
-	
+
 }

-
-Player::~Player()
+void Player::setCamera()
 {
-	if(right != nullptr)
-		delete right;
-	if(left != nullptr)
-		delete left;
-	/*if (player != nullptr)
-		delete player;*/
+	glRotatef(rotation.x, 1, 0, 0);
+	glRotatef(rotation.y, 0, 1, 0);
+	glTranslatef(-position.x, -position.y, -position.z);
+
 }
-
-void Player::Display(void)
-{
-	if (right != nullptr)
-	{			
-		right->draw_weapon();		
-	}
-		
-	if (left != nullptr)
-	{		
-		left->draw_weapon();		
-	}
-
-	/*glRotatef(player->eyes.rotX, 1, 0, 0);
-	glRotatef(player->eyes.rotY, 0, 1, 0);
-	glTranslatef(player->eyes.posX, player->eyes.posY, player->eyes.posZ);*/
-	glRotatef(eyes.rotX, 1, 0, 0);
-	glRotatef(eyes.rotY, 0, 1, 0);
-	glTranslatef(eyes.posX, eyes.posY, eyes.posZ);
-}
-
-Player & Player::GetInstance(void)
-{
-	static Player instance;
-	return instance;
-}
-
-//Player * Player::GetInstance(void)
-//{
-//	if (player == nullptr)
-//		player = new Player();
-//	return player;
-//}
-
-void Player::PlayerMoveEyes(float angle, float fac, bool heigth)
-{
-	//player movement
-	
-	/*if (heigth)
-		player->eyes.posY += angle*fac;
-	else
-	{
-		player->eyes.posX += (float)cos((player->eyes.rotY + angle) / 180 * M_PI) * fac;
-		player->eyes.posZ += (float)sin((player->eyes.rotY + angle) / 180 * M_PI) * fac;
-	}*/
-	if (heigth)
-		eyes.posY += angle*fac;
-	else
-	{
-		eyes.posX += (float)cos((eyes.rotY + angle) / 180 * M_PI) * fac;
-		eyes.posZ += (float)sin((eyes.rotY + angle) / 180 * M_PI) * fac;
-	}
-}
-
-void Player::PlayerRotateEyes(int dx, int dy)
-{
-	eyes.rotY += dx / 10.0f;
-	eyes.rotX += dy / 10.0f;
-}
-