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

Merge remote-tracking branch 'origin/master' into havok

Browse Source 
Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
ViktorLjung
2014-06-04 05:48:48 +02:00
parent f9f20535ba 62dd85349f
commit 94178098ea
14 changed files with 1123 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Components/SoundEmitter.h
+2 -1
View File
@@ -10,13 +10,14 @@ namespace Components
struct SoundEmitter : Component struct SoundEmitter : Component
{ {
enum class SoundType enum class SoundType
{ {
SOUND_3D, SOUND_3D,
SOUND_2D SOUND_2D
}; };
SoundEmitter() : Gain(1.f), MaxDistance(1.f), MinDistance(1.f), Pitch(1.f), Loop(false) {} SoundEmitter() : Gain(1.f), MaxDistance(10000.f), MinDistance(1.f), Pitch(1.f), Loop(false) {}
float Gain; float Gain;
float MaxDistance; float MaxDistance;
float MinDistance; float MinDistance;
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/Events/PlaySFX.h
+10 -1
View File
@@ -9,8 +9,17 @@ namespace Events
struct PlaySFX : Event struct PlaySFX : Event
{ {
EntityID Emitter; PlaySFX() :
MinDistance(100.f),
MaxDistance(10000.f),
Volume(1.f),
Loop (false) {}
//EntityID Emitter;
glm::vec3 Position;
std::string Resource; std::string Resource;
float MinDistance;
float MaxDistance;
float Volume;
bool Loop; bool Loop;
}; };
src/GUI/Frame.h
+4
View File
@@ -132,7 +132,11 @@ public:
Rectangle AbsoluteRectangle() Rectangle AbsoluteRectangle()
{ {
int left = Left(); int left = Left();
if (m_Parent)
left = std::max(left, m_Parent->Left());
int top = Top(); int top = Top();
if (m_Parent)
top = std::max(top, m_Parent->Top());
int width = Right() - left; int width = Right() - left;
int height = Bottom() - top; int height = Bottom() - top;
return Rectangle(left, top, width, height); return Rectangle(left, top, width, height);
src/GameWorld.cpp
+358 -294
View File
@@ -514,12 +514,15 @@ void GameWorld::BindGamepadButton(Gamepad::Button button, std::string command, f
EventBroker->Publish(e); EventBroker->Publish(e);
} }
void GameWorld::CreateGate(glm::vec3 Position) void GameWorld::CreateGate(EntityID parent, glm::vec3 position, glm::quat orientation)
{ {
auto gateParent = CreateEntity(parent);
auto transform = AddComponent<Components::Transform>(gateParent);
transform->Position = position;
transform->Orientation = orientation;
{ {
auto gateBase = CreateEntity(); auto gateBase = CreateEntity(gateParent);
auto transform = AddComponent<Components::Transform>(gateBase); auto transform = AddComponent<Components::Transform>(gateBase);
transform->Position = Position;
auto model = AddComponent<Components::Model>(gateBase); auto model = AddComponent<Components::Model>(gateBase);
model->ModelFile = "Models/Gate/Lift/Lift.obj"; model->ModelFile = "Models/Gate/Lift/Lift.obj";
auto physics = AddComponent<Components::Physics>(gateBase); auto physics = AddComponent<Components::Physics>(gateBase);
@@ -578,10 +581,9 @@ void GameWorld::CreateGate(glm::vec3 Position)
CommitEntity(gateBase); CommitEntity(gateBase);
} }
auto gate = CreateEntity(gateParent);
{ {
auto gate = CreateEntity();
auto transform = AddComponent<Components::Transform>(gate); auto transform = AddComponent<Components::Transform>(gate);
transform->Position = Position;
auto model = AddComponent<Components::Model>(gate); auto model = AddComponent<Components::Model>(gate);
model->ModelFile = "Models/Gate/Gate/Gate.obj"; model->ModelFile = "Models/Gate/Gate/Gate.obj";
auto physics = AddComponent<Components::Physics>(gate); auto physics = AddComponent<Components::Physics>(gate);
@@ -589,8 +591,8 @@ void GameWorld::CreateGate(glm::vec3 Position)
physics->CollisionLayer = (int)Components::Physics::CollisionLayer::STATIC; physics->CollisionLayer = (int)Components::Physics::CollisionLayer::STATIC;
auto move = AddComponent<Components::Move>(gate); auto move = AddComponent<Components::Move>(gate);
move->Speed = 5.f; move->Speed = 5.f;
move->GoalPosition = glm::vec3(Position.x, Position.y + 9.02345f, Position.z); move->GoalPosition = glm::vec3(0, 9.02345f, 0);
move->StartPosition = glm::vec3(Position.x, Position.y, Position.z); move->StartPosition = glm::vec3(0, 0, 0);
{ {
auto mainShape = CreateEntity(gate); auto mainShape = CreateEntity(gate);
auto transform = AddComponent<Components::Transform>(mainShape); auto transform = AddComponent<Components::Transform>(mainShape);
@@ -612,29 +614,27 @@ void GameWorld::CreateGate(glm::vec3 Position)
CommitEntity(lowerShape); CommitEntity(lowerShape);
} }
CommitEntity(gate); CommitEntity(gate);
}
{
auto gateTrigger = CreateEntity(gateParent);
auto transform = AddComponent<Components::Transform>(gateTrigger);
transform->Position = glm::vec3(0, 2.8241, 0);
auto trigger = AddComponent<Components::Trigger>(gateTrigger);
auto triggerMove = AddComponent<Components::TriggerMove>(gateTrigger);
triggerMove->Entity = gate;
{ {
auto gateTrigger = CreateEntity(); auto shape = CreateEntity(gateTrigger);
auto transform = AddComponent<Components::Transform>(gateTrigger); auto transform = AddComponent<Components::Transform>(shape);
transform->Position = glm::vec3(Position.x, Position.y + 2.8241, Position.z); transform->Position = glm::vec3(0.f, 2.8241f, 0.f);
auto trigger = AddComponent<Components::Trigger>(gateTrigger); auto box = AddComponent<Components::BoxShape>(shape);
auto triggerMove = AddComponent<Components::TriggerMove>(gateTrigger); box->Width = 6.963f;
triggerMove->Entity = gate; box->Height = 3.104f;
box->Depth = 10.356f;
CommitEntity(shape);
{
auto shape = CreateEntity(gateTrigger);
auto transform = AddComponent<Components::Transform>(shape);
transform->Position = glm::vec3(0.f, 2.8241f, 0.f);
auto box = AddComponent<Components::BoxShape>(shape);
box->Width = 6.963f;
box->Height = 3.104f;
box->Depth = 10.356f;
CommitEntity(shape);
}
CommitEntity(gateTrigger);
} }
CommitEntity(gateTrigger);
} }
} }
@@ -790,14 +790,338 @@ 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); #pragma region Terrain
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 bridge_middle = CreateEntity(base);
auto transform = AddComponent<Components::Transform>(bridge_middle);
auto model = AddComponent<Components::Model>(bridge_middle);
model->ModelFile = "Models/TerrainFiveIstles/Bridges/MiddleBridge.obj";
auto physics = AddComponent<Components::Physics>(bridge_middle);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
{
auto shape = CreateEntity(bridge_middle);
auto transformshape = AddComponent<Components::Transform>(shape);
auto meshShape = AddComponent<Components::MeshShape>(shape);
meshShape->ResourceName = "Models/TerrainFiveIstles/Bridges/MiddleBridgeCollision.obj";
CommitEntity(shape);
}
CommitEntity(bridge_middle);
}
{
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);
}
{
auto bridge_base = CreateEntity(base);
auto transform = AddComponent<Components::Transform>(bridge_base);
auto model = AddComponent<Components::Model>(bridge_base);
model->ModelFile = "Models/TerrainFiveIstles/Bridges/BaseBridge.obj";
auto physics = AddComponent<Components::Physics>(bridge_base);
physics->Mass = 10;
physics->MotionType = Components::Physics::MotionTypeEnum::Fixed;
physics->CollisionLayer = 1;
{
auto shape = CreateEntity(bridge_base);
auto transformshape = AddComponent<Components::Transform>(shape);
auto meshShape = AddComponent<Components::MeshShape>(shape);
meshShape->ResourceName = "Models/TerrainFiveIstles/Bridges/BaseBridge.obj";
CommitEntity(shape);
}
CommitEntity(bridge_base);
}
#pragma endregion Terrain
CreateGate(base, glm::vec3(273.f, 40.185f, 0.06f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
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);
{ {
@@ -910,6 +1234,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);
} }
@@ -961,264 +1286,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
+3 -3
View File
@@ -79,13 +79,13 @@ private:
void BindGamepadAxis(Gamepad::Axis axis, std::string command, float value); void BindGamepadAxis(Gamepad::Axis axis, std::string command, float value);
void BindGamepadButton(Gamepad::Button button, std::string command, float value); void BindGamepadButton(Gamepad::Button button, std::string command, float value);
void CreateGate(glm::vec3 Position); void CreateGate(EntityID parent, glm::vec3 position, glm::quat orientation);
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/Renderer.cpp
+4 -2
View File
@@ -276,6 +276,7 @@ void Renderer::DrawFrame(RenderQueuePair &rq)
//glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); //glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
//glClearColor(0.0f, 0.5f, 0.0f, 1.0f); //glClearColor(0.0f, 0.5f, 0.0f, 1.0f);
glEnable(GL_SCISSOR_TEST);
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
glEnable(GL_CULL_FACE); glEnable(GL_CULL_FACE);
glCullFace(GL_BACK); glCullFace(GL_BACK);
@@ -531,8 +532,9 @@ void Renderer::ForwardRendering(RenderQueue &rq)
if (spriteJob) if (spriteJob)
{ {
glm::mat4 modelMatrix = spriteJob->ModelMatrix; glm::mat4 modelMatrix = spriteJob->ModelMatrix;
MVP = cameraMatrix * modelMatrix; glm::mat4 billboardingMatrix = glm::inverse(glm::toMat4(glm::inverse(m_Camera->Orientation())));
MVP = cameraMatrix * modelMatrix * billboardingMatrix;
glUniformMatrix4fv(glGetUniformLocation(ShaderProgramHandle, "MVP"), 1, GL_FALSE, glm::value_ptr(glm::mat4(MVP))); glUniformMatrix4fv(glGetUniformLocation(ShaderProgramHandle, "MVP"), 1, GL_FALSE, glm::value_ptr(glm::mat4(MVP)));
glUniformMatrix4fv(glGetUniformLocation(ShaderProgramHandle, "M"), 1, GL_FALSE, glm::value_ptr(glm::mat4(modelMatrix))); glUniformMatrix4fv(glGetUniformLocation(ShaderProgramHandle, "M"), 1, GL_FALSE, glm::value_ptr(glm::mat4(modelMatrix)));
glUniformMatrix4fv(glGetUniformLocation(ShaderProgramHandle, "V"), 1, GL_FALSE, glm::value_ptr(glm::mat4(m_Camera->ViewMatrix()))); glUniformMatrix4fv(glGetUniformLocation(ShaderProgramHandle, "V"), 1, GL_FALSE, glm::value_ptr(glm::mat4(m_Camera->ViewMatrix())));
src/Systems/DebugSystem.cpp
+1 -1
View File
@@ -20,7 +20,7 @@ bool Systems::DebugSystem::OnKeyDown(const Events::KeyDown &event)
if (event.KeyCode == GLFW_KEY_ENTER) if (event.KeyCode == GLFW_KEY_ENTER)
{ {
Events::PlaySFX e; Events::PlaySFX e;
e.Emitter = 0; e.Position = glm::vec3(0);
e.Resource = "Sounds/korvring.wav"; e.Resource = "Sounds/korvring.wav";
EventBroker->Publish<Events::PlaySFX>(e); EventBroker->Publish<Events::PlaySFX>(e);
src/Systems/PhysicsSystem.cpp
+1 -1
View File
@@ -284,7 +284,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/SoundSystem.cpp
+33 -28
View File
@@ -20,7 +20,7 @@ void Systems::SoundSystem::Initialize()
{ {
LOG_INFO("FMOD initialized successfully"); LOG_INFO("FMOD initialized successfully");
} }
FMOD_System_Set3DSettings(m_System, 1.f, 1.f, 1.f); //dopplerScale, distancefactor, rolloffscale FMOD_System_Set3DSettings(m_System, 0.f, 1.f, 1.f); //dopplerScale, distancefactor, rolloffscale
} }
@@ -44,20 +44,31 @@ void Systems::SoundSystem::Update(double dt)
std::map<EntityID, FMOD_CHANNEL*>::iterator it; std::map<EntityID, FMOD_CHANNEL*>::iterator it;
for(it = m_DeleteChannels.begin(); it != m_DeleteChannels.end();) for(it = m_DeleteChannels.begin(); it != m_DeleteChannels.end();)
{ {
FMOD_BOOL *isPlaying = false; FMOD_BOOL isPlaying = false;
FMOD_Channel_IsPlaying(it->second, isPlaying); FMOD_Channel_IsPlaying(it->second, &isPlaying);
if(isPlaying) if(isPlaying)
{ {
it++; it++;
} }
else else
{ {
FMOD_Sound_Release(m_DeleteSounds[it->first]); // FMOD_Sound_Release(m_DeleteSounds[it->first]);
m_DeleteSounds.erase(it->first); // m_DeleteSounds.erase(it->first);
it = m_DeleteChannels.erase(it); it = m_DeleteChannels.erase(it);
} }
} }
//LOG_INFO("Antal emitters i listan: %i", m_Channels.size());
for (auto channel : m_Channels)
{
FMOD_BOOL isPlaying = false;
FMOD_Channel_IsPlaying(channel.second, &isPlaying);
if(!isPlaying)
{
m_Channels.erase(channel.first);
}
}
} }
void Systems::SoundSystem::UpdateEntity(double dt, EntityID entity, EntityID parent) void Systems::SoundSystem::UpdateEntity(double dt, EntityID entity, EntityID parent)
@@ -86,7 +97,7 @@ void Systems::SoundSystem::UpdateEntity(double dt, EntityID entity, EntityID par
if(emitter) if(emitter)
{ {
FMOD_CHANNEL* channel = m_Channels[entity]; FMOD_CHANNEL* channel = m_Channels[entity];
FMOD_SOUND* sound = m_Sounds[entity]; //FMOD_SOUND* sound = m_Sounds[entity];
auto eTransform = m_World->GetComponent<Components::Transform>(entity); auto eTransform = m_World->GetComponent<Components::Transform>(entity);
glm::vec3 tPos = m_TransformSystem->AbsolutePosition(entity); glm::vec3 tPos = m_TransformSystem->AbsolutePosition(entity);
@@ -121,34 +132,28 @@ bool Systems::SoundSystem::OnComponentCreated(const Events::ComponentCreated &ev
float pitch = emitter->Pitch; float pitch = emitter->Pitch;
//LoadSound(sound, path, maxDist, minDist); //LoadSound(sound, path, maxDist, minDist);
m_Channels.insert(std::make_pair(emitter->Entity, channel)); m_Channels.insert(std::make_pair(emitter->Entity, channel));
m_Sounds.insert(std::make_pair(emitter->Entity, sound)); // m_Sounds.insert(std::make_pair(emitter->Entity, sound));
} }
return true; return true;
} }
bool Systems::SoundSystem::PlaySFX(const Events::PlaySFX &event) bool Systems::SoundSystem::PlaySFX(const Events::PlaySFX &event)
{ {
auto emitter = m_World->GetComponent<Components::SoundEmitter>(event.Emitter); auto eEntity = m_World->CreateEntity();
if(!emitter) auto eTransform = m_World->AddComponent<Components::Transform>(eEntity);
{ eTransform->Position = event.Position;
LOG_ERROR("FMOD: The Entity %i does not have a SoundEmitter-component, but is trying to play a sound", event.Emitter);FMOD_CHANNEL* channel = m_Channels[event.Emitter]; auto eComponent = m_World->AddComponent<Components::SoundEmitter>(eEntity);
return false; eComponent->MinDistance = event.MinDistance;
} eComponent->MaxDistance= event.MaxDistance;
eComponent->Loop = event.Loop;
eComponent->Gain = event.Volume;
emitter->type = Components::SoundEmitter::SoundType::SOUND_3D; eComponent->type = Components::SoundEmitter::SoundType::SOUND_3D;
Sound* sound = ResourceManager->Load<Sound>("Sound3D", event.Resource); Sound* sound = ResourceManager->Load<Sound>("Sound3D", event.Resource);
m_Sounds[event.Emitter] = *sound; //m_Sounds[eEntity] = *sound;
FMOD_Sound_Set3DMinMaxDistance(*sound, emitter->MinDistance, emitter->MaxDistance); FMOD_Sound_Set3DMinMaxDistance(*sound, eComponent->MinDistance, eComponent->MaxDistance);
PlaySound(&m_Channels[event.Emitter], m_Sounds[event.Emitter], 1.0, event.Loop); PlaySound(&m_Channels[eEntity], *sound, 1.0, eComponent->Loop);
FMOD_System_Update(m_System);
FMOD_BOOL isPlaying = false;
FMOD_Channel_IsPlaying(m_Channels[event.Emitter], &isPlaying);
if(!isPlaying)
LOG_ERROR("FMOD: File %s is not playing", event.Resource.c_str());
else
LOG_INFO("Now playing sound %s", event.Resource.c_str());
return true; return true;
} }
@@ -160,7 +165,7 @@ bool Systems::SoundSystem::PlayBGM(const Events::PlayBGM &event)
m_Channels[emitter] = m_BGMChannel; m_Channels[emitter] = m_BGMChannel;
eComponent->type = Components::SoundEmitter::SoundType::SOUND_3D; eComponent->type = Components::SoundEmitter::SoundType::SOUND_3D;
Sound* sound = ResourceManager->Load<Sound>("Sound2D", event.Resource); Sound* sound = ResourceManager->Load<Sound>("Sound2D", event.Resource);
m_Sounds[emitter] = *sound; //m_Sounds[emitter] = *sound;
FMOD_System_PlaySound(m_System, FMOD_CHANNEL_FREE, *sound, false, &m_Channels[emitter]); FMOD_System_PlaySound(m_System, FMOD_CHANNEL_FREE, *sound, false, &m_Channels[emitter]);
return true; return true;
@@ -199,8 +204,8 @@ void Systems::SoundSystem::OnComponentRemoved(EntityID entity, std::string type,
if(emitter) if(emitter)
{ {
m_DeleteChannels.insert(std::make_pair(entity, m_Channels[entity])); m_DeleteChannels.insert(std::make_pair(entity, m_Channels[entity]));
m_DeleteSounds.insert(std::make_pair(entity, m_Sounds[entity])); //m_DeleteSounds.insert(std::make_pair(entity, m_Sounds[entity]));
m_Channels.erase(entity); m_Channels.erase(entity);
m_Sounds.erase(entity); //m_Sounds.erase(entity);
} }
} }
src/Systems/SoundSystem.h
+1 -1
View File
@@ -52,7 +52,7 @@ private:
std::vector<EntityID> m_Listeners; std::vector<EntityID> m_Listeners;
std::map<EntityID, FMOD_CHANNEL*> m_Channels; std::map<EntityID, FMOD_CHANNEL*> m_Channels;
std::map<EntityID, FMOD_CHANNEL*> m_DeleteChannels; std::map<EntityID, FMOD_CHANNEL*> m_DeleteChannels;
std::map<EntityID, FMOD_SOUND*> m_Sounds; //std::map<EntityID, FMOD_SOUND*> m_Sounds;
std::map<EntityID, FMOD_SOUND*> m_DeleteSounds; std::map<EntityID, FMOD_SOUND*> m_DeleteSounds;
std::shared_ptr<Systems::TransformSystem> m_TransformSystem; std::shared_ptr<Systems::TransformSystem> m_TransformSystem;
src/Systems/TankSteeringSystem.cpp
+57 -4
View File
@@ -90,12 +90,48 @@ void Systems::TankSteeringSystem::UpdateEntity(double dt, EntityID entity, Entit
auto cloneTransform = m_World->GetComponent<Components::Transform>(clone); auto cloneTransform = m_World->GetComponent<Components::Transform>(clone);
cloneTransform->Position = templateAbsoluteTransform.Position; cloneTransform->Position = templateAbsoluteTransform.Position;
cloneTransform->Orientation = absoluteTransform.Orientation * cloneTransform->Orientation; cloneTransform->Orientation = absoluteTransform.Orientation * cloneTransform->Orientation;
Events::SetVelocity eSetVelocity; Events::SetVelocity eSetVelocity;
eSetVelocity.Entity = clone; eSetVelocity.Entity = clone;
eSetVelocity.Velocity = tankTransform->Velocity + absoluteTransform.Orientation * (glm::vec3(0.f, 0.f, -1.f) * barrelSteeringComponent->ShotSpeed); eSetVelocity.Velocity = tankTransform->Velocity + absoluteTransform.Orientation * (glm::vec3(0.f, 0.f, -1.f) * barrelSteeringComponent->ShotSpeed);
EventBroker->Publish(eSetVelocity); EventBroker->Publish(eSetVelocity);
m_TimeSinceLastShot[tankSteeringComponent->Barrel] = 0; m_TimeSinceLastShot[tankSteeringComponent->Barrel] = 0;
{
Events::CreateExplosion e;
e.LifeTime = 1.5;
e.ParticleScale.push_back(0.6);
e.ParticleScale.push_back(1.8);
e.ParticlesToSpawn = 5;
e.Position = cloneTransform->Position;
e.RelativeUpOrientation = glm::angleAxis(glm::pi<float>() / 2, glm::vec3(1,0,0));
e.Speed = 1.7;
e.SpreadAngle = glm::pi<float>()/10;
e.spritePath = "Textures/Sprites/Smoke1.png";
e.Color = glm::vec4(0.6,0.6,0.6,1);
EventBroker->Publish(e);
}
{
Events::CreateExplosion e;
e.LifeTime = 0.2;
e.ParticleScale.push_back(1);
//e.ParticleScale.push_back(2);
e.ParticlesToSpawn = 1;
e.Position = cloneTransform->Position;
e.Speed = 0;
e.SpreadAngle = glm::pi<float>();
e.spritePath = "Textures/Sprites/MuzzleFlash.png";
e.Color = glm::vec4(2, 2, 2, 0.2);
EventBroker->Publish(e);
}
{
Events::PlaySFX e;
e.Resource = "Sounds/SFX/TankShot.mp3";
e.Position = cloneTransform->Position;
e.Loop = false;
EventBroker->Publish(e);
}
auto clonePhysicsComponent = m_World->GetComponent<Components::Physics>(clone); auto clonePhysicsComponent = m_World->GetComponent<Components::Physics>(clone);
//1,670m/s //1,670m/s
@@ -109,6 +145,15 @@ void Systems::TankSteeringSystem::UpdateEntity(double dt, EntityID entity, Entit
m_TimeSinceLastShot[tankSteeringComponent->Barrel] += dt; m_TimeSinceLastShot[tankSteeringComponent->Barrel] += dt;
} }
// auto shot = m_World->GetComponent<Components::TankShell>(entity);
// if(shot)
// {
// if(inputController->Shoot && m_TimeSinceLastShot[tankSteeringComponent->Barrel] > 0.5)
// {
//
// }
// }
} }
bool Systems::TankSteeringSystem::OnCollision(const Events::Collision &e) bool Systems::TankSteeringSystem::OnCollision(const Events::Collision &e)
@@ -179,6 +224,13 @@ bool Systems::TankSteeringSystem::OnCollision(const Events::Collision &e)
e.Color = glm::vec4(2, 2, 2, 0.2); e.Color = glm::vec4(2, 2, 2, 0.2);
EventBroker->Publish(e); EventBroker->Publish(e);
} }
{
Events::PlaySFX e;
e.MinDistance = 150.f;
e.Position = shellTransform->Position;
e.Resource = "Sounds/SFX/Explosion.wav";
EventBroker->Publish(e);
}
for (auto &physComponent : *physicsComponents) for (auto &physComponent : *physicsComponents)
{ {
@@ -300,11 +352,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;
@@ -359,6 +411,7 @@ EntityID Systems::TankSteeringSystem::CreateTank(int playerID)
m_World->AddComponent<Components::Input>(tank); m_World->AddComponent<Components::Input>(tank);
auto health = m_World->AddComponent<Components::Health>(tank); auto health = m_World->AddComponent<Components::Health>(tank);
health->Amount = 100.f; health->Amount = 100.f;
m_World->AddComponent<Components::Listener>(tank);
{ {
auto shape = m_World->CreateEntity(tank); auto shape = m_World->CreateEntity(tank);
src/Systems/TankSteeringSystem.h
+4
View File
@@ -22,6 +22,7 @@
#include "Components/Health.h" #include "Components/Health.h"
#include "Components/TankShell.h" #include "Components/TankShell.h"
#include "Components/SphereShape.h" #include "Components/SphereShape.h"
#include "Components/Listener.h"
#include "Events/EnableCollisions.h" #include "Events/EnableCollisions.h"
#include "Events/DisableCollisions.h" #include "Events/DisableCollisions.h"
@@ -29,6 +30,9 @@
#include "Components/TriggerExplosion.h" #include "Components/TriggerExplosion.h"
#include "Components/FrameTimer.h" #include "Components/FrameTimer.h"
#include "Events/PlaySFX.h"
#include "Events/PlayBGM.h"
#include "Events/Damage.h" #include "Events/Damage.h"
#include "Components/Vehicle.h" #include "Components/Vehicle.h"
#include "Components/Player.h" #include "Components/Player.h"
vs11/Returngeance/Returngeance.vcxproj.filters
+643 -189
View File
@@ -1,201 +1,655 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\src\Camera.cpp" />
<ClCompile Include="..\..\src\CubemapTexture.cpp" />
<ClCompile Include="..\..\src\EventBroker.cpp" />
<ClCompile Include="..\..\src\GameWorld.cpp" />
<ClCompile Include="..\..\src\InputManager.cpp" />
<ClCompile Include="..\..\src\main.cpp" /> <ClCompile Include="..\..\src\main.cpp" />
<ClCompile Include="..\..\src\Model.cpp" /> <ClCompile Include="..\..\src\GameWorld.cpp" />
<ClCompile Include="..\..\src\OBJ.cpp" />
<ClCompile Include="..\..\src\Physics\VehicleSetup.cpp" />
<ClCompile Include="..\..\src\PrecompiledHeader.cpp" />
<ClCompile Include="..\..\src\Renderer.cpp" />
<ClCompile Include="..\..\src\ResourceManager.cpp" />
<ClCompile Include="..\..\src\ShaderProgram.cpp" />
<ClCompile Include="..\..\src\Skybox.cpp" />
<ClCompile Include="..\..\src\Sound.cpp" />
<ClCompile Include="..\..\src\Systems\DamageSystem.cpp" />
<ClCompile Include="..\..\src\Systems\DebugSystem.cpp" />
<ClCompile Include="..\..\src\Systems\FollowSystem.cpp" />
<ClCompile Include="..\..\src\Systems\FreeSteeringSystem.cpp" />
<ClCompile Include="..\..\src\Systems\GarageSystem.cpp" />
<ClCompile Include="..\..\src\Systems\HelicopterSteeringSystem.cpp" />
<ClCompile Include="..\..\src\Systems\InputSystem.cpp" />
<ClCompile Include="..\..\src\Systems\ParticleSystem.cpp" />
<ClCompile Include="..\..\src\Systems\PhysicsSystem.cpp" />
<ClCompile Include="..\..\src\Systems\RenderSystem.cpp" />
<ClCompile Include="..\..\src\Systems\SoundSystem.cpp" />
<ClCompile Include="..\..\src\Systems\TankSteeringSystem.cpp" />
<ClCompile Include="..\..\src\Systems\TimerSystem.cpp" />
<ClCompile Include="..\..\src\Systems\TransformSystem.cpp" />
<ClCompile Include="..\..\src\Systems\TriggerSystem.cpp" />
<ClCompile Include="..\..\src\Systems\WallSystem.cpp" />
<ClCompile Include="..\..\src\Systems\WheelPairSystem.cpp" />
<ClCompile Include="..\..\src\Texture.cpp" />
<ClCompile Include="..\..\src\World.cpp" /> <ClCompile Include="..\..\src\World.cpp" />
<ClCompile Include="..\..\src\Systems\JeepSteeringSystem.cpp" /> <ClCompile Include="..\..\src\ShaderProgram.cpp" />
<ClCompile Include="..\..\src\PrecompiledHeader.cpp" />
<ClCompile Include="..\..\src\Systems\RenderSystem.cpp">
<Filter>Rendering\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Renderer.cpp">
<Filter>Rendering</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Skybox.cpp">
<Filter>Rendering</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Texture.cpp">
<Filter>Rendering</Filter>
</ClCompile>
<ClCompile Include="..\..\src\OBJ.cpp">
<Filter>Rendering</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Model.cpp">
<Filter>Rendering</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Camera.cpp">
<Filter>Rendering</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CubemapTexture.cpp">
<Filter>Rendering</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\PhysicsSystem.cpp">
<Filter>Physics\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\TransformSystem.cpp">
<Filter>Base\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\DebugSystem.cpp">
<Filter>Base\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\SoundSystem.cpp">
<Filter>Audio\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\InputSystem.cpp">
<Filter>Input\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\FreeSteeringSystem.cpp">
<Filter>Input\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ResourceManager.cpp" />
<ClCompile Include="..\..\src\Systems\ParticleSystem.cpp">
<Filter>Particle System\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\EventBroker.cpp" />
<ClCompile Include="..\..\src\Physics\VehicleSetup.cpp">
<Filter>Physics</Filter>
</ClCompile>
<ClCompile Include="..\..\src\InputManager.cpp">
<Filter>Input</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\TankSteeringSystem.cpp">
<Filter>Physics\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\HelicopterSteeringSystem.cpp">
<Filter>Game\Vehicles\Helicopter\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\TriggerSystem.cpp">
<Filter>Physics\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\TimerSystem.cpp">
<Filter>Base\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\DamageSystem.cpp">
<Filter>Game\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\WheelPairSystem.cpp" />
<ClCompile Include="..\..\src\Systems\FollowSystem.cpp">
<Filter>Game\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\WallSystem.cpp">
<Filter>Gameplay\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Systems\GarageSystem.cpp">
<Filter>Game\Systems</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Sound.cpp">
<Filter>Audio</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Util">
<UniqueIdentifier>{ce43847c-9745-46d2-b000-069af4882886}</UniqueIdentifier>
</Filter>
<Filter Include="Shaders">
<UniqueIdentifier>{8974329a-5c12-4b94-86e7-5931555bc129}</UniqueIdentifier>
</Filter>
<Filter Include="Rendering">
<UniqueIdentifier>{aca514ec-84de-423c-a270-ec4399904c5a}</UniqueIdentifier>
</Filter>
<Filter Include="Rendering\Components">
<UniqueIdentifier>{fcbc3469-7049-4c07-9d76-f8f1e872f042}</UniqueIdentifier>
</Filter>
<Filter Include="Rendering\Systems">
<UniqueIdentifier>{f6c5fd1d-7180-42b7-b973-a91bfc3ea189}</UniqueIdentifier>
</Filter>
<Filter Include="Physics">
<UniqueIdentifier>{d08cc18b-b7d8-47a7-91af-7283052e4c97}</UniqueIdentifier>
</Filter>
<Filter Include="Physics\Components">
<UniqueIdentifier>{1c5d571e-55f4-498b-b64a-2f28ac2cd9b0}</UniqueIdentifier>
</Filter>
<Filter Include="Physics\Systems">
<UniqueIdentifier>{635843f6-c94e-4798-8201-db64d11e2a03}</UniqueIdentifier>
</Filter>
<Filter Include="Base">
<UniqueIdentifier>{3bd82924-397c-4c5a-959c-971612269374}</UniqueIdentifier>
</Filter>
<Filter Include="Base\Components">
<UniqueIdentifier>{c17ff66a-f9f5-4329-a05d-e7bf8a140dd3}</UniqueIdentifier>
</Filter>
<Filter Include="Base\Systems">
<UniqueIdentifier>{caa1e07f-fa19-4706-bf59-de74a0290763}</UniqueIdentifier>
</Filter>
<Filter Include="Audio">
<UniqueIdentifier>{444e18d8-8ab6-413b-b9b0-59a6309e0511}</UniqueIdentifier>
</Filter>
<Filter Include="Audio\Components">
<UniqueIdentifier>{a2db813b-1d08-4d48-97ac-2faaff29a1cc}</UniqueIdentifier>
</Filter>
<Filter Include="Audio\Systems">
<UniqueIdentifier>{44c41b41-b706-4d88-8d50-abdeb2a828fe}</UniqueIdentifier>
</Filter>
<Filter Include="Input">
<UniqueIdentifier>{30c6d948-459c-4fc7-b44d-ecbe5f34203e}</UniqueIdentifier>
</Filter>
<Filter Include="Input\Components">
<UniqueIdentifier>{8bcc0a31-3e0d-4342-8d10-ec8edfa03abd}</UniqueIdentifier>
</Filter>
<Filter Include="Input\Systems">
<UniqueIdentifier>{93ce6550-7614-46b4-a554-0eec26e6fbf6}</UniqueIdentifier>
</Filter>
<Filter Include="Particle System">
<UniqueIdentifier>{0bb544bb-1b0a-487f-88d6-f8ab8a2795f4}</UniqueIdentifier>
</Filter>
<Filter Include="Particle System\Components">
<UniqueIdentifier>{a6ca6194-3aa5-46cc-ac05-206f9a400dec}</UniqueIdentifier>
</Filter>
<Filter Include="Particle System\Systems">
<UniqueIdentifier>{9f45f029-46c8-4c0d-b44c-dc9bffd3c6a6}</UniqueIdentifier>
</Filter>
<Filter Include="GUI">
<UniqueIdentifier>{6e633434-4aed-453d-b2f9-8c51ca7f78db}</UniqueIdentifier>
</Filter>
<Filter Include="Audio\Events">
<UniqueIdentifier>{85692f3a-5241-4780-a3ca-f4d8a2851392}</UniqueIdentifier>
</Filter>
<Filter Include="Input\Events">
<UniqueIdentifier>{ee125b77-b275-4841-abc9-374957a89916}</UniqueIdentifier>
</Filter>
<Filter Include="Physics\Events">
<UniqueIdentifier>{42ae084f-ade8-402c-87ba-f03f6b846bc8}</UniqueIdentifier>
</Filter>
<Filter Include="Rendering\Events">
<UniqueIdentifier>{a025d51e-594d-4844-983b-f683726bf1bf}</UniqueIdentifier>
</Filter>
<Filter Include="Base\Events">
<UniqueIdentifier>{ffab6cc2-2fbf-400f-9398-a6741b6cc95c}</UniqueIdentifier>
</Filter>
<Filter Include="Game">
<UniqueIdentifier>{5b992473-73e6-485e-8f13-17e0801fb2ca}</UniqueIdentifier>
</Filter>
<Filter Include="Game\Vehicles">
<UniqueIdentifier>{8a78be3a-a3c5-4054-a2f1-1456f3fcbab0}</UniqueIdentifier>
</Filter>
<Filter Include="Game\Vehicles\Helicopter">
<UniqueIdentifier>{8ccc0abe-5bdd-4656-ab11-5708a39c71ae}</UniqueIdentifier>
</Filter>
<Filter Include="Game\Vehicles\Helicopter\Components">
<UniqueIdentifier>{b2416d05-a49e-4fef-a5c4-cd03d8cc2efd}</UniqueIdentifier>
</Filter>
<Filter Include="Game\Vehicles\Helicopter\Systems">
<UniqueIdentifier>{b34c0c95-a887-4cf4-af24-cf7c1f459aa8}</UniqueIdentifier>
</Filter>
<Filter Include="Game\Components">
<UniqueIdentifier>{cb06b441-90b8-46ed-b347-4190dac7185b}</UniqueIdentifier>
</Filter>
<Filter Include="Particle System\Events">
<UniqueIdentifier>{ddd3c442-7c2f-4690-9308-fcef62deee0b}</UniqueIdentifier>
</Filter>
<Filter Include="Game\Systems">
<UniqueIdentifier>{3c2ea0e5-41a1-4b11-a891-1d59ead7223c}</UniqueIdentifier>
</Filter>
<Filter Include="Base\Events">
<UniqueIdentifier>{3cbe68d9-2446-45ee-8637-ffb805997dcd}</UniqueIdentifier>
</Filter>
<Filter Include="Rendering\Events">
<UniqueIdentifier>{a025d51e-594d-4844-983b-f683726bf1bf}</UniqueIdentifier>
</Filter>
<Filter Include="Game\Events">
<UniqueIdentifier>{9702064a-02a2-4b3c-a2ab-47c23a9cf49c}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\src\Camera.h" />
<ClInclude Include="..\..\src\Color.h" />
<ClInclude Include="..\..\src\Component.h" />
<ClInclude Include="..\..\src\Components\BarrelSteering.h" />
<ClInclude Include="..\..\src\Components\BlendMap.h" />
<ClInclude Include="..\..\src\Components\BoxShape.h" />
<ClInclude Include="..\..\src\Components\Camera.h" />
<ClInclude Include="..\..\src\Components\DirectionalLight.h" />
<ClInclude Include="..\..\src\Components\Flag.h" />
<ClInclude Include="..\..\src\Components\Follow.h" />
<ClInclude Include="..\..\src\Components\FrameTimer.h" />
<ClInclude Include="..\..\src\Components\Garage.h" />
<ClInclude Include="..\..\src\Components\Move.h" />
<ClInclude Include="..\..\src\Components\Rotate.h" />
<ClInclude Include="..\..\src\Components\TriggerMove.h" />
<ClInclude Include="..\..\src\Components\Timer.h" />
<ClInclude Include="..\..\src\Components\TriggerExplosion.h" />
<ClInclude Include="..\..\src\Components\ExtendedMeshShape.h" />
<ClInclude Include="..\..\src\Components\FreeSteering.h" />
<ClInclude Include="..\..\src\Components\Health.h" />
<ClInclude Include="..\..\src\Components\HelicopterSteering.h" />
<ClInclude Include="..\..\src\Components\HingeConstraint.h" />
<ClInclude Include="..\..\src\Components\Input.h" />
<ClInclude Include="..\..\src\Components\Listener.h" />
<ClInclude Include="..\..\src\Components\MeshShape.h" />
<ClInclude Include="..\..\src\Components\Model.h" />
<ClInclude Include="..\..\src\Components\Particle.h" />
<ClInclude Include="..\..\src\Components\ParticleEmitter.h" />
<ClInclude Include="..\..\src\Components\Physics.h" />
<ClInclude Include="..\..\src\Components\Player.h" />
<ClInclude Include="..\..\src\Components\PointLight.h" />
<ClInclude Include="..\..\src\Components\SoundEmitter.h" />
<ClInclude Include="..\..\src\Components\SphereShape.h" />
<ClInclude Include="..\..\src\Components\Sprite.h" />
<ClInclude Include="..\..\src\Components\TankShell.h" />
<ClInclude Include="..\..\src\Components\TankSteering.h" />
<ClInclude Include="..\..\src\Components\Template.h" />
<ClInclude Include="..\..\src\Components\TowerSteering.h" />
<ClInclude Include="..\..\src\Components\Transform.h" />
<ClInclude Include="..\..\src\Components\Trigger.h" />
<ClInclude Include="..\..\src\Components\TriggerRotate.h" />
<ClInclude Include="..\..\src\Components\Vehicle.h" />
<ClInclude Include="..\..\src\Components\SpawnPoint.h" />
<ClInclude Include="..\..\src\Components\Viewport.h" />
<ClInclude Include="..\..\src\Components\Wall.h" />
<ClInclude Include="..\..\src\Components\Wheel.h" />
<ClInclude Include="..\..\src\Components\WheelPair.h" />
<ClInclude Include="..\..\src\CubemapTexture.h" />
<ClInclude Include="..\..\src\Engine.h" />
<ClInclude Include="..\..\src\Entity.h" />
<ClInclude Include="..\..\src\Events\ApplyForce.h" />
<ClInclude Include="..\..\src\Events\ApplyPointImpulse.h" />
<ClInclude Include="..\..\src\Events\BindGamepadAxis.h" />
<ClInclude Include="..\..\src\Events\BindGamepadButton.h" />
<ClInclude Include="..\..\src\Events\BindKey.h" />
<ClInclude Include="..\..\src\Events\BindMouseButton.h" />
<ClInclude Include="..\..\src\Events\Collision.h" />
<ClInclude Include="..\..\src\Events\CreateExplosion.h" />
<ClInclude Include="..\..\src\Events\ComponentCreated.h" />
<ClInclude Include="..\..\src\Events\Damage.h" />
<ClInclude Include="..\..\src\Events\DisableCollisions.h" />
<ClInclude Include="..\..\src\Events\EnableCollisions.h" />
<ClInclude Include="..\..\src\Events\GamepadAxis.h" />
<ClInclude Include="..\..\src\Events\GamepadButton.h" />
<ClInclude Include="..\..\src\Events\InputCommand.h" />
<ClInclude Include="..\..\src\Events\KeyDown.h" />
<ClInclude Include="..\..\src\Events\KeyUp.h" />
<ClInclude Include="..\..\src\Events\LeaveTrigger.h" />
<ClInclude Include="..\..\src\Events\LockMouse.h" />
<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\Move.h" />
<ClInclude Include="..\..\src\Events\PlayBGM.h" />
<ClInclude Include="..\..\src\Events\PlaySFX.h" />
<ClInclude Include="..\..\src\Events\Rotate.h" />
<ClInclude Include="..\..\src\Events\SetVelocity.h" />
<ClInclude Include="..\..\src\Events\SetViewportCamera.h" />
<ClInclude Include="..\..\src\Events\SpawnVehicle.h" />
<ClInclude Include="..\..\src\Events\StopSound.h" />
<ClInclude Include="..\..\src\Events\TankSteer.h" />
<ClInclude Include="..\..\src\Events\EnterTrigger.h" />
<ClInclude Include="..\..\src\Factory.h" />
<ClInclude Include="..\..\src\GameWorld.h" />
<ClInclude Include="..\..\src\GUI\Frame.h" />
<ClInclude Include="..\..\src\EventBroker.h" />
<ClInclude Include="..\..\src\GUI\GameFrame.h" />
<ClInclude Include="..\..\src\GUI\HealthOverlay.h" />
<ClInclude Include="..\..\src\GUI\PlayerHUD.h" />
<ClInclude Include="..\..\src\GUI\VehicleSelection.h" />
<ClInclude Include="..\..\src\GUI\WorldFrame.h" />
<ClInclude Include="..\..\src\GUI\TextureFrame.h" />
<ClInclude Include="..\..\src\GUI\Viewport.h" />
<ClInclude Include="..\..\src\InputController.h" />
<ClInclude Include="..\..\src\InputManager.h" />
<ClInclude Include="..\..\src\Model.h" />
<ClInclude Include="..\..\src\OBJ.h" />
<ClInclude Include="..\..\src\Physics\VehicleSetup.h" />
<ClInclude Include="..\..\src\PrecompiledHeader.h" />
<ClInclude Include="..\..\src\Renderer.h" />
<ClInclude Include="..\..\src\RenderQueue.h" />
<ClInclude Include="..\..\src\ResourceManager.h" />
<ClInclude Include="..\..\src\ShaderProgram.h" />
<ClInclude Include="..\..\src\Skybox.h" />
<ClInclude Include="..\..\src\Sound.h" />
<ClInclude Include="..\..\src\System.h" />
<ClInclude Include="..\..\src\Systems\DamageSystem.h" />
<ClInclude Include="..\..\src\Systems\DebugSystem.h" />
<ClInclude Include="..\..\src\Systems\FollowSystem.h" />
<ClInclude Include="..\..\src\Systems\FreeSteeringSystem.h" />
<ClInclude Include="..\..\src\Systems\GarageSystem.h" />
<ClInclude Include="..\..\src\Systems\HelicopterSteeringSystem.h" />
<ClInclude Include="..\..\src\Systems\InputSystem.h" />
<ClInclude Include="..\..\src\Systems\ParticleSystem.h" />
<ClInclude Include="..\..\src\Systems\PhysicsSystem.h" />
<ClInclude Include="..\..\src\Systems\RenderSystem.h" />
<ClInclude Include="..\..\src\Systems\SoundSystem.h" />
<ClInclude Include="..\..\src\Systems\TankSteeringSystem.h" />
<ClInclude Include="..\..\src\Systems\TimerSystem.h" />
<ClInclude Include="..\..\src\Systems\TransformSystem.h" />
<ClInclude Include="..\..\src\Systems\TriggerSystem.h" />
<ClInclude Include="..\..\src\Systems\WallSystem.h" />
<ClInclude Include="..\..\src\Systems\WheelPairSystem.h" />
<ClInclude Include="..\..\src\Texture.h" />
<ClInclude Include="..\..\src\Util\GLError.h" />
<ClInclude Include="..\..\src\Util\Rectangle.h" />
<ClInclude Include="..\..\src\Util\Logging.h" />
<ClInclude Include="..\..\src\Util\UnorderedMapPair.h" />
<ClInclude Include="..\..\src\World.h" /> <ClInclude Include="..\..\src\World.h" />
<ClInclude Include="..\..\src\Systems\JeepSteeringSystem.h" /> <ClInclude Include="..\..\src\GameWorld.h" />
<ClInclude Include="..\..\src\Components\JeepSteering.h" /> <ClInclude Include="..\..\src\Factory.h" />
<ClInclude Include="..\..\src\Events\JeepSteer.h" /> <ClInclude Include="..\..\src\Entity.h" />
<ClInclude Include="..\..\src\Component.h" />
<ClInclude Include="..\..\src\System.h" />
<ClInclude Include="..\..\src\Util\GLError.h">
<Filter>Util</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Util\Logging.h">
<Filter>Util</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Color.h" />
<ClInclude Include="..\..\src\Engine.h" />
<ClInclude Include="..\..\src\PrecompiledHeader.h" />
<ClInclude Include="..\..\src\ShaderProgram.h" />
<ClInclude Include="..\..\src\Components\Model.h">
<Filter>Rendering\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Sprite.h">
<Filter>Rendering\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Renderer.h">
<Filter>Rendering</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Skybox.h">
<Filter>Rendering</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Texture.h">
<Filter>Rendering</Filter>
</ClInclude>
<ClInclude Include="..\..\src\OBJ.h">
<Filter>Rendering</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Model.h">
<Filter>Rendering</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Camera.h">
<Filter>Rendering</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CubemapTexture.h">
<Filter>Rendering</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Physics.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\PhysicsSystem.h">
<Filter>Physics\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Transform.h">
<Filter>Base\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Template.h">
<Filter>Base\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Camera.h">
<Filter>Rendering\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\TransformSystem.h">
<Filter>Base\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\DebugSystem.h">
<Filter>Base\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\SoundSystem.h">
<Filter>Audio\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\SoundEmitter.h">
<Filter>Audio\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\RenderSystem.h">
<Filter>Rendering\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\InputSystem.h">
<Filter>Input\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\FreeSteeringSystem.h">
<Filter>Input\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Input.h">
<Filter>Input\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\FreeSteering.h">
<Filter>Input\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\ParticleEmitter.h">
<Filter>Particle System\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\PointLight.h">
<Filter>Rendering\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\DirectionalLight.h">
<Filter>Rendering\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ResourceManager.h" />
<ClInclude Include="..\..\src\Sound.h">
<Filter>Audio</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Vehicle.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Wheel.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Physics\VehicleSetup.h">
<Filter>Physics</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\BoxShape.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\SphereShape.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\MeshShape.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Util\UnorderedMapPair.h">
<Filter>Util</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\HingeConstraint.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\ExtendedMeshShape.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\WheelPair.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\ParticleSystem.h">
<Filter>Particle System\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Particle.h">
<Filter>Particle System\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\GUI\Frame.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Util\Rectangle.h">
<Filter>Util</Filter>
</ClInclude>
<ClInclude Include="..\..\src\EventBroker.h" />
<ClInclude Include="..\..\src\Events\KeyDown.h">
<Filter>Input\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\KeyUp.h">
<Filter>Input\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\InputManager.h">
<Filter>Input</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\MousePress.h">
<Filter>Input\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\MouseRelease.h">
<Filter>Input\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\MouseMove.h">
<Filter>Input\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\BindKey.h">
<Filter>Input\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\BindMouseButton.h">
<Filter>Input\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\InputCommand.h">
<Filter>Input\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\InputController.h">
<Filter>Input</Filter>
</ClInclude>
<ClInclude Include="..\..\src\RenderQueue.h">
<Filter>Rendering</Filter>
</ClInclude>
<ClInclude Include="..\..\src\GUI\Viewport.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Physics\VehicleSetup.h">
<Filter>Physics</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\TankSteering.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\TankSteer.h">
<Filter>Physics\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\TankSteeringSystem.h">
<Filter>Physics\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\TowerSteering.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\BarrelSteering.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\SetVelocity.h">
<Filter>Physics\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\GamepadAxis.h">
<Filter>Input\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\GamepadButton.h">
<Filter>Input\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\BindGamepadAxis.h">
<Filter>Input\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\BindGamepadButton.h">
<Filter>Input\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Viewport.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Health.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\LockMouse.h">
<Filter>Input\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\HelicopterSteering.h">
<Filter>Game\Vehicles\Helicopter\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\HelicopterSteeringSystem.h">
<Filter>Game\Vehicles\Helicopter\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\ApplyForce.h">
<Filter>Physics\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\ApplyPointImpulse.h">
<Filter>Physics\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Player.h">
<Filter>Game\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\CreateExplosion.h">
<Filter>Particle System\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\Collision.h">
<Filter>Physics\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Health.h">
<Filter>Gameplay\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Listener.h">
<Filter>Audio\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\ComponentCreated.h">
<Filter>Base\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\PlayBGM.h">
<Filter>Audio\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\PlaySFX.h">
<Filter>Audio\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\StopSound.h">
<Filter>Audio\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\TankShell.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\DisableCollisions.h">
<Filter>Physics\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\EnableCollisions.h">
<Filter>Physics\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Trigger.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\TriggerSystem.h">
<Filter>Physics\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\TriggerExplosion.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\EnterTrigger.h">
<Filter>Physics\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\TimerSystem.h">
<Filter>Base\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Timer.h">
<Filter>Base\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\FrameTimer.h">
<Filter>Base\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\DamageSystem.h">
<Filter>Game\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\Damage.h">
<Filter>Game\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Flag.h">
<Filter>Game\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\GUI\TextureFrame.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\GUI\WorldFrame.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\SetViewportCamera.h">
<Filter>Rendering\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\GUI\GameFrame.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\GUI\HealthOverlay.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\GUI\PlayerHUD.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\WheelPairSystem.h">
<Filter>Physics\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\Move.h">
<Filter>Base\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\BlendMap.h">
<Filter>Rendering\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\WallSystem.h">
<Filter>Gameplay\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\LeaveTrigger.h">
<Filter>Physics\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Follow.h">
<Filter>Game\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\FollowSystem.h">
<Filter>Game\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\Rotate.h">
<Filter>Base\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\TriggerMove.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\TriggerRotate.h">
<Filter>Physics\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Systems\GarageSystem.h">
<Filter>Game\Systems</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Garage.h">
<Filter>Game\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Move.h">
<Filter>Base\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Rotate.h">
<Filter>Base\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\BlendMap.h">
<Filter>Rendering\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\GUI\VehicleSelection.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\OnDead.h">
<Filter>Gameplay\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Events\SpawnVehicle.h">
<Filter>Game\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\Wall.h">
<Filter>Game\Components</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\SpawnPoint.h">
<Filter>Game\Components</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\..\src\Shaders\AABB.frag.glsl" /> <None Include="..\..\src\Shaders\Fragment2.glsl">
<None Include="..\..\src\Shaders\BlendMap.frag.glsl" /> <Filter>Shaders</Filter>
<None Include="..\..\src\Shaders\BlendMap.vert.glsl" /> </None>
<None Include="..\..\src\Shaders\FinalForwardPass.frag.glsl" /> <None Include="..\..\src\Shaders\Normals.frag.glsl">
<None Include="..\..\src\Shaders\FinalForwardPass.vert.glsl" /> <Filter>Shaders</Filter>
<None Include="..\..\src\Shaders\FinalPass.frag.glsl" /> </None>
<None Include="..\..\src\Shaders\FinalPass.vert.glsl" /> <None Include="..\..\src\Shaders\Normals.geo.glsl">
<None Include="..\..\src\Shaders\ForwardRendering.frag.glsl" /> <Filter>Shaders</Filter>
<None Include="..\..\src\Shaders\ForwardRendering.vert.glsl" /> </None>
<None Include="..\..\src\Shaders\Fragment.glsl" /> <None Include="..\..\src\Shaders\ShadowMap.frag.glsl">
<None Include="..\..\src\Shaders\Fragment2-Debug.glsl" /> <Filter>Shaders</Filter>
<None Include="..\..\src\Shaders\Fragment2.glsl" /> </None>
<None Include="..\..\src\Shaders\Normals.frag.glsl" /> <None Include="..\..\src\Shaders\ShadowMap.vert.glsl">
<None Include="..\..\src\Shaders\Normals.geo.glsl" /> <Filter>Shaders</Filter>
<None Include="..\..\src\Shaders\ShadowMap.frag.glsl" /> </None>
<None Include="..\..\src\Shaders\ShadowMap.vert.glsl" /> <None Include="..\..\src\Shaders\Skybox.frag.glsl">
<None Include="..\..\src\Shaders\Skybox.frag.glsl" /> <Filter>Shaders</Filter>
<None Include="..\..\src\Shaders\Skybox.vert.glsl" /> </None>
<None Include="..\..\src\Shaders\SunPass.frag.glsl" /> <None Include="..\..\src\Shaders\Skybox.vert.glsl">
<None Include="..\..\src\Shaders\SunPass.vert.glsl" /> <Filter>Shaders</Filter>
<None Include="..\..\src\Shaders\Vertex.glsl" /> </None>
<None Include="..\..\src\Shaders\Vertex2.glsl" /> <None Include="..\..\src\Shaders\Vertex.glsl">
<None Include="..\..\src\Shaders\VisualizeDepth.frag.glsl" /> <Filter>Shaders</Filter>
<None Include="..\..\src\Shaders\VisualizeDepth.vert.glsl" /> </None>
<None Include="..\..\src\Shaders\Vertex2.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\VisualizeDepth.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\VisualizeDepth.vert.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\AABB.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\Fragment.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\Fragment2-Debug.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\FinalPass.vert.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\FinalPass.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\ForwardRendering.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\ForwardRendering.vert.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\SunPass.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\SunPass.vert.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\BlendMap.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\BlendMap.vert.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\FinalForwardPass.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\FinalForwardPass.vert.glsl">
<Filter>Shaders</Filter>
</None>
</ItemGroup> </ItemGroup>
</Project> </Project>