From 4891a4d9395f0134cab250532a5ba23824c8f983 Mon Sep 17 00:00:00 2001
From: tleety <dahltobbe@hotmail.com>
Date: Tue, 15 Sep 2015 17:56:23 +0200
Subject: [PATCH] Bricks are now models. Warning: Laggy

---
 include/Core/Engine.h         | 2 +-
 include/Game/LevelSystem.h    | 1 +
 src/game/Game/LevelSystem.cpp | 8 +++++---
 3 files changed, 7 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 include/Game/LevelSystem.h
 mode change 100644 => 100755 src/game/Game/LevelSystem.cpp

diff --git a/include/Core/Engine.h b/include/Core/Engine.h
index 0345813..e128c59 100755
--- a/include/Core/Engine.h
+++ b/include/Core/Engine.h
@@ -127,7 +127,7 @@ public:
 		{
 			auto t_Light = m_World->CreateEntity();
 			auto transform = m_World->AddComponent<Components::Transform>(t_Light);
-			transform->Position = glm::vec3(2.f, 1.5f, -10.f);
+			transform->Position = glm::vec3(2.f, 1.5f, -9.f);
 			auto pl = m_World->AddComponent<Components::PointLight>(t_Light);
 			pl->Radius = 8.f;
 		}
diff --git a/include/Game/LevelSystem.h b/include/Game/LevelSystem.h
old mode 100644
new mode 100755
index 6269974..dd03a09
--- a/include/Game/LevelSystem.h
+++ b/include/Game/LevelSystem.h
@@ -8,6 +8,7 @@
 #include "Core/System.h"
 #include "Core/CTransform.h"
 #include "Rendering/CSprite.h"
+#include "Rendering/CModel.h"
 #include "Game/CBrick.h"
 #include "Physics/EContact.h"
 #include "Core/EventBroker.h"
diff --git a/src/game/Game/LevelSystem.cpp b/src/game/Game/LevelSystem.cpp
old mode 100644
new mode 100755
index 68dce72..dbcf4e1
--- a/src/game/Game/LevelSystem.cpp
+++ b/src/game/Game/LevelSystem.cpp
@@ -43,17 +43,19 @@ void dd::Systems::LevelSystem::CreateBrick(int row, int line, glm::vec2 spacesBe
 {
     auto brick = m_World->CreateEntity();
     std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(brick);
-    std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(brick);
+    //std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(brick);
+    auto model = m_World->AddComponent<Components::Model>(brick);
     std::shared_ptr<Components::Brick> cBrick = m_World->AddComponent<Components::Brick>(brick);
     std::shared_ptr<Components::RectangleShape> cRec = m_World->AddComponent<Components::RectangleShape>(brick);
     std::shared_ptr<Components::Physics> cPhys = m_World->AddComponent<Components::Physics>(brick);
     std::string fileName = "Textures/Bricks/";
     fileName.append(std::to_string(num));
     fileName.append(".png");
-    sprite->SpriteFile =  fileName;
+    //sprite->SpriteFile =  fileName;
+    model->ModelFile = "Models/Test/Brick/Brick.obj";
     float x = spaceToEdge + line * spacesBetweenBricks.x;
     float y = spaceToEdge + row * spacesBetweenBricks.y;
-    transform->Scale = glm::vec3(1.6, 0.4, 0.);
+    transform->Scale = glm::vec3(1, 0.4, 0.2);
     transform->Position = glm::vec3(x - 7, y + 1, -10.f);
     //sprite->Color = glm::vec4(1.f, 1.f, 1.f, 1.f);
     m_World->CommitEntity(brick);