diff --git a/assets b/assets index bc811a1..8e4988f 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit bc811a1b392782213d0823e418bc1d773e1a9641 +Subproject commit 8e4988fc2ba2582098f9a2e870cb981df7218985 diff --git a/src/GameWorld.cpp b/src/GameWorld.cpp index 8ff18fc..8fb8c34 100755 --- a/src/GameWorld.cpp +++ b/src/GameWorld.cpp @@ -248,10 +248,8 @@ void GameWorld::Initialize() auto RampShape = CreateEntity(gateBase); auto transform = AddComponent(RampShape); transform->Position = glm::vec3(0, 0.24f, 0); - auto box = AddComponent(RampShape); - box->Width = 14.9f/2; - box->Height = 0.38f/2; - box->Depth = 1.484f/2; + auto mesh = AddComponent(RampShape); + mesh->ResourceName = "Models/Gate/Lift/RampCollision.obj"; CommitEntity(RampShape); } CommitEntity(gateBase); @@ -296,7 +294,7 @@ void GameWorld::Initialize() auto trigger = AddComponent(gateTrigger); auto triggerMove = AddComponent(gateTrigger); triggerMove->Entity = gate; - triggerMove->Time = 3.f; + triggerMove->Time = 0.5f; triggerMove->GoalPosition = glm::vec3(0, -50 + 9.02345f, 150); diff --git a/src/Systems/PhysicsSystem.cpp b/src/Systems/PhysicsSystem.cpp index 23dae56..46741c9 100644 --- a/src/Systems/PhysicsSystem.cpp +++ b/src/Systems/PhysicsSystem.cpp @@ -725,18 +725,12 @@ bool Systems::PhysicsSystem::OnTankSteer(const Events::TankSteer &event) { steeringX = (1 - (glm::clamp(abs(m_Vehicles[event.Entity]->calcKMPH() /vehicleComponent->TopSpeed), 0.f, 0.7f))) * steeringX; } - if(abs(m_Vehicles[event.Entity]->calcKMPH()) < 2 && abs(m_Vehicles[event.Entity]->m_mainSteeringAngle) > 80.f * (HK_REAL_PI / 180)) { deviceStatus->m_positionY = -0.4f; deviceStatus->m_positionX = steeringX; } -// else if(m_Vehicles[event.Entity]->calcKMPH() > -2 && abs(m_Vehicles[event.Entity]->m_mainSteeringAngle) > 80.f * (HK_REAL_PI / 180)) -// { -// deviceStatus->m_positionY = 0.4f;; -// deviceStatus->m_positionX = -steeringX; -// } else { deviceStatus->m_positionX = steeringX; diff --git a/src/Systems/TransformSystem.cpp b/src/Systems/TransformSystem.cpp index da07a55..2e2e7f3 100755 --- a/src/Systems/TransformSystem.cpp +++ b/src/Systems/TransformSystem.cpp @@ -24,7 +24,7 @@ void Systems::TransformSystem::UpdateEntity( double dt, EntityID entity, EntityI { auto transform = m_World->GetComponent(entity); glm::vec3 move = m_MoveItems[entity].GoalPosition - transform->Position; - move *= m_MoveItems[entity].Time; + move /= m_MoveItems[entity].Time; m_MoveItems[entity].Time -= dt; if(m_MoveItems[entity].Time <= 0)