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:40:02 +01:00
parent e117d8d519 61b0d9e7d3
commit fad346d76f
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/Systems/PlayerSystem.cpp
+2 -3
View File
@@ -35,7 +35,7 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
if(input->KeyState[GLFW_KEY_A] || input->KeyState[GLFW_KEY_LEFT]) { if(input->KeyState[GLFW_KEY_A] || input->KeyState[GLFW_KEY_LEFT]) {
transform->Position -= Camera_Right * (float)dt * speed; transform->Position -= Camera_Right * (float)dt * speed;
} }
if(input->KeyState[GLFW_KEY_D] || input->KeyState[GLFW_KEY_RIGHT]) { else if(input->KeyState[GLFW_KEY_D] || input->KeyState[GLFW_KEY_RIGHT]) {
transform->Position += Camera_Right * (float)dt * speed; transform->Position += Camera_Right * (float)dt * speed;
} }
if(input->KeyState[GLFW_KEY_W]) { if(input->KeyState[GLFW_KEY_W]) {
@@ -69,7 +69,6 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
float TurnSpeed = 2.0f; float TurnSpeed = 2.0f;
glm::vec3 Euler = glm::eulerAngles(transform->Orientation); glm::vec3 Euler = glm::eulerAngles(transform->Orientation);
LOG_DEBUG("Euler: %f", Euler.z);
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;
@@ -105,7 +104,7 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
} }
else else
{ {
if(Euler.z < 0.5f && Euler.z > -0.5f) if(Euler.z < 1.5f && Euler.z > -1.5f)
transform->Orientation = glm::angleAxis<float>(0,glm::vec3(0,0,1)); transform->Orientation = glm::angleAxis<float>(0,glm::vec3(0,0,1));
else if(Euler.z < 0.f) else if(Euler.z < 0.f)
transform->Orientation = transform->Orientation * glm::angleAxis<float>((float)dt,glm::vec3(0,0,1)); transform->Orientation = transform->Orientation * glm::angleAxis<float>((float)dt,glm::vec3(0,0,1));
Escape-the-Dawn/Systems/RenderSystem.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ void Systems::RenderSystem::UpdateEntity( double dt, EntityID entity, EntityID p
#ifdef DEBUG #ifdef DEBUG
auto bounds = m_World->GetComponent<Components::Bounds>(entity, "Bounds"); auto bounds = m_World->GetComponent<Components::Bounds>(entity, "Bounds");
if (bounds != nullptr) { if (bounds != nullptr) {
glm::vec3 origin = transformComponent->Position + bounds->Origin; glm::vec3 origin = transformComponent->Scale * (transformComponent->Position + bounds->Origin);
glm::vec3 volumeVector = transformComponent->Scale * bounds->VolumeVector; glm::vec3 volumeVector = transformComponent->Scale * bounds->VolumeVector;
m_Renderer->AddAABBToDraw(origin, volumeVector); m_Renderer->AddAABBToDraw(origin, volumeVector);
} }
Escape-the-Dawn/World.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ void World::RemoveEntity(EntityID entity)
for (auto pair : m_EntityComponents[entity]) { for (auto pair : m_EntityComponents[entity]) {
auto type = pair.first; auto type = pair.first;
auto component = pair.second; auto component = pair.second;
m_ComponentsOfType[type].erase(std::remove(m_ComponentsOfType[type].begin(), m_ComponentsOfType[type].end(), component)); m_ComponentsOfType[type].remove(component);
} }
RecycleEntityID(entity); RecycleEntityID(entity);
} }
Escape-the-Dawn/World.h
+1 -1
View File
@@ -81,7 +81,7 @@ protected:
std::unordered_map<EntityID, std::unordered_map<std::string, boost::any>> m_EntityProperties; std::unordered_map<EntityID, std::unordered_map<std::string, boost::any>> m_EntityProperties;
std::unordered_map<std::string, std::vector<std::shared_ptr<Component>>> m_ComponentsOfType; std::unordered_map<std::string, std::list<std::shared_ptr<Component>>> m_ComponentsOfType;
std::unordered_map<EntityID, std::map<std::string, std::shared_ptr<Component>>> m_EntityComponents; std::unordered_map<EntityID, std::map<std::string, std::shared_ptr<Component>>> m_EntityComponents;
EntityID GenerateEntityID(); EntityID GenerateEntityID();