diff --git a/assets/Textures/Pad.png b/assets/Textures/2048 512 Pad.png similarity index 100% rename from assets/Textures/Pad.png rename to assets/Textures/2048 512 Pad.png diff --git a/assets/Textures/AgileBreakOut - Shortcut.lnk b/assets/Textures/AgileBreakOut - Shortcut.lnk new file mode 100644 index 0000000..82bd0c9 Binary files /dev/null and b/assets/Textures/AgileBreakOut - Shortcut.lnk differ diff --git a/include/Game/CBall.h b/include/Game/CBall.h new file mode 100644 index 0000000..ecddc4f --- /dev/null +++ b/include/Game/CBall.h @@ -0,0 +1,25 @@ +// +// Created by Administrator on 2015-09-10. +// + +#ifndef DAYDREAM_CPAD_H +#define DAYDREAM_CPAD_H + +#include "Core/Component.h" + +namespace dd +{ + +namespace Components +{ + +struct Ball : Component +{ + +}; + +} + +} + +#endif //DAYDREAM_CPAD_H diff --git a/include/Game/LevelSystem.h b/include/Game/LevelSystem.h index 09c37c9..5efa79b 100644 --- a/include/Game/LevelSystem.h +++ b/include/Game/LevelSystem.h @@ -12,6 +12,7 @@ //#include "Core/EContact.h" #include "Core/EventBroker.h" #include "Core/World.h" +#include "Game/CBall.h" #include "Game/EStageCleared.h" #include #include diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index f76976d..aece1db 100755 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -67,7 +67,7 @@ set(SOURCE_FILES ${SOURCE_FILES_Rendering} ${SOURCE_FILES_Transform} ${SOURCE_FILES_Game} - ../../include/Game/CBrick.h ../../include/Game/EStageCleared.h ../../include/Game/CPad.h Game/PadSystem.cpp ../../include/Game/PadSystem.h) +) if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") diff --git a/src/game/Game/LevelSystem.cpp b/src/game/Game/LevelSystem.cpp index 5e33379..866a72b 100644 --- a/src/game/Game/LevelSystem.cpp +++ b/src/game/Game/LevelSystem.cpp @@ -11,8 +11,6 @@ void dd::Systems::LevelSystem::Initialize() { CreateBasicLevel(tRows, tLines, tSpaceBetweenBricks, tSpaceToEdge); - - return; } @@ -81,13 +79,12 @@ bool dd::Systems::LevelSystem::OnContact(/*const dd::Events::Contact &event,*/) EntityID entityBall; EntityID entity1; EntityID entity2; - EntityID ball; auto brick = m_World->GetComponent(entity1); + auto ball = m_World->GetComponent(entity2); if (brick != NULL) { entityBrick = entity1; - ball = m_World->GetComponent(entity2); if (ball != NULL) { entityBall = entity2;