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

Merge remote-tracking branch 'origin/master' into Sound+Particles

Browse Source
This commit is contained in:
Stiffly
2014-06-04 15:22:00 +02:00
parent 2ef5d49f7e 7b90e54899
commit f2ae46efa5
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameWorld.cpp
+10 -11
View File
@@ -276,15 +276,6 @@ void GameWorld::Initialize()
} }
#pragma endregion Region for wall debris #pragma endregion Region for wall debris
#pragma region Wall_Regin
for(int i = 10; i < 0; i++)
{
EntityID Wall = CreateWall(glm::vec3(i*10.f, -15.f, 0.f), glm::quat());
}
#pragma endregion Region for all wall creations
/*EntityID tank1 = CreateTank(1); /*EntityID tank1 = CreateTank(1);
{ {
auto transform = GetComponent<Components::Transform>(tank1); auto transform = GetComponent<Components::Transform>(tank1);
@@ -644,9 +635,9 @@ void GameWorld::CreateGate(EntityID parent, glm::vec3 position, glm::quat orient
} }
} }
EntityID GameWorld::CreateWall(glm::vec3 pos, glm::quat orientation) EntityID GameWorld::CreateWall(EntityID parent, glm::vec3 pos, glm::quat orientation)
{ {
auto wall = CreateEntity(); auto wall = CreateEntity(parent);
auto transform = AddComponent<Components::Transform>(wall); auto transform = AddComponent<Components::Transform>(wall);
transform->Position = pos; transform->Position = pos;
transform->Orientation = orientation; transform->Orientation = orientation;
@@ -1116,6 +1107,14 @@ void GameWorld::CreateBase(glm::quat orientation, int playerID)
CreateGate(base, glm::vec3(273.f, 40.185f, 0.06f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0))); CreateGate(base, glm::vec3(273.f, 40.185f, 0.06f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
CreateWall(base, glm::vec3(273.f, 40.3f, -55.f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
CreateWall(base, glm::vec3(273.f, 40.3f, -45.f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
CreateWall(base, glm::vec3(273.f, 40.3f, -35.f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
CreateWall(base, glm::vec3(273.f, 40.3f, -25.f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
CreateWall(base, glm::vec3(273.f, 40.3f, -15.f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
CreateWall(base, glm::vec3(273.f, 40.3f, 15.f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
CreateWall(base, glm::vec3(273.f, 40.3f, 25.f), 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); 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) EntityID GameWorld::CreateGarage(EntityID parent, glm::vec3 Position, glm::quat orientation, int playerID)
src/GameWorld.h
+1 -1
View File
@@ -81,7 +81,7 @@ private:
void CreateGate(EntityID parent, glm::vec3 position, glm::quat orientation); 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(EntityID parent, glm::vec3 pos, glm::quat orientation);
EntityID CreateGarage(EntityID parent, 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, int playerID); void CreateBase(glm::quat orientation, int playerID);