After merge fixes

Conflicts:
	include/Game/GUI/HUD.h
	src/game/Core/Renderer.cpp

CMakeLists.txt

@@ -15,11 +15,11 @@ else()
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fpermissive")
     if(UNIX)
         # Needed to link with debug version of bgfx on linux
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -ldl")
     endif()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 endif()
 
 set(BUILD_SHARED_LIBS FALSE)
@@ -31,7 +31,7 @@ include_directories(${PROJECT_SOURCE_DIR}/include)
 #set(GLFW_INCLUDE_DIR ${daydream_SOURCE_DIR}/libs/glfw-3.0.4/include)
 #set(GLFW_LIBRARY ${daydream_SOURCE_DIR}/libs/glfw-3.0.4/lib/Release/glfw3dll.lib)
 
-set(Boost_DEBUG ON)
+#set(Boost_DEBUG ON)
 set(Boost_USE_STATIC_LIBS on)
 add_definitions(-DBOOST_ALL_NO_LIB)
 #set(BOOST_INCLUDEDIR ${BOOST_ROOT}/boost)
@@ -40,9 +40,15 @@ set(BOOST_LIBRARYDIR $ENV{BOOST_ROOT}/lib64-msvc-12.0)
 
 #add_definitions(-DGLEW_MX)
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  ${PROJECT_SOURCE_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
+foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
+    string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} )
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} )
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} )
+endforeach(OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES)
 
 add_subdirectory(src/game)
 add_subdirectory(src/tests)

assets/Models/Brick/IceBrick.mtl

@@ -0,0 +1,12 @@
+# Blender MTL File: 'Bricks.blend'
+# Material Count: 1
+
+newmtl Material.002
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd IceBrick_Diffuse.png

assets/Models/Brick/LifeBuoyBrick.mtl

@@ -0,0 +1,12 @@
+# Blender MTL File: 'Bricks.blend'
+# Material Count: 1
+
+newmtl Material.004
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd LifebuoyTexture.png

assets/Models/Brick/StickyBrick.mtl

@@ -0,0 +1,12 @@
+# Blender MTL File: 'Bricks.blend'
+# Material Count: 1
+
+newmtl Material.004
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd StickyTexture.png

assets/Models/Brick/TurquoiseBrick.mtl

@@ -0,0 +1,12 @@
+# Blender MTL File: 'Bricks.blend'
+# Material Count: 1
+
+newmtl Material.004
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd turquoise.png

assets/Models/Brick/TurquoiseBrick.obj

