Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022

Assets/Scenes/SampleScene_Profiles/PostProcessing Profile.asset

@@ -47,6 +47,50 @@ MonoBehaviour:
   dirtIntensity:
     overrideState: 0
     value: 0
+--- !u!114 &-5197951191444609525
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 40b924e2dad56384a8df2a1e111bb675, type: 3}
+  m_Name: Vignette
+  m_EditorClassIdentifier: 
+  active: 1
+  enabled:
+    overrideState: 1
+    value: 1
+  mode:
+    overrideState: 1
+    value: 0
+  color:
+    overrideState: 1
+    value: {r: 0, g: 0, b: 0, a: 1}
+  center:
+    overrideState: 1
+    value: {x: 0.5, y: 0.5}
+  intensity:
+    overrideState: 1
+    value: 0.1
+  smoothness:
+    overrideState: 1
+    value: 0.2
+  roundness:
+    overrideState: 0
+    value: 1
+  rounded:
+    overrideState: 0
+    value: 0
+  mask:
+    overrideState: 0
+    value: {fileID: 0}
+    defaultState: 1
+  opacity:
+    overrideState: 0
+    value: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -62,6 +106,8 @@ MonoBehaviour:
   settings:
   - {fileID: -8837999042995907667}
   - {fileID: 2086242626207873403}
+  - {fileID: 3905136773684907243}
+  - {fileID: -5197951191444609525}
 --- !u!114 &2086242626207873403
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -114,8 +160,8 @@ MonoBehaviour:
     overrideState: 0
     value: 1
   temperature:
-    overrideState: 0
+    overrideState: 1
-    value: 0
+    value: 5
   tint:
     overrideState: 0
     value: 0
@@ -126,17 +172,17 @@ MonoBehaviour:
     overrideState: 0
     value: 0
   saturation:
-    overrideState: 0
+    overrideState: 1
-    value: 0
+    value: 10
   brightness:
     overrideState: 0
     value: 0
   postExposure:
-    overrideState: 0
+    overrideState: 1
-    value: 0
+    value: 0.1
   contrast:
-    overrideState: 0
+    overrideState: 1
-    value: 0
+    value: 5
   mixerRedOutRedIn:
     overrideState: 0
     value: 100
@@ -166,13 +212,13 @@ MonoBehaviour:
     value: 100
   lift:
     overrideState: 0
-    value: {x: 1, y: 1, z: 1, w: 0}
+    value: {x: 0.96115273, y: 0.9799524, z: 1, w: 0}
   gamma:
     overrideState: 0
-    value: {x: 1, y: 1, z: 1, w: 0}
+    value: {x: 1, y: 0.9256901, z: 0.9161244, w: 0}
   gain:
     overrideState: 0
-    value: {x: 1, y: 1, z: 1, w: 0}
+    value: {x: 1, y: 0.9172976, z: 0.89808714, w: 0}
   masterCurve:
     overrideState: 0
     value:
@@ -1373,3 +1419,52 @@ MonoBehaviour:
       - 0.5
       - 0.5
       - 0.5
+--- !u!114 &3905136773684907243
+MonoBehaviour:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c1cb7e9e120078f43bce4f0b1be547a7, type: 3}
+  m_Name: AmbientOcclusion
+  m_EditorClassIdentifier: 
+  active: 1
+  enabled:
+    overrideState: 1
+    value: 1
+  mode:
+    overrideState: 1
+    value: 1
+  intensity:
+    overrideState: 1
+    value: 1
+  color:
+    overrideState: 1
+    value: {r: 0, g: 0, b: 0, a: 1}
+  ambientOnly:
+    overrideState: 0
+    value: 1
+  noiseFilterTolerance:
+    overrideState: 0
+    value: 0
+  blurTolerance:
+    overrideState: 0
+    value: -4.6
+  upsampleTolerance:
+    overrideState: 0
+    value: -12
+  thicknessModifier:
+    overrideState: 0
+    value: 1
+  directLightingStrength:
+    overrideState: 0
+    value: 0
+  radius:
+    overrideState: 0
+    value: 0.25
+  quality:
+    overrideState: 0
+    value: 2

Assets/Scripts/PlayerController.cs

@@ -88,8 +88,8 @@ public class PlayerController : MonoBehaviour
             currentSpeed -= 0.01f;
         }
 
-        float curSpeedX = canMove ? (currentSpeed + speedModifier) : 0;
+        float curSpeedX = canMove ? (currentSpeed + speedModifier): 0;
-        float curSpeedY = canMove ? (currentSpeed + currentSpeed + speedModifier) * Input.GetAxis("Horizontal") : 0;
+        float curSpeedY = canMove ? (currentSpeed + speedModifier) * Input.GetAxis("Horizontal") : 0;
 
         moveDirection = (transform.forward * curSpeedX * Time.deltaTime) + (transform.right * curSpeedY * Time.deltaTime);
 
@@ -201,10 +201,10 @@ public class PlayerController : MonoBehaviour
                 switch (platform.type)
                 {
                     case PlatformManager.PlatformType.Push:
-                        rb.AddForce(-(other.transform.position - transform.position) * step, ForceMode.Force);
+                        rb.AddForce(-(other.transform.position - transform.position) * step, ForceMode.Impulse);
                         break;
                     case PlatformManager.PlatformType.Pull:
-                        rb.AddForce((other.transform.position - transform.position) * step, ForceMode.Force);
+                        rb.AddForce((other.transform.position - transform.position) * step, ForceMode.Impulse);
                         break;
                 }
             }
@@ -224,10 +224,10 @@ public class PlayerController : MonoBehaviour
 
         if (other.GetContact(0).normal == other.transform.forward
                 || other.GetContact(0).normal == -other.transform.forward
+                || other.GetContact(0).normal == -other.transform.right
+                || other.GetContact(0).normal == other.transform.right
                 || (other.GetContact(0).normal != -other.transform.up
-                    && other.GetContact(0).normal != other.transform.up
+                    && other.GetContact(0).normal != other.transform.up)
-                    && other.GetContact(0).normal != -other.transform.right
-                    && other.GetContact(0).normal != other.transform.right)
             )
         {
             return;
@@ -236,7 +236,7 @@ public class PlayerController : MonoBehaviour
         saveDirection = -other.GetContact(0).normal;
 
         // TODO: Handle other PlatformTypes
-        Physics.gravity = -other.GetContact(0).normal * 9.81f;
+        Physics.gravity = this.downDirection * 9.81f;
 
     }
 
@@ -276,17 +276,16 @@ public class PlayerController : MonoBehaviour
             }
             if (other.GetContact(0).normal == other.transform.forward
                 || other.GetContact(0).normal == -other.transform.forward
+                || other.GetContact(0).normal == -other.transform.right
+                || other.GetContact(0).normal == other.transform.right
                 || (other.GetContact(0).normal != -other.transform.up
-                    && other.GetContact(0).normal != other.transform.up
+                    && other.GetContact(0).normal != other.transform.up)
-                    && other.GetContact(0).normal != -other.transform.right
-                    && other.GetContact(0).normal != other.transform.right)
             )
             {
                 return;
             }
-
-            Vector3 gDirection = -transform.up;
             saveDirection = -other.GetContact(0).normal;
+            Vector3 gDirection = -transform.up;
             if (platform == null)
             {
                 gDirection = -transform.up;