From 3c17ab603772149c997ad03ddf498513fe003f2d Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Wed, 4 Jun 2014 05:12:06 +0200
Subject: [PATCH] Bridges

---
 assets            |  2 +-
 src/GameWorld.cpp | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/assets b/assets
index a6e3f12..637f866 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit a6e3f120fd90e4c2c3983cf0098bb9c3ebdc4b39
+Subproject commit 637f866e2d220a1c063f7de2d9f64863643d686f
diff --git a/src/GameWorld.cpp b/src/GameWorld.cpp
index a7b15bd..4f3d9fd 100755
--- a/src/GameWorld.cpp
+++ b/src/GameWorld.cpp
@@ -998,6 +998,26 @@ void GameWorld::CreateBase(glm::quat orientation, int playerID)
 		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/MiddleBridge.obj";
+			CommitEntity(shape);
+		}
+		CommitEntity(bridge_middle);
+	}
+
 	{
 		auto terrain_base = CreateEntity(base);
 		auto transform = AddComponent<Components::Transform>(terrain_base);
@@ -1066,6 +1086,26 @@ void GameWorld::CreateBase(glm::quat orientation, int playerID)
 		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);
+	}
+
 	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)