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(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(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 transform = m_World->AddComponent(brick); - std::shared_ptr sprite = m_World->AddComponent(brick); + //std::shared_ptr sprite = m_World->AddComponent(brick); + auto model = m_World->AddComponent(brick); std::shared_ptr cBrick = m_World->AddComponent(brick); std::shared_ptr cRec = m_World->AddComponent(brick); std::shared_ptr cPhys = m_World->AddComponent(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);