@@ -0,0 +1,513 @@
+# Blender v2.75 (sub 0) OBJ File: 'Bricks.blend'
+# www.blender.org
+mtllib TurquoiseBrick.mtl
+o OriginalBrick_Cube.002
+v 0.416882 0.151013 0.189181
+v 0.383459 0.157800 0.197587
+v 0.427922 0.161606 0.161784
+v 0.383459 0.180000 0.161784
+v 0.432779 0.125616 0.202365
+v 0.383459 0.126000 0.215784
+v 0.450000 0.126000 0.161784
+v -0.416882 0.151013 0.189181
+v 0.000000 0.157800 0.197587
+v -0.383459 0.157800 0.197587
+v -0.427922 0.161606 0.161784
+v 0.000000 0.180000 0.161784
+v -0.383459 0.180000 0.161784
+v -0.432779 0.125616 0.202365
+v 0.000000 0.126000 0.215784
+v -0.383459 0.126000 0.215784
+v -0.450000 0.126000 0.161784
+v 0.427922 0.161606 0.000000
+v 0.416882 0.151013 -0.189181
+v 0.383459 0.180000 0.000000
+v 0.383459 0.157800 -0.197587
+v 0.427922 0.161606 -0.161784
+v 0.383459 0.180000 -0.161784
+v 0.450000 0.126000 0.000000
+v 0.432779 0.125616 -0.202365
+v 0.383459 0.126000 -0.215784
+v 0.450000 0.126000 -0.161784
+v 0.000000 0.180000 0.000000
+v -0.427922 0.161606 0.000000
+v -0.416882 0.151013 -0.189181
+v 0.000000 0.157800 -0.197587
+v -0.383459 0.180000 0.000000
+v -0.383459 0.157800 -0.197587
+v -0.427922 0.161606 -0.161784
+v 0.000000 0.180000 -0.161784
+v -0.383459 0.180000 -0.161784
+v -0.450000 0.126000 0.000000
+v -0.432779 0.125616 -0.202365
+v 0.000000 0.126000 -0.215784
+v -0.383459 0.126000 -0.215784
+v -0.450000 0.126000 -0.161784
+v 0.416882 -0.151013 0.189181
+v 0.383459 -0.157800 0.197587
+v 0.427922 -0.161606 0.161784
+v 0.383459 -0.180000 0.161784
+v 0.432779 -0.125616 0.202365
+v 0.383459 -0.126000 0.215784
+v 0.450000 -0.126000 0.161784
+v 0.432723 0.000000 0.202132
+v 0.383459 0.000000 0.215784
+v 0.450000 0.000000 0.161784
+v -0.416882 -0.151013 0.189181
+v 0.000000 -0.157800 0.197587
+v -0.383459 -0.157800 0.197587
+v -0.427922 -0.161606 0.161784
+v 0.000000 -0.180000 0.161784
+v -0.383459 -0.180000 0.161784
+v -0.432779 -0.125616 0.202365
+v 0.000000 -0.126000 0.215784
+v -0.383459 -0.126000 0.215784
+v -0.450000 -0.126000 0.161784
+v -0.432723 0.000000 0.202132
+v 0.000000 0.000000 0.215784
+v -0.383459 0.000000 0.215784
+v -0.450000 0.000000 0.161784
+v 0.427922 -0.161606 0.000000
+v 0.416882 -0.151013 -0.189181
+v 0.383459 -0.180000 0.000000
+v 0.383459 -0.157800 -0.197587
+v 0.427922 -0.161606 -0.161784
+v 0.383459 -0.180000 -0.161784
+v 0.450000 -0.126000 0.000000
+v 0.432779 -0.125616 -0.202365
+v 0.383459 -0.126000 -0.215784
+v 0.450000 -0.126000 -0.161784
+v 0.450000 0.000000 0.000000
+v 0.432723 0.000000 -0.202132
+v 0.383459 0.000000 -0.215784
+v 0.450000 0.000000 -0.161784
+v 0.000000 -0.180000 0.000000
+v -0.427922 -0.161606 0.000000
+v -0.416882 -0.151013 -0.189181
+v 0.000000 -0.157800 -0.197587
+v -0.383459 -0.180000 0.000000
+v -0.383459 -0.157800 -0.197587
+v -0.427922 -0.161606 -0.161784
+v 0.000000 -0.180000 -0.161784
+v -0.383459 -0.180000 -0.161784
+v -0.450000 -0.126000 0.000000
+v -0.432779 -0.125616 -0.202365
+v 0.000000 -0.126000 -0.215784
+v -0.383459 -0.126000 -0.215784
+v -0.450000 -0.126000 -0.161784
+v -0.450000 0.000000 0.000000
+v -0.432723 0.000000 -0.202132
+v 0.000000 0.000000 -0.215784
+v -0.383459 0.000000 -0.215784
+v -0.450000 0.000000 -0.161784
+vt 0.732824 0.651596
+vt 0.497063 0.656145
+vt 0.498352 0.561696
+vt 0.835737 0.544092
+vt 0.832410 0.574334
+vt 0.728776 0.549797
+vt 0.733409 0.516110
+vt 0.747921 0.523504
+vt 0.498691 0.536867
+vt 0.754013 0.503366
+vt 0.838288 0.518944
+vt 0.716137 0.523643
+vt 0.711494 0.504530
+vt 0.498984 0.515399
+vt 0.734485 0.500579
+vt 0.734742 0.443967
+vt 0.756687 0.444264
+vt 0.500002 0.440769
+vt 0.708811 0.443615
+vt 0.842574 0.445423
+vt 0.261516 0.645162
+vt 0.268342 0.543511
+vt 0.164088 0.565217
+vt 0.161584 0.534899
+vt 0.264629 0.509713
+vt 0.281689 0.517713
+vt 0.159717 0.509691
+vt 0.244381 0.496413
+vt 0.249922 0.516708
+vt 0.263977 0.494158
+vt 0.286851 0.498734
+vt 0.243317 0.437260
+vt 0.265263 0.437561
+vt 0.291193 0.437916
+vt 0.157430 0.436083
+vt 0.495722 0.754363
+vt 0.939579 0.572784
+vt 0.950008 0.538976
+vt 0.966270 0.556108
+vt 0.495366 0.780443
+vt 0.733578 0.753608
+vt 0.929866 0.518425
+vt 0.931317 0.541897
+vt 0.953950 0.520177
+vt 0.983612 0.534778
+vt 0.733699 0.802691
+vt 0.495056 0.803167
+vt 0.935351 0.446668
+vt 0.962999 0.447038
+vt 0.733787 0.881463
+vt 0.493987 0.881463
+vt 0.999906 0.447531
+vt 0.057009 0.560761
+vt 0.047501 0.526686
+vt 0.066106 0.530111
+vt 0.257977 0.747114
+vt 0.068193 0.506688
+vt 0.030782 0.543370
+vt 0.014024 0.521580
+vt 0.256516 0.796175
+vt 0.044070 0.507787
+vt 0.037002 0.434429
+vt 0.064650 0.434809
+vt 0.254277 0.874915
+vt 0.000094 0.433923
+vt 0.501652 0.319843
+vt 0.502941 0.225399
+vt 0.738475 0.236380
+vt 0.731650 0.338024
+vt 0.835884 0.316299
+vt 0.838396 0.346613
+vt 0.735366 0.371817
+vt 0.718307 0.363820
+vt 0.501313 0.344671
+vt 0.840268 0.371818
+vt 0.755614 0.385114
+vt 0.750071 0.364821
+vt 0.736021 0.387371
+vt 0.713148 0.382798
+vt 0.501020 0.366139
+vt 0.267194 0.229946
+vt 0.164293 0.337419
+vt 0.167628 0.307183
+vt 0.271241 0.331739
+vt 0.266605 0.365420
+vt 0.252095 0.358025
+vt 0.246001 0.378160
+vt 0.161736 0.362565
+vt 0.283877 0.357890
+vt 0.288517 0.377003
+vt 0.265527 0.380951
+vt 0.504282 0.127186
+vt 0.942953 0.320724
+vt 0.952471 0.354792
+vt 0.933866 0.351373
+vt 0.742013 0.134433
+vt 0.504638 0.101108
+vt 0.931787 0.374794
+vt 0.969182 0.338104
+vt 0.985946 0.359886
+vt 0.504948 0.078385
+vt 0.743473 0.085376
+vt 0.955907 0.373688
+vt 0.506017 0.000095
+vt 0.745712 0.006641
+vt 0.060470 0.308697
+vt 0.050030 0.342497
+vt 0.033776 0.325361
+vt 0.266441 0.127940
+vt 0.070165 0.363055
+vt 0.068721 0.339584
+vt 0.046081 0.361294
+vt 0.016425 0.346681
+vt 0.266320 0.078861
+vt 0.266232 0.000094
+vt 0.733646 0.779865
+vt 0.257192 0.773359
+vt 0.742798 0.108190
+vt 0.266373 0.101685
+vn 0.194900 0.980800 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 0.961700 0.273900
+vn 0.647300 0.762200 0.000000
+vn 0.178700 0.949500 0.257800
+vn 0.457300 0.661600 0.594300
+vn 0.631200 0.737600 0.239800
+vn 0.000000 0.694500 0.719500
+vn 0.939500 0.276000 0.202600
+vn 0.961700 0.274000 0.000000
+vn 0.151600 0.685100 0.712500
+vn 0.135500 0.258500 0.956400
+vn 0.000000 0.256900 0.966400
+vn 0.632300 0.305000 0.712100
+vn 0.658300 0.000000 0.752800
+vn 0.979700 0.000000 0.200600
+vn 0.000000 0.000000 1.000000
+vn 0.134200 0.000000 0.990900
+vn 1.000000 0.000000 0.000000
+vn -0.194900 0.980800 0.000000
+vn -0.178700 0.949500 0.257800
+vn -0.647300 0.762200 0.000000
+vn -0.457300 0.661600 0.594300
+vn -0.151600 0.685100 0.712500
+vn -0.961700 0.274000 0.000000
+vn -0.939500 0.276000 0.202600
+vn -0.631200 0.737600 0.239800
+vn -0.632300 0.305000 0.712100
+vn -0.135500 0.258500 0.956400
+vn -0.979700 0.000000 0.200600
+vn -0.658300 0.000000 0.752800
+vn -0.134200 0.000000 0.990900
+vn -1.000000 0.000000 0.000000
+vn 0.000000 0.961700 -0.273900
+vn 0.178700 0.949500 -0.257800
+vn 0.457300 0.661600 -0.594300
+vn 0.151600 0.685100 -0.712500
+vn 0.000000 0.694500 -0.719500
+vn 0.939500 0.276000 -0.202600
+vn 0.631200 0.737600 -0.239800
+vn 0.632300 0.305000 -0.712100
+vn 0.135500 0.258500 -0.956400
+vn 0.000000 0.256900 -0.966400
+vn 0.979700 0.000000 -0.200600
+vn 0.658300 0.000000 -0.752800
+vn 0.134200 0.000000 -0.990900
+vn 0.000000 0.000000 -1.000000
+vn -0.178700 0.949500 -0.257800
+vn -0.457300 0.661600 -0.594300
+vn -0.631200 0.737600 -0.239800
+vn -0.939500 0.276000 -0.202600
+vn -0.151600 0.685100 -0.712500
+vn -0.135500 0.258500 -0.956400
+vn -0.632300 0.305000 -0.712100
+vn -0.658300 0.000000 -0.752800
+vn -0.979700 0.000000 -0.200600
+vn -0.134200 0.000000 -0.990900
+vn 0.000000 -0.961700 0.273900
+vn 0.000000 -1.000000 0.000000
+vn 0.194900 -0.980800 0.000000
+vn 0.178700 -0.949500 0.257800
+vn 0.647300 -0.762200 0.000000
+vn 0.457300 -0.661600 0.594300
+vn 0.151600 -0.685100 0.712500
+vn 0.000000 -0.694500 0.719500
+vn 0.961700 -0.274000 0.000000
+vn 0.939500 -0.276000 0.202600
+vn 0.631200 -0.737600 0.239800
+vn 0.632300 -0.305000 0.712100
+vn 0.135500 -0.258500 0.956400
+vn 0.000000 -0.256900 0.966400
+vn -0.194900 -0.980800 0.000000
+vn -0.647300 -0.762200 0.000000
+vn -0.178700 -0.949500 0.257800
+vn -0.457300 -0.661600 0.594300
+vn -0.631200 -0.737600 0.239800
+vn -0.939500 -0.276000 0.202600
+vn -0.961700 -0.274000 0.000000
+vn -0.151600 -0.685100 0.712500
+vn -0.135500 -0.258500 0.956400
+vn -0.632300 -0.305000 0.712100
+vn 0.000000 -0.961700 -0.273900
+vn 0.178700 -0.949500 -0.257800
+vn 0.457300 -0.661600 -0.594300
+vn 0.631200 -0.737600 -0.239800
+vn 0.000000 -0.694500 -0.719500
+vn 0.939500 -0.276000 -0.202600
+vn 0.151600 -0.685100 -0.712500
+vn 0.135500 -0.258500 -0.956400
+vn 0.000000 -0.256900 -0.966400
+vn 0.632300 -0.305000 -0.712100
+vn -0.178700 -0.949500 -0.257800
+vn -0.457300 -0.661600 -0.594300
+vn -0.151600 -0.685100 -0.712500
+vn -0.939500 -0.276000 -0.202600
+vn -0.631200 -0.737600 -0.239800
+vn -0.632300 -0.305000 -0.712100
+vn -0.135500 -0.258500 -0.956400
+usemtl Material.004
+s 1
+f 20/1/1 28/2/2 12/3/3
+f 18/4/4 20/5/1 4/6/5
+f 1/7/6 3/8/7 4/6/5
+f 4/6/5 12/3/3 9/9/8
+f 3/8/7 7/10/9 24/11/10
+f 1/7/6 2/12/11 6/13/12
+f 9/9/8 15/14/13 6/13/12
+f 1/7/6 5/15/14 7/10/9
+f 5/15/14 49/16/15 51/17/16
+f 15/14/13 63/18/17 50/19/18
+f 5/15/14 6/13/12 50/19/18
+f 7/10/9 51/17/16 76/20/19
+f 12/3/3 28/2/2 32/21/20
+f 13/22/21 32/23/20 29/24/22
+f 8/25/23 10/26/24 13/22/21
+f 9/9/8 12/3/3 13/22/21
+f 37/27/25 17/28/26 11/29/27
+f 8/25/23 14/30/28 16/31/29
+f 16/31/29 15/14/13 9/9/8
+f 17/28/26 14/30/28 8/25/23
+f 65/32/30 62/33/31 14/30/28
+f 64/34/32 63/18/17 15/14/13
+f 14/30/28 62/33/31 64/34/32
+f 94/35/33 65/32/30 17/28/26
+f 35/36/34 28/2/2 20/1/1
+f 23/37/35 20/5/1 18/4/4
+f 19/38/36 21/39/37 23/37/35
+f 31/40/38 35/36/34 23/41/35
+f 24/11/10 27/42/39 22/43/40
+f 19/38/36 25/44/41 26/45/42
+f 26/46/42 39/47/43 31/40/38
+f 27/42/39 25/44/41 19/38/36
+f 79/48/44 77/49/45 25/44/41
+f 78/50/46 96/51/47 39/47/43
+f 25/44/41 77/49/45 78/52/46
+f 76/20/19 79/48/44 27/42/39
+f 32/21/20 28/2/2 35/36/34
+f 29/24/22 32/23/20 36/53/48
+f 30/54/49 34/55/50 36/53/48
+f 36/56/48 35/36/34 31/40/38
+f 34/55/50 41/57/51 37/27/25
+f 30/54/49 33/58/52 40/59/53
+f 31/40/38 39/47/43 40/60/53
+f 30/54/49 38/61/54 41/57/51
+f 38/61/54 95/62/55 98/63/56
+f 39/47/43 96/51/47 97/64/57
+f 38/61/54 40/59/53 97/65/57
+f 41/57/51 98/63/56 94/35/33
+f 56/66/58 80/67/59 68/68/60
+f 45/69/61 68/70/60 66/71/62
+f 42/72/63 43/73/64 45/69/61
+f 53/74/65 56/66/58 45/69/61
+f 72/75/66 48/76/67 44/77/68
+f 42/72/63 46/78/69 47/79/70
+f 47/79/70 59/80/71 53/74/65
+f 48/76/67 46/78/69 42/72/63
+f 51/17/16 49/16/15 46/78/69
+f 50/19/18 63/18/17 59/80/71
+f 46/78/69 49/16/15 50/19/18
+f 76/20/19 51/17/16 48/76/67
+f 84/81/72 80/67/59 56/66/58
+f 81/82/73 84/83/72 57/84/74
+f 52/85/75 55/86/76 57/84/74
+f 57/84/74 56/66/58 53/74/65
+f 55/86/76 61/87/77 89/88/78
+f 52/85/75 54/89/79 60/90/80
+f 53/74/65 59/80/71 60/90/80
+f 52/85/75 58/91/81 61/87/77
+f 58/91/81 62/33/31 65/32/30
+f 59/80/71 63/18/17 64/34/32
+f 58/91/81 60/90/80 64/34/32
+f 61/87/77 65/32/30 94/35/33
+f 68/68/60 80/67/59 87/92/82
+f 66/71/62 68/70/60 71/93/83
+f 67/94/84 70/95/85 71/93/83
+f 71/96/83 87/92/82 83/97/86
+f 70/95/85 75/98/87 72/75/66
+f 67/94/84 69/99/88 74/100/89
+f 83/97/86 91/101/90 74/102/89
+f 67/94/84 73/103/91 75/98/87
+f 73/103/91 77/49/45 79/48/44
+f 91/101/90 96/104/47 78/105/46
+f 73/103/91 74/100/89 78/52/46
+f 75/98/87 79/48/44 76/20/19
+f 87/92/82 80/67/59 84/81/72
+f 88/106/92 84/83/72 81/82/73
+f 82/107/93 85/108/94 88/106/92
+f 83/97/86 87/92/82 88/109/92
+f 89/88/78 93/110/95 86/111/96
+f 82/107/93 90/112/97 92/113/98
+f 92/114/98 91/101/90 83/97/86
+f 93/110/95 90/112/97 82/107/93
+f 98/63/56 95/62/55 90/112/97
+f 97/115/57 96/104/47 91/101/90
+f 90/112/97 95/62/55 97/65/57
+f 94/35/33 98/63/56 93/110/95
+f 4/6/5 20/1/1 12/3/3
+f 3/8/7 18/4/4 4/6/5
+f 2/12/11 1/7/6 4/6/5
+f 2/12/11 4/6/5 9/9/8
+f 18/4/4 3/8/7 24/11/10
+f 5/15/14 1/7/6 6/13/12
+f 2/12/11 9/9/8 6/13/12
+f 3/8/7 1/7/6 7/10/9
+f 7/10/9 5/15/14 51/17/16
+f 6/13/12 15/14/13 50/19/18
+f 49/16/15 5/15/14 50/19/18
+f 24/11/10 7/10/9 76/20/19
+f 13/22/21 12/3/3 32/21/20
+f 11/29/27 13/22/21 29/24/22
+f 11/29/27 8/25/23 13/22/21
+f 10/26/24 9/9/8 13/22/21
+f 29/24/22 37/27/25 11/29/27
+f 10/26/24 8/25/23 16/31/29
+f 10/26/24 16/31/29 9/9/8
+f 11/29/27 17/28/26 8/25/23
+f 17/28/26 65/32/30 14/30/28
+f 16/31/29 64/34/32 15/14/13
+f 16/31/29 14/30/28 64/34/32
+f 37/27/25 94/35/33 17/28/26
+f 23/41/35 35/36/34 20/1/1
+f 22/43/40 23/37/35 18/4/4
+f 22/43/40 19/38/36 23/37/35
+f 21/116/37 31/40/38 23/41/35
+f 18/4/4 24/11/10 22/43/40
+f 21/39/37 19/38/36 26/45/42
+f 21/116/37 26/46/42 31/40/38
+f 22/43/40 27/42/39 19/38/36
+f 27/42/39 79/48/44 25/44/41
+f 26/46/42 78/50/46 39/47/43
+f 26/45/42 25/44/41 78/52/46
+f 24/11/10 76/20/19 27/42/39
+f 36/56/48 32/21/20 35/36/34
+f 34/55/50 29/24/22 36/53/48
+f 33/58/52 30/54/49 36/53/48
+f 33/117/52 36/56/48 31/40/38
+f 29/24/22 34/55/50 37/27/25
+f 38/61/54 30/54/49 40/59/53
+f 33/117/52 31/40/38 40/60/53
+f 34/55/50 30/54/49 41/57/51
+f 41/57/51 38/61/54 98/63/56
+f 40/60/53 39/47/43 97/64/57
+f 95/62/55 38/61/54 97/65/57
+f 37/27/25 41/57/51 94/35/33
+f 45/69/61 56/66/58 68/68/60
+f 44/77/68 45/69/61 66/71/62
+f 44/77/68 42/72/63 45/69/61
+f 43/73/64 53/74/65 45/69/61
+f 66/71/62 72/75/66 44/77/68
+f 43/73/64 42/72/63 47/79/70
+f 43/73/64 47/79/70 53/74/65
+f 44/77/68 48/76/67 42/72/63
+f 48/76/67 51/17/16 46/78/69
+f 47/79/70 50/19/18 59/80/71
+f 47/79/70 46/78/69 50/19/18
+f 72/75/66 76/20/19 48/76/67
+f 57/84/74 84/81/72 56/66/58
+f 55/86/76 81/82/73 57/84/74
+f 54/89/79 52/85/75 57/84/74
+f 54/89/79 57/84/74 53/74/65
+f 81/82/73 55/86/76 89/88/78
+f 58/91/81 52/85/75 60/90/80
+f 54/89/79 53/74/65 60/90/80
+f 55/86/76 52/85/75 61/87/77
+f 61/87/77 58/91/81 65/32/30
+f 60/90/80 59/80/71 64/34/32
+f 62/33/31 58/91/81 64/34/32
+f 89/88/78 61/87/77 94/35/33
+f 71/96/83 68/68/60 87/92/82
+f 70/95/85 66/71/62 71/93/83
+f 69/99/88 67/94/84 71/93/83
+f 69/118/88 71/96/83 83/97/86
+f 66/71/62 70/95/85 72/75/66
+f 73/103/91 67/94/84 74/100/89
+f 69/118/88 83/97/86 74/102/89
+f 70/95/85 67/94/84 75/98/87
+f 75/98/87 73/103/91 79/48/44
+f 74/102/89 91/101/90 78/105/46
+f 77/49/45 73/103/91 78/52/46
+f 72/75/66 75/98/87 76/20/19
+f 88/109/92 87/92/82 84/81/72
+f 86/111/96 88/106/92 81/82/73
+f 86/111/96 82/107/93 88/106/92
+f 85/119/94 83/97/86 88/109/92
+f 81/82/73 89/88/78 86/111/96
+f 85/108/94 82/107/93 92/113/98
+f 85/119/94 92/114/98 83/97/86
+f 86/111/96 93/110/95 82/107/93
+f 93/110/95 98/63/56 90/112/97
+f 92/114/98 97/115/57 91/101/90
+f 92/113/98 90/112/97 97/65/57
+f 89/88/78 94/35/33 93/110/95

