From 1d94338214ebd065186e83fa307599be88998de9 Mon Sep 17 00:00:00 2001
From: PlatinumSkink <niklas.cullberg@hotmail.com>
Date: Thu, 10 Sep 2015 21:46:03 +0200
Subject: [PATCH] Added CBall

---
 assets/Textures/{Pad.png => 2048 512 Pad.png} | Bin
 assets/Textures/AgileBreakOut - Shortcut.lnk  | Bin 0 -> 916 bytes
 include/Game/CBall.h                          |  25 ++++++++++++++++++
 include/Game/LevelSystem.h                    |   1 +
 src/game/CMakeLists.txt                       |   2 +-
 src/game/Game/LevelSystem.cpp                 |   5 +---
 6 files changed, 28 insertions(+), 5 deletions(-)
 rename assets/Textures/{Pad.png => 2048 512 Pad.png} (100%)
 create mode 100644 assets/Textures/AgileBreakOut - Shortcut.lnk
 create mode 100644 include/Game/CBall.h

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 0000000000000000000000000000000000000000..82bd0c9726c56f74f27bed38d0b1d5e46ace0880
GIT binary patch
literal 916
zcmah{T}V@57=ETUG$N0=$bQHX3+7}xNytV;+tR~g>kNh&GQ#2JI!$Nnr^_w`iztYK
z?q)2hyfM0px+%P>+Y#A6(M3ThA-fQ~5qjRUwT&+9Jv{ICeecinz3+Rz005Jvff`sc
zG=^@X84CBCt~>A6SBj?Pud{^@tF_f|(r+rqSGCh*L1*Z@R<y3Tb!GlzGrC=_xxMK1
zxg*t}+9rfP<KR#e;|hi|dMbhAXh9R!UfI<3yx4mfvGGm9q@a443HD+b8R$qML5Brr
zDtuk)#S02lJ&S=V+h$&@!gl?Ku$V>FNn`W{RB~l$+l5%QvQkcgNA(8=y;oUmpu#6y
z4z-jMKFc*3!(bhkY`YzHcvzQ?NyOnrnmURkG~|psIvAr72MEcR^#~zyme@ly66RwI
z^U}E%KCNex;2@1TMc7@$lh7yQ-gG>g)N-tQ8+!Of3_VKD7N8JhYF{`M{_T4C*@qkI
z!bY+EVP@ix3_eDnlV~N%y<1_24{nmwCfg-phUBS*%vC!4d`;b_JSsJe-MYWJ=%jtS
zL<reVVynh?(=Qj|l&HJ@WqDw7N0Xd|VFxi(8JrapnC1v$9ABDt$(9?8?7z=a&T&F&
zdwgl!e&XKSwrB6Lq<!ir`e{EX0m8hW__w`CrS-^`RSQE|#<=ju6wX)9Q+i5IWu39~
u(Sgg+DOUHi)$zr4E;#q(%E?8W`Ss{+W%kX;&$gM7{`Oz}(+~dV7ur9E)wcNn

literal 0
HcmV?d00001

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 <fstream>
 #include <iostream>
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<Components::Brick>(entity1);
+    auto ball = m_World->GetComponent<Components::Ball>(entity2);
     if (brick != NULL)
     {
         entityBrick = entity1;
-        ball = m_World->GetComponent<Components::Ball>(entity2);
         if (ball != NULL)
         {
             entityBall = entity2;