Merge pull request #440 from SHADE-DP/PlayerController

Scene changes and bug fixes

Assets/Materials/CutScene/CutScene_04a.shmat

@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 51238312
+    data.textureIndex: 59076169
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/CutScene/CutScene_04b.shmat

@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 61471971
+    data.textureIndex: 66572525
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/CutScene/CutScene_04c.shmat

@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 58217538
+    data.textureIndex: 66182834
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/CutScene/CutScene_05a.shmat

@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 61980534
+    data.textureIndex: 58009216
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}

Assets/Materials/CutScene/CutScene_05b.shmat

@@ -3,6 +3,6 @@
   SubPass: UI
   Properties:
     data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 51561286
+    data.textureIndex: 55022275
     data.alpha: 1
     data.beta: {x: 1, y: 1, z: 1}

Assets/Scenes/Level1.shade

@@ -1,3 +1,4 @@
+- NavData: 0
 - EID: 1
   Name: DefaultLight
   IsActive: true
@@ -2419,7 +2420,7 @@
   Components:
     Transform Component:
       Translate: {x: 0, y: 0, z: 0}
-      Rotate: {x: 0, y: 0, z: 0}
+      Rotate: {x: -0.0818509459, y: 0.5, z: -11.5662012}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
     Renderable Component:
@@ -7009,6 +7010,7 @@
       Enabled: true
       Score: 50
       currCategory: 1
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -7061,6 +7063,7 @@
       Enabled: true
       Score: 500
       currCategory: 2
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -7113,6 +7116,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -7165,6 +7169,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -7180,7 +7185,7 @@
 - EID: 228
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: -7.47360849, y: 1.4327563, z: -2.44241929}
@@ -7217,6 +7222,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 215
   Name: CollisionWall
   IsActive: true
@@ -7240,10 +7246,40 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 576
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 225
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: 1.97487497, y: 1.3500793, z: -10.195508}
@@ -7280,6 +7316,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 214
   Name: CollisionWall
   IsActive: true
@@ -7303,10 +7340,40 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 575
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 224
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: -5.47656107, y: 1.4327563, z: -2.44241929}
@@ -7343,6 +7410,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 213
   Name: CollisionWall
   IsActive: true
@@ -7366,10 +7434,40 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 572
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 223
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: 6.09239721, y: 1.4327563, z: -6.03106117}
@@ -7406,6 +7504,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 212
   Name: CollisionWall
   IsActive: true
@@ -7429,10 +7528,40 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 571
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 222
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: 6.09239721, y: 1.4327563, z: -3.94262314}
@@ -7469,6 +7598,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 211
   Name: CollisionWall
   IsActive: true
@@ -7492,6 +7622,36 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 570
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 198
   Name: ====Raccoon====
   IsActive: true
@@ -7646,8 +7806,6 @@
       armLength: 2
       turnSpeedPitch: 0.200000003
       turnSpeedYaw: 0.400000006
-      inverseXControls: true
-      inverseYControls: false
       pitchUpperClamp: 45
       pitchLowerClamp: 5
 - EID: 65731
@@ -8331,7 +8489,7 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
     classSHADE::SHParticleEmitterComponent:
-      Emission Count: 4
+      Emission Count: 10
       Is Passive: false
       Emission Interval: 0
       Min Life: 1
@@ -8346,7 +8504,7 @@
       Rotation Decay: 0
       Texture Asset ID: 0
       Custom Update Shader Asset ID: 0
-      Color Tint: {x: 0.470701218, y: 0.559471369, z: 0.283432603, w: 1}
+      Color Tint: {x: 0.581223547, y: 0.722466946, z: 0.283257961, w: 1}
       Acceleration: {x: 0, y: -0.0390000008, z: 0}
       IsActive: true
   Scripts:
@@ -8354,9 +8512,106 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 1
       density: 1
       dontReturn: false
       soundDistance: 10
       highlightSpeed: 200
       highlightThickness: 60
       highlightLowerClamp: 0.25
+- EID: 66150
+  Name: ParticlesDeco
+  IsActive: true
+  NumberOfChildren: 3
+  Components: ~
+  Scripts: ~
+- EID: 613
+  Name: Water particles
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 1.93323815, y: 1.15519547, z: -0.353647888}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 0
+      Min Life: 0.100000001
+      Max Life: 0.100000001
+      Minimum Speed: 0
+      Maximum Speed: 0
+      Minimum Size: 0.0500000007
+      Maximum Size: 0.100000001
+      Size Decay: 1
+      Angular Ranges And Offset: {x: 0, y: -1.50999999, z: 0, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1}
+      Acceleration: {x: 0, y: -0.899999976, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 615
+  Name: Water particles
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 1.92703927, y: 0.649912179, z: -0.349291772}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 0
+      Min Life: 0.100000001
+      Max Life: 0.100000001
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.0199999996
+      Maximum Size: 0.0199999996
+      Size Decay: 1
+      Angular Ranges And Offset: {x: 6.11999989, y: 0, z: 6.11999989, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1}
+      Acceleration: {x: 0, y: 0.100000001, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 66147
+  Name: Water particles
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -5.35778379, y: 1.15327418, z: -9.67887211}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 3
+      Is Passive: true
+      Emission Interval: 1.5
+      Min Life: 0.300000012
+      Max Life: 0.300000012
+      Minimum Speed: 0
+      Maximum Speed: 0
+      Minimum Size: 0.0500000007
+      Maximum Size: 0.100000001
+      Size Decay: 0.980000019
+      Angular Ranges And Offset: {x: 0, y: -1.50999999, z: 0, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1}
+      Acceleration: {x: 0, y: -0.100000001, z: 0}
+      IsActive: true
+  Scripts: ~

Assets/Scenes/Level2.shade

@@ -1,3 +1,4 @@
+- NavData: 0
 - EID: 20
   Name: ===== Light =====
   IsActive: true
@@ -18,7 +19,7 @@
       Position: {x: 0, y: 0, z: 0}
       Type: Directional
       Direction: {x: 15, y: -90, z: 15}
-      Color: {x: 1, y: 1, z: 1, w: 1}
+      Color: {x: 0.881057262, y: 0.735790312, z: 0.32214871, w: 1}
       Layer: 4294967295
       Strength: 1
       Casting Shadows: false
@@ -53,7 +54,7 @@
       Position: {x: 2, y: 1.5, z: -5.5999999}
       Type: Directional
       Direction: {x: -0.0780000016, y: 0.159999996, z: -1}
