BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed physics relative orientations!

Browse Source
This commit is contained in:
sippeangelo
2014-06-04 04:18:44 +02:00
parent 7d9f1a7ac7
commit e11f656b3d
6 changed files with 298 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets
+1 -1
Submodule assets updated: 588da9ca0d...cc30e5fb5c
src/Components/SpawnPoint.h
+2
View File
@@ -8,6 +8,8 @@ namespace Components
struct SpawnPoint : Component struct SpawnPoint : Component
{ {
EntityID Player;
virtual SpawnPoint* Clone() const override { return new SpawnPoint(*this); } virtual SpawnPoint* Clone() const override { return new SpawnPoint(*this); }
}; };
src/GameWorld.cpp
+288 -267
View File
@@ -789,14 +789,295 @@ EntityID GameWorld::CreateJeep(int playerID)
return jeep; return jeep;
} }
EntityID GameWorld::CreateGarage(glm::vec3 position, glm::quat orientation, int playerID) void GameWorld::CreateTerrain()
{ {
auto garage = CreateEntity(); {
auto transform = AddComponent<Components::Transform>(garage); auto road_middle = CreateEntity();
transform->Position = position; auto transform = AddComponent<Components::Transform>(road_middle);
auto model = AddComponent<Components::Model>(road_middle);
model->ModelFile = "Models/TerrainFiveIstles/Roads/MiddleRoad.obj";
auto physics = AddComponent<Components::Physics>(road_middle);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
auto groundshape = CreateEntity(road_middle);
auto transformshape = AddComponent<Components::Transform>(groundshape);
auto meshShape = AddComponent<Components::MeshShape>(groundshape);
meshShape->ResourceName = "Models/TerrainFiveIstles/Roads/MiddleRoad.obj";
CommitEntity(groundshape);
CommitEntity(road_middle);
}
{
/*auto water = CreateEntity();
auto transform = AddComponent<Components::Transform>(water);
transform->Position = glm::vec3(0, -35, 0);
transform->Orientation = glm::quat(glm::vec3(0.0f, 0.0f, 0.0f));
transform->Scale = glm::vec3(5000.f, 10.f, 5000.f);
auto model = AddComponent<Components::Model>(water);
model->ModelFile = "Models/Placeholders/PhysicsTest/Cube.obj";
auto blendmap = AddComponent<Components::BlendMap>(water);
blendmap->TextureRed = "Textures/Skybox/Sky34/bottom.jpg";
blendmap->TextureGreen = "Textures/Skybox/Sky34/bottom.jpg";
blendmap->TextureBlue = "Textures/Skybox/Sky34/bottom.jpg";
blendmap->TextureRepeats = 1.f;
auto physics = AddComponent<Components::Physics>(water);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
{
auto groundshape = CreateEntity(water);
auto box = AddComponent<Components::BoxShape>(groundshape);
box->Depth = 250.f;
box->Height = 5.f;
box->Width = 250.f;
CommitEntity(groundshape);
}
CommitEntity(water);*/
}
{
auto ground_middle = CreateEntity();
auto transform = AddComponent<Components::Transform>(ground_middle);
auto model = AddComponent<Components::Model>(ground_middle);
model->ModelFile = "Models/TerrainFiveIstles/Middle.obj";
auto blendmap = AddComponent<Components::BlendMap>(ground_middle);
blendmap->TextureRed = "Textures/Ground/SoilBeach0087_11_S.jpg";
blendmap->TextureRedNormal = "Textures/Ground/SoilBeach0087_11_SNM.png";
blendmap->TextureGreen = "Textures/Ground/Grass0126_2_S.jpg";
blendmap->TextureGreenNormal = "Textures/Ground/Grass0126_2_SNM.png";
blendmap->TextureBlue = "Textures/Ground/Cliffs2.png";
blendmap->TextureBlueNormal = "Textures/Ground/Cliffs2NM.png";
blendmap->TextureRepeats = 30.f;
auto physics = AddComponent<Components::Physics>(ground_middle);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
auto groundshape = CreateEntity(ground_middle);
auto transformshape = AddComponent<Components::Transform>(groundshape);
auto meshShape = AddComponent<Components::MeshShape>(groundshape);
meshShape->ResourceName = "Models/TerrainFiveIstles/Middle.obj";
CommitEntity(groundshape);
CommitEntity(ground_middle);
}
CreateBase(glm::quat(), 1);
CreateBase(glm::quat(glm::vec3(0, glm::pi<float>(), 0)), 2);
{
auto tree = CreateEntity();
auto transform = AddComponent<Components::Transform>(tree);
transform->Position = glm::vec3(0, -10, 0);
auto physics = AddComponent<Components::Physics>(tree);
physics->Mass = 100.f;
physics->MotionType = Components::Physics::MotionTypeEnum::Keyframed;
physics->CollisionEvent = false;
//physics->LinearDamping = 3.f;
physics->CalculateCenterOfMass = true;
{
auto stem = CreateEntity(tree);
auto transform = AddComponent<Components::Transform>(stem);
transform->Position = glm::vec3(0, -2.40906f, 0);
auto model = AddComponent<Components::Model>(stem);
model->ModelFile = "Models/Tree/Stem/Stem.obj";
}
{
auto leafs = CreateEntity(tree);
auto transform = AddComponent<Components::Transform>(leafs);
transform->Position = glm::vec3(0, -2.45511f, 0);
auto model = AddComponent<Components::Model>(leafs);
model->ModelFile = "Models/Tree/Leafs/Leafs.obj";
model->Transparent = true;
CommitEntity(leafs);
}
{
auto shape = CreateEntity(tree);
auto transform = AddComponent<Components::Transform>(shape);
transform->Position = glm::vec3(0.f, 0.f, 0.f);
auto mesh = AddComponent<Components::MeshShape>(shape);
mesh->ResourceName = "Models/Tree/Collision/Collision.obj";
CommitEntity(shape);
}
/*{
auto shape = CreateEntity(tree);
auto transform = AddComponent<Components::Transform>(shape);
auto box = AddComponent<Components::BoxShape>(shape);
transform->Position = glm::vec3(0.f, 0, 0.f);
box->Width = 0.296f;
box->Height = 2.511f;
box->Depth = 0.296f;
CommitEntity(shape);
}
{
auto shape = CreateEntity(tree);
auto transform = AddComponent<Components::Transform>(shape);
auto sphere = AddComponent<Components::SphereShape>(shape);
transform->Position = glm::vec3(0, 2.04506f, 0.f);
sphere->Radius = 1.389f;
CommitEntity(shape);
}*/
CommitEntity(tree);
}
}
void GameWorld::CreateBase(glm::quat orientation, int playerID)
{
auto base = CreateEntity();
auto transform = AddComponent<Components::Transform>(base);
transform->Orientation = orientation; transform->Orientation = orientation;
auto player = AddComponent<Components::Player>(garage);
player->ID = playerID; {
auto ground_small = CreateEntity(base);
auto transform = AddComponent<Components::Transform>(ground_small);
auto model = AddComponent<Components::Model>(ground_small);
model->ModelFile = "Models/TerrainFiveIstles/Small.obj";
auto blendmap = AddComponent<Components::BlendMap>(ground_small);
blendmap->TextureRed = "Textures/Ground/SoilBeach0087_11_S.jpg";
blendmap->TextureRedNormal = "Textures/Ground/SoilBeach0087_11_SNM.png";
blendmap->TextureGreen = "Textures/Ground/Grass0126_2_S.jpg";
blendmap->TextureGreenNormal = "Textures/Ground/Grass0126_2_SNM.png";
blendmap->TextureBlue = "Textures/Ground/Cliffs2.png";
blendmap->TextureBlueNormal = "Textures/Ground/Cliffs2NM.png";
blendmap->TextureRepeats = 30.f;
auto physics = AddComponent<Components::Physics>(ground_small);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
auto groundshape = CreateEntity(ground_small);
auto transformshape = AddComponent<Components::Transform>(groundshape);
auto meshShape = AddComponent<Components::MeshShape>(groundshape);
meshShape->ResourceName = "Models/TerrainFiveIstles/Small.obj";
CommitEntity(groundshape);
CommitEntity(ground_small);
}
{
auto road_small = CreateEntity(base);
auto transform = AddComponent<Components::Transform>(road_small);
auto model = AddComponent<Components::Model>(road_small);
model->ModelFile = "Models/TerrainFiveIstles/Roads/SmallRoad.obj";
auto physics = AddComponent<Components::Physics>(road_small);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
auto groundshape = CreateEntity(road_small);
auto transformshape = AddComponent<Components::Transform>(groundshape);
auto meshShape = AddComponent<Components::MeshShape>(groundshape);
meshShape->ResourceName = "Models/TerrainFiveIstles/Roads/SmallRoad.obj";
CommitEntity(groundshape);
CommitEntity(road_small);
}
{
auto terrain_base = CreateEntity(base);
auto transform = AddComponent<Components::Transform>(terrain_base);
auto model = AddComponent<Components::Model>(terrain_base);
model->ModelFile = "Models/TerrainFiveIstles/Base.obj";
auto blendmap = AddComponent<Components::BlendMap>(terrain_base);
blendmap->TextureRed = "Textures/Ground/SoilBeach0087_11_S.jpg";
blendmap->TextureRedNormal = "Textures/Ground/SoilBeach0087_11_SNM.png";
blendmap->TextureGreen = "Textures/Ground/Grass0126_2_S.jpg";
blendmap->TextureGreenNormal = "Textures/Ground/Grass0126_2_SNM.png";
blendmap->TextureBlue = "Textures/Ground/Cliffs2.png";
blendmap->TextureBlueNormal = "Textures/Ground/Cliffs2NM.png";
blendmap->TextureRepeats = 30.f;
auto physics = AddComponent<Components::Physics>(terrain_base);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
auto shape = CreateEntity(terrain_base);
auto transformshape = AddComponent<Components::Transform>(shape);
auto meshShape = AddComponent<Components::MeshShape>(shape);
meshShape->ResourceName = "Models/TerrainFiveIstles/Base.obj";
CommitEntity(shape);
CommitEntity(terrain_base);
}
{
auto ground_base = CreateEntity(base);
auto transform = AddComponent<Components::Transform>(ground_base);
auto model = AddComponent<Components::Model>(ground_base);
model->ModelFile = "Models/TerrainFiveIstles/BaseGround.obj";
auto physics = AddComponent<Components::Physics>(ground_base);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
auto shape = CreateEntity(ground_base);
auto transformshape = AddComponent<Components::Transform>(shape);
auto meshShape = AddComponent<Components::MeshShape>(shape);
meshShape->ResourceName = "Models/TerrainFiveIstles/BaseGround.obj";
CommitEntity(shape);
CommitEntity(ground_base);
}
{
auto road_base = CreateEntity(base);
auto transform = AddComponent<Components::Transform>(road_base);
auto model = AddComponent<Components::Model>(road_base);
model->ModelFile = "Models/TerrainFiveIstles/Roads/BaseRoad.obj";
auto physics = AddComponent<Components::Physics>(road_base);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
auto groundshape = CreateEntity(road_base);
auto transformshape = AddComponent<Components::Transform>(groundshape);
auto meshShape = AddComponent<Components::MeshShape>(groundshape);
meshShape->ResourceName = "Models/TerrainFiveIstles/Roads/BaseRoad.obj";
CommitEntity(groundshape);
CommitEntity(road_base);
}
CreateGarage(base, glm::vec3(323.2f, 41.4f, -10.2f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)), playerID);
}
EntityID GameWorld::CreateGarage(EntityID parent, glm::vec3 Position, glm::quat orientation, int playerID)
{
auto garage = CreateEntity(parent);
auto transform = AddComponent<Components::Transform>(garage);
transform->Position = Position;
transform->Orientation = orientation;
auto player = CreateEntity(garage);
auto playerComponent = AddComponent<Components::Player>(player);
playerComponent->ID = playerID;
auto ElevatorBase = CreateEntity(garage); auto ElevatorBase = CreateEntity(garage);
{ {
@@ -909,6 +1190,7 @@ EntityID GameWorld::CreateGarage(glm::vec3 position, glm::quat orientation, int
auto transform = AddComponent<Components::Transform>(spawnPoint); auto transform = AddComponent<Components::Transform>(spawnPoint);
transform->Position.y = 1.f; transform->Position.y = 1.f;
auto spawnPointComponent = AddComponent<Components::SpawnPoint>(spawnPoint); auto spawnPointComponent = AddComponent<Components::SpawnPoint>(spawnPoint);
spawnPointComponent->Player = player;
} }
CommitEntity(spawnPoint); CommitEntity(spawnPoint);
} }
@@ -960,264 +1242,3 @@ EntityID GameWorld::CreateGarage(glm::vec3 position, glm::quat orientation, int
return garage; return garage;
} }
void GameWorld::CreateTerrain()
{
{
auto road_middle = CreateEntity();
auto transform = AddComponent<Components::Transform>(road_middle);
auto model = AddComponent<Components::Model>(road_middle);
model->ModelFile = "Models/TerrainFiveIstles/Roads/MiddleRoad.obj";
auto physics = AddComponent<Components::Physics>(road_middle);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
auto groundshape = CreateEntity(road_middle);
auto transformshape = AddComponent<Components::Transform>(groundshape);
auto meshShape = AddComponent<Components::MeshShape>(groundshape);
meshShape->ResourceName = "Models/TerrainFiveIstles/Roads/MiddleRoad.obj";
CommitEntity(groundshape);
CommitEntity(road_middle);
}
{
/*auto water = CreateEntity();
auto transform = AddComponent<Components::Transform>(water);
transform->Position = glm::vec3(0, -35, 0);
transform->Orientation = glm::quat(glm::vec3(0.0f, 0.0f, 0.0f));
transform->Scale = glm::vec3(5000.f, 10.f, 5000.f);
auto model = AddComponent<Components::Model>(water);
model->ModelFile = "Models/Placeholders/PhysicsTest/Cube.obj";
auto blendmap = AddComponent<Components::BlendMap>(water);
blendmap->TextureRed = "Textures/Skybox/Sky34/bottom.jpg";
blendmap->TextureGreen = "Textures/Skybox/Sky34/bottom.jpg";
blendmap->TextureBlue = "Textures/Skybox/Sky34/bottom.jpg";
blendmap->TextureRepeats = 1.f;
auto physics = AddComponent<Components::Physics>(water);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
{
auto groundshape = CreateEntity(water);
auto box = AddComponent<Components::BoxShape>(groundshape);
box->Depth = 250.f;
box->Height = 5.f;
box->Width = 250.f;
CommitEntity(groundshape);
}
CommitEntity(water);*/
}
{
auto ground_middle = CreateEntity();
auto transform = AddComponent<Components::Transform>(ground_middle);
auto model = AddComponent<Components::Model>(ground_middle);
model->ModelFile = "Models/TerrainFiveIstles/Middle.obj";
auto blendmap = AddComponent<Components::BlendMap>(ground_middle);
blendmap->TextureRed = "Textures/Ground/SoilBeach0087_11_S.jpg";
blendmap->TextureRedNormal = "Textures/Ground/SoilBeach0087_11_SNM.png";
blendmap->TextureGreen = "Textures/Ground/Grass0126_2_S.jpg";
blendmap->TextureGreenNormal = "Textures/Ground/Grass0126_2_SNM.png";
blendmap->TextureBlue = "Textures/Ground/Cliffs2.png";
blendmap->TextureBlueNormal = "Textures/Ground/Cliffs2NM.png";
blendmap->TextureRepeats = 30.f;
auto physics = AddComponent<Components::Physics>(ground_middle);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
auto groundshape = CreateEntity(ground_middle);
auto transformshape = AddComponent<Components::Transform>(groundshape);
auto meshShape = AddComponent<Components::MeshShape>(groundshape);
meshShape->ResourceName = "Models/TerrainFiveIstles/Middle.obj";
CommitEntity(groundshape);
CommitEntity(ground_middle);
}
CreateBase(glm::quat());
CreateBase(glm::quat(glm::vec3(0, glm::pi<float>(), 0)));
{
auto tree = CreateEntity();
auto transform = AddComponent<Components::Transform>(tree);
transform->Position = glm::vec3(0, -10, 0);
auto physics = AddComponent<Components::Physics>(tree);
physics->Mass = 100.f;
physics->MotionType = Components::Physics::MotionTypeEnum::Keyframed;
physics->CollisionEvent = false;
//physics->LinearDamping = 3.f;
physics->CalculateCenterOfMass = true;
{
auto stem = CreateEntity(tree);
auto transform = AddComponent<Components::Transform>(stem);
transform->Position = glm::vec3(0, -2.40906f, 0);
auto model = AddComponent<Components::Model>(stem);
model->ModelFile = "Models/Tree/Stem/Stem.obj";
}
{
auto leafs = CreateEntity(tree);
auto transform = AddComponent<Components::Transform>(leafs);
transform->Position = glm::vec3(0, -2.45511f, 0);
auto model = AddComponent<Components::Model>(leafs);
model->ModelFile = "Models/Tree/Leafs/Leafs.obj";
model->Transparent = true;
CommitEntity(leafs);
}
{
auto shape = CreateEntity(tree);
auto transform = AddComponent<Components::Transform>(shape);
transform->Position = glm::vec3(0.f, 0.f, 0.f);
auto mesh = AddComponent<Components::MeshShape>(shape);
mesh->ResourceName = "Models/Tree/Collision/Collision.obj";
CommitEntity(shape);
}
/*{
auto shape = CreateEntity(tree);
auto transform = AddComponent<Components::Transform>(shape);
auto box = AddComponent<Components::BoxShape>(shape);
transform->Position = glm::vec3(0.f, 0, 0.f);
box->Width = 0.296f;
box->Height = 2.511f;
box->Depth = 0.296f;
CommitEntity(shape);
}
{
auto shape = CreateEntity(tree);
auto transform = AddComponent<Components::Transform>(shape);
auto sphere = AddComponent<Components::SphereShape>(shape);
transform->Position = glm::vec3(0, 2.04506f, 0.f);
sphere->Radius = 1.389f;
CommitEntity(shape);
}*/
CommitEntity(tree);
}
}
void GameWorld::CreateBase(glm::quat orientation)
{
{
auto ground_small = CreateEntity();
auto transform = AddComponent<Components::Transform>(ground_small);
transform->Orientation = orientation;
auto model = AddComponent<Components::Model>(ground_small);
model->ModelFile = "Models/TerrainFiveIstles/Small.obj";
auto blendmap = AddComponent<Components::BlendMap>(ground_small);
blendmap->TextureRed = "Textures/Ground/SoilBeach0087_11_S.jpg";
blendmap->TextureRedNormal = "Textures/Ground/SoilBeach0087_11_SNM.png";
blendmap->TextureGreen = "Textures/Ground/Grass0126_2_S.jpg";
blendmap->TextureGreenNormal = "Textures/Ground/Grass0126_2_SNM.png";
blendmap->TextureBlue = "Textures/Ground/Cliffs2.png";
blendmap->TextureBlueNormal = "Textures/Ground/Cliffs2NM.png";
blendmap->TextureRepeats = 30.f;
auto physics = AddComponent<Components::Physics>(ground_small);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
auto groundshape = CreateEntity(ground_small);
auto transformshape = AddComponent<Components::Transform>(groundshape);
auto meshShape = AddComponent<Components::MeshShape>(groundshape);
meshShape->ResourceName = "Models/TerrainFiveIstles/Small.obj";
CommitEntity(groundshape);
CommitEntity(ground_small);
}
{
auto ground_base = CreateEntity();
auto transform = AddComponent<Components::Transform>(ground_base);
transform->Orientation = orientation;
auto model = AddComponent<Components::Model>(ground_base);
model->ModelFile = "Models/TerrainFiveIstles/Base.obj";
auto blendmap = AddComponent<Components::BlendMap>(ground_base);
blendmap->TextureRed = "Textures/Ground/SoilBeach0087_11_S.jpg";
blendmap->TextureRedNormal = "Textures/Ground/SoilBeach0087_11_SNM.png";
blendmap->TextureGreen = "Textures/Ground/Grass0126_2_S.jpg";
blendmap->TextureGreenNormal = "Textures/Ground/Grass0126_2_SNM.png";
blendmap->TextureBlue = "Textures/Ground/Cliffs2.png";
blendmap->TextureBlueNormal = "Textures/Ground/Cliffs2NM.png";
blendmap->TextureRepeats = 30.f;
auto physics = AddComponent<Components::Physics>(ground_base);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
auto groundshape = CreateEntity(ground_base);
auto transformshape = AddComponent<Components::Transform>(groundshape);
auto meshShape = AddComponent<Components::MeshShape>(groundshape);
meshShape->ResourceName = "Models/TerrainFiveIstles/Base.obj";
CommitEntity(groundshape);
CommitEntity(ground_base);
}
{
auto road_base = CreateEntity();
auto transform = AddComponent<Components::Transform>(road_base);
transform->Orientation = orientation;
auto model = AddComponent<Components::Model>(road_base);
model->ModelFile = "Models/TerrainFiveIstles/Roads/BaseRoad.obj";
auto physics = AddComponent<Components::Physics>(road_base);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
auto groundshape = CreateEntity(road_base);
auto transformshape = AddComponent<Components::Transform>(groundshape);
auto meshShape = AddComponent<Components::MeshShape>(groundshape);
meshShape->ResourceName = "Models/TerrainFiveIstles/Roads/BaseRoad.obj";
CommitEntity(groundshape);
CommitEntity(road_base);
}
{
auto road_small = CreateEntity();
auto transform = AddComponent<Components::Transform>(road_small);
transform->Orientation = orientation;
auto model = AddComponent<Components::Model>(road_small);
model->ModelFile = "Models/TerrainFiveIstles/Roads/SmallRoad.obj";
auto physics = AddComponent<Components::Physics>(road_small);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
auto groundshape = CreateEntity(road_small);
auto transformshape = AddComponent<Components::Transform>(groundshape);
auto meshShape = AddComponent<Components::MeshShape>(groundshape);
meshShape->ResourceName = "Models/TerrainFiveIstles/Roads/SmallRoad.obj";
CommitEntity(groundshape);
CommitEntity(road_small);
}
CreateGarage(glm::vec3(323.2f, 41.4f, -10.2f), glm::quat(glm::vec3(0, glm::pi<float>(), 0)), 1); // glm::vec3(0, glm::pi<float>()/2.f, 0)
}
src/GameWorld.h
+2 -2
View File
@@ -82,9 +82,9 @@ private:
void AddTankWheelPair(EntityID tankEntity, glm::vec3 position, int axleID, bool steering); void AddTankWheelPair(EntityID tankEntity, glm::vec3 position, int axleID, bool steering);
EntityID CreateJeep(int playerID); EntityID CreateJeep(int playerID);
EntityID CreateWall(glm::vec3 pos, glm::quat orientation); EntityID CreateWall(glm::vec3 pos, glm::quat orientation);
EntityID CreateGarage(glm::vec3 Position, glm::quat orientation, int playerID); EntityID CreateGarage(EntityID parent, glm::vec3 Position, glm::quat orientation, int playerID);
void CreateTerrain(); void CreateTerrain();
void CreateBase(glm::quat orientation); void CreateBase(glm::quat orientation, int playerID);
std::vector<EntityID> m_WallDebrisTemplates; std::vector<EntityID> m_WallDebrisTemplates;
}; };
src/Systems/PhysicsSystem.cpp
+1 -1
View File
@@ -300,7 +300,7 @@ void Systems::PhysicsSystem::UpdateEntity(double dt, EntityID entity, EntityID p
auto absoluteTransformParent = m_World->GetSystem<Systems::TransformSystem>()->AbsoluteTransform(parent); auto absoluteTransformParent = m_World->GetSystem<Systems::TransformSystem>()->AbsoluteTransform(parent);
transformComponent->Position -= absoluteTransformParent.Position; transformComponent->Position -= absoluteTransformParent.Position;
transformComponent->Position = transformComponent->Position * absoluteTransformParent.Orientation; transformComponent->Position = transformComponent->Position * absoluteTransformParent.Orientation;
transformComponent->Orientation = absoluteTransformParent.Orientation * glm::inverse(transformComponent->Orientation); transformComponent->Orientation = glm::inverse(absoluteTransformParent.Orientation) * transformComponent->Orientation;
} }
} }
src/Systems/TankSteeringSystem.cpp
+4 -4
View File
@@ -300,11 +300,11 @@ bool Systems::TankSteeringSystem::OnSpawnVehicle(const Events::SpawnVehicle &eve
return false; return false;
} }
for (auto &spawnPointComponent : *spawnPointComponents) for (auto &component : *spawnPointComponents)
{ {
auto spawnPoint = spawnPointComponent->Entity; auto spawnPoint = component->Entity;
auto spawnPointBaseParent = m_World->GetEntityBaseParent(spawnPoint); auto spawnPointComponent = std::dynamic_pointer_cast<Components::SpawnPoint>(component);
auto playerComponent = m_World->GetComponent<Components::Player>(spawnPointBaseParent); auto playerComponent = m_World->GetComponent<Components::Player>(spawnPointComponent->Player);
if (!playerComponent || playerComponent->ID != event.PlayerID) if (!playerComponent || playerComponent->ID != event.PlayerID)
continue; continue;