assets/Models/Brick/WhiteBrick.mtl

@@ -0,0 +1,12 @@
+# Blender MTL File: 'Bricks.blend'
+# Material Count: 1
+
+newmtl Material.004
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd White.png

assets/Models/Brick/WhiteBrick.obj

@@ -0,0 +1,513 @@
+# Blender v2.75 (sub 0) OBJ File: 'Bricks.blend'
+# www.blender.org
+mtllib WhiteBrick.mtl
+o OriginalBrick.001_Cube.003
+v 0.416882 0.151013 0.189181
+v 0.383459 0.157800 0.197587
+v 0.427922 0.161606 0.161784
+v 0.383459 0.180000 0.161784
+v 0.432779 0.125616 0.202365
+v 0.383459 0.126000 0.215784
+v 0.450000 0.126000 0.161784
+v -0.416882 0.151013 0.189181
+v 0.000000 0.157800 0.197587
+v -0.383459 0.157800 0.197587
+v -0.427922 0.161606 0.161784
+v 0.000000 0.180000 0.161784
+v -0.383459 0.180000 0.161784
+v -0.432779 0.125616 0.202365
+v 0.000000 0.126000 0.215784
+v -0.383459 0.126000 0.215784
+v -0.450000 0.126000 0.161784
+v 0.427922 0.161606 0.000000
+v 0.416882 0.151013 -0.189181
+v 0.383459 0.180000 0.000000
+v 0.383459 0.157800 -0.197587
+v 0.427922 0.161606 -0.161784
+v 0.383459 0.180000 -0.161784
+v 0.450000 0.126000 0.000000
+v 0.432779 0.125616 -0.202365
+v 0.383459 0.126000 -0.215784
+v 0.450000 0.126000 -0.161784
+v 0.000000 0.180000 0.000000
+v -0.427922 0.161606 0.000000
+v -0.416882 0.151013 -0.189181
+v 0.000000 0.157800 -0.197587
+v -0.383459 0.180000 0.000000
+v -0.383459 0.157800 -0.197587
+v -0.427922 0.161606 -0.161784
+v 0.000000 0.180000 -0.161784
+v -0.383459 0.180000 -0.161784
+v -0.450000 0.126000 0.000000
+v -0.432779 0.125616 -0.202365
+v 0.000000 0.126000 -0.215784
+v -0.383459 0.126000 -0.215784
+v -0.450000 0.126000 -0.161784
+v 0.416882 -0.151013 0.189181
+v 0.383459 -0.157800 0.197587
+v 0.427922 -0.161606 0.161784
+v 0.383459 -0.180000 0.161784
+v 0.432779 -0.125616 0.202365
+v 0.383459 -0.126000 0.215784
+v 0.450000 -0.126000 0.161784
+v 0.432723 0.000000 0.202132
+v 0.383459 0.000000 0.215784
+v 0.450000 0.000000 0.161784
+v -0.416882 -0.151013 0.189181
+v 0.000000 -0.157800 0.197587
+v -0.383459 -0.157800 0.197587
+v -0.427922 -0.161606 0.161784
+v 0.000000 -0.180000 0.161784
+v -0.383459 -0.180000 0.161784
+v -0.432779 -0.125616 0.202365
+v 0.000000 -0.126000 0.215784
+v -0.383459 -0.126000 0.215784
+v -0.450000 -0.126000 0.161784
+v -0.432723 0.000000 0.202132
+v 0.000000 0.000000 0.215784
+v -0.383459 0.000000 0.215784
+v -0.450000 0.000000 0.161784
+v 0.427922 -0.161606 0.000000
+v 0.416882 -0.151013 -0.189181
+v 0.383459 -0.180000 0.000000
+v 0.383459 -0.157800 -0.197587
+v 0.427922 -0.161606 -0.161784
+v 0.383459 -0.180000 -0.161784
+v 0.450000 -0.126000 0.000000
+v 0.432779 -0.125616 -0.202365
+v 0.383459 -0.126000 -0.215784
+v 0.450000 -0.126000 -0.161784
+v 0.450000 0.000000 0.000000
+v 0.432723 0.000000 -0.202132
+v 0.383459 0.000000 -0.215784
+v 0.450000 0.000000 -0.161784
+v 0.000000 -0.180000 0.000000
+v -0.427922 -0.161606 0.000000
+v -0.416882 -0.151013 -0.189181
+v 0.000000 -0.157800 -0.197587
+v -0.383459 -0.180000 0.000000
+v -0.383459 -0.157800 -0.197587
+v -0.427922 -0.161606 -0.161784
+v 0.000000 -0.180000 -0.161784
+v -0.383459 -0.180000 -0.161784
+v -0.450000 -0.126000 0.000000
+v -0.432779 -0.125616 -0.202365
+v 0.000000 -0.126000 -0.215784
+v -0.383459 -0.126000 -0.215784
+v -0.450000 -0.126000 -0.161784
+v -0.450000 0.000000 0.000000
+v -0.432723 0.000000 -0.202132
+v 0.000000 0.000000 -0.215784
+v -0.383459 0.000000 -0.215784
+v -0.450000 0.000000 -0.161784
+vt 0.732824 0.651596
+vt 0.497063 0.656145
+vt 0.498352 0.561696
+vt 0.835737 0.544092
+vt 0.832410 0.574334
+vt 0.728776 0.549797
+vt 0.733409 0.516110
+vt 0.747921 0.523504
+vt 0.498691 0.536867
+vt 0.754013 0.503366
+vt 0.838288 0.518944
+vt 0.716137 0.523643
+vt 0.711494 0.504530
+vt 0.498984 0.515399
+vt 0.734485 0.500579
+vt 0.734742 0.443967
+vt 0.756687 0.444264
+vt 0.500002 0.440769
+vt 0.708811 0.443615
+vt 0.842574 0.445423
+vt 0.261516 0.645162
+vt 0.268342 0.543511
+vt 0.164088 0.565217
+vt 0.161584 0.534899
+vt 0.264629 0.509713
+vt 0.281689 0.517713
+vt 0.159717 0.509691
+vt 0.244381 0.496413
+vt 0.249922 0.516708
+vt 0.263977 0.494158
+vt 0.286851 0.498734
+vt 0.243317 0.437260
+vt 0.265263 0.437561
+vt 0.291193 0.437916
+vt 0.157430 0.436083
+vt 0.495722 0.754363
+vt 0.939579 0.572784
+vt 0.950008 0.538976
+vt 0.966270 0.556108
+vt 0.495366 0.780443
+vt 0.733578 0.753608
+vt 0.929866 0.518425
+vt 0.931317 0.541897
+vt 0.953950 0.520177
+vt 0.983612 0.534778
+vt 0.733699 0.802691
+vt 0.495056 0.803167
+vt 0.935351 0.446668
+vt 0.962999 0.447038
+vt 0.733787 0.881463
+vt 0.493987 0.881463
+vt 0.999906 0.447531
+vt 0.057009 0.560761
+vt 0.047501 0.526686
+vt 0.066106 0.530111
+vt 0.257977 0.747114
+vt 0.068193 0.506688
+vt 0.030782 0.543370
+vt 0.014024 0.521580
+vt 0.256516 0.796175
+vt 0.044070 0.507787
+vt 0.037002 0.434429
+vt 0.064650 0.434809
+vt 0.254277 0.874915
+vt 0.000094 0.433923
+vt 0.501652 0.319843
+vt 0.502941 0.225399
+vt 0.738475 0.236380
+vt 0.731650 0.338024
+vt 0.835884 0.316299
+vt 0.838396 0.346613
+vt 0.735366 0.371817
+vt 0.718307 0.363820
+vt 0.501313 0.344671
+vt 0.840268 0.371818
+vt 0.755614 0.385114
+vt 0.750071 0.364821
+vt 0.736021 0.387371
+vt 0.713148 0.382798
+vt 0.501020 0.366139
+vt 0.267194 0.229946
+vt 0.164293 0.337419
+vt 0.167628 0.307183
+vt 0.271241 0.331739
+vt 0.266605 0.365420
+vt 0.252095 0.358025
+vt 0.246001 0.378160
+vt 0.161736 0.362565
+vt 0.283877 0.357890
+vt 0.288517 0.377003
+vt 0.265527 0.380951
+vt 0.504282 0.127186
+vt 0.942953 0.320724
+vt 0.952471 0.354792
+vt 0.933866 0.351373
+vt 0.742013 0.134433
+vt 0.504638 0.101108
+vt 0.931787 0.374794
+vt 0.969182 0.338104
+vt 0.985946 0.359886
+vt 0.504948 0.078385
+vt 0.743473 0.085376
+vt 0.955907 0.373688
+vt 0.506017 0.000095
+vt 0.745712 0.006641
+vt 0.060470 0.308697
+vt 0.050030 0.342497
+vt 0.033776 0.325361
+vt 0.266441 0.127940
+vt 0.070165 0.363055
+vt 0.068721 0.339584
+vt 0.046081 0.361294
+vt 0.016425 0.346681
+vt 0.266320 0.078861
+vt 0.266232 0.000094
+vt 0.733646 0.779865
+vt 0.257192 0.773359
+vt 0.742798 0.108190
+vt 0.266373 0.101685
+vn 0.194900 0.980800 0.000000
+vn 0.000000 1.000000 0.000000
+vn 0.000000 0.961700 0.273900
+vn 0.647300 0.762200 0.000000
+vn 0.178700 0.949500 0.257800
+vn 0.457300 0.661600 0.594300
+vn 0.631200 0.737600 0.239800
+vn 0.000000 0.694500 0.719500
+vn 0.939500 0.276000 0.202600
+vn 0.961700 0.274000 0.000000
+vn 0.151600 0.685100 0.712500
+vn 0.135500 0.258500 0.956400
+vn 0.000000 0.256900 0.966400
+vn 0.632300 0.305000 0.712100
+vn 0.658300 0.000000 0.752800
+vn 0.979700 0.000000 0.200600
+vn 0.000000 0.000000 1.000000
+vn 0.134200 0.000000 0.990900
+vn 1.000000 0.000000 0.000000
+vn -0.194900 0.980800 0.000000
+vn -0.178700 0.949500 0.257800
+vn -0.647300 0.762200 0.000000
+vn -0.457300 0.661600 0.594300
+vn -0.151600 0.685100 0.712500
+vn -0.961700 0.274000 0.000000
+vn -0.939500 0.276000 0.202600
+vn -0.631200 0.737600 0.239800
+vn -0.632300 0.305000 0.712100
+vn -0.135500 0.258500 0.956400
+vn -0.979700 0.000000 0.200600
+vn -0.658300 0.000000 0.752800
+vn -0.134200 0.000000 0.990900
+vn -1.000000 0.000000 0.000000
+vn 0.000000 0.961700 -0.273900
+vn 0.178700 0.949500 -0.257800
+vn 0.457300 0.661600 -0.594300
+vn 0.151600 0.685100 -0.712500
+vn 0.000000 0.694500 -0.719500
+vn 0.939500 0.276000 -0.202600
+vn 0.631200 0.737600 -0.239800
+vn 0.632300 0.305000 -0.712100
+vn 0.135500 0.258500 -0.956400
+vn 0.000000 0.256900 -0.966400
+vn 0.979700 0.000000 -0.200600
+vn 0.658300 0.000000 -0.752800
+vn 0.134200 0.000000 -0.990900
+vn 0.000000 0.000000 -1.000000
+vn -0.178700 0.949500 -0.257800
+vn -0.457300 0.661600 -0.594300
+vn -0.631200 0.737600 -0.239800
+vn -0.939500 0.276000 -0.202600
+vn -0.151600 0.685100 -0.712500
+vn -0.135500 0.258500 -0.956400
+vn -0.632300 0.305000 -0.712100
+vn -0.658300 0.000000 -0.752800
+vn -0.979700 0.000000 -0.200600
+vn -0.134200 0.000000 -0.990900
+vn 0.000000 -0.961700 0.273900
+vn 0.000000 -1.000000 0.000000
+vn 0.194900 -0.980800 0.000000
+vn 0.178700 -0.949500 0.257800
+vn 0.647300 -0.762200 0.000000
+vn 0.457300 -0.661600 0.594300
+vn 0.151600 -0.685100 0.712500
+vn 0.000000 -0.694500 0.719500
+vn 0.961700 -0.274000 0.000000
+vn 0.939500 -0.276000 0.202600
+vn 0.631200 -0.737600 0.239800
+vn 0.632300 -0.305000 0.712100
+vn 0.135500 -0.258500 0.956400
+vn 0.000000 -0.256900 0.966400
+vn -0.194900 -0.980800 0.000000
+vn -0.647300 -0.762200 0.000000
+vn -0.178700 -0.949500 0.257800
+vn -0.457300 -0.661600 0.594300
+vn -0.631200 -0.737600 0.239800
+vn -0.939500 -0.276000 0.202600
+vn -0.961700 -0.274000 0.000000
+vn -0.151600 -0.685100 0.712500
+vn -0.135500 -0.258500 0.956400
+vn -0.632300 -0.305000 0.712100
+vn 0.000000 -0.961700 -0.273900
+vn 0.178700 -0.949500 -0.257800
+vn 0.457300 -0.661600 -0.594300
+vn 0.631200 -0.737600 -0.239800
+vn 0.000000 -0.694500 -0.719500
+vn 0.939500 -0.276000 -0.202600
+vn 0.151600 -0.685100 -0.712500
+vn 0.135500 -0.258500 -0.956400
+vn 0.000000 -0.256900 -0.966400
+vn 0.632300 -0.305000 -0.712100
+vn -0.178700 -0.949500 -0.257800
+vn -0.457300 -0.661600 -0.594300
+vn -0.151600 -0.685100 -0.712500
+vn -0.939500 -0.276000 -0.202600
+vn -0.631200 -0.737600 -0.239800
+vn -0.632300 -0.305000 -0.712100
+vn -0.135500 -0.258500 -0.956400
+usemtl Material.004
+s 1
+f 20/1/1 28/2/2 12/3/3
+f 18/4/4 20/5/1 4/6/5
+f 1/7/6 3/8/7 4/6/5
+f 4/6/5 12/3/3 9/9/8
+f 3/8/7 7/10/9 24/11/10
+f 1/7/6 2/12/11 6/13/12
+f 9/9/8 15/14/13 6/13/12
+f 1/7/6 5/15/14 7/10/9
+f 5/15/14 49/16/15 51/17/16
+f 15/14/13 63/18/17 50/19/18
+f 5/15/14 6/13/12 50/19/18
+f 7/10/9 51/17/16 76/20/19
+f 12/3/3 28/2/2 32/21/20
+f 13/22/21 32/23/20 29/24/22
+f 8/25/23 10/26/24 13/22/21
+f 9/9/8 12/3/3 13/22/21
+f 37/27/25 17/28/26 11/29/27
+f 8/25/23 14/30/28 16/31/29
+f 16/31/29 15/14/13 9/9/8
+f 17/28/26 14/30/28 8/25/23
+f 65/32/30 62/33/31 14/30/28
+f 64/34/32 63/18/17 15/14/13
+f 14/30/28 62/33/31 64/34/32
+f 94/35/33 65/32/30 17/28/26
+f 35/36/34 28/2/2 20/1/1
+f 23/37/35 20/5/1 18/4/4
+f 19/38/36 21/39/37 23/37/35
+f 31/40/38 35/36/34 23/41/35
+f 24/11/10 27/42/39 22/43/40
+f 19/38/36 25/44/41 26/45/42
+f 26/46/42 39/47/43 31/40/38
+f 27/42/39 25/44/41 19/38/36
+f 79/48/44 77/49/45 25/44/41
+f 78/50/46 96/51/47 39/47/43
+f 25/44/41 77/49/45 78/52/46
+f 76/20/19 79/48/44 27/42/39
+f 32/21/20 28/2/2 35/36/34
+f 29/24/22 32/23/20 36/53/48
+f 30/54/49 34/55/50 36/53/48
+f 36/56/48 35/36/34 31/40/38
+f 34/55/50 41/57/51 37/27/25
+f 30/54/49 33/58/52 40/59/53
+f 31/40/38 39/47/43 40/60/53
+f 30/54/49 38/61/54 41/57/51
+f 38/61/54 95/62/55 98/63/56
+f 39/47/43 96/51/47 97/64/57
+f 38/61/54 40/59/53 97/65/57
+f 41/57/51 98/63/56 94/35/33
+f 56/66/58 80/67/59 68/68/60
+f 45/69/61 68/70/60 66/71/62
+f 42/72/63 43/73/64 45/69/61
+f 53/74/65 56/66/58 45/69/61
+f 72/75/66 48/76/67 44/77/68
+f 42/72/63 46/78/69 47/79/70
+f 47/79/70 59/80/71 53/74/65
+f 48/76/67 46/78/69 42/72/63
+f 51/17/16 49/16/15 46/78/69
+f 50/19/18 63/18/17 59/80/71
+f 46/78/69 49/16/15 50/19/18
+f 76/20/19 51/17/16 48/76/67
+f 84/81/72 80/67/59 56/66/58
+f 81/82/73 84/83/72 57/84/74
+f 52/85/75 55/86/76 57/84/74
+f 57/84/74 56/66/58 53/74/65
+f 55/86/76 61/87/77 89/88/78
+f 52/85/75 54/89/79 60/90/80
+f 53/74/65 59/80/71 60/90/80
+f 52/85/75 58/91/81 61/87/77
+f 58/91/81 62/33/31 65/32/30
+f 59/80/71 63/18/17 64/34/32
+f 58/91/81 60/90/80 64/34/32
+f 61/87/77 65/32/30 94/35/33
+f 68/68/60 80/67/59 87/92/82
+f 66/71/62 68/70/60 71/93/83
+f 67/94/84 70/95/85 71/93/83
+f 71/96/83 87/92/82 83/97/86
+f 70/95/85 75/98/87 72/75/66
+f 67/94/84 69/99/88 74/100/89
+f 83/97/86 91/101/90 74/102/89
+f 67/94/84 73/103/91 75/98/87
+f 73/103/91 77/49/45 79/48/44
+f 91/101/90 96/104/47 78/105/46
+f 73/103/91 74/100/89 78/52/46
+f 75/98/87 79/48/44 76/20/19
+f 87/92/82 80/67/59 84/81/72
+f 88/106/92 84/83/72 81/82/73
+f 82/107/93 85/108/94 88/106/92
+f 83/97/86 87/92/82 88/109/92
+f 89/88/78 93/110/95 86/111/96
+f 82/107/93 90/112/97 92/113/98
+f 92/114/98 91/101/90 83/97/86
+f 93/110/95 90/112/97 82/107/93
+f 98/63/56 95/62/55 90/112/97
+f 97/115/57 96/104/47 91/101/90
+f 90/112/97 95/62/55 97/65/57
+f 94/35/33 98/63/56 93/110/95
+f 4/6/5 20/1/1 12/3/3
+f 3/8/7 18/4/4 4/6/5
+f 2/12/11 1/7/6 4/6/5
+f 2/12/11 4/6/5 9/9/8
+f 18/4/4 3/8/7 24/11/10
+f 5/15/14 1/7/6 6/13/12
+f 2/12/11 9/9/8 6/13/12
+f 3/8/7 1/7/6 7/10/9
+f 7/10/9 5/15/14 51/17/16
+f 6/13/12 15/14/13 50/19/18
+f 49/16/15 5/15/14 50/19/18
+f 24/11/10 7/10/9 76/20/19
+f 13/22/21 12/3/3 32/21/20
+f 11/29/27 13/22/21 29/24/22
+f 11/29/27 8/25/23 13/22/21
+f 10/26/24 9/9/8 13/22/21
+f 29/24/22 37/27/25 11/29/27
+f 10/26/24 8/25/23 16/31/29
+f 10/26/24 16/31/29 9/9/8
+f 11/29/27 17/28/26 8/25/23
+f 17/28/26 65/32/30 14/30/28
+f 16/31/29 64/34/32 15/14/13
+f 16/31/29 14/30/28 64/34/32
+f 37/27/25 94/35/33 17/28/26
+f 23/41/35 35/36/34 20/1/1
+f 22/43/40 23/37/35 18/4/4
+f 22/43/40 19/38/36 23/37/35
+f 21/116/37 31/40/38 23/41/35
+f 18/4/4 24/11/10 22/43/40
+f 21/39/37 19/38/36 26/45/42
+f 21/116/37 26/46/42 31/40/38
+f 22/43/40 27/42/39 19/38/36
+f 27/42/39 79/48/44 25/44/41
+f 26/46/42 78/50/46 39/47/43
+f 26/45/42 25/44/41 78/52/46
+f 24/11/10 76/20/19 27/42/39
+f 36/56/48 32/21/20 35/36/34
+f 34/55/50 29/24/22 36/53/48
+f 33/58/52 30/54/49 36/53/48
+f 33/117/52 36/56/48 31/40/38
+f 29/24/22 34/55/50 37/27/25
+f 38/61/54 30/54/49 40/59/53
+f 33/117/52 31/40/38 40/60/53
+f 34/55/50 30/54/49 41/57/51
+f 41/57/51 38/61/54 98/63/56
+f 40/60/53 39/47/43 97/64/57
+f 95/62/55 38/61/54 97/65/57
+f 37/27/25 41/57/51 94/35/33
+f 45/69/61 56/66/58 68/68/60
+f 44/77/68 45/69/61 66/71/62
+f 44/77/68 42/72/63 45/69/61
+f 43/73/64 53/74/65 45/69/61
+f 66/71/62 72/75/66 44/77/68
+f 43/73/64 42/72/63 47/79/70
+f 43/73/64 47/79/70 53/74/65
+f 44/77/68 48/76/67 42/72/63
+f 48/76/67 51/17/16 46/78/69
+f 47/79/70 50/19/18 59/80/71
+f 47/79/70 46/78/69 50/19/18
+f 72/75/66 76/20/19 48/76/67
+f 57/84/74 84/81/72 56/66/58
+f 55/86/76 81/82/73 57/84/74
+f 54/89/79 52/85/75 57/84/74
+f 54/89/79 57/84/74 53/74/65
+f 81/82/73 55/86/76 89/88/78
+f 58/91/81 52/85/75 60/90/80
+f 54/89/79 53/74/65 60/90/80
+f 55/86/76 52/85/75 61/87/77
+f 61/87/77 58/91/81 65/32/30
+f 60/90/80 59/80/71 64/34/32
+f 62/33/31 58/91/81 64/34/32
+f 89/88/78 61/87/77 94/35/33
+f 71/96/83 68/68/60 87/92/82
+f 70/95/85 66/71/62 71/93/83
+f 69/99/88 67/94/84 71/93/83
+f 69/118/88 71/96/83 83/97/86
+f 66/71/62 70/95/85 72/75/66
+f 73/103/91 67/94/84 74/100/89
+f 69/118/88 83/97/86 74/102/89
+f 70/95/85 67/94/84 75/98/87
+f 75/98/87 73/103/91 79/48/44
+f 74/102/89 91/101/90 78/105/46
+f 77/49/45 73/103/91 78/52/46
+f 72/75/66 75/98/87 76/20/19
+f 88/109/92 87/92/82 84/81/72
+f 86/111/96 88/106/92 81/82/73
+f 86/111/96 82/107/93 88/106/92
+f 85/119/94 83/97/86 88/109/92
+f 81/82/73 89/88/78 86/111/96
+f 85/108/94 82/107/93 92/113/98
+f 85/119/94 92/114/98 83/97/86
+f 86/111/96 93/110/95 82/107/93
+f 93/110/95 98/63/56 90/112/97
+f 92/114/98 97/115/57 91/101/90
+f 92/113/98 90/112/97 97/65/57
+f 89/88/78 94/35/33 93/110/95

