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

Merge branch 'master' of github.com:sippeangelo/Return-to-the-Return-of-Return-Fire-2-Returngeance

Browse Source
This commit is contained in:
Tleety
2014-06-05 06:53:50 +02:00
parent b4cec1747e ce2e0b192c
commit 83e28d48f8
31 changed files with 322 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Events/Dead.h
+16
View File
@@ -0,0 +1,16 @@
#ifndef Events_Dead_h__
#define Events_Dead_h__
#include "Entity.h"
#include "EventBroker.h"
namespace Events
{
struct Dead : Event
{
EntityID Entity;
};
}
#endif // Events_Dead_h__
src/Events/FlagCaptured.h
+1 -1
View File
@@ -8,7 +8,7 @@ namespace Events
{
struct FlagCaptured : Event
{
EntityID Player;
unsigned int Player;
};
}
src/Events/FlagDropped.h
+1 -1
View File
@@ -8,7 +8,7 @@ namespace Events
{
struct FlagDropped : Event
{
EntityID Player;
unsigned int Player;
};
}
src/Events/FlagPickup.h
+1 -1
View File
@@ -8,7 +8,7 @@ namespace Events
{
struct FlagPickup : Event
{
EntityID Player;
unsigned int Player;
};
}
src/Events/FlagReturned.h
+1 -1
View File
@@ -8,7 +8,7 @@ namespace Events
{
struct FlagReturned : Event
{
EntityID Player;
unsigned int Player;
};
}
src/Events/GameOver.h
+1 -1
View File
@@ -8,7 +8,7 @@ namespace Events
{
struct GameOver : Event
{
EntityID Winner;
unsigned int Player;
};
}
src/Events/OnDead.h
-16
View File
@@ -1,16 +0,0 @@
#ifndef Events_OnDead_h__
#define Events_OnDead_h__
#include "Entity.h"
#include "EventBroker.h"
namespace Events
{
struct OnDead : Event
{
EntityID Entity;
};
}
#endif // Events_OnDead_h__
src/GUI/GameFrame.h
+1
View File
@@ -11,6 +11,7 @@
#include "GameWorld.h"
#include "Events/GameStart.h"
#include "Events/GameOver.h"
#include "Events/Dead.h"
namespace GUI
{
src/GUI/HealthOverlay.h
+1 -1
View File
@@ -37,7 +37,7 @@ namespace GUI
if (!health)
return false;
SetColor(glm::vec4(1.f, 1.f, 1.f, 1 - health->Amount / 100.f));
SetColor(glm::vec4(1.f, 1.f, 1.f, 1 - (health->Amount / 100.f * 2)));
return true;
}
src/GUI/PlayerHUD.h
+15 -11
View File
@@ -7,6 +7,7 @@
#include "GUI/GameOverFrame.h"
#include "Events/GameOver.h"
#include "Events/Dead.h"
#include "Components/Player.h"
namespace GUI
@@ -20,7 +21,8 @@ namespace GUI
, m_World(world)
, m_PlayerID(playerID)
{
EVENT_SUBSCRIBE_MEMBER(m_EGameOver, &GUI::PlayerHUD::OnGameOver)
EVENT_SUBSCRIBE_MEMBER(m_EGameOver, &GUI::PlayerHUD::OnGameOver);
EVENT_SUBSCRIBE_MEMBER(m_EDead, &GUI::PlayerHUD::OnDead);
m_HealthOverlay = new HealthOverlay(this, "HealthOverlay", m_World, m_PlayerID);
@@ -35,6 +37,7 @@ namespace GUI
m_VehicleSelection = new VehicleSelection(this, "VehicleSelection", m_World, m_PlayerID);
m_GameOverFrame = new GameOverFrame(this, "GameOver");
m_GameOverFrame->Hide();
}
protected:
@@ -49,14 +52,7 @@ namespace GUI
EventRelay<Frame, Events::GameOver> m_EGameOver;
bool OnGameOver(const Events::GameOver &event)
{
auto playerComponent = m_World->GetComponent<Components::Player>(event.Winner);
if (!playerComponent)
{
LOG_ERROR("Winner is not a valid player!");
return false;
}
if (m_PlayerID == playerComponent->ID)
if (m_PlayerID == event.Player)
m_GameOverFrame->Show(true);
else
m_GameOverFrame->Show(false);
@@ -64,6 +60,14 @@ namespace GUI
return true;
}
EventRelay<Frame, Events::Dead> m_EDead;
bool OnDead(const Events::Dead &event)
{
m_VehicleSelection->Show();
m_HealthOverlay->SetColor(glm::vec4(1, 1, 1, 0));
return true;
}
bool OnCommand(const Events::InputCommand &event)
{
if (event.PlayerID != m_PlayerID)
@@ -71,10 +75,10 @@ namespace GUI
if (event.Command == "interface_confirm" && event.Value > 0)
{
if (m_GameOverFrame->Visible())
/*if (m_GameOverFrame->Visible())
{
m_GameOverFrame->Hide();
}
}*/
}
return true;
src/GUI/Viewport.h
+1 -1
View File
@@ -51,7 +51,7 @@ public:
return;
Components::Transform absoluteTransform = m_TransformSystem->AbsoluteTransform(m_CameraEntity);
m_Camera->SetFOV(cameraComponent->FOV);
m_Camera->SetNearClip(cameraComponent->NearClip);
m_Camera->SetFarClip(cameraComponent->FarClip);
src/GameWorld.cpp
+88 -35
View File
@@ -8,7 +8,15 @@ void GameWorld::Initialize()
ResourceManager->Preload("Model", "Models/Placeholders/PhysicsTest/Plane.obj");
ResourceManager->Preload("Model", "Models/Placeholders/PhysicsTest/ArrowCube.obj");
//Background Music
ResourceManager->Preload("Model", "Models/Tank/TankCollisionShape.obj");
ResourceManager->Preload("Model", "Models/Tank/tankBody.obj");
ResourceManager->Preload("Model", "Models/Tank/tankTop.obj");
ResourceManager->Preload("Model", "Models/Tank/tankBarrel.obj");
ResourceManager->Preload("Model", "Models/Jeep/Chassi/Chassi.OBJ");
ResourceManager->Preload("Model", "Models/Jeep/WheelFront/wheelFront.obj");
ResourceManager->Preload("Model", "Models/Jeep/WheelBack/wheelBack.obj");
//Background Music
{
Events::PlayBGM e;
e.Resource = "Sounds/SFX/WUB.mp3";
@@ -23,6 +31,10 @@ void GameWorld::Initialize()
BindGamepadButton(Gamepad::Button::Right, "interface_horizontal", 1.f);
BindKey(GLFW_KEY_W, "interface_vertical", 1.f);
BindKey(GLFW_KEY_S, "interface_vertical", -1.f);
BindKey(GLFW_KEY_W, "jeep_vertical", 1.f);
BindKey(GLFW_KEY_S, "jeep_vertical", -1.f);
BindGamepadAxis(Gamepad::Axis::LeftY, "interface_vertical", 1.f);
BindGamepadButton(Gamepad::Button::Up, "interface_vertical", 1.f);
BindGamepadButton(Gamepad::Button::Down, "interface_vertical", -1.f);
@@ -346,37 +358,7 @@ void GameWorld::Initialize()
EventBroker->Publish(e);
}*/
{
auto flag = CreateEntity();
auto transform = AddComponent<Components::Transform>(flag);
transform->Position = glm::vec3(0, -50, 100);
auto model = AddComponent<Components::Model>(flag);
model->ModelFile = "Models/Flag/FishingRod/FishingRod.obj";
{
auto fish = CreateEntity(flag);
auto transform = AddComponent<Components::Transform>(fish);
transform->Position = glm::vec3(-1.3f, 1.0, 0);
auto model = AddComponent<Components::Model>(fish);
model->ModelFile = "Models/Flag/LeFish/Salmon.obj";
CommitEntity(fish);
}
auto trigger = AddComponent<Components::Trigger>(flag);
{
auto shape = CreateEntity(flag);
auto transform = AddComponent<Components::Transform>(shape);
transform->Position = glm::vec3(-0.9f, 0.9f, 0);
auto box = AddComponent<Components::BoxShape>(shape);
box->Width = 1.1f;
box->Depth = 0.7f;
box->Height = 3.9f;
CommitEntity(shape);
}
auto flagComponent = AddComponent<Components::Flag>(flag);
CommitEntity(flag);
}
//for (int i = 0; i < 500; i++)
//{
@@ -468,7 +450,6 @@ void GameWorld::RegisterComponents()
m_ComponentFactory.Register<Components::Transform>([]() { return new Components::Transform(); });
m_ComponentFactory.Register<Components::Template>([]() { return new Components::Template(); });
m_ComponentFactory.Register<Components::Player>([]() { return new Components::Player(); });
m_ComponentFactory.Register<Components::Flag>([]() { return new Components::Flag(); });
m_ComponentFactory.Register<Components::Move>([]() { return new Components::Move(); });
m_ComponentFactory.Register<Components::Rotate>([]() { return new Components::Rotate(); });
m_ComponentFactory.Register<Components::Team>([]() { return new Components::Team(); });
@@ -495,7 +476,9 @@ void GameWorld::RegisterSystems()
m_SystemFactory.Register<Systems::FollowSystem>([this]() { return new Systems::FollowSystem(this, EventBroker, ResourceManager); });
m_SystemFactory.Register<Systems::GarageSystem>([this]() { return new Systems::GarageSystem(this, EventBroker, ResourceManager); });
m_SystemFactory.Register<Systems::WallSystem>([this]() { return new Systems::WallSystem(this, EventBroker, ResourceManager); });
m_SystemFactory.Register<Systems::FlagSystem>([this]() { return new Systems::FlagSystem(this, EventBroker, ResourceManager); });
m_SystemFactory.Register<Systems::TowerSystem>([this]() { return new Systems::TowerSystem(this, EventBroker, ResourceManager); });
m_SystemFactory.Register<Systems::GameStateSystem>([this]() { return new Systems::GameStateSystem(this, EventBroker, ResourceManager); });
m_SystemFactory.Register<Systems::RenderSystem>([this]() { return new Systems::RenderSystem(this, EventBroker, ResourceManager); });
}
@@ -520,7 +503,9 @@ void GameWorld::AddSystems()
AddSystem<Systems::FollowSystem>();
AddSystem<Systems::GarageSystem>();
AddSystem<Systems::WallSystem>();
AddSystem<Systems::FlagSystem>();
AddSystem<Systems::TowerSystem>();
AddSystem<Systems::GameStateSystem>();
AddSystem<Systems::RenderSystem>();
}
@@ -946,6 +931,18 @@ void GameWorld::CreateTerrain()
auto transform = AddComponent<Components::Transform>(decoration_middle);
auto model = AddComponent<Components::Model>(decoration_middle);
model->ModelFile = "Models/TerrainFiveIstles/Decoration/Middle.obj";
auto physics = AddComponent<Components::Physics>(decoration_middle);
physics->Mass = 1.f;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
{
auto shape = CreateEntity(decoration_middle);
auto transform = AddComponent<Components::Transform>(shape);
auto mesh = AddComponent<Components::MeshShape>(shape);
mesh->ResourceName = "Models/TerrainFiveIstles/Decoration/Middle.obj";
CommitEntity(shape);
}
CommitEntity(decoration_middle);
}
@@ -1261,6 +1258,16 @@ void GameWorld::CreateBase(glm::quat orientation, int teamID)
auto transform = AddComponent<Components::Transform>(decoration_base);
auto model = AddComponent<Components::Model>(decoration_base);
model->ModelFile = "Models/TerrainFiveIstles/Decoration/Base.obj";
auto physics = AddComponent<Components::Physics>(decoration_base);
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->Mass = 1.f;
{
auto shape = CreateEntity(decoration_base);
auto transform = AddComponent<Components::Transform>(shape);
auto mesh = AddComponent<Components::MeshShape>(shape);
mesh->ResourceName = "Models/TerrainFiveIstles/Decoration/BaseCollision.obj";
CommitEntity(shape);
}
CommitEntity(decoration_base);
}
@@ -1415,6 +1422,8 @@ void GameWorld::CreateBase(glm::quat orientation, int teamID)
CreateTower(base, glm::vec3(119.05541f, 29.54314f, 18.33529f), teamID);
CreateGarage(base, glm::vec3(323.2f, 41.4f, -10.2f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)), teamID);
CreateFlag(base, glm::vec3(291.f, 41.7412f, -36.2f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)), teamID);
}
EntityID GameWorld::CreateGarage(EntityID parent, glm::vec3 Position, glm::quat orientation, int teamID)
@@ -1522,10 +1531,10 @@ EntityID GameWorld::CreateGarage(EntityID parent, glm::vec3 Position, glm::quat
{
auto shape = CreateEntity(elevator);
auto transform = AddComponent<Components::Transform>(shape);
transform->Position = glm::vec3(0, 0, 0);
transform->Position = glm::vec3(0, -2, 0);
auto box = AddComponent<Components::BoxShape>(shape);
box->Width = 4.754f;
box->Height = 0.141f;
box->Height = 2.141f;
box->Depth = 6.86f;
CommitEntity(shape);
}
@@ -1594,3 +1603,47 @@ EntityID GameWorld::CreateGarage(EntityID parent, glm::vec3 Position, glm::quat
return garage;
}
void GameWorld::CreateFlag(EntityID parent, glm::vec3 position, glm::quat orientation, int TeamID)
{
auto flag = CreateEntity(parent);
SetProperty(flag, "Name", "Flag");
auto transform = AddComponent<Components::Transform>(flag);
transform->Position = position;
transform->Orientation = orientation;
auto flagComponent = AddComponent<Components::Flag>(flag);
auto trigger = AddComponent<Components::Trigger>(flag);
auto team = AddComponent<Components::Team>(flag);
team->TeamID = TeamID;
{
auto fish = CreateEntity(flag);
auto transform = AddComponent<Components::Transform>(fish);
transform->Position = glm::vec3(-1.3f, 1.0, 0);
auto model = AddComponent<Components::Model>(fish);
model->ModelFile = "Models/Flag/LeFish/Salmon.obj";
CommitEntity(fish);
}
{
auto rod = CreateEntity(flag);
auto transform = AddComponent<Components::Transform>(rod);
transform->Position = glm::vec3(-1.3f, 1.0, 0);
auto model = AddComponent<Components::Model>(rod);
model->ModelFile = "Models/Flag/FishingRod/FishingRod.obj";
CommitEntity(rod);
}
{
auto shape = CreateEntity(flag);
auto transform = AddComponent<Components::Transform>(shape);
transform->Position = glm::vec3(-0.9f, 0.9f, 0);
auto box = AddComponent<Components::BoxShape>(shape);
box->Width = 1.1f;
box->Depth = 0.7f;
box->Height = 3.9f;
CommitEntity(shape);
}
CommitEntity(flag);
}
src/GameWorld.h
+3
View File
@@ -26,6 +26,8 @@
#include "Systems/TowerSystem.h"
#include "Systems/GarageSystem.h"
#include "Systems/JeepSteeringSystem.h"
#include "Systems/FlagSystem.h"
#include "Systems/GameStateSystem.h"
#include "Components/Camera.h"
#include "Components/DirectionalLight.h"
@@ -90,6 +92,7 @@ private:
EntityID CreateGarage(EntityID parent, glm::vec3 Position, glm::quat orientation, int teamID);
void CreateTerrain();
void CreateBase(glm::quat orientation, int playerID);
void CreateFlag(EntityID parent, glm::vec3 position, glm::quat orientation, int TeamID);
std::vector<EntityID> m_WallDebrisTemplates;
std::vector<EntityID> m_TowerDebrisTemplates;
EntityID m_ShotTemplate;
src/Systems/DamageSystem.cpp
+6 -7
View File
@@ -19,12 +19,11 @@ bool Systems::DamageSystem::OnDamage( const Events::Damage &event )
return false;
auto health = m_World->GetComponent<Components::Health>(event.Entity);
health->Amount -= event.Amount;
//if(health->Amount <= 0)
//{
// Events::OnDead e;
// e.Entity = event.Entity;
// EventBroker->Publish(e);
//}
LOG_INFO("Damaged entity %i, Health left: %f", event.Entity, health->Amount);
if(health->Amount <= 0)
{
Events::Dead e;
e.Entity = event.Entity;
EventBroker->Publish(e);
}
return true;
}
src/Systems/DamageSystem.h
+1 -1
View File
@@ -6,7 +6,7 @@
#include "Components/Health.h"
#include "Components/DamageModel.h"
#include "Events/Damage.h"
#include "Events/OnDead.h"
#include "Events/Dead.h"
namespace Systems
{
src/Systems/FlagSystem.cpp
+63
View File
@@ -0,0 +1,63 @@
#include "PrecompiledHeader.h"
#include "FlagSystem.h"
#include "World.h"
void Systems::FlagSystem::RegisterComponents( ComponentFactory* cf )
{
cf->Register<Components::Flag>([]() { return new Components::Flag(); });
}
void Systems::FlagSystem::Initialize()
{
EVENT_SUBSCRIBE_MEMBER(m_EEnterTrigger, &Systems::FlagSystem::OnEnterTrigger);
}
void Systems::FlagSystem::Update( double dt )
{
}
void Systems::FlagSystem::UpdateEntity( double dt, EntityID entity, EntityID parent )
{
}
bool Systems::FlagSystem::OnEnterTrigger( const Events::EnterTrigger &event )
{
auto JeepSteeringComponent = m_World->GetComponent<Components::JeepSteering>(event.Entity);
if(!JeepSteeringComponent)
return false;
auto teamComponent = m_World->GetComponent<Components::Team>(event.Trigger);
auto playerComponent = m_World->GetComponent<Components::Player>(event.Entity);
if(!teamComponent || !playerComponent)
return false;
if (teamComponent->TeamID == playerComponent->ID)
return false;
auto flagComponent = m_World->GetComponent<Components::Flag>(event.Trigger);
if(!flagComponent)
return false;
PickUpFlag(event.Entity, event.Trigger);
return true;
}
void Systems::FlagSystem::PickUpFlag( EntityID entity, EntityID trigger )
{
m_World->RemoveComponent<Components::Trigger>(trigger);
m_World->SetEntityParent(trigger, entity);
auto triggerTransform = m_World->GetComponent<Components::Transform>(trigger);
triggerTransform->Position = glm::vec3(-1.5f, 0.1f, 2.f);
auto teamComponent = m_World->GetComponent<Components::Team>(trigger);
auto playerComponent = m_World->GetComponent<Components::Player>(entity);
Events::FlagPickup ePickup;
ePickup.Player = playerComponent->ID;
EventBroker->Publish(ePickup);
}
src/Systems/FlagSystem.h
+44
View File
@@ -0,0 +1,44 @@
#ifndef FlagSystem_h__
#define FlagSystem_h__
#include "System.h"
#include "Components/Flag.h"
#include "Components/Player.h"
#include "Components/Team.h"
#include "Components/Trigger.h"
#include "Components/Transform.h"
#include "Components/JeepSteering.h"
#include "Events/FlagCaptured.h"
#include "Events/FlagDropped.h"
#include "Events/FlagPickup.h"
#include "Events/FlagReturned.h"
#include "Events/EnterTrigger.h"
namespace Systems
{
class FlagSystem : public System
{
public:
FlagSystem(World* world, std::shared_ptr<::EventBroker> eventBroker, std::shared_ptr<::ResourceManager> resourceManager)
: System(world, eventBroker, resourceManager) { }
void Initialize() override;
void RegisterComponents(ComponentFactory* cf) override;
void Update(double dt) override;
void UpdateEntity(double dt, EntityID entity, EntityID parent) override;
private:
EventRelay<FlagSystem, Events::EnterTrigger> m_EEnterTrigger;
bool OnEnterTrigger(const Events::EnterTrigger &event);
void PickUpFlag(EntityID entity, EntityID trigger);
};
}
#endif // DamageSystem_h__
src/Systems/GameStateSystem.cpp
+1 -1
View File
@@ -12,7 +12,7 @@ bool Systems::GameStateSystem::OnFlagCaptured(const Events::FlagCaptured &event)
m_InGame = false;
Events::GameOver e1;
e1.Winner = event.Player;
e1.Player = event.Player;
EventBroker->Publish(e1);
Events::PlayBGM e2;
e2.Resource = "Sounds/BGM/WilliamTellOverture.mp3";
src/Systems/GarageSystem.cpp
+21
View File
@@ -112,6 +112,27 @@ bool Systems::GarageSystem::OnCommand(const Events::InputCommand &event)
if (triggerTeamComponent->TeamID == entityPlayerComponent->ID)
{
auto components = m_World->GetComponentsOfType<Components::Flag>();
for (auto &component : *components)
{
auto teamComponent = m_World->GetComponent<Components::Team>(component->Entity);
if(!teamComponent)
continue;
auto parent = m_World->GetEntityParent(component->Entity);
if(parent != entity)
continue;
if(teamComponent->TeamID != entityPlayerComponent->ID)
{
Events::FlagCaptured e;
e.Player = entityPlayerComponent->ID;
EventBroker->Publish(e);
}
}
EntityID garage = m_World->GetEntityParent(trigger);
auto garageComponent = m_World->GetComponent<Components::Garage>(garage);
ToggleGarage(garageComponent);
src/Systems/GarageSystem.h
+2
View File
@@ -19,6 +19,8 @@
#include "Components/Move.h"
#include "Components/Rotate.h"
#include "Components/Team.h"
#include "Components/Flag.h"
#include "Events/FlagCaptured.h"
namespace Systems
{
src/Systems/JeepSteeringSystem.cpp
-1
View File
@@ -102,7 +102,6 @@ EntityID Systems::JeepSteeringSystem::CreateJeep(int playerID)
{
auto jeep = m_World->CreateEntity();
auto transform = m_World->AddComponent<Components::Transform>(jeep);
transform->Position = glm::vec3(0, 5, 0);
//transform->Orientation = glm::angleAxis(0.f, glm::vec3(0, 1, 0));
auto physics = m_World->AddComponent<Components::Physics>(jeep);
physics->Mass = 2000;
src/Systems/ParticleSystem.cpp
-1
View File
@@ -239,7 +239,6 @@ void Systems::ParticleSystem::ScalarInterpolation(double timeProgress, std::vect
bool Systems::ParticleSystem::CreateExplosion(const Events::CreateExplosion &e)
{
LOG_INFO("Spawning an explosion");
auto explosion = m_World->CreateEntity();
auto emitter = m_World->AddComponent<Components::ParticleEmitter>(explosion);
emitter->LifeTime = e.LifeTime;
src/Systems/PhysicsSystem.cpp
+30 -18
View File
@@ -39,6 +39,7 @@ void Systems::PhysicsSystem::Initialize()
EVENT_SUBSCRIBE_MEMBER(m_EApplyPointImpulse, &Systems::PhysicsSystem::OnApplyPointImpulse);
EVENT_SUBSCRIBE_MEMBER(m_EEnableCollisions, &Systems::PhysicsSystem::OnEnableCollisions);
EVENT_SUBSCRIBE_MEMBER(m_EDisableCollisions, &Systems::PhysicsSystem::OnDisableCollisions);
EVENT_SUBSCRIBE_MEMBER(m_EDead, &Systems::PhysicsSystem::OnDead);
hkMemorySystem::FrameInfo finfo(10000 * 1024); // Allocate 10MB of Physics solver buffer
hkMemoryRouter* memoryRouter = hkMemoryInitUtil::initDefault(hkMallocAllocator::m_defaultMallocAllocator, finfo);
@@ -786,7 +787,6 @@ void Systems::PhysicsSystem::OnComponentRemoved(EntityID entity, std::string typ
if(m_RigidBodies.find(entity) != m_RigidBodies.end())
{
LOG_INFO("Removed Trigger of entity %i", entity);
m_PhysicsWorld->markForWrite();
m_RigidBodyEntities.erase(m_RigidBodies[entity]);
m_PhysicsWorld->removeEntity(m_RigidBodies[entity]);
@@ -798,27 +798,19 @@ void Systems::PhysicsSystem::OnComponentRemoved(EntityID entity, std::string typ
void Systems::PhysicsSystem::OnEntityRemoved( EntityID entity )
{
if(m_RigidBodies.find(entity) != m_RigidBodies.end())
/*
else if(m_RigidBodies.find(entity) != m_RigidBodies.end())
{
LOG_INFO("Removed rigid body of entity %i", entity);
LOG_INFO("Removed rigid body of entity %i abogfusdkifbhdzfsgiudfhghdfhgdhfögödhfgödhfödhfödfjhödgfdgföuhudgf", entity);
m_PhysicsWorld->markForWrite();
m_RigidBodyEntities.erase(m_RigidBodies[entity]);
if(m_ListShapes.find(entity) != m_ListShapes.end())
{
m_ListShapes[entity]->removeReference();
m_ListShapes.erase(entity);
}
m_PhysicsWorld->removeEntity(m_RigidBodies[entity]);
m_PhysicsWorld->unmarkForWrite();
m_RigidBodies.erase(entity);
m_PhysicsWorld->unmarkForWrite();
}
if(m_Vehicles.find(entity) != m_Vehicles.end())
{
m_PhysicsWorld->markForWrite();
m_Vehicles[entity]->removeFromWorld();
m_PhysicsWorld->unmarkForWrite();
}
m_RigidBodyEntities.erase(m_RigidBodies[entity]);
}*/
}
bool Systems::PhysicsSystem::OnEnableCollisions( const Events::EnableCollisions &e )
@@ -901,3 +893,23 @@ bool Systems::PhysicsSystem::OnJeepSteer( const Events::JeepSteer &event )
return true;
}
bool Systems::PhysicsSystem::OnDead( const Events::Dead &e )
{
if(m_Vehicles.find(e.Entity) != m_Vehicles.end())
{
EntityID camera = m_World->GetProperty<EntityID>(e.Entity, "Camera");
m_World->RemoveComponent<Components::Camera>(camera);
auto transform = m_World->GetComponent<Components::Transform>(e.Entity);
transform->Position = glm::vec3(0, -10000.f, 0);
m_RigidBodies[e.Entity]->setPosition(hkVector4(0, -10000, 0));
/*m_Vehicles.erase(e.Entity);
m_RigidBodyEntities.erase(m_RigidBodies[e.Entity]);
m_RigidBodies.erase(e.Entity);*/
m_World->RemoveComponent<Components::TankSteering>(e.Entity);
}
return true;
}
src/Systems/PhysicsSystem.h
+5 -2
View File
@@ -86,9 +86,10 @@
#include "Events/DisableCollisions.h"
#include "Components/Trigger.h"
#include "Components/Template.h"
#include "Components/Camera.h"
#include "Events/EnterTrigger.h"
#include "Events/JeepSteer.h"
#include "Events/Dead.h"
namespace Systems
{
@@ -111,7 +112,6 @@ public:
e.Entity1 = entity1;
e.Entity2 = entity2;
m_PhysicsSystem->EventBroker->Publish(e);
LOG_INFO("CollisionEvent!");
}
private:
@@ -192,6 +192,9 @@ private:
bool OnEnableCollisions(const Events::EnableCollisions &e);
EventRelay<PhysicsSystem, Events::DisableCollisions> m_EDisableCollisions;
bool OnDisableCollisions(const Events::DisableCollisions &e);
EventRelay<PhysicsSystem, Events::Dead> m_EDead;
bool OnDead(const Events::Dead &e);
void SetUpPhysicsState(EntityID entity, EntityID parent);
void TearDownPhysicsState(EntityID entity, EntityID parent);
src/Systems/TankSteeringSystem.cpp
+1 -1
View File
@@ -509,7 +509,7 @@ EntityID Systems::TankSteeringSystem::CreateTank(int playerID)
m_World->AddComponent<Components::Input>(tank);
m_World->AddComponent<Components::Listener>(tank);
auto health = m_World->AddComponent<Components::Health>(tank);
health->Amount = 100.f;
health->Amount = 200.f;
src/Systems/TriggerSystem.cpp
+1 -27
View File
@@ -53,19 +53,7 @@ bool Systems::TriggerSystem::OnEnterTrigger( const Events::EnterTrigger &event )
if (teamComponent->TeamID != playerComponent->ID)
return false;
auto flagComponent1 = m_World->GetComponent<Components::Flag>(event.Trigger);
auto flagComponent2 = m_World->GetComponent<Components::Flag>(event.Entity);
//HACK: SIMON IS DISSING AMERICA
if(flagComponent1)
{
Flag(event.Entity, event.Trigger);
}
else if (flagComponent2)
{
Flag(event.Trigger, event.Entity);
}
auto triggerMoveComponent = m_World->GetComponent<Components::TriggerMove>(event.Trigger);
if (triggerMoveComponent)
@@ -148,20 +136,6 @@ void Systems::TriggerSystem::Move(EntityID entity, bool queue, bool swap)
}
}
void Systems::TriggerSystem::Flag( EntityID entity, EntityID phantomEntity )
{
auto tankSteering = m_World->GetComponent<Components::TankSteering>(entity);
if (!tankSteering)
return;
m_World->RemoveComponent<Components::Trigger>(phantomEntity);
m_World->SetEntityParent(phantomEntity, entity);
auto phantomTransform = m_World->GetComponent<Components::Transform>(phantomEntity);
phantomTransform->Position = glm::vec3(-1.5f, 0.1f, 2.f);
}
void Systems::TriggerSystem::Explosion( EntityID entity, EntityID phantomEntity )
{
/*auto transformComponent = m_World->GetComponent<Components::Transform>(entity);
src/Systems/TriggerSystem.h
-1
View File
@@ -48,7 +48,6 @@ namespace Systems
EventRelay<TriggerSystem, Events::LeaveTrigger> m_ELeaveTrigger;
bool OnLeaveTrigger(const Events::LeaveTrigger &event);
private:
void Flag(EntityID entity, EntityID phantomEntity);
void Explosion(EntityID entity, EntityID phantomEntity);
void Move(EntityID entity, bool queue, bool swap);
void Rotate(EntityID entity, bool queue, bool swap);
src/Systems/WallSystem.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "System.h"
#include "Systems/TransformSystem.h"
#include "Events/OnDead.h"
#include "Events/Dead.h"
#include "Events/Damage.h"
#include "Events/ApplyPointImpulse.h"
#include "Components/Model.h"
src/World.cpp
+6 -4
View File
@@ -78,14 +78,16 @@ bool World::ValidEntity(EntityID entity)
void World::RemoveEntity(EntityID entity)
{
m_EntitiesToRemove.insert(entity);
for (auto pair : m_EntityParents)
auto it = m_EntityChildren.find(entity);
if (it != m_EntityChildren.end())
{
if (pair.second == entity)
for (auto entity : it->second)
{
m_EntitiesToRemove.insert(pair.first);
m_EntitiesToRemove.insert(entity);
}
}
m_EntitiesToRemove.insert(entity);
}
void World::ProcessEntityRemovals()
vs11/Returngeance/Returngeance.vcxproj
+3 -1
View File
@@ -109,6 +109,7 @@
<ClCompile Include="..\..\src\ShaderProgram.cpp" />
<ClCompile Include="..\..\src\Skybox.cpp" />
<ClCompile Include="..\..\src\Sound.cpp" />
<ClCompile Include="..\..\src\Systems\FlagSystem.cpp" />
<ClCompile Include="..\..\src\Systems\JeepSteeringSystem.cpp" />
<ClCompile Include="..\..\src\Systems\DamageSystem.cpp" />
<ClCompile Include="..\..\src\Systems\DebugSystem.cpp" />
@@ -219,7 +220,7 @@
<ClInclude Include="..\..\src\Events\MouseMove.h" />
<ClInclude Include="..\..\src\Events\MousePress.h" />
<ClInclude Include="..\..\src\Events\MouseRelease.h" />
<ClInclude Include="..\..\src\Events\OnDead.h" />
<ClInclude Include="..\..\src\Events\Dead.h" />
<ClInclude Include="..\..\src\Events\Move.h" />
<ClInclude Include="..\..\src\Events\PlayBGM.h" />
<ClInclude Include="..\..\src\Events\PlaySFX.h" />
@@ -256,6 +257,7 @@
<ClInclude Include="..\..\src\Skybox.h" />
<ClInclude Include="..\..\src\Sound.h" />
<ClInclude Include="..\..\src\System.h" />
<ClInclude Include="..\..\src\Systems\FlagSystem.h" />
<ClInclude Include="..\..\src\Systems\JeepSteeringSystem.h" />
<ClInclude Include="..\..\src\Systems\DamageSystem.h" />
<ClInclude Include="..\..\src\Systems\DebugSystem.h" />
vs11/Returngeance/Returngeance.vcxproj.filters
+7
View File
@@ -38,6 +38,9 @@
<ClCompile Include="..\..\src\Systems\WheelPairSystem.cpp" />
<ClCompile Include="..\..\src\Texture.cpp" />
<ClCompile Include="..\..\src\World.cpp" />
<ClCompile Include="..\..\src\Systems\FlagSystem.cpp">
<Filter>Game\Systems</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\Camera.h" />
@@ -180,9 +183,13 @@
<ClInclude Include="..\..\src\Systems\TowerSystem.h" />
<ClInclude Include="..\..\src\Systems\TransformSystem.h" />
<ClInclude Include="..\..\src\Systems\TriggerSystem.h" />
<ClInclude Include="..\..\src\Systems\FlagSystem.h">
<Filter>Game\Systems</Filter>
<ClInclude Include="..\..\src\Systems\WallSystem.h" />
<ClInclude Include="..\..\src\Systems\WheelPairSystem.h" />
<ClInclude Include="..\..\src\Texture.h" />
</ClInclude>
<ClInclude Include="..\..\src\Events\Dead.h" />
<ClInclude Include="..\..\src\Util\GLError.h" />
<ClInclude Include="..\..\src\Util\Rectangle.h" />
<ClInclude Include="..\..\src\Util\Logging.h" />