-      Color: {x: 0, y: 0, z: 0, w: 1}
+      Color: {x: 0.845814943, y: 0.612846136, z: 0.208659217, w: 1}
       Layer: 4294967295
       Strength: 1
       Casting Shadows: true
@@ -111,6 +112,7 @@
       Enabled: true
       Score: 50
       currCategory: 1
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -163,6 +165,7 @@
       Enabled: true
       Score: 50
       currCategory: 1
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -215,6 +218,7 @@
       Enabled: true
       Score: 500
       currCategory: 2
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -267,6 +271,7 @@
       Enabled: true
       Score: 500
       currCategory: 2
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -319,6 +324,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -371,6 +377,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -423,6 +430,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -481,6 +489,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 2
       dontReturn: false
       soundDistance: 10
@@ -701,6 +710,7 @@
       Enabled: true
       Score: 50
       currCategory: 1
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -753,6 +763,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -805,6 +816,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -857,6 +869,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -909,6 +922,7 @@
       Enabled: true
       Score: 500
       currCategory: 2
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -961,6 +975,7 @@
       Enabled: true
       Score: 50
       currCategory: 1
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -1013,6 +1028,7 @@
       Enabled: true
       Score: 50
       currCategory: 1
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -1025,7 +1041,7 @@
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 2.66560459, y: 0.10531798, z: 5.97001934}
+      Translate: {x: 4.52824974, y: 0.902858257, z: 3.99456692}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
@@ -1065,6 +1081,7 @@
       Enabled: true
       Score: 50
       currCategory: 1
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -1117,6 +1134,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -1169,6 +1187,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -1221,6 +1240,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -1273,6 +1293,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -1325,6 +1346,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -1377,6 +1399,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -1429,6 +1452,7 @@
       Enabled: true
       Score: 50
       currCategory: 1
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -1481,6 +1505,7 @@
       Enabled: true
       Score: 500
       currCategory: 2
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -1533,6 +1558,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -1585,6 +1611,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -1637,6 +1664,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -1695,6 +1723,7 @@
       Enabled: true
       Score: 500
       currCategory: 2
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -1747,6 +1776,7 @@
       Enabled: true
       Score: 50
       currCategory: 1
+      currFood: 0
       density: 3
       dontReturn: false
       soundDistance: 10
@@ -1799,6 +1829,7 @@
       Enabled: true
       Score: 50
       currCategory: 1
+      currFood: 0
       density: 3
       dontReturn: false
       soundDistance: 10
@@ -1851,6 +1882,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 3
       dontReturn: false
       soundDistance: 10
@@ -1903,6 +1935,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 3
       dontReturn: false
       soundDistance: 10
@@ -1955,6 +1988,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 3
       dontReturn: false
       soundDistance: 10
@@ -2013,6 +2047,7 @@
       Enabled: true
       Score: 500
       currCategory: 2
+      currFood: 0
       density: 1
       dontReturn: false
       soundDistance: 10
@@ -2065,6 +2100,7 @@
       Enabled: true
       Score: 50
       currCategory: 1
+      currFood: 0
       density: 3
       dontReturn: false
       soundDistance: 10
@@ -2117,6 +2153,7 @@
       Enabled: true
       Score: 50
       currCategory: 1
+      currFood: 0
       density: 3
       dontReturn: false
       soundDistance: 10
@@ -2169,6 +2206,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 3
       dontReturn: false
       soundDistance: 10
@@ -2221,6 +2259,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 3
       dontReturn: false
       soundDistance: 10
@@ -2273,6 +2312,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 3
       dontReturn: false
       soundDistance: 10
@@ -2331,6 +2371,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 2
       dontReturn: false
       soundDistance: 10
@@ -2557,6 +2598,7 @@
       Enabled: true
       Score: 10
       currCategory: 0
+      currFood: 0
       density: 2
       dontReturn: false
       soundDistance: 10
@@ -2740,7 +2782,7 @@
 - EID: 13
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: 2.24178481, y: 1.4327563, z: 9.46397972}
@@ -2777,6 +2819,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 18
   Name: CollisionWall
   IsActive: true
@@ -2800,10 +2843,40 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 576
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 14
   Name: ScoreZone
   IsActive: true
-  NumberOfChildren: 1
+  NumberOfChildren: 2
   Components:
     Transform Component:
       Translate: {x: -0.5, y: 1.5, z: -5}
@@ -2840,6 +2913,7 @@
   Scripts:
     - Type: ScoringZone
       Enabled: true
+      startingParticleCount: 10
 - EID: 17
   Name: CollisionWall
   IsActive: true
@@ -2863,6 +2937,36 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 579
+  Name: Particle
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 10
+      Is Passive: false
+      Emission Interval: 0
+      Min Life: 0.5
+      Max Life: 0.5
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.200000003
+      Maximum Size: 0.300000012
+      Size Decay: 0.985000014
+      Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 6.19999981, w: 0}
+      Rotation Speed: 0.0500000007
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 37407233
+      Color Tint: {x: 0, y: 0, z: 0, w: 1}
+      Acceleration: {x: 0, y: -0.0299999993, z: 0}
+      IsActive: true
+  Scripts: ~
 - EID: 238
   Name: ====GameManager====
   IsActive: true
@@ -2945,6 +3049,7 @@
   Scripts:
     - Type: PlayerController
       Enabled: true
+      smokeCount: 4
       respawnPoint: 239
       currentState: 0
       walkMaxMoveVel: 2.5
@@ -3039,7 +3144,7 @@
       armLength: 2
       turnSpeedPitch: 0.200000003
       turnSpeedYaw: 0.400000006
-      inverseXControls: true
+      inverseXControls: false
       inverseYControls: false
       pitchUpperClamp: 45
       pitchLowerClamp: 5
@@ -5544,7 +5649,7 @@
   Components:
     Transform Component:
       Translate: {x: 0, y: -300, z: 0}
-      Rotate: {x: -1.48352981, y: 2.82014489, z: 0.5}
+      Rotate: {x: 0.5, y: 0.5, z: 0.5}
       Scale: {x: 400, y: 100, z: 500}
       IsActive: true
     Renderable Component:
@@ -5630,7 +5735,7 @@
 - EID: 19
   Name: ====EnvironmentMaster====
   IsActive: true
-  NumberOfChildren: 30
+  NumberOfChildren: 33
   Components:
     Transform Component:
       Translate: {x: 0, y: 0, z: 0}
@@ -14739,6 +14844,204 @@
           Rotation Offset: {x: 0, y: 0, z: 0}
       IsActive: true
   Scripts: ~
+- EID: 570
+  Name: CeilingFan
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -3.43279505, y: 3.04381442, z: 0.590506613}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 135521751
+      Material: 131956078
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 0.34906584, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 1.60570288, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: -0.907571197, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: -2.16420817, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 2.87979317, z: 0}
+      IsActive: true
+  Scripts:
+    - Type: CeilingFan
+      Enabled: true
+      rotateSpeed: 3
+- EID: 571
+  Name: CeilingFan
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -0.0900869966, y: 3.04381442, z: -2.56089497}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 135521751
+      Material: 131956078
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 0.34906584, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 1.60570288, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: -0.907571197, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: -2.16420817, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 2.87979317, z: 0}
+      IsActive: true
+  Scripts:
+    - Type: CeilingFan
+      Enabled: true
+      rotateSpeed: 3
+- EID: 572
+  Name: CeilingFan
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 2.14731741, y: 3.04381442, z: 3.51156116}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 135521751
+      Material: 131956078
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 0.34906584, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 1.60570288, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: -0.907571197, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: -2.16420817, z: 0}
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
+          Rotation Offset: {x: 0, y: 2.87979317, z: 0}
+      IsActive: true
+  Scripts:
+    - Type: CeilingFan
+      Enabled: true
+      rotateSpeed: 3
 - EID: 548
   Name: TweenManager
   IsActive: true
@@ -15085,201 +15388,99 @@
       Clicked: false
       IsActive: true
   Scripts: ~
-- EID: 570
+- EID: 66150
-  Name: CeilingFan
+  Name: ParticlesDeco
+  IsActive: true
+  NumberOfChildren: 3
+  Components: ~
+  Scripts: ~
+- EID: 613
+  Name: Water particles
   IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -3.43279505, y: 3.04381442, z: 0.590506613}
+      Translate: {x: 1.49184668, y: 1.40755236, z: -4.72096539}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
-    Renderable Component:
+    classSHADE::SHParticleEmitterComponent:
-      Mesh: 135521751
+      Emission Count: 3
-      Material: 131956078
+      Is Passive: true
+      Emission Interval: 0
+      Min Life: 0.100000001
+      Max Life: 0.100000001
+      Minimum Speed: 0
+      Maximum Speed: 0
+      Minimum Size: 0.0500000007
+      Maximum Size: 0.100000001
+      Size Decay: 1
+      Angular Ranges And Offset: {x: 0, y: -1.50999999, z: 0, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1}
+      Acceleration: {x: 0, y: -0.899999976, z: 0}
       IsActive: true
-    Collider Component:
+  Scripts: ~
-      Colliders:
+- EID: 615
-        - Is Trigger: false
+  Name: Water particles
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 0.34906584, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 1.60570288, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: -0.907571197, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: -2.16420817, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 2.87979317, z: 0}
-      IsActive: true
-  Scripts:
-    - Type: CeilingFan
-      Enabled: true
-      rotateSpeed: 3
-- EID: 571
-  Name: CeilingFan
   IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: -0.0900869966, y: 3.04381442, z: -2.56089497}
+      Translate: {x: 1.50063443, y: 0.889689028, z: -4.72193813}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
-    Renderable Component:
+    classSHADE::SHParticleEmitterComponent:
-      Mesh: 135521751
+      Emission Count: 3
-      Material: 131956078
+      Is Passive: true
+      Emission Interval: 0
+      Min Life: 0.100000001
+      Max Life: 0.100000001
+      Minimum Speed: 1
+      Maximum Speed: 1.5
+      Minimum Size: 0.0199999996
+      Maximum Size: 0.0199999996
+      Size Decay: 1
+      Angular Ranges And Offset: {x: 6.11999989, y: 0, z: 6.11999989, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1}
+      Acceleration: {x: 0, y: 0.100000001, z: 0}
       IsActive: true
-    Collider Component:
+  Scripts: ~
-      Colliders:
+- EID: 66147
-        - Is Trigger: false
+  Name: Water particles
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 0.34906584, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 1.60570288, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: -0.907571197, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: -2.16420817, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 2.87979317, z: 0}
-      IsActive: true
-  Scripts:
-    - Type: CeilingFan
-      Enabled: true
-      rotateSpeed: 3
-- EID: 572
-  Name: CeilingFan
   IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
-      Translate: {x: 2.14731741, y: 3.04381442, z: 3.51156116}
+      Translate: {x: 2.49271369, y: 1.43694282, z: -4.72096539}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
       IsActive: true
-    Renderable Component:
+    classSHADE::SHParticleEmitterComponent:
-      Mesh: 135521751
+      Emission Count: 3
-      Material: 131956078
+      Is Passive: true
+      Emission Interval: 1.5
+      Min Life: 0.300000012
+      Max Life: 0.300000012
+      Minimum Speed: 0
+      Maximum Speed: 0
+      Minimum Size: 0.0500000007
+      Maximum Size: 0.100000001
+      Size Decay: 0.980000019
+      Angular Ranges And Offset: {x: 0, y: -1.50999999, z: 0, w: 0}
+      Rotation Speed: 0
+      Rotation Decay: 0
+      Texture Asset ID: 0
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.0187467411, y: 0.627120614, z: 0.709251106, w: 1}
+      Acceleration: {x: 0, y: -0.100000001, z: 0}
       IsActive: true
-    Collider Component:
+  Scripts: ~
-      Colliders:
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 0.34906584, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 1.60570288, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: -0.907571197, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: -2.16420817, z: 0}
-        - Is Trigger: false
-          Collision Tag: 0
-          Type: Box
-          Half Extents: {x: 0.699999988, y: 0.0500000007, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: -0.699999988, y: -0.75, z: 0}
-          Rotation Offset: {x: 0, y: 2.87979317, z: 0}
-      IsActive: true
-  Scripts:
-    - Type: CeilingFan
-      Enabled: true
-      rotateSpeed: 3

Assets/Scenes/MainMenu.shade

@@ -1,3 +1,4 @@
+- NavData: 0
 - EID: 0
   Name: Main Menu Canvas
   IsActive: true
@@ -540,7 +541,14 @@
       Canvas Height: 1080
       Scale by canvas width: false
       IsActive: false
-  Scripts: ~
+  Scripts:
+    - Type: SHADE_Scripting.UI.Options
+      Enabled: true
+      masterVolSlider: 29
+      sfxVolSlider: 30
+      bgmVolSlider: 31
+      fovSlider: 37
+      sensitivitySlider: 38
 - EID: 20
   Name: BackGround
   IsActive: true
@@ -898,47 +906,47 @@
   Scripts: ~
 - EID: 449
   Name: Camera Invert X Text
-  IsActive: false
+  IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
       Translate: {x: 0, y: -200, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 75, y: 75, z: 1}
-      IsActive: false
+      IsActive: true
     Text Renderer Component:
       Text: "Camera Invert    X:"
       Font: 174412429
       Color: {x: 0, y: 0, z: 0, w: 1}
       Text Size: {x: 1, y: 1, z: 1}
-      IsActive: false
+      IsActive: true
     UI Component:
       Canvas ID: 19
       Hovered: false
       Clicked: false
-      IsActive: false
+      IsActive: true
   Scripts: ~
 - EID: 447
   Name: Camera Invert Y Text
-  IsActive: false
+  IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
       Translate: {x: 800, y: -200, z: 0.100000001}
       Rotate: {x: 0, y: 0, z: 0}
       Scale: {x: 75, y: 75, z: 1}
-      IsActive: false
+      IsActive: true
     Text Renderer Component:
       Text: "Y:"
       Font: 174412429
       Color: {x: 0, y: 0, z: 0, w: 1}
       Text Size: {x: 1, y: 1, z: 1}
-      IsActive: false
+      IsActive: true
     UI Component:
       Canvas ID: 19
       Hovered: false
       Clicked: false
-      IsActive: false
+      IsActive: true
   Scripts: ~
 - EID: 36
   Name: Camera Slider Group
@@ -1008,54 +1016,62 @@
   Scripts: ~
 - EID: 448
   Name: Invert X Toggle Button
-  IsActive: false
+  IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
       Translate: {x: -300, y: -200, z: 0}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 75, y: 75, z: 1}
+      Scale: {x: 150, y: 150, z: 1}
-      IsActive: false
+      IsActive: true
     Renderable Component:
       Mesh: 141771688
       Material: 129340704
-      IsActive: false
+      IsActive: true
     Toggle Button Component:
-      Non Toggled Texture: 55358401
+      Non Toggled Texture: 50439604
-      Toggled Texture: 52333376
+      Toggled Texture: 64389107
       Value: false
-      IsActive: false
+      IsActive: true
     UI Component:
       Canvas ID: 19
       Hovered: false
       Clicked: false
-      IsActive: false
+      IsActive: true
-  Scripts: ~
+  Scripts:
+    - Type: InverseCamera
+      Enabled: true
+      inverseX: true
+      inverseY: false
 - EID: 445
   Name: Invert Y Toggle Button
-  IsActive: false
+  IsActive: true
   NumberOfChildren: 0
   Components:
     Transform Component:
       Translate: {x: -50, y: -200, z: 0}
       Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 75, y: 75, z: 1}
+      Scale: {x: 150, y: 150, z: 1}
-      IsActive: false
+      IsActive: true
     Renderable Component:
       Mesh: 141771688
       Material: 129340704
-      IsActive: false
+      IsActive: true
     Toggle Button Component:
-      Non Toggled Texture: 55358401
+      Non Toggled Texture: 50439604
-      Toggled Texture: 52333376
+      Toggled Texture: 64389107
       Value: false
-      IsActive: false
+      IsActive: true
     UI Component:
       Canvas ID: 19
       Hovered: false
       Clicked: false
-      IsActive: false
+      IsActive: true
-  Scripts: ~
+  Scripts:
+    - Type: InverseCamera
+      Enabled: true
+      inverseX: false
+      inverseY: true
 - EID: 39
   Name: Audio Slider Text Group
   IsActive: true
@@ -1490,9 +1506,9 @@
       Material: 129340704
       IsActive: true
     Button Component:
-      Default Texture: 52916516
+      Default Texture: 55897117
-      Hovered Texture: 52916516
+      Hovered Texture: 55897117
-      Clicked Texture: 52916516
+      Clicked Texture: 55897117
       IsActive: true
     UI Component:
       Canvas ID: 50
@@ -1518,9 +1534,9 @@
       Material: 129340704
       IsActive: true
     Button Component:
-      Default Texture: 55380564
+      Default Texture: 52151774
-      Hovered Texture: 55380564
+      Hovered Texture: 52151774
-      Clicked Texture: 55380564
+      Clicked Texture: 52151774
       IsActive: true
     UI Component:
       Canvas ID: 50
@@ -1546,9 +1562,9 @@
       Material: 129340704
       IsActive: true
     Button Component:
-      Default Texture: 53392159
+      Default Texture: 51704639
-      Hovered Texture: 53392159
+      Hovered Texture: 51704639
-      Clicked Texture: 53392159
+      Clicked Texture: 51704639
       IsActive: true
     UI Component:
       Canvas ID: 50

Assets/Scripts/Gameplay/Item/SC_Item.cs

@@ -10,15 +10,26 @@ public class Item : Script
     HEAVY
   }
 
+  public enum Food
+  {
+    EGG,
+    APPLE,
+    MEAT,
+    WATERMELON,
+    CHEESE
+  }
+
   public int Score = 10;
 
   public ItemCategory currCategory;
+  public Food currFood;
   public bool returnBack { get; set; }
   private Transform transform;
   private RigidBody rb;
   private bool playSound = false;
   private bool caputurePos = false;
   private Vector3 firstPostion;
+  private Vector3 firstRotation;
   private Collider collider;
   public float density = 1.0f;
   public bool dontReturn = false;
@@ -101,7 +112,7 @@ public class Item : Script
 
       if (transform)
       {
-        transform.LocalEulerAngles = Vector3.Zero;
+        transform.LocalEulerAngles = firstRotation;
         transform.LocalPosition = firstPostion;
       }
 
@@ -129,6 +140,7 @@ public class Item : Script
     if (!caputurePos)
     {
       firstPostion = transform.LocalPosition;
+      firstRotation = transform.LocalEulerAngles;
       caputurePos = true;
     }
 
@@ -144,6 +156,7 @@ public class Item : Script
       Audio.DetachAudioClipFromObject(AudioHandler.audioClipHandlers["SFXImpactElastic"]);
       Audio.DetachAudioClipFromObject(AudioHandler.audioClipHandlers["SFXImpactHard"]);
 
+      Debug.Log("ENTER");
       if(emitter)
         emitter.Emit();
 

Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerLandState.cs

@@ -1,4 +1,5 @@
 using SHADE;
+using SHADE_Scripting.Audio;
 using System;
 
 public class PlayerLandState : BaseState

Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs

@@ -61,7 +61,7 @@ public class PickAndThrow : Script
   protected override void awake()
   {
     pc = GetScript<PlayerController>();
-    if(!pc)
+    if (!pc)
       Debug.LogError("PLAYER CONTROLLER EMPTY");
 
     raccoonHoldLocation = GetComponentInChildren<Transform>();
@@ -69,15 +69,17 @@ public class PickAndThrow : Script
       Debug.LogError("CHILD EMPTY");
 
     tpc = GetScriptInChildren<ThirdPersonCamera>();
-    if(!tpc)
+    if (!tpc)
       Debug.LogError("TPC EMPTY");
 
-    AudioHandler.audioClipHandlers["SFXThrow"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_throw");
+    AudioHandler.audioClipHandlers["SFXThrowLarge"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_throw_large");
+    AudioHandler.audioClipHandlers["SFXThrowMedium"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_throw_medium");
+    AudioHandler.audioClipHandlers["SFXThrowSmall"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_throw_small");
 
     timer = delayTimer;
 
     trajComp = GetComponentInChildren<TrajectoryRenderable>();
-    if(!trajComp)
+    if (!trajComp)
       Debug.LogError("TrajectoryRenderable MISSING");
   }
 
@@ -126,7 +128,13 @@ public class PickAndThrow : Script
 
         if (Input.GetMouseButtonUp(Input.MouseCode.LeftButton) && pc.isAiming)
         {
-          AudioHandler.audioClipHandlers["SFXThrow"].Play();
+          if (itemScript.currCategory == ItemCategory.LIGHT)
+            AudioHandler.audioClipHandlers["SFXThrowSmall"].Play();
+          else if (itemScript.currCategory == ItemCategory.MEDIUM)
+            AudioHandler.audioClipHandlers["SFXThrowMedium"].Play();
+          else
+            AudioHandler.audioClipHandlers["SFXThrowLarge"].Play();
+
           itemRidigBody.IsGravityEnabled = true;
           itemCollider.GetCollisionShape(0).IsTrigger = false;
           pc.isAiming = false;

Assets/Scripts/Gameplay/Player/SC_PlayerController.cs

@@ -150,6 +150,10 @@ public class PlayerController : Script
     }
 
     AudioHandler.audioClipHandlers["footsteps"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_footsteps");
+    AudioHandler.audioClipHandlers["Jump"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_jump");
+    AudioHandler.audioClipHandlers["JumpPad"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_jumpPad");
+    AudioHandler.audioClipHandlers["Land"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_land");
+    AudioHandler.audioClipHandlers["RaccoonCaught"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_caught");
 
     playLandedAnimation = false;
 
@@ -403,7 +407,11 @@ public class PlayerController : Script
           v.y *= jumpPadMultiplayer;
           landedOnJumpPad = false;
           jumpPadDrop = true;
+          AudioHandler.audioClipHandlers["JumpPad"].Play();
         }
+        else
+          AudioHandler.audioClipHandlers["Jump"].Play();
+
         rb.LinearVelocity = v;
       }
     }
@@ -445,6 +453,7 @@ public class PlayerController : Script
         isGrounded = true;
         if (currentState == RaccoonStates.FALLING)
         {
+          AudioHandler.audioClipHandlers["Land"].Play();
           currentState = RaccoonStates.LANDED;
           jumpPadDrop = false;
           dropTimer = 0.0f;
@@ -491,6 +500,7 @@ public class PlayerController : Script
   {
     if (currentState == RaccoonStates.CAUGHT && tranform && respawnPoint)
     {
+      AudioHandler.audioClipHandlers["RaccoonCaught"].Play();
       currentState = RaccoonStates.IDLE;
       if (stateMachine && !stateMachine.IsState(typeof(PlayerIdleState)))
         stateMachine.SetState(typeof(PlayerIdleState));

Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs

@@ -14,8 +14,6 @@ namespace SHADE_Scripting
     public float armLength = 2.0f;
     public float turnSpeedPitch = 0.3f;
     public float turnSpeedYaw = 0.5f;
-    public bool inverseXControls = false;
-    public bool inverseYControls = false;
     public float pitchUpperClamp = 45.0f;
     public float pitchLowerClamp = 5.0f;
 
@@ -51,15 +49,15 @@ namespace SHADE_Scripting
       if (arm)
       {
         Vector2 vel = Input.GetMouseVelocity();
-        if(inverseYControls)
+        if(Settings.inverseY)
           arm.Pitch -= vel.y * turnSpeedPitch * Time.DeltaTimeF;
         else
           arm.Pitch += vel.y * turnSpeedPitch * Time.DeltaTimeF;
 
-        if (inverseXControls)
+        if (Settings.inverseX)
-          arm.Yaw -= vel.x * turnSpeedYaw * Time.DeltaTimeF;
-        else
           arm.Yaw += vel.x * turnSpeedYaw * Time.DeltaTimeF;
+        else
+          arm.Yaw -= vel.x * turnSpeedYaw * Time.DeltaTimeF;
 
         if (arm.Pitch > pitchUpperClamp)
         {

Assets/Scripts/Gameplay/SC_GameManager.cs

@@ -90,6 +90,7 @@ public class GameManager : Script
     Application.FixDeltaTime = Time.DefaultFixDeltaTime;
 
     AudioHandler.audioClipHandlers["SFXItemScore"] = Audio.CreateAudioClip("event:/Music/stingers/item_scored");
+    AudioHandler.audioClipHandlers["RaccoonScored"] = Audio.CreateAudioClip("event:/Raccoon/raccoon_scored");
   }
 
   protected override void start()
@@ -248,6 +249,7 @@ public class GameManager : Script
 
     Audio.SetParameter("Multiplier", currMultiplierCombo);
     AudioHandler.audioClipHandlers["SFXItemScore"].Play();
+    AudioHandler.audioClipHandlers["RaccoonScored"].Play();
 
     MultiplierTextFx fx = multiplierText.GetScript<MultiplierTextFx>();
     if (fx)

Assets/Scripts/Gameplay/SC_JumpPad.cs

@@ -12,6 +12,7 @@ public class JumpPad : Script
   public float scaleDuration = 0.25f;
   private bool landed = false;
   private bool scaleUpDone = false;
+  public float itemUpwardForce = 6.0f;
 
   [NonSerialized]
   private TweenThread scaleYUp;
@@ -73,6 +74,15 @@ public class JumpPad : Script
       scaleYUp.Reset();
       scaleXZUp.Reset();
     }
+    else if (info.GameObject.GetComponent<RigidBody>())
+    {
+      Audio.AttachAudioClipToObject(AudioHandler.audioClipHandlers["SFXJumpPad"], GameObject.EntityId);
+      AudioHandler.audioClipHandlers["SFXJumpPad"].Play();
+      info.GameObject.GetComponent<RigidBody>().AddForce(new Vector3(0, itemUpwardForce, 0));
+      landed = true;
+      scaleYUp.Reset();
+      scaleXZUp.Reset();
+    }
   }
 
 }

Assets/Scripts/Gameplay/SC_ScoringZone.cs

@@ -4,7 +4,17 @@ using System;
 public class ScoringZone : Script
 {
 
+  private ParticleEmitter particle;
+  public int startingParticleCount = 10;
+
   protected override void awake()
+  {
+    particle = GetComponentInChildren<ParticleEmitter>();
+    if (!particle)
+      Debug.LogError("PARTICLE MISSING");
+  }
+
+  protected override void update()
   {
   }
 
@@ -14,6 +24,8 @@ public class ScoringZone : Script
     {
       GameManager.Instance.Score += info.GameObject.GetScript<Item>().Score * GameManager.Instance.currMultiplierCombo;
       GameManager.Instance.ItemScored();
+      particle.EmissionCount = startingParticleCount * GameManager.Instance.currMultiplierCombo;
+      particle.Emit();
       info.GameObject.SetActive(false);
     }
   }

Assets/Scripts/UI/SC_InverseCamera.cs

@@ -0,0 +1,53 @@
+using SHADE;
+using SHADE_Scripting.UI;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+
+public class InverseCamera : Script
+{
+  public bool inverseX = false;
+  public bool inverseY = false;
+
+  protected override void awake()
+  {
+    UIElement ui = GetComponent<UIElement>();
+    if (ui)
+    {
+      Toggle toggle = ui.GetComponent<Toggle>();
+
+      if(inverseX)
+        toggle.SetValue(Settings.inverseX);
+      if(inverseY)
+        toggle.SetValue(Settings.inverseY);
+    }
+    else
+    {
+      Debug.LogError("Failed to register Toggle action for inverse");
+    }
+  }
+  protected override void start()
+  {
+    UIElement ui = GetComponent<UIElement>();
+    if (ui)
+    {
+      ui.OnClick.RegisterAction(() =>
+      {
+        Toggle toggle = ui.GetComponent<Toggle>();
+        if(inverseX)
+          Settings.inverseX = toggle.GetValue();
+        if(inverseY)
+          Settings.inverseY = toggle.GetValue();
+      });
+    }
+    else
+    {
+      Debug.LogError("Failed to register Toggle action for inverse");
+    }
+  }
+
+}
+

Assets/Scripts/UI/SC_InverseCamera.cs.shmeta

@@ -0,0 +1,3 @@
+Name: SC_InverseCamera
+ID: 160969739
+Type: 9

Assets/Scripts/UI/SC_Options.cs

@@ -15,9 +15,6 @@ namespace SHADE_Scripting.UI
     public GameObject fovSlider;
     public GameObject sensitivitySlider;
 
-
-
-
     protected override void awake()
     {
       Slider mv = masterVolSlider.GetComponent<Slider>();
@@ -26,8 +23,6 @@ namespace SHADE_Scripting.UI
       Slider fov = fovSlider.GetComponent<Slider>();
       Slider sens = sensitivitySlider.GetComponent<Slider>();
 
-
-
       if (mv != null)
       {
         mv.ScaledValue = Settings.masterVolume;

Assets/Scripts/UI/Settings.cs

@@ -13,5 +13,7 @@ static public class Settings
   static public float masterVolume = 100.0f;
   static public float sfxVolume = 100.0f;
   static public float bgmVolume = 100.0f;
+  static public bool inverseX = false;
+  static public bool inverseY = false;
 }
 

Assets/Shaders/ParticleEmit_CS.glsl

@@ -131,7 +131,7 @@ void main()
   ParticleData particle;
 
   // Get seed for randomization
-  uint pixel_index = uint (emitterPosition.x + emitterPosition.y + floatBitsToUint(genericDataBuffer.data.elapsedTime) * (gl_GlobalInvocationID.x + 1));
+  uint pixel_index = uint (emitterPosition.x * emitterPosition.y + floatBitsToUint(genericDataBuffer.data.elapsedTime) * (gl_GlobalInvocationID.x + 1));
   uint seed = pcg_hash (pixel_index);
 
   int index = freelist.freeIndices[freelistIndex];

Assets/Shaders/ParticleUpdateRandomColor_CS.glsl

@@ -0,0 +1,163 @@
+#version 450
+
+layout(local_size_x = 128) in;
+
+struct DrawArraysIndirectArgs
+{
+  uint count;
+  uint instanceCount;
+  uint first;
+  uint baseInstance;
+};
+
+struct ParticleData
+{
+  vec4 position;
+  vec4 orientationSpeedDecay;
+  vec4 velocity;
+  vec4 acceleration;
+  vec4 scaleAndDecay;
+  vec4 colorTint;
+  float life;
+  uint textureIndex;
+};
+
+struct GenericData
+{
+  //! Delta time
+  float dt;
+
+  //! Elapsed time of the application
+  float elapsedTime;
+
+  //! Viewport width of the scene (excluding imgui, that means smaller than window)
+  uint viewportWidth;
+
+  //! Ditto but for height
+  uint viewportHeight;
+};
+
+layout(set = 1, binding = 0) uniform CameraData
+{
+  vec4 position; 
+  mat4 vpMat;
+  mat4 viewMat;
+  mat4 projMat;
+} cameraData;
+
+
+layout (set = 0, binding = 0) uniform GenericDataBuffer
+{
+  GenericData data;
+} genericDataBuffer;
+
+layout (std430, set = 2, binding = 1) coherent restrict readonly buffer ParticlesInputBuffer
+{
+  ParticleData data[];
+} inputParticles;
+
+// output buffer not needed
+layout (std430, set = 2, binding = 2) coherent restrict buffer ParticlesOutputBuffer
+{
+  ParticleData data[];
+} outputParticles;
+
+layout (std430, set = 2, binding = 3) coherent restrict buffer ParticlesFreelistBuffer
+{
+  int freeCount;
+  int freeIndices[];
+
+} freelist;
+
+layout (std430, set = 2, binding = 4) coherent restrict buffer IndicesData
+{
+  uint indices[];
+};
+
+layout (std140, set = 2, binding = 5) coherent restrict buffer IndirectDrawArgs
+{
+  DrawArraysIndirectArgs indirectArgs;
+}; 
+
+// push constants
+layout(std140, push_constant) uniform EmitterPushConstant
+{
+  vec4 emitterPosition;
+  uint emissionCount;
+
+} emitterPushConstant;
+
+uint pcg_hash(uint seed)
+{
+  uint state = seed * 747796405u + 2891336453u;
+  uint word = ((state >> ((state >> 28u) + 4u)) ^ state) * 277803737u;
+  return (word >> 22u) ^ word;
+}
+
+// Used to advance the PCG state.
+uint rand_pcg(inout uint rng_state)
+{
+  uint state = rng_state;
+  rng_state = rng_state * 747796405u + 2891336453u;
+  uint word = ((state >> ((state >> 28u) + 4u)) ^ state) * 277803737u;
+  return (word >> 22u) ^ word;
+}
+
+// Advances the prng state and returns the corresponding random float.
+float rand(inout uint state)
+{
+  uint x = rand_pcg(state);
+  state = x;
+  return float(x)*uintBitsToFloat(0x2f800004u);
+}
+
+void main()
+{ 
+  uint index = gl_GlobalInvocationID.x;
+
+  ParticleData particle = inputParticles.data[index];
+
+    // Get seed for randomization
+  uint pixel_index = uint (particle.velocity.x + particle.velocity.y + floatBitsToUint(genericDataBuffer.data.elapsedTime) * (gl_GlobalInvocationID.x + 1));
+  uint seed = pcg_hash (pixel_index);
+
+
+  if (particle.life > 0.0f)
+  {
+    // update position from velocity
+    particle.position += particle.velocity * genericDataBuffer.data.dt;
+    particle.velocity += particle.acceleration;
+    particle.life -= genericDataBuffer.data.dt;
+    particle.orientationSpeedDecay.x += particle.orientationSpeedDecay.y;
+    particle.scaleAndDecay.x *= particle.scaleAndDecay.z;
+    particle.scaleAndDecay.y *= particle.scaleAndDecay.w;
+
+    if (particle.colorTint.xyz == vec3(0.0f))
+    {
+      particle.colorTint.xyz = vec3 (rand (seed), rand(seed), rand(seed));
+    }
+
+    if (particle.orientationSpeedDecay.y > 0.0f)
+    {
+      particle.orientationSpeedDecay.y -= particle.orientationSpeedDecay.z * genericDataBuffer.data.dt;
+      if (particle.orientationSpeedDecay.y < 0.0f)
+        particle.orientationSpeedDecay.y = 0.0f;
+    }  
+    
+    if (particle.life < 0.0f || particle.scaleAndDecay.x < 0.0f || particle.scaleAndDecay.y < 0.0f)
+    {
+      particle.life = 0.0f;
+      particle.position.x = 9999.0f;
+      
+      outputParticles.data[index] = particle;
+      freelist.freeIndices[atomicAdd(freelist.freeCount, 1)] = int (index);
+      return;
+    }
+
+    uint drawIndex = atomicAdd (indirectArgs.instanceCount, 1);
+    indices[drawIndex] = index;
+
+  }
+
+  outputParticles.data[index] = particle;
+}

Assets/Shaders/ParticleUpdateRandomColor_CS.shshaderb.shmeta

@@ -0,0 +1,3 @@
+Name: ParticleUpdateRandomColor_CS
+ID: 37407233
+Type: 2

Assets/Texture/Cutscene/TX_cutscene_04a.shtex.shmeta

@@ -1,3 +1,3 @@
 Name: TX_cutscene_04a
-ID: 51238312
+ID: 59076169
 Type: 3

Assets/Texture/Cutscene/TX_cutscene_04b.shtex.shmeta

@@ -1,3 +1,3 @@
 Name: TX_cutscene_04b
-ID: 61471971
+ID: 66572525
 Type: 3

Assets/Texture/Cutscene/TX_cutscene_04c.shtex.shmeta

@@ -1,3 +1,3 @@
 Name: TX_cutscene_04c
-ID: 58217538
+ID: 66182834
 Type: 3

Assets/Texture/Cutscene/TX_cutscene_05a.shtex.shmeta

@@ -1,3 +1,3 @@
 Name: TX_cutscene_05a
-ID: 61980534
+ID: 58009216
 Type: 3

Assets/Texture/Cutscene/TX_cutscene_05b.shtex.shmeta

@@ -1,3 +1,3 @@
 Name: TX_cutscene_05b
-ID: 51561286
+ID: 55022275
 Type: 3

Assets/Texture/UI/Checkbox_Empty.shtex.shmeta

@@ -0,0 +1,3 @@
+Name: Checkbox_Empty
+ID: 50439604
+Type: 3

Assets/Texture/UI/Checkbox_Filled.shtex.shmeta

@@ -0,0 +1,3 @@
+Name: Checkbox_Filled
+ID: 64389107
+Type: 3

Assets/Texture/UI/Level Select/Level_1_Select.shtex.shmeta

@@ -0,0 +1,3 @@
+Name: Level_1_Select
+ID: 55897117
+Type: 3

Assets/Texture/UI/Level Select/Level_2_Select.shtex.shmeta

@@ -0,0 +1,3 @@
+Name: Level_2_Select
+ID: 52151774
+Type: 3

Assets/Texture/UI/Level Select/Level_3_Select.shtex.shmeta

@@ -0,0 +1,3 @@
+Name: Level_3_Select
+ID: 51704639
+Type: 3

Assets/Texture/UI/Level Select/TX_Button_Level1.shtex.shmeta

@@ -1,3 +0,0 @@
-Name: TX_Button_Level1
-ID: 52916516
-Type: 3

Assets/Texture/UI/Level Select/TX_Button_Level2_1.shtex.shmeta

@@ -1,3 +0,0 @@
-Name: TX_Button_Level2_1
-ID: 55380564
-Type: 3

Assets/Texture/UI/Level Select/TX_Button_Level3_1.shtex.shmeta

@@ -1,3 +0,0 @@
-Name: TX_Button_Level3_1
-ID: 53392159
-Type: 3

SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp

@@ -574,6 +574,13 @@ namespace SHADE
     ReceiverPtr compileAssetReceivePtr = std::dynamic_pointer_cast<SHEventReceiver>(compileAssetReceiever);
     SHEventManager::SubscribeTo(SH_ASSET_COMPILE_EVENT, compileAssetReceivePtr);
 
+    std::shared_ptr<SHEventReceiverSpec<SHGraphicsSystem>> sceneExitPreEvent
+    {
+      std::make_shared<SHEventReceiverSpec<SHGraphicsSystem>>(this, &SHGraphicsSystem::ReceivePreSceneExitEvent)
+    };
+    ReceiverPtr sceneExitPreEventPtr = std::dynamic_pointer_cast<SHEventReceiver>(sceneExitPreEvent);
+    SHEventManager::SubscribeTo(SH_SCENE_EXIT_PRE, sceneExitPreEventPtr);
+
   }
 
   void SHGraphicsSystem::InitGenericDataAndTexturesDescSet(void) noexcept
@@ -984,6 +991,14 @@ namespace SHADE
     return eventPtr->handle;
   }
 
+  SHEventHandle SHGraphicsSystem::ReceivePreSceneExitEvent(SHEventPtr eventPtr) noexcept
+  {
+    device->WaitIdle();
+
+    return eventPtr->handle;
+  }
+
+
   SHEventHandle SHGraphicsSystem::ReceiveLightDeleteEvent(SHEventPtr eventPtr) noexcept
   {
     // we need to wait for the device to finish using the graph first

SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h

@@ -183,6 +183,7 @@ namespace SHADE
     /* Light functions                                                       */
     /*-----------------------------------------------------------------------*/
     SHEventHandle ReceiveLightEnableShadowEvent (SHEventPtr eventPtr) noexcept;
+    SHEventHandle ReceivePreSceneExitEvent      (SHEventPtr eventPtr) noexcept;
     SHEventHandle ReceiveLightDeleteEvent       (SHEventPtr eventPtr) noexcept;
 
     /*-----------------------------------------------------------------------*/

SHADE_Engine/src/Graphics/MiddleEnd/Particles/SHParticleEmitterComponent.cpp

@@ -1,5 +1,7 @@
 #include "SHpch.h"
 #include "SHParticleEmitterComponent.h"
+#include "Graphics/Buffers/SHVkBuffer.h"
+#include "Graphics/Descriptors/SHVkDescriptorSetGroup.h"
 
 namespace SHADE
 {
@@ -12,7 +14,12 @@ namespace SHADE
 
   void SHParticleEmitterComponent::OnDestroy(void)
   {
-
+    emitterData.Free();
+    particleData.Free();
+    freelistData.Free();
+    indicesData.Free();
+    drawCallData.Free();
+    particleDescriptorSet.Free();
   }
 
   void SHParticleEmitterComponent::Emit(void) noexcept

SHADE_Engine/src/Navigation/SHNavigationSystem.cpp

@@ -15,8 +15,8 @@
 #include <map>
 #include <list>
 
-#define DRAW_NAVIGATION_DATA
+//#define DRAW_NAVIGATION_DATA
-#define DRAW_NAVIGATION_PATH
+//#define DRAW_NAVIGATION_PATH
 
 
 namespace SHADE

SHADE_Managed/src/Components/Toggle.cxx

@@ -0,0 +1,30 @@
+// Precompiled Headers
+#include "SHpch.h"
+// Primary Header
+#include "Toggle.hxx"
+#include "Assets/NativeAsset.hxx"
+#include "Utility/Convert.hxx"
+#include "Utility/Debug.hxx"
+
+
+#include "ECS_Base/Managers/SHSystemManager.h"
+#include "UI/SHUISystem.h"
+
+
+namespace SHADE
+{
+    Toggle::Toggle(Entity entity)
+        : Component(entity)
+    {}
+
+    bool Toggle::GetValue()
+    {
+        return GetNativeComponent()->GetValue();
+    }
+
+    void Toggle::SetValue(bool value)
+    {
+        return GetNativeComponent()->SetValue(value);
+    }
+
+}

SHADE_Managed/src/Components/Toggle.hxx

@@ -0,0 +1,48 @@
+/************************************************************************************//*!
+\file           Slider.hxx
+\author         Daniel Chua, 2001877
+\par            email: yeechendaniel/@digipen.edu
+\date           Feb 26, 2023
+\brief          Contains the definition of the managed Slider class with the
+                declaration of functions for working with it.
+
+                Note: This file is written in C++17/CLI.
+
+Copyright (C) 2023 DigiPen Institute of Technology.
+Reproduction or disclosure of this file or its contents without the prior written consent
+of DigiPen Institute of Technology is prohibited.
+*//*************************************************************************************/
+#pragma once
+
+// Project Includes
+#include "Components/Component.hxx"
+#include "Math/Vector3.hxx"
+#include "Math/Quaternion.hxx"
+// External Dependencies
+#include "UI/SHToggleButtonComponent.h"
+
+namespace SHADE
+{
+    /// <summary>
+    /// CLR version of the SHADE Engine's SHSliderComponent.
+    /// </summary>
+    public ref class Toggle : public Component<SHToggleButtonComponent>
+    {
+    internal:
+        /*-----------------------------------------------------------------------------*/
+        /* Constructors                                                                */
+        /*-----------------------------------------------------------------------------*/
+        /// <summary>
+        /// Constructs a Slider Component that represents a native SHSliderComponent 
+        /// tied to the specified Entity.
+        /// </summary>
+        /// <param name="entity">Entity that this Component will be tied to.</param>
+        Toggle(Entity entity);
+
+    public:
+
+        bool GetValue();
+        void SetValue(bool value);
+    };
+}
+

SHADE_Managed/src/Engine/ECS.cxx

@@ -53,6 +53,7 @@ of DigiPen Institute of Technology is prohibited.
 #include "Components\Animator.hxx"
 #include "Components\ParticleEmitter.hxx"
 #include "Components\Navigation.hxx"
+#include "Components\Toggle.hxx"
 
 
 namespace SHADE
@@ -345,6 +346,7 @@ namespace SHADE
         componentMap.Add(createComponentSet<SHAnimatorComponent, Animator>());
         componentMap.Add(createComponentSet<SHParticleEmitterComponent, ParticleEmitter>());
         componentMap.Add(createComponentSet<SHNavigationComponent, Navigation>());
+        componentMap.Add(createComponentSet<SHToggleButtonComponent, Toggle>());
     }
     
     /*---------------------------------------------------------------------------------*/