From 651e62ba942bbd3a7d59af87fed4eb19dcee59d6 Mon Sep 17 00:00:00 2001
From: ViktorLjung <ljunga_93@hotmail.com>
Date: Wed, 28 May 2014 20:40:15 +0200
Subject: [PATCH] Camera on tank barrel

---
 src/GameWorld.cpp | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/GameWorld.cpp b/src/GameWorld.cpp
index d2a591c..d25c813 100755
--- a/src/GameWorld.cpp
+++ b/src/GameWorld.cpp
@@ -379,6 +379,20 @@ EntityID GameWorld::CreateTank(int playerID)
 				}
 				CommitEntity(shot);
 				barrelSteering->ShotTemplate = shot;
+
+
+				auto cameraTower = CreateEntity(barrel);
+				{
+					auto transform = AddComponent<Components::Transform>(cameraTower);
+					transform->Position.z = 16.f;
+					transform->Position.y = 4.f;
+					transform->Orientation = glm::quat(glm::vec3(-glm::radians(5.f), 0.f, 0.f));
+					auto cameraComp = AddComponent<Components::Camera>(cameraTower);
+					cameraComp->FarClip = 2000.f;
+					//auto freeSteering = AddComponent<Components::FreeSteering>(cameraTower);
+				}
+
+				SetProperty(tank, "Camera", cameraTower);
 			}
 			CommitEntity(barrel);
 			tankSteering->Barrel = barrel;
@@ -387,18 +401,7 @@ EntityID GameWorld::CreateTank(int playerID)
 		tankSteering->Turret = tower;
 
 
-		auto cameraTower = CreateEntity(tower);
-		{
-			auto transform = AddComponent<Components::Transform>(cameraTower);
-			transform->Position.z = 16.f;
-			transform->Position.y = 4.f;
-			//transform->Orientation = glm::quat(glm::vec3(glm::pi<float>() / 8.f, 0.f, 0.f));
-			auto cameraComp = AddComponent<Components::Camera>(cameraTower);
-			cameraComp->FarClip = 2000.f;
-			//auto freeSteering = AddComponent<Components::FreeSteering>(cameraTower);
-		}
-
-		SetProperty(tank, "Camera", cameraTower);
+		
 	}
 
 	//{