assets/Models/LifeBuoy/Lifebuoy1.mtl

@@ -0,0 +1,12 @@
+# Blender MTL File: 'Lifebuoy.blend'
+# Material Count: 1
+
+newmtl Material.001
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd LifebuoyTexture1.png

assets/Models/LifeBuoy/Lifebuoy2.mtl

@@ -0,0 +1,12 @@
+# Blender MTL File: 'Lifebuoy.blend'
+# Material Count: 1
+
+newmtl Material.001
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd LifebuoyTexture2.png

assets/Models/LifeBuoy/Lifebuoy3.mtl

@@ -0,0 +1,12 @@
+# Blender MTL File: 'Lifebuoy.blend'
+# Material Count: 1
+
+newmtl Material.001
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd LifebuoyTexture3.png

assets/Models/LifeBuoy/Lifebuoy4.mtl

@@ -0,0 +1,12 @@
+# Blender MTL File: 'Lifebuoy.blend'
+# Material Count: 1
+
+newmtl Material.001
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd LifebuoyTexture4.png

assets/Models/LifeBuoy/Lifebuoy5.mtl

@@ -0,0 +1,12 @@
+# Blender MTL File: 'Lifebuoy.blend'
+# Material Count: 1
+
+newmtl Material.001
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd LifebuoyTexture5.png

assets/Models/Ship/Ship.mtl

@@ -0,0 +1,12 @@
+# Blender MTL File: 'Ship.blend'
+# Material Count: 1
+
+newmtl Material.001
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd ShipTexture.png

assets/Models/Test/Ball/Sid.mtl

@@ -0,0 +1,21 @@
+# Blender MTL File: 'Sid.blend'
+# Material Count: 2
+
+newmtl Derp
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd SquidTexture.png
+
+newmtl None
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2
+map_Kd SquidTexture.png

deps/include/Box2D/Dynamics/b2World.h

@@ -53,7 +53,8 @@ public:
 
 	/// Register a destruction listener. The listener is owned by you and must
 	/// remain in scope.
-	void SetDestructionListener(b2DestructionListener* listener);
+	void
+			SetDestructionListener(b2DestructionListener* listener);
 
 	/// Register a contact filter to provide specific control over collision.
 	/// Otherwise the default filter is used (b2_defaultFilter). The listener is

deps/include/Box2D/Particle/b2ParticleSystem.cpp

@@ -654,7 +654,7 @@ int32 b2ParticleSystem::CreateParticle(const b2ParticleDef& def)
 		// If the oldest particle should be destroyed...
 		if (m_def.destroyByAge)
 		{
-			DestroyOldestParticle(0, false);
+			DestroyOldestParticle(0, true);
 			// Need to destroy this particle *now* so that it's possible to
 			// create a new particle.
 			SolveZombie();

deps/include/Box2D/Particle/b2ParticleSystem.h

@@ -299,7 +299,7 @@ public:
 	/// b2World::Step()).
 	void DestroyParticle(int32 index)
 	{
-		DestroyParticle(index, false);
+		DestroyParticle(index, true);
 	}
 
 	/// Destroy a particle.
@@ -330,7 +330,7 @@ public:
 	/// @return Number of particles destroyed.
 	int32 DestroyParticlesInShape(const b2Shape& shape, const b2Transform& xf)
 	{
-		return DestroyParticlesInShape(shape, xf, false);
+		return DestroyParticlesInShape(shape, xf, true);
 	}
 
 	/// Destroy particles inside a shape.

deps/lib/msvc12/x64/OpenAL32.def

@@ -0,0 +1,187 @@
+EXPORTS
+    alAuxiliaryEffectSlotf
+    alAuxiliaryEffectSlotfv
+    alAuxiliaryEffectSloti
+    alAuxiliaryEffectSlotiv
+    alBuffer3f
+    alBuffer3i
+    alBufferData
+    alBufferSamplesSOFT
+    alBufferSubDataSOFT
+    alBufferSubSamplesSOFT
+    alBufferf
+    alBufferfv
+    alBufferi
+    alBufferiv
+    alDeferUpdatesSOFT
+    alDeleteAuxiliaryEffectSlots
+    alDeleteBuffers
+    alDeleteEffects
+    alDeleteFilters
+    alDeleteFontsoundsSOFT
+    alDeletePresetsSOFT
+    alDeleteSoundfontsSOFT
+    alDeleteSources
+    alDisable
+    alDistanceModel
+    alDopplerFactor
+    alDopplerVelocity
+    alEffectf
+    alEffectfv
+    alEffecti
+    alEffectiv
+    alEnable
+    alFilterf
+    alFilterfv
+    alFilteri
+    alFilteriv
+    alFontsound2iSOFT
+    alFontsoundModulatoriSOFT
+    alFontsoundiSOFT
+    alFontsoundivSOFT
+    alGenAuxiliaryEffectSlots
+    alGenBuffers
+    alGenEffects
+    alGenFilters
+    alGenFontsoundsSOFT
+    alGenPresetsSOFT
+    alGenSoundfontsSOFT
+    alGenSources
+    alGetAuxiliaryEffectSlotf
+    alGetAuxiliaryEffectSlotfv
+    alGetAuxiliaryEffectSloti
+    alGetAuxiliaryEffectSlotiv
+    alGetBoolean
+    alGetBooleanv
+    alGetBuffer3f
+    alGetBuffer3i
+    alGetBufferSamplesSOFT
+    alGetBufferf
+    alGetBufferfv
+    alGetBufferi
+    alGetBufferiv
+    alGetDouble
+    alGetDoublev
+    alGetEffectf
+    alGetEffectfv
+    alGetEffecti
+    alGetEffectiv
+    alGetEnumValue
+    alGetError
+    alGetFilterf
+    alGetFilterfv
+    alGetFilteri
+    alGetFilteriv
+    alGetFloat
+    alGetFloatv
+    alGetFontsoundModulatorivSOFT
+    alGetFontsoundivSOFT
+    alGetInteger
+    alGetInteger64SOFT
+    alGetInteger64vSOFT
+    alGetIntegerv
+    alGetListener3f
+    alGetListener3i
+    alGetListenerf
+    alGetListenerfv
+    alGetListeneri
+    alGetListeneriv
+    alGetPresetivSOFT
+    alGetProcAddress
+    alGetSoundfontivSOFT
+    alGetSource3dSOFT
+    alGetSource3f
+    alGetSource3i
+    alGetSource3i64SOFT
+    alGetSourcedSOFT
+    alGetSourcedvSOFT
+    alGetSourcef
+    alGetSourcefv
+    alGetSourcei
+    alGetSourcei64SOFT
+    alGetSourcei64vSOFT
+    alGetSourceiv
+    alGetString
+    alIsAuxiliaryEffectSlot
+    alIsBuffer
+    alIsBufferFormatSupportedSOFT
+    alIsEffect
+    alIsEnabled
+    alIsExtensionPresent
+    alIsFilter
+    alIsFontsoundSOFT
+    alIsPresetSOFT
+    alIsSoundfontSOFT
+    alIsSource
+    alListener3f
+    alListener3i
+    alListenerf
+    alListenerfv
+    alListeneri
+    alListeneriv
+    alLoadSoundfontSOFT
+    alMidiEventSOFT
+    alMidiGainSOFT
+    alMidiPauseSOFT
+    alMidiPlaySOFT
+    alMidiResetSOFT
+    alMidiSoundfontSOFT
+    alMidiSoundfontvSOFT
+    alMidiStopSOFT
+    alMidiSysExSOFT
+    alPresetFontsoundsSOFT
+    alPresetiSOFT
+    alPresetivSOFT
+    alProcessUpdatesSOFT
+    alSoundfontPresetsSOFT
+    alSource3dSOFT
+    alSource3f
+    alSource3i
+    alSource3i64SOFT
+    alSourcePause
+    alSourcePausev
+    alSourcePlay
+    alSourcePlayv
+    alSourceQueueBuffers
+    alSourceRewind
+    alSourceRewindv
+    alSourceStop
+    alSourceStopv
+    alSourceUnqueueBuffers
+    alSourcedSOFT
+    alSourcedvSOFT
+    alSourcef
+    alSourcefv
+    alSourcei
+    alSourcei64SOFT
+    alSourcei64vSOFT
+    alSourceiv
+    alSpeedOfSound
+    alcCaptureCloseDevice
+    alcCaptureOpenDevice
+    alcCaptureSamples
+    alcCaptureStart
+    alcCaptureStop
+    alcCloseDevice
+    alcCreateContext
+    alcDestroyContext
+    alcDevicePauseSOFT
+    alcDeviceResumeSOFT
+    alcGetContextsDevice
+    alcGetCurrentContext
+    alcGetEnumValue
+    alcGetError
+    alcGetInteger64vSOFT
+    alcGetIntegerv
+    alcGetProcAddress
+    alcGetString
+    alcGetThreadContext
+    alcIsExtensionPresent
+    alcIsRenderFormatSupportedSOFT
+    alcLoopbackOpenDeviceSOFT
+    alcMakeContextCurrent
+    alcOpenDevice
+    alcProcessContext
+    alcRenderSamplesSOFT
+    alcSetThreadContext
+    alcSuspendContext

include/Core/CTransform.h

@@ -41,6 +41,9 @@ struct Transform : public Component
 	glm::vec3 Velocity;
 	/** Physical scale multiplier. */
 	glm::vec3 Scale;
+
+	// Sticky is if it sticks with the player or not. True means it will follow the camera.
+	bool Sticky;
 };
 
 }

include/Core/Engine.h

@@ -43,8 +43,13 @@
 #include "Game/PadSystem.h"
 #include "Game/CBall.h"
 #include "Game/CPad.h"
+#include "Game/CLifebuoy.h"
+#include "Game/CProjectile.h"
 #include "Game/CBrick.h"
 #include "Game/BallSystem.h"
+#include "Game/HitLagSystem.h"
+#include "Game/LifebuoySystem.h"
+#include "Game/ProjectileSystem.h"
 #include "Game/Bricks/CPowerUpBrick.h"
 
 #include "Physics/PhysicsSystem.h"
@@ -52,14 +57,16 @@
 #include "Physics/CRectangleShape.h"
 #include "Physics/ESetImpulse.h"
 #include "Physics/CWaterVolume.h"
+#include "Physics/CParticle.h"
+#include "Physics/CParticleEmitter.h"
 
 #include "Game/EGameStart.h"
 #include "Sound/EPlaySound.h"
 
 #include "GUI/Frame.h"
 #include "GUI/Button.h"
-#include "Game/MainMenu.h"
-#include "Game/HUD.h"
+#include "Game/GUI/MainMenu.h"
+#include "Game/GUI/HUD.h"
 
 namespace dd
 {
@@ -107,14 +114,12 @@ public:
 		m_World->ComponentFactory.Register<Components::Brick>();
 		m_World->ComponentFactory.Register<Components::Pad>();
 		m_World->ComponentFactory.Register<Components::Life>();
+		m_World->ComponentFactory.Register<Components::Lifebuoy>();
+		m_World->ComponentFactory.Register<Components::Projectile>();
 
 		m_World->ComponentFactory.Register<Components::PowerUp>();
 		m_World->ComponentFactory.Register<Components::PowerUpBrick>();
 
-		m_World->SystemFactory.Register<Systems::PhysicsSystem>(
-				[this]() { return new Systems::PhysicsSystem(m_World.get(), m_EventBroker); });
-		m_World->AddSystem<Systems::PhysicsSystem>();
-
 		m_World->SystemFactory.Register<Systems::LevelSystem>(
 				[this]() { return new Systems::LevelSystem(m_World.get(), m_EventBroker); });
 		m_World->AddSystem<Systems::LevelSystem>();
@@ -124,59 +129,50 @@ public:
 		m_World->SystemFactory.Register<Systems::BallSystem>(
 				[this]() { return new Systems::BallSystem(m_World.get(), m_EventBroker); });
 		m_World->AddSystem<Systems::BallSystem>();
+		m_World->SystemFactory.Register<Systems::HitLagSystem>(
+				[this]() { return new Systems::HitLagSystem(m_World.get(), m_EventBroker); });
+		m_World->AddSystem<Systems::HitLagSystem>();
+		m_World->SystemFactory.Register<Systems::LifebuoySystem>(
+			[this]() { return new Systems::LifebuoySystem(m_World.get(), m_EventBroker); });
+		m_World->AddSystem<Systems::LifebuoySystem>();
+		m_World->SystemFactory.Register<Systems::ProjectileSystem>(
+			[this]() { return new Systems::ProjectileSystem(m_World.get(), m_EventBroker); });
+		m_World->AddSystem<Systems::ProjectileSystem>();
+		m_World->SystemFactory.Register<Systems::PhysicsSystem>(
+				[this]() { return new Systems::PhysicsSystem(m_World.get(), m_EventBroker); });
+		m_World->AddSystem<Systems::PhysicsSystem>();
 
 		m_World->ComponentFactory.Register<Components::Model>();
 		m_World->ComponentFactory.Register<Components::Template>();
 		m_World->ComponentFactory.Register<Components::PointLight>();
 		m_World->ComponentFactory.Register<Components::WaterVolume>();
+		m_World->ComponentFactory.Register<Components::Particle>();
+		m_World->ComponentFactory.Register<Components::ParticleEmitter>();
 		m_World->Initialize();
 
-
-		//OctoBall
-		{
-          	auto ent = m_World->CreateEntity();
-        	std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(ent);
-			transform->Position = glm::vec3(-0.f, 0.26f, -9.f);
-			transform->Scale = glm::vec3(0.5f, 0.5f, 0.5f);
-			transform->Velocity = glm::vec3(0.0f, -10.f, 0.f);
-          	auto model = m_World->AddComponent<Components::Model>(ent);
-			model->ModelFile = "Models/Test/Ball/Ballopus.obj";
-          	std::shared_ptr<Components::CircleShape> circleShape = m_World->AddComponent<Components::CircleShape>(ent);
-			std::shared_ptr<Components::Ball> ball = m_World->AddComponent<Components::Ball>(ent);
-			ball->Speed = 5.f;
-			std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(ent);
-			physics->Static = false;
-			physics->Category = CollisionLayer::Type::Ball;
-			physics->Mask = CollisionLayer::Type::Pad | CollisionLayer::Type::Brick | CollisionLayer::Type::Wall;
-			physics->Calculate = true;
-
-			auto plight = m_World->AddComponent<Components::PointLight>(ent);
-			plight->Radius = 2.f;
-
-			m_World->CommitEntity(ent);
-		}
-
 		//PointLightTest
 		{
 			auto t_Light = m_World->CreateEntity();
 			auto transform = m_World->AddComponent<Components::Transform>(t_Light);
 			transform->Position = glm::vec3(-3.f, 6.f, -5.f);
+			transform->Sticky = true;
 			auto pl = m_World->AddComponent<Components::PointLight>(t_Light);
 			pl->Radius = 20.f;
 			pl->Diffuse = glm::vec3(0.8f, 0.7f, 0.05f);
 			auto model = m_World->AddComponent<Components::Model>(t_Light);
-			model->ModelFile = "Core/UnitSphere.obj";
+			model->ModelFile = "Models/Core/UnitSphere.obj";
 			m_World->CommitEntity(t_Light);
 		}
 		{
 			auto t_Light = m_World->CreateEntity();
 			auto transform = m_World->AddComponent<Components::Transform>(t_Light);
 			transform->Position = glm::vec3(3.f, -5.f, -5.f);
+			transform->Sticky = true;
 			auto pl = m_World->AddComponent<Components::PointLight>(t_Light);
 			pl->Radius = 15.f;
 			pl->Diffuse = glm::vec3(0.1f, 0.5f, 0.8f);
 			auto model = m_World->AddComponent<Components::Model>(t_Light);
-			model->ModelFile = "Core/UnitSphere.obj";
+			model->ModelFile = "Models/Core/UnitSphere.obj";
 			m_World->CommitEntity(t_Light);
 		}
 
@@ -186,13 +182,26 @@ public:
 			auto transform = m_World->AddComponent<Components::Transform>(t_halfPipe);
 			transform->Position = glm::vec3(0.f, 0.f, -15.f);
 			transform->Scale = glm::vec3(6.f, 6.f, 10.f);
+			transform->Sticky = false;
 			auto model = m_World->AddComponent<Components::Model>(t_halfPipe);
 			model->ModelFile = "Models/Test/halfpipe/Halfpipe.obj";
-			model->Color = glm::vec4(1.f, 1.f, 1.f, 0.3f);
+			model->Color = glm::vec4(0.8f, 0.8f, 0.8f, 0.3f);
+			m_World->CommitEntity(t_halfPipe);
+		}
+		{
+			auto t_halfPipe = m_World->CreateEntity();
+			auto transform = m_World->AddComponent<Components::Transform>(t_halfPipe);
+			transform->Position = glm::vec3(0.f, 34.6f, -15.f);
+			transform->Scale = glm::vec3(6.f, 6.f, 10.f);
+			transform->Sticky = false;
+			auto model = m_World->AddComponent<Components::Model>(t_halfPipe);
+			model->ModelFile = "Models/Test/halfpipe/Halfpipe.obj";
+			model->Color = glm::vec4(0.8f, 0.8f, 0.8f, 0.3f);
 			m_World->CommitEntity(t_halfPipe);
 		}
 
 		//Background
+		
 		{
 			auto background = m_World->CreateEntity();
 			auto transform = m_World->AddComponent<Components::Transform>(background);
@@ -203,77 +212,91 @@ public:
 			m_World->CommitEntity(background);
 		}
 
+//			auto particleEmitter= m_World->AddComponent<Components::Emitter>(Pe);
 		//Water test
 		{
 			auto t_waterBody = m_World->CreateEntity();
 			auto transform = m_World->AddComponent<Components::Transform>(t_waterBody);
-			transform->Position = glm::vec3(0.f, -5.5f, -10.f);
-			transform->Scale = glm::vec3(7.f, 1.5f, 1.f);
+			transform->Position = glm::vec3(0.f, -3.5f, -10.f);
+			transform->Scale = glm::vec3(7.0f, 1.5f, 1.f);
+			transform->Sticky = true;
 			auto water = m_World->AddComponent<Components::WaterVolume>(t_waterBody);
 			auto body = m_World->AddComponent<Components::RectangleShape>(t_waterBody);
 			m_World->CommitEntity(t_waterBody);
 		}
+
+		//ParticleTest
+
+
+		/*{
+			auto Pe = m_World->CreateEntity();
+			auto transform = m_World->AddComponent<Components::Transform>(Pe);
+			auto particleEmitter= m_World->AddComponent<Components::ParticleEmitter>(Pe);
+			auto emitteSprite = m_World->AddComponent<Components::Sprite>(Pe);
+
+			transform->Position = glm::vec3(0.f, 0.f, -10.f);
+			emitteSprite->SpriteFile = "Textures/Test/Brick_Normal.png";
+			particleEmitter->GravityScale = 0.0f;
+			particleEmitter->SpawnRate = 1.f;
+			particleEmitter->NumberOfTicks = 2;
+			particleEmitter->Speed = 1.f;
+			particleEmitter->ParticlesPerTick = 5;
+			particleEmitter->Spread = glm::pi<float>()*2;
+			particleEmitter->EmittingAngle = glm::pi<float>();
+			particleEmitter->LifeTime = 50;
+
+			{
+				auto Pt = m_World->CreateEntity(Pe);
+				auto PtTransform = m_World->AddComponent<Components::Transform>(Pt);
+				auto PtSprite = m_World->AddComponent<Components::Sprite>(Pt);
+				auto PtParticle = m_World->AddComponent<Components::Particle>(Pt);
+				auto PtTemplate = m_World->AddComponent<Components::Template>(Pt);
+
+				//PtTransform->Velocity = glm::vec3(1.0f, 0.f, 0.f);
+				PtTransform->Position = transform->Position;
+				PtSprite->SpriteFile = "Textures/Background.png";
+				PtParticle->LifeTime = 3.f;
+				PtParticle->Flags = static_cast<ParticleFlags::Type>(ParticleFlags::Type::Powder | ParticleFlags::Type::ParticleContactFilter | ParticleFlags::Type::FixtureContactFilter);
+			}
+			m_World->CommitEntity(Pe);
+		}*/
+
 		//TODO: Why does the ball not collide with these bricks?
 		//BottomBox
 		{
-			auto topWall = m_World->CreateEntity();
-			auto transform = m_World->AddComponent<Components::Transform>(topWall);
-			transform->Position = glm::vec3(0.f, -6.f, -9.9f);
-			transform->Scale = glm::vec3(10.f, 0.5f, 1.f);
-			std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(topWall);
+			auto BottomWall = m_World->CreateEntity();
+			auto transform = m_World->AddComponent<Components::Transform>(BottomWall);
+			transform->Position = glm::vec3(0.f, -6.f, -10.f);
+			transform->Scale = glm::vec3(20.f, 0.5f, 1.f);
+			std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(BottomWall);
 			sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
-			std::shared_ptr<Components::RectangleShape> boxShape = m_World->AddComponent<Components::RectangleShape>(
-					topWall);
-			std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(topWall);
-			physics->Static = true;
-			m_World->CommitEntity(topWall);
+			std::shared_ptr<Components::RectangleShape> rectangleShape = m_World->AddComponent<Components::RectangleShape>(BottomWall);
+			rectangleShape->Dimensions = glm::vec2(20.f, 0.5f);
+			std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(BottomWall);
+			physics->CollisionType = CollisionType::Type::Static;
+			physics->Category = CollisionLayer::Wall;
+			physics->Mask = static_cast<CollisionLayer::Type>(CollisionLayer::LifeBuoy);
+			transform->Sticky = true;
+			m_World->CommitEntity(BottomWall);
 		}
-		//SideBox
-//		{
-//			auto topWall = m_World->CreateEntity();
-//			std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(topWall);
-//			transform->Position = glm::vec3(3.f, -3.0f, -9.9f);
-//			transform->Scale = glm::vec3(0.5f, 3.f, 1.f);
-//			std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(topWall);
-//			sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
-//			std::shared_ptr<Components::RectangleShape> boxShape = m_World->AddComponent<Components::RectangleShape>(
-//					topWall);
-//			std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(topWall);
-//			physics->Static = true;
-//			m_World->CommitEntity(topWall);
-//		}
-//		//OtherSideBox
-//		{
-//			auto topWall = m_World->CreateEntity();
-//			std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(topWall);
-//			transform->Position = glm::vec3(-4.f, -3.0f, -9.9f);
-//			transform->Scale = glm::vec3(0.5f, 3.0f, 1.f);
-//			std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(topWall);
-//			sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
-//			std::shared_ptr<Components::RectangleShape> boxShape = m_World->AddComponent<Components::RectangleShape>(
-//					topWall);
-//			std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(topWall);
-//			physics->Static = true;
-//			m_World->CommitEntity(topWall);
-//		}
 
 		{
 			auto topWall = m_World->CreateEntity();
-			std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(
-					topWall);
+			std::shared_ptr<Components::Transform> transform = m_World->AddComponent<Components::Transform>(topWall);
 			transform->Position = glm::vec3(0.f, 6.f, -10.f);
 			transform->Scale = glm::vec3(20.f, 0.5f, 1.f);
 
 			std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(topWall);
 			sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
 
-			std::shared_ptr<Components::RectangleShape> boxShape = m_World->AddComponent<Components::RectangleShape>(
-					topWall);
+			std::shared_ptr<Components::RectangleShape> rectangleShape = m_World->AddComponent<Components::RectangleShape>(topWall);
+			rectangleShape->Dimensions = glm::vec2(20.f, 0.5f);
 
 			std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(topWall);
-			physics->Static = true;
-			physics->Category = CollisionLayer::Type::Wall;
-			physics->Mask = CollisionLayer::Type::Ball | CollisionLayer::Type::Brick;
+			physics->CollisionType = CollisionType::Type::Static;
+			physics->Category = CollisionLayer::Wall;
+			physics->Mask = static_cast<CollisionLayer::Type>(CollisionLayer::Ball | CollisionLayer::Brick);
+			transform->Sticky = true;
 
 			m_World->CommitEntity(topWall);
 		}
@@ -288,13 +311,14 @@ public:
 			std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(leftWall);
 			sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
 
-			std::shared_ptr<Components::RectangleShape> boxShape = m_World->AddComponent<Components::RectangleShape>(
-					leftWall);
+			std::shared_ptr<Components::RectangleShape> rectangleShape = m_World->AddComponent<Components::RectangleShape>(leftWall);
+			rectangleShape->Dimensions = glm::vec2(0.5f, 20.f);
 
 			std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(leftWall);
-			physics->Static = true;
-			physics->Category = CollisionLayer::Type::Wall;
-			physics->Mask = CollisionLayer::Type::Ball | CollisionLayer::Type::Brick;
+			physics->CollisionType = CollisionType::Type::Static;
+			physics->Category = CollisionLayer::Wall;
+			physics->Mask = static_cast<CollisionLayer::Type>(CollisionLayer::Ball | CollisionLayer::Brick);
+			transform->Sticky = true;
 
 			m_World->CommitEntity(leftWall);
 		}
@@ -309,37 +333,18 @@ public:
 			std::shared_ptr<Components::Sprite> sprite = m_World->AddComponent<Components::Sprite>(rightWall);
 			sprite->SpriteFile = "Textures/Core/ErrorTexture.png";
 
-			std::shared_ptr<Components::RectangleShape> boxShape = m_World->AddComponent<Components::RectangleShape>(
-					rightWall);
+			std::shared_ptr<Components::RectangleShape> rectangleShape = m_World->AddComponent<Components::RectangleShape>(rightWall);
+			rectangleShape->Dimensions = glm::vec2(0.5f, 20.f);
 
 			std::shared_ptr<Components::Physics> physics = m_World->AddComponent<Components::Physics>(rightWall);
-			physics->Static = true;
-			physics->Category = CollisionLayer::Type::Wall;
-			physics->Mask = CollisionLayer::Type::Ball | CollisionLayer::Type::Brick;
+			physics->CollisionType = CollisionType::Type::Static;
+			physics->Category = CollisionLayer::Wall;
+			physics->Mask = static_cast<CollisionLayer::Type>(CollisionLayer::Ball | CollisionLayer::Brick);
+			transform->Sticky = true;
 
 			m_World->CommitEntity(rightWall);
 		}
 
-		{
-			auto ent = m_World->CreateEntity();
-			m_World->SetProperty(ent, "Name", "Pad");
-			auto ctransform = m_World->AddComponent<Components::Transform>(ent);
-			ctransform->Position = glm::vec3(0.f, -3.5f, -10.f);
-			ctransform->Scale = glm::vec3(1.0f, 1.0f, 1.f);
-			auto rectangle = m_World->AddComponent<Components::RectangleShape>(ent);
-			auto physics = m_World->AddComponent<Components::Physics>(ent);
-			physics->Static = false;
-			physics->Category = CollisionLayer::Type::Pad;
-			physics->Mask = CollisionLayer::Type::Ball | CollisionLayer::Type::PowerUp;
-			physics->Calculate = true;
-			auto cModel = m_World->AddComponent<Components::Model>(ent);
-			cModel->ModelFile = "Models/Submarine2.obj";
-
-			auto pad = m_World->AddComponent<Components::Pad>(ent);
-			m_World->CommitEntity(ent);
-		}
-
-
 		//EVENT_SUBSCRIBE_MEMBER(m_EGameStart, &Engine::OnGameStart);
 		m_EGameStart = decltype(m_EGameStart)(std::bind(&Engine::OnGameStart, this, std::placeholders::_1));
 		m_EventBroker->Subscribe(m_EGameStart);
@@ -449,7 +454,6 @@ public:
 			auto spriteComponent = m_World->GetComponent<Components::Sprite>(entity);
 			if (spriteComponent)
 			{
-
 				std::string normal = spriteComponent->NormalTexture;
 				std::string spec = spriteComponent->SpecularTexture;
 
@@ -472,7 +476,6 @@ public:
 				EnqueueSprite(texturediff, texturenorm, texturespec, modelMatrix, spriteComponent->Color, absoluteTransform.Position.z);
 			}
 		}
-
 	}
 
 	//TODO: Get this out of engine.h
@@ -563,6 +566,8 @@ private:
 			e.IsAmbient = true;
 			m_EventBroker->Publish(e);
 		}
+
+		return true;
 	};
 	double m_LastTime;
 };

include/Core/EventBroker.h

@@ -24,6 +24,7 @@
 #include <map>
 #include <unordered_map>
 #include <list>
+#include <tuple>
 
 #define EVENT_SUBSCRIBE_MEMBER(relay, handler) \
 	relay = decltype(relay)(std::bind(handler, this, std::placeholders::_1)); \
@@ -123,16 +124,23 @@ public:
 	void Unsubscribe(BaseEventRelay &relay);
 
 private:
+	bool m_IsProcessing = false;
+
 	typedef std::string ContextTypeName_t; // typeid(ContextType).name()
 	typedef std::string EventTypeName_t; // typeid(EventType).name()
 
 	typedef std::unordered_multimap<EventTypeName_t, BaseEventRelay*> EventRelays_t;
 	typedef std::unordered_map<ContextTypeName_t, EventRelays_t> ContextRelays_t;
 	ContextRelays_t m_ContextRelays;
+	std::vector<BaseEventRelay*> m_RelaysToSubscribe;
+	std::vector<BaseEventRelay*> m_RelaysToUnsubscribe;
 
 	typedef std::list<std::pair<EventTypeName_t, std::shared_ptr<Event>>> EventQueue_t;
 	std::shared_ptr<EventQueue_t> m_EventQueueRead;
 	std::shared_ptr<EventQueue_t> m_EventQueueWrite;
+
+	void subscribeImmediate(BaseEventRelay& relay);
+	void unsubscribeImmediate(BaseEventRelay& relay);
 };
 
 template <typename EventType>

include/Core/Renderer.h

@@ -16,8 +16,8 @@
 	along with Daydream Engine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef Renderer_h__
-#define Renderer_h__
+#ifndef DD_RENDERER_H__
+#define DD_RENDERER_H__
 
 #include "Util/Rectangle.h"
 #include "Camera.h"
@@ -30,8 +30,6 @@ namespace dd
 class Renderer
 {
 public:
-	//Render();
-
 	GLFWwindow* Window() const { return m_Window; }
 	Rectangle Resolution() const { return m_Resolution; }
 	void SetResolution(const Rectangle& resolution) { m_Resolution = resolution; }
@@ -39,8 +37,6 @@ public:
 	void SetFullscreen(bool fullscreen) { m_Fullscreen = fullscreen; }
 	bool VSYNC() const { return m_VSYNC; }
 	void SetVSYNC(bool vsync) { m_VSYNC = vsync; }
-	//void SetViewport(const Rectangle& viewport) { m_Viewport = viewport; }
-	//void SetScissor(const Rectangle& scissor) { m_Scissor = scissor; }
 	const dd::Camera* Camera() const { return m_Camera; }
 	void SetCamera(const dd::Camera* camera)
 	{
@@ -50,7 +46,6 @@ public:
 			m_Camera = camera;
 		}
 	}
-
 	void Initialize();
 	void Draw(RenderQueueCollection& rq);
 
@@ -58,8 +53,6 @@ private:
 	Rectangle m_Resolution = Rectangle(1280, 720);
 	bool m_Fullscreen = false;
 	bool m_VSYNC = false;
-	//Rectangle m_Viewport;
-	//Rectangle m_Scissor;
 	std::unique_ptr<dd::Camera> m_DefaultCamera = nullptr;
 	const dd::Camera* m_Camera = nullptr;
 
@@ -67,42 +60,37 @@ private:
 	std::string m_GLVendor;
 	GLFWwindow* m_Window = nullptr;
 
-	ShaderProgram* m_spDeferred1;
-	ShaderProgram* m_spDeferred2;
-	ShaderProgram* m_spDeferred3;
-	ShaderProgram* m_spForward;
-	ShaderProgram* m_spScreen;
-	ShaderProgram* t_m_spWater;
-	ShaderProgram* t_m_spWater2;
+	ShaderProgram* m_SpDeferred1;
+	ShaderProgram* m_SpDeferred2;
+	ShaderProgram* m_SpDeferred3;
+	ShaderProgram* m_SpForward;
+	ShaderProgram* m_SpScreen;
+	ShaderProgram* m_SpWater;
+	ShaderProgram* m_SpWater2;
 
 	GLuint m_ScreenQuad = 0;
 	Model* m_UnitSphere = nullptr;
 	Model* m_UnitQuad = nullptr;
 	Texture* m_StandardNormal;
 	Texture* m_StandardSpecular;
-	Texture* t_m_WhiteSphereTexture;
-
-	GLuint m_rbDepthBuffer = 0;
-	GLuint m_fbDeferred1 = 0;
-	GLuint m_GDiffuse = 0;
-	GLuint m_GPosition = 0;
-	GLuint m_GNormal = 0;
-	GLuint m_GSpecular = 0;
-	GLuint m_fbDeferred2 = 0;
-	GLuint m_tLighting = 0;
-	GLuint m_fbDeferred3 = 0;
-	GLuint m_tFinal = 0;
-	//Water GTexture
-	GLuint t_m_Gwater = 0;
-	//Water blur texture
-	GLuint t_m_BWater;
-	GLuint t_m_BWater2;
-	//WAterpass Framebuffer
-	GLuint t_m_fbWater;
-	//Waterpass Framebuffer
-	GLuint t_m_fbWaterBlur;
-	GLuint t_m_fbWaterBlur2;
+	Texture* m_WhiteSphereTexture;
 
+	GLuint m_RbDepthBuffer = 0;	//DepthBuffer Texture
+	GLuint m_FbDeferred1 = 0;	//Framebuffer for first pass
+	GLuint m_GDiffuse = 0;		//Texture for diffuseColors
+	GLuint m_GPosition = 0;		//Texture for positions
+	GLuint m_GNormal = 0;		//Texture for normals
+	GLuint m_GSpecular = 0;		//Texture for specular
+	GLuint m_FbDeferred2 = 0;	//Framebuffer that handles the lighting pass
+	GLuint m_TLighting = 0;		//Texture for the lighting pass
+	GLuint m_FbDeferred3 = 0;	//Frambuffer for handling the last pass.
+	GLuint m_TFinal = 0;		//Final Texture to be printed to screen
+	GLuint m_Gwater = 0;		//Water Color Texture
+	GLuint m_BWater;			//Water blur texture
+	GLuint m_BWater2;			//Water blur texture
+	GLuint m_FbWater;			//Waterpass Framebuffer
+	GLuint m_FbWaterBlur; 		//Waterpass Framebuffer
+	GLuint m_FbWaterBlur2;		//Waterpass Framebuffer
 
 	GLuint m_CurrentScreenBuffer = 0;
 	void LoadShaders();

include/Core/ResourceManager.h

@@ -188,13 +188,13 @@ void ResourceManager::Preload(std::string resourceName)
 	auto resourceType = typeid(T).name();
 	if (IsResourceLoaded(resourceType, resourceName))
 	{
-		LOG_WARNING("Attempted to preload resource \"%s\" multiple times!", resourceName);
+		LOG_WARNING("Attempted to preload resource \"%s\" multiple times!", resourceName.c_str());
 		return;
 	}
 
 	m_Preloading = true;
 	LOG_INFO("Preloading resource \"%s\"", resourceName.c_str());
-	CreateResource<T>(resourceName);
+	CreateResource<T>(resourceName, nullptr);
 	m_Preloading = false;
 }
 

include/Core/World.h

@@ -194,7 +194,7 @@ public:
 
 	// Triggers commit events in systems
 	// TODO: Replace completely by EComponentCreated?
-	int CommitEntity(EntityID entity);
+	void CommitEntity(EntityID entity);
 
 	/** Get all components of a specific type.
 	

include/GUI/Button.h

@@ -60,6 +60,10 @@ protected:
 
 	virtual bool OnMouseMove(const Events::MouseMove& event)
 	{
+		if (Hidden()) {
+			return false;
+		}
+
 		bool isOver = Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1));
 		if (isOver && !m_MouseIsOver) { // Enter
 			if (!m_IsDown) {
@@ -88,6 +92,11 @@ protected:
 	}
 	virtual bool OnMousePress(const Events::MousePress& event)
 	{
+		if (Hidden()) {
+			LOG_DEBUG("Pressed hidden button");
+			return false;
+		}
+
 		if (!Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1))) {
 			return false;
 		}
@@ -107,6 +116,11 @@ protected:
 	}
 	virtual bool OnMouseRelease(const Events::MouseRelease& event)
 	{
+		if (Hidden()) {
+			LOG_DEBUG("Released hidden button");
+			return false;
+		}
+
 		bool isOver = Rectangle::Intersects(AbsoluteRectangle(), Rectangle(event.X, event.Y, 1, 1));
 		if (!isOver && !m_IsDown) {
 			return false;

include/GUI/Frame.h

@@ -44,6 +44,8 @@ public:
 		: m_Name(name)
 	{
 		SetParent(parent);
+		Width = parent->Width;
+		Height = parent->Height;
 		EVENT_SUBSCRIBE_MEMBER(m_EKeyDown, &Frame::OnKeyDown);
 		EVENT_SUBSCRIBE_MEMBER(m_EKeyUp, &Frame::OnKeyUp);
 		EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &Frame::OnCommand);

include/GUI/TextureFrame.h

@@ -23,18 +23,6 @@ public:
 		if (m_Texture == nullptr)
 			return;
 
-		// Main texture
-		{
-			FrameJob job;
-			job.Scissor = (m_ScissorEnabled) ? m_Parent->AbsoluteRectangle() : Rectangle();
-			job.Viewport = Rectangle(Left(), Top(), Width, Height);
-			job.TextureID = m_Texture->ResourceID;
-			job.DiffuseTexture = *m_Texture;
-			job.Color = glm::vec4(m_Color.r, m_Color.g, m_Color.b, m_Color.a * m_CurrentFade);
-			job.Name = Name();
-			rq.GUI.Add(job);
-		}
-
 		// Texture while fading
 		if (m_FadeTexture && m_CurrentFade < 1) {
 			FrameJob job;
@@ -46,9 +34,21 @@ public:
 			job.Name = Name();
 			rq.GUI.Add(job);
 		}
+
+		// Main texture
+		{
+			FrameJob job;
+			job.Scissor = (m_ScissorEnabled) ? m_Parent->AbsoluteRectangle() : Rectangle();
+			job.Viewport = Rectangle(Left(), Top(), Width, Height);
+			job.TextureID = m_Texture->ResourceID;
+			job.DiffuseTexture = *m_Texture;
+			job.Color = glm::vec4(m_Color.r, m_Color.g, m_Color.b, m_Color.a * m_CurrentFade);
+			job.Name = Name();
+			rq.GUI.Add(job);
+		}
 	}
 
-	dd::Texture* Texture() const { return m_Texture; }
+	std::string Texture() const { return m_TextureName; }
 
 	void SetTexture(std::string resourceName)
 	{
@@ -58,6 +58,7 @@ public:
 		}
 
 		m_Texture = ResourceManager::Load<dd::Texture>(resourceName);
+		m_TextureName = resourceName;
 		if (m_Texture == nullptr) {
 			m_Texture = ResourceManager::Load<dd::Texture>("Textures/Core/ErrorTexture.png");
 		}
@@ -98,6 +99,7 @@ public:
 protected:
 	bool m_ScissorEnabled = true;
 	dd::Texture* m_Texture = nullptr;
+	std::string m_TextureName;
 	dd::Texture* m_FadeTexture = nullptr;
 	glm::vec4 m_Color = glm::vec4(1.f, 1.f, 1.f, 1.f);
 	float m_FadeDuration = 0.f;

include/Game/BallSystem.h

@@ -5,23 +5,48 @@
 #include "Core/World.h"
 #include "Core/EventBroker.h"
 #include "Core/CTransform.h"
+#include "Core/CTemplate.h"
+#include "Physics/CPhysics.h"
+#include "Physics/CCircleShape.h"
+#include "Physics/CRectangleShape.h"
 #include "Physics/EContact.h"
+#include "Rendering/CModel.h"
+#include "Rendering/CPointLight.h"
 #include "Game/CBall.h"
 #include "Game/CPowerUp.h"
+#include "Game/CLife.h"
+#include "Game/CBrick.h"
+#include "Game/ELifeLost.h"
+#include "Game/EComboEvent.h"
+#include "Game/EResetBall.h"
+#include "Game/EMultiBall.h"
+#include "Game/EMultiBallLost.h"
+#include "Game/EStickyPad.h"
+#include "Game/EInkBlaster.h"
+#include "Game/EInkBlasterOver.h"
+#include "Game/EGameOver.h"
+#include "Game/EPause.h"
+#include "Game/EHitPad.h"
+#include "Game/EHitLag.h"
+#include "Game/EActionButton.h"
+#include "Game/CLifebuoy.h"
+#include "Game/ELifebuoyHit.h"
 
-namespace dd {
+namespace dd
+{
 
-namespace Systems {
+namespace Systems
+{
 
-class BallSystem : public System {
+class BallSystem : public System
+{
 public:
     BallSystem(World *world, std::shared_ptr<dd::EventBroker> eventBroker)
             : System(world, eventBroker) { }
 
     ~BallSystem();
 
-    EventRelay<BallSystem, Events::Contact> m_Contact;
-    bool Contact(const Events::Contact &event);
+
 
     void RegisterComponents(ComponentFactory *cf) override;
 
@@ -39,11 +64,77 @@ public:
     // Called when an entity is removed
     void OnEntityRemoved(EntityID entity) override;
 
-private:
+    EntityID CreateBall();
+    void CreateLife(int);
+    EntityID Ball() { return m_Ball; };
+    void SetBall(const EntityID& ball) { m_Ball = ball; }
 
+    float& XMovementMultiplier() { return m_XMovementMultiplier; }
+    void SetXMovementMultiplier(const float& xMovementMultiplier) { m_XMovementMultiplier = xMovementMultiplier; }
+    float& EdgeX() { return m_EdgeX; }
+    void SetEdgeX(const float& edgeX) { m_EdgeX = edgeX; }
+    float& EdgeY() { return m_EdgeY; }
+    void SetEdgeY(const float& edgeY) { m_EdgeY = edgeY; }
+    int& MultiBalls() { return m_MultiBalls; }
+    void SetMultiBalls(const int& multiBalls) { m_MultiBalls = multiBalls; }
+    int& Lives() { return m_Lives; }
+    void SetLives(const int& lives) { m_Lives = lives; }
+    int& PastLives() { return m_PastLives; }
+    void SetPastLives(const int& pastLives) { m_PastLives = pastLives; }
+    bool ReplaceBall() const { return m_ReplaceBall; }
+    void SetReplaceBall(const bool& replaceBall) { m_ReplaceBall = replaceBall; }
+    bool IsPaused() const { return m_Pause; }
+    void SetPause(const bool& pause) { m_Pause = pause; }
+
+private:
+    float m_XMovementMultiplier = 2.f;
+    float m_EdgeX = 3.2f;
+    float m_EdgeY = 5.2f;
+    int m_MultiBalls = 0;
+    int m_Lives = 3;
+    int m_PastLives = 3;
+    bool m_ReplaceBall = false;
+    bool m_Pause = false;
+    bool m_Waiting = true;
+	bool m_Sticky = false;
+	bool m_InkBlaster = false;
+	bool m_InkAttached = false;
+	bool m_BlockedWaiting = false;
+	int m_StickyCounter = 5;
+
+    glm::vec3 m_SavedSpeed;
+    bool m_InitializePause = false;
+
+    EntityID m_Ball;
+
+    std::unordered_map<EntityID, std::list<glm::vec2>> m_Contacts;
+    void ResolveContacts();
+
+    dd::EventRelay<BallSystem, dd::Events::LifeLost> m_ELifeLost;
+    dd::EventRelay<BallSystem, dd::Events::MultiBallLost> m_EMultiBallLost;
+    dd::EventRelay<BallSystem, dd::Events::ResetBall> m_EResetBall;
+    dd::EventRelay<BallSystem, dd::Events::MultiBall> m_EMultiBall;
+	dd::EventRelay<BallSystem, dd::Events::StickyPad> m_EStickyPad;
+	dd::EventRelay<BallSystem, dd::Events::InkBlaster> m_EInkBlaster;
+	dd::EventRelay<BallSystem, dd::Events::InkBlasterOver> m_EInkBlasterOver;
+    dd::EventRelay<BallSystem, dd::Events::Pause> m_EPause;
+    dd::EventRelay<BallSystem, dd::Events::Contact> m_Contact;
+    dd::EventRelay<BallSystem, dd::Events::ActionButton> m_EActionButton;
+
+    bool Contact(const Events::Contact &event);
+    bool OnLifeLost(const dd::Events::LifeLost &event);
+    bool OnMultiBallLost(const dd::Events::MultiBallLost &event);
+    bool OnResetBall(const dd::Events::ResetBall &event);
+    bool OnMultiBall(const dd::Events::MultiBall &event);
+	bool OnStickyPad(const dd::Events::StickyPad &event);
+	bool OnInkBlaster(const dd::Events::InkBlaster &event);
+	bool OnInkBlasterOver(const dd::Events::InkBlasterOver &event);
+    bool OnPause(const dd::Events::Pause &event);
+    bool OnActionButton(const dd::Events::ActionButton &event);
 };
 
 }
+
 }
 
 #endif

include/Game/CBall.h

@@ -17,6 +17,13 @@ struct Ball : Component
 {
     int Number = 0;
     float Speed = 5.f;
+    int Combo = 0;
+    bool Paused = false;
+    bool Waiting = true;
+	bool InkBlaster = false;
+	bool Sticky = false;
+	glm::vec3 StickyPlacement = glm::vec3(0, 0, 0);
+    glm::vec3 SavedSpeed = glm::vec3(0, 0, 0);
 };
 
 }

include/Game/CBrick.h

@@ -15,9 +15,8 @@ namespace Components
 
 struct Brick : Component
 {
-    int Points = 10;
-    int Hits = 1;
     int Score = 50;
+    int Type = 0;
     bool Removed = false;
 };
 

include/Game/CLifebuoy.h

@@ -0,0 +1,25 @@
+//
+// Created by Adniklastrator on 2015-10-08.
+//
+
+#ifndef DAYDREAM_CLIFEBUOY_H
+#define DAYDREAM_CLIFEBUOY_H
+
+#include "Core/Component.h"
+
+namespace dd
+{
+
+namespace Components
+{
+
+struct Lifebuoy : Component
+{
+	int Hits = 4;
+};
+
+}
+
+}
+
+#endif //DAYDREAM_CLIFEBUOY_H

include/Game/CPad.h

@@ -17,12 +17,9 @@ namespace Components
 
 struct Pad : Component
 {
-    int Lives;
-    int Points;
-
     float SlowdownModifier = 5.f;
     float AccelerationSpeed = 40.f;
-    float MaxSpeed = 20.f;
+    float MaxSpeed = 5.f;
 };
 
 }

include/Game/CProjectile.h

@@ -0,0 +1,25 @@
+//
+// Created by Adniklastrator on 2015-10-08.
+//
+
+#ifndef DAYDREAM_CPROJECTILE_H
+#define DAYDREAM_CPROJECTILE_H
+
+#include "Core/Component.h"
+
+namespace dd
+{
+
+namespace Components
+{
+
+struct Projectile : Component
+{
+
+};
+
+}
+
+}
+
+#endif //DAYDREAM_CPROJECTILE_H

include/Game/EActionButton.h

@@ -0,0 +1,25 @@
+//
+// Created by Administrator on 2015-10-07.
+//
+
+#ifndef DAYDREAM_EACTIONBUTTON_H
+#define DAYDREAM_EACTIONBUTTON_H
+
+#include "Core/EventBroker.h"
+
+namespace dd
+{
+
+namespace Events
+{
+
+struct ActionButton : Event
+{
+	glm::vec3 Position;
+};
+
+}
+
+}
+
+#endif //DAYDREAM_EACTIONBUTTON_H