BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Browse Source
This commit is contained in:
ViktorLjung
2014-03-13 02:05:56 +01:00
parent c32d941171 2b4616f09d
commit ab637c957e
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/GameWorld.cpp
+4 -3
View File
@@ -24,12 +24,12 @@ void GameWorld::Initialize()
SetProperty(ent, "Name", std::string("Camera")); SetProperty(ent, "Name", std::string("Camera"));
transform = AddComponent<Components::Transform>(ent, "Transform"); transform = AddComponent<Components::Transform>(ent, "Transform");
AddComponent<Components::Input>(ent, "Input"); AddComponent<Components::Input>(ent, "Input");
transform->Position = glm::vec3(0.f, 2.f, 10.f); transform->Position = glm::vec3(0.f, 10.f, 14.f);
camera = AddComponent<Components::Camera>(ent, "Camera"); camera = AddComponent<Components::Camera>(ent, "Camera");
camera->FOV = 45.f; camera->FOV = 45.f;
camera->FarClip = 1000.f; camera->FarClip = 1000.f;
camera->NearClip = 0.01f; camera->NearClip = 0.01f;
transform->Orientation = glm::angleAxis<float>(glm::radians(25.0f),glm::vec3(1,0,0)); transform->Orientation = glm::angleAxis<float>(glm::radians(15.0f),glm::vec3(1,0,0));
// Fucking lights // Fucking lights
ent = CreateEntity(); ent = CreateEntity();
@@ -93,7 +93,8 @@ void GameWorld::Initialize()
model->ModelFile = "Models/ship.obj"; model->ModelFile = "Models/ship.obj";
AddComponent<Components::Input>(m_Player, "Input"); AddComponent<Components::Input>(m_Player, "Input");
auto bounds = AddComponent<Components::Bounds>(m_Player, "Bounds"); auto bounds = AddComponent<Components::Bounds>(m_Player, "Bounds");
bounds->VolumeVector = glm::vec3(1.0f, 2.0f, 3.0f); bounds->Origin = glm::vec3(0.f, 0.f, 2.f);
bounds->VolumeVector = glm::vec3(3.0f, 0.5f, 2.0f);
ent = CreateEntity(); ent = CreateEntity();
transform = AddComponent<Components::Transform>(ent, "Transform"); transform = AddComponent<Components::Transform>(ent, "Transform");
Escape-the-Dawn/Systems/PlayerSystem.cpp
+19 -3
View File
@@ -75,18 +75,34 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
if(input->KeyState[GLFW_KEY_LEFT]) { if(input->KeyState[GLFW_KEY_LEFT]) {
transform->Position -= Ship_Right * (float)dt * speed; transform->Position -= Ship_Right * (float)dt * speed;
if(Euler.z < 25.f) if(Euler.z < 10.f)
{ {
transform->Orientation = transform->Orientation * glm::angleAxis<float>((float)dt * TurnSpeed,glm::vec3(0,0,1)); transform->Orientation = transform->Orientation * glm::angleAxis<float>((float)dt * TurnSpeed,glm::vec3(0,0,1));
}
else if(Euler.z < 20.f)
{
transform->Orientation = transform->Orientation * glm::angleAxis<float>((float)dt * TurnSpeed/2,glm::vec3(0,0,1));
}
else if (Euler.z < 25.f)
{
transform->Orientation = transform->Orientation * glm::angleAxis<float>((float)dt * TurnSpeed/4,glm::vec3(0,0,1));
} }
} }
else if(input->KeyState[GLFW_KEY_RIGHT]) { else if(input->KeyState[GLFW_KEY_RIGHT]) {
transform->Position += Ship_Right * (float)dt * speed; transform->Position += Ship_Right * (float)dt * speed;
if(Euler.z > -25.f) if(Euler.z > -10.f)
{ {
transform->Orientation = transform->Orientation * glm::angleAxis<float>((float)dt * TurnSpeed,glm::vec3(0,0,-1)); transform->Orientation = transform->Orientation * glm::angleAxis<float>((float)dt * TurnSpeed,glm::vec3(0,0,-1));
} }
else if(Euler.z > -20.f)
{
transform->Orientation = transform->Orientation * glm::angleAxis<float>((float)dt * TurnSpeed/2,glm::vec3(0,0,-1));
}
else if (Euler.z > -25.f)
{
transform->Orientation = transform->Orientation * glm::angleAxis<float>((float)dt * TurnSpeed/4,glm::vec3(0,0,-1));
}
} }
else else
{ {