Merge branch 'main' into SP3-20-UI-System

Assets/Scenes/MainGame.shade

@@ -9567,10 +9567,17 @@
       maxMultiplierDuration: 5
       maxMultiplierCombo: 10
       multiplierFont: 60
+    - Type: PauseMenu
+      Enabled: true
+      resumeBtn: 8
+      retryBtn: 461
+      quitBtn: 0
+      gamePauseText: 11
+      canvas: 10
 - EID: 199
   Name: =====Text====
   IsActive: true
-  NumberOfChildren: 3
+  NumberOfChildren: 4
   Components: ~
   Scripts: ~
 - EID: 237
@@ -9618,6 +9625,21 @@
       Font: 176667660
       IsActive: true
   Scripts: ~
+- EID: 11
+  Name: GamePause
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -250, y: 300, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 100, y: 100, z: 100}
+      IsActive: true
+    Text Renderer Component:
+      Text: Game Pause
+      Font: 176667660
+      IsActive: false
+  Scripts: ~
 - EID: 198
   Name: ====Raccoon====
   IsActive: true
@@ -9676,17 +9698,21 @@
       maxJumpHeight: 2
       maxJumpTime: 0.75
       fallMultipler: 3
-      lightMultiper: 0.75
+      jumpPadMultiplayer: 1.20000005
-      mediumMultiper: 0.5
+      lightMultiper: 0.899999976
-      heavyMultiper: 0.25
+      mediumMultiper: 0.699999988
+      heavyMultiper: 0.5
     - Type: PickAndThrow
       Enabled: true
       throwForce: [10, 8, 10]
-      cameraArmOffSet: [0, 0.25, 0]
+      cameraArmOffSet: [0.25, 0.600000024, 0.200000003]
       delayTimer: 1
       aimingLength: 1
       throwItem: false
       rayDistance: 0.75
+      rayHeight: 0.100000001
+      aimingFOV: 50
+      defaultFOV: 45
 - EID: 3
   Name: HoldingPoint
   IsActive: true
@@ -9713,30 +9739,31 @@
       Pitch: 0
       Yaw: 360
       Roll: 1.28065994e-06
-      Width: 1920
+      Width: 2560
-      Height: 1080
+      Height: 1369
       Near: 0.00999999978
       Far: 10000
       Perspective: true
+      FOV: 45
       IsActive: true
     Camera Arm Component:
       Arm Pitch: 0
       Arm Yaw: 0
       Arm Length: 3
       Look At Camera Origin: true
-      Target Offset: {x: 0, y: 0, z: 0}
+      Target Offset: {x: 0, y: 0.75, z: 0}
       Camera Collision: true
       IsActive: true
   Scripts:
     - Type: SHADE_Scripting.ThirdPersonCamera
       Enabled: true
       armLength: 3
-      turnSpeedPitch: 0.300000012
+      turnSpeedPitch: 0.200000003
-      turnSpeedYaw: 0.5
+      turnSpeedYaw: 0.400000006
-      pitchClamp: 45
       inverseXControls: false
-      inverseYControls: true
+      inverseYControls: false
-      lowerClamp: 5
+      pitchUpperClamp: 45
+      pitchLowerClamp: 5
 - EID: 9
   Name: PlayerBag
   IsActive: true
@@ -10488,11 +10515,11 @@
       Translate: {x: 2.70000005, y: 0.100000001, z: -2}
       Rotate: {x: -0, y: 0, z: -0}
       Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
+      IsActive: false
     Renderable Component:
       Mesh: 140697366
       Material: 129495479
-      IsActive: true
+      IsActive: false
     RigidBody Component:
       Type: Dynamic
       Drag: 0.00999999978
@@ -10506,7 +10533,7 @@
       Freeze Rotation X: true
       Freeze Rotation Y: false
       Freeze Rotation Z: true
-      IsActive: true
+      IsActive: false
     Collider Component:
       Colliders:
         - Is Trigger: false
@@ -10518,7 +10545,7 @@
           Density: 1
           Position Offset: {x: 0, y: 0.899999976, z: 0}
           Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
+      IsActive: false
   Scripts:
     - Type: Homeowner1
       Enabled: true
@@ -10531,3 +10558,154 @@
       distanceToCapture: 0.5
       captureTime: 0.5
       footstepSFXIntervalMultiplier: 0.5
+- EID: 12
+  Name: Mesh_Meat
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 2.30459714, y: 0.209537908, z: 6.371418}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 136892700
+      Material: 131956078
+      IsActive: true
+    RigidBody Component:
+      Type: Dynamic
+      Drag: 0.00999999978
+      Angular Drag: 0.100000001
+      Use Gravity: true
+      Interpolate: false
+      Sleeping Enabled: true
+      Freeze Position X: false
+      Freeze Position Y: false
+      Freeze Position Z: false
+      Freeze Rotation X: false
+      Freeze Rotation Y: false
+      Freeze Rotation Z: false
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 2
+          Type: Box
+          Half Extents: {x: 0.300000012, y: 0.300000012, z: 0.300000012}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts:
+    - Type: Item
+      Enabled: true
+      Score: 50
+      currCategory: 1
+      density: 1
+      dontReturn: false
+- EID: 16
+  Name: JumpPad
+  IsActive: false
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 3.43332767, y: 0.149463654, z: 6.84711409}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: false
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 1
+          Type: Box
+          Half Extents: {x: 1, y: 0.25, z: 1}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: false
+  Scripts:
+    - Type: JumpPad
+      Enabled: true
+- EID: 10
+  Name: Canvas
+  IsActive: false
+  NumberOfChildren: 3
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      IsActive: false
+  Scripts: ~
+- EID: 8
+  Name: ResumeButton
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 100, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 300, y: 200, z: 500}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 129340704
+      IsActive: true
+    Button Component:
+      Default Texture: 52901020
+      Hovered Texture: 62235279
+      Clicked Texture: 64722619
+      IsActive: true
+    UI Component:
+      Canvas ID: 10
+      IsActive: true
+  Scripts: ~
+- EID: 0
+  Name: QuitButton
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: -300, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 300, y: 200, z: 500}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 129340704
+      IsActive: true
+    Button Component:
+      Default Texture: 66477839
+      Hovered Texture: 65045286
+      Clicked Texture: 58607560
+      IsActive: true
+    UI Component:
+      Canvas ID: 10
+      IsActive: true
+  Scripts: ~
+- EID: 461
+  Name: RetryButton
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: -100, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 300, y: 200, z: 500}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 129340704
+      IsActive: true
+    Button Component:
+      Default Texture: 55782622
+      Hovered Texture: 58972174
+      Clicked Texture: 55224464
+      IsActive: true
+    UI Component:
+      Canvas ID: 10
+      IsActive: true
+  Scripts: ~

Assets/Scripts/Audio/AudioHandler.cs

@@ -19,5 +19,13 @@ namespace SHADE_Scripting.Audio
         h.Value.Stop(fadeOut);
       }
     }
+
+    public static void pauseAllSounds(bool pause)
+    {
+      foreach (KeyValuePair<string, AudioClipHandler> h in audioClipHandlers)
+      {
+        h.Value.SetPause(pause);
+      }
+    }
   }
 }

Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs

@@ -8,7 +8,7 @@ using static Item;
 
 public class PickAndThrow : Script
 {
-  public Vector3 throwForce = new Vector3(100.0f, 200.0f, 100.0f);
+  public Vector3 throwForce = new Vector3(10.0f, 8.0f, 10.0f);
   public Vector3 cameraArmOffSet = new Vector3(0.0f, 0.25f, 0.0f);
   public GameObject item { get; set; }
   public float delayTimer = 1.0f;
@@ -33,6 +33,9 @@ public class PickAndThrow : Script
   [Tooltip("Height of ray")]
   public float rayHeight = 0.1f;
 
+  public float aimingFOV = 50;
+  public float defaultFOV = 45;
+
   protected override void awake()
   {
     pc = GetScript<PlayerController>();
@@ -74,6 +77,7 @@ public class PickAndThrow : Script
           pc.isAiming = true;
           pc.camArm.ArmLength = aimingLength;
           pc.camArm.TargetOffset = cameraArmOffSet;
+          pc.cam.FOV = aimingFOV;
         }
 
         if (Input.GetMouseButtonUp(Input.MouseCode.LeftButton) && pc.isAiming)
@@ -83,6 +87,7 @@ public class PickAndThrow : Script
           itemCollider.GetCollisionShape(0).IsTrigger = false;
           pc.isAiming = false;
           pc.camArm.TargetOffset = Vector3.Zero;
+          pc.cam.FOV = defaultFOV;
           if (tpc)
             pc.camArm.ArmLength = tpc.armLength;
           pc.holdItem = false;
@@ -103,6 +108,7 @@ public class PickAndThrow : Script
         if (Input.GetMouseButtonDown(Input.MouseCode.RightButton) && pc.isAiming)
         {
           pc.isAiming = false;
+          pc.cam.FOV = defaultFOV;
           pc.camArm.TargetOffset = Vector3.Zero;
           if (tpc)
             pc.camArm.ArmLength = tpc.armLength;
@@ -132,7 +138,7 @@ public class PickAndThrow : Script
     {
       if (itemScript)
       {
-        Vector3 vec = new Vector3(throwForce.x * lastXDir, throwForce.y, throwForce.z * lastZDir);
+        Vector3 vec = new Vector3(throwForce.x * lastXDir, throwForce.y + (throwForce.y * GetPitchRatioRange()), throwForce.z * lastZDir);
         if (itemScript.currCategory == ItemCategory.LIGHT)
           itemRidigBody.AddForce(vec * 0.2f);
         if (itemScript.currCategory == ItemCategory.MEDIUM)
@@ -254,5 +260,10 @@ public class PickAndThrow : Script
     return false;
   }
 
+  private float GetPitchRatioRange()
+  {
+    return (pc.camArm.Pitch - tpc.pitchUpperClamp) / (tpc.pitchLowerClamp - tpc.pitchUpperClamp);
+  }
+
 
 }

Assets/Scripts/Gameplay/Player/SC_PlayerController.cs

@@ -65,7 +65,7 @@ public class PlayerController : Script
   //Jumping vars==================================================================
   [Tooltip("max height of the jump")]
   public float maxJumpHeight = 1.0f;
-  [Tooltip("max amt of time it will take for the jump")]
+  [Tooltip("max amount of time it will take for the jump")]
   public float maxJumpTime = 0.5f;
   [Tooltip("increase gravity when falling")]
   public float fallMultipler = 3.0f;
@@ -73,6 +73,9 @@ public class PlayerController : Script
   private bool isGrounded = true;
   private float gravity = -9.8f;
   private float groundGravity = -0.5f;
+  public bool landedOnJumpPad { get; set; }
+  [Tooltip("multiply height on Jump Pad ")]
+  public float jumpPadMultiplayer = 2.0f;
 
   //ItemMultipler==================================================================
   [Tooltip("How light item will affect player jump")]
@@ -88,6 +91,7 @@ public class PlayerController : Script
     isMoveKeyPress = false;
     holdItem = false;
     isAiming = false;
+    landedOnJumpPad = false;
 
     //Jump setup
     float timeToApex = maxJumpTime / 2;
@@ -287,7 +291,7 @@ public class PlayerController : Script
   {
     if (currentState == RaccoonStates.WALKING || currentState == RaccoonStates.RUNNING || currentState == RaccoonStates.IDLE)
     {
-      if (Input.GetKeyDown(Input.KeyCode.Space) && isGrounded && rb != null)
+      if ( (Input.GetKeyDown(Input.KeyCode.Space) || landedOnJumpPad ) && isGrounded && rb != null)
       {
         currentState = RaccoonStates.JUMP;
         Vector3 v = rb.LinearVelocity;
@@ -302,6 +306,12 @@ public class PlayerController : Script
           if (item != null && item.currCategory == ItemCategory.HEAVY)
             v.y *= heavyMultiper;
         }
+
+        if (landedOnJumpPad)
+        { 
+          v.y *= jumpPadMultiplayer;
+          landedOnJumpPad = false;
+        }
         rb.LinearVelocity = v;
       }
     }

Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs

@@ -14,10 +14,10 @@ namespace SHADE_Scripting
     public float armLength = 2.0f;
     public float turnSpeedPitch = 0.3f;
     public float turnSpeedYaw = 0.5f;
-    public float pitchClamp = 45.0f;
     public bool inverseXControls = false;
     public bool inverseYControls = false;
-    public float lowerClamp = 5.0f;
+    public float pitchUpperClamp = 45.0f;
+    public float pitchLowerClamp = 5.0f;
 
     protected override void awake()
     {
@@ -51,17 +51,17 @@ namespace SHADE_Scripting
           arm.Pitch += vel.y * turnSpeedPitch * Time.DeltaTimeF;
 
         if (inverseXControls)
-          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 > pitchClamp)
+        if (arm.Pitch > pitchUpperClamp)
         {
-          arm.Pitch = pitchClamp;
+          arm.Pitch = pitchUpperClamp;
         }
-        else if (arm.Pitch < lowerClamp)
+        else if (arm.Pitch < pitchLowerClamp)
         {
-          arm.Pitch = lowerClamp;
+          arm.Pitch = pitchLowerClamp;
         }
       }
     }

Assets/Scripts/Gameplay/SC_GameManager.cs

@@ -38,6 +38,9 @@ public class GameManager : Script
   private Vector3 fontScalar;
 
   public static GameManager Instance { get; private set; }
+  //public static int highScore { get; private set; } maybe need
+
+  public bool GamePause { get; set; }
 
   protected override void start()
   {
@@ -83,7 +86,11 @@ public class GameManager : Script
 
   protected override void update()
   {
-    Cheats();
+    if (GamePause)
+    {
+      return;
+    }
+
     if (currGameState == GameState.START)
     {
       timer -= Time.DeltaTimeF;
@@ -140,15 +147,6 @@ public class GameManager : Script
       Instance = null;
   }
 
-  private void Cheats()
-  {
-    if (Input.GetKeyDown(Input.KeyCode.Escape))
-    {
-      Audio.StopAllSounds();
-      SceneManager.ChangeScene(97158628);
-    }
-  }
-
   public void ItemScored()
   {
     totalItemCount -= 1;

Assets/Scripts/SC_JumpPad.cs

@@ -0,0 +1,22 @@
+using SHADE;
+using System;
+
+public class JumpPad : Script
+{
+  protected override void awake()
+  {
+  }
+
+  protected override void update()
+  {
+  }
+
+  protected override void onCollisionEnter(CollisionInfo info)
+  {
+    if (info.GameObject.GetScript<PlayerController>() && info.GameObject.GetScript<PlayerController>().currentState == PlayerController.RaccoonStates.FALLING)
+    {
+      info.GameObject.GetScript<PlayerController>().landedOnJumpPad = true;
+    }
+  }
+
+}

Assets/Scripts/SC_JumpPad.cs.shmeta

@@ -0,0 +1,3 @@
+Name: SC_JumpPad
+ID: 167326885
+Type: 9

Assets/Scripts/UI/SC_PauseMenu.cs

@@ -0,0 +1,106 @@
+using System;
+using SHADE;
+using SHADE_Scripting.Audio;
+
+public class PauseMenu : Script
+{
+  public GameObject resumeBtn;
+  public GameObject retryBtn;
+  public GameObject quitBtn;
+
+  public GameObject gamePauseText;
+  public GameObject canvas;
+
+  protected override void awake()
+  {
+    GameManager.Instance.GamePause = false;
+    if (gamePauseText)
+      gamePauseText.GetComponent<TextRenderable>().Enabled = false;
+    if (canvas)
+      canvas.SetActive(false);
+
+    if (!resumeBtn)
+      Debug.LogError("Resume Btn missing");
+
+    if (!retryBtn)
+      Debug.LogError("Retry Btn missing");
+
+    if (!quitBtn)
+      Debug.LogError("Quit Btn missing");
+  }
+  protected override void start()
+  {
+    //resume
+    UIElement resume = resumeBtn.GetComponent<UIElement>();
+    if (resume != null)
+    {
+      resume.OnClick.RegisterAction(() =>
+      {
+        if (GameManager.Instance.GamePause)
+        {
+          GameManager.Instance.GamePause = false;
+          AudioHandler.pauseAllSounds(false);
+          if (gamePauseText)
+            gamePauseText.GetComponent<TextRenderable>().Enabled = false;
+          if (canvas)
+            canvas.SetActive(false);
+        }
+      });
+    }
+    else
+    {
+      Debug.LogError("Failed to register resume button.");
+    }
+
+    //retry
+    UIElement retry = retryBtn.GetComponent<UIElement>();
+    if (retry != null)
+    {
+      retry.OnClick.RegisterAction(() =>
+      {
+        Audio.StopAllSounds();
+        //get curr scene
+        //SceneManager.ChangeScene(); 
+      });
+    }
+    else
+    {
+      Debug.LogError("Failed to register retry button.");
+    }
+
+    UIElement quit = quitBtn.GetComponent<UIElement>();
+    if (quit != null)
+    {
+      quit.OnClick.RegisterAction(() =>
+      {
+        Audio.StopAllSounds();
+        //go to main menu
+        SceneManager.ChangeScene(97158628);
+      });
+    }
+    else
+    {
+      Debug.LogError("Failed to register quit button.");
+    }
+  }
+
+  protected override void update()
+  {
+    if (GameManager.Instance.GamePause)
+    {
+      return;
+    }
+
+    if (Input.GetKeyDown(Input.KeyCode.Escape) && !GameManager.Instance.GamePause)
+    {
+      GameManager.Instance.GamePause = true;
+      AudioHandler.pauseAllSounds(true);
+      if (gamePauseText)
+        gamePauseText.GetComponent<TextRenderable>().Enabled = true;
+      if (canvas)
+        canvas.SetActive(true);
+    }
+
+  }
+}
+

Assets/Scripts/UI/SC_PauseMenu.cs.shmeta

@@ -0,0 +1,3 @@
+Name: SC_PauseMenu
+ID: 151952680
+Type: 9

SHADE_Engine/src/Camera/SHCameraSystem.cpp

@@ -296,7 +296,7 @@ namespace SHADE
         {
           camera.offset = arm->GetOffset();
           if (arm->lookAtCameraOrigin)
-            CameraLookAt(camera, camera.position);
+            CameraLookAt(camera, camera.position + arm->GetTargetOffset());
 
         }
 

SHADE_Engine/src/Graphics/MiddleEnd/TextRendering/SHTextRenderingSubSystem.cpp

@@ -13,6 +13,7 @@
 #include "Math/Transform/SHTransformComponent.h"
 #include "Graphics/MiddleEnd/GlobalData/SHGlobalDescriptorSets.h"
 #include "Graphics/MiddleEnd/Interface/SHRenderer.h"
+#include "Scene/SHSceneManager.h"
 
 namespace SHADE
 {
@@ -184,6 +185,9 @@ namespace SHADE
 
     for (auto& comp : textRendererComps)
     {
+      if (!SHSceneManager::CheckNodeAndComponentsActive<SHTextRenderableComponent>(comp.GetEID()))
+        continue;
+
       auto* transform = SHComponentManager::GetComponent<SHTransformComponent>(comp.GetEID());
 
       Handle<SHFont> fontHandle = comp.fontHandle;

SHADE_Engine/src/Serialization/SHSerialization.cpp

@@ -70,6 +70,7 @@ namespace SHADE
     //Compile component IDs
     const auto componentIDList = SHSerialization::GetComponentIDList(node[ComponentsNode]);
     eid = SHEntityManager::CreateEntity(componentIDList, eid, name, parentEID);
+
     createdEntities[oldEID] = eid;
     //createdEntities.push_back(eid);
     if (node[NumberOfChildrenNode])
@@ -90,6 +91,12 @@ namespace SHADE
     if (node[ScriptsNode])
       SHSystemManager::GetSystem<SHScriptEngine>()->DeserialiseScripts(eid, node[ScriptsNode]);
 
+    auto& sceneGraph = SHSceneManager::GetCurrentSceneGraph();
+    if (node[IsActiveNode])
+    {
+      sceneGraph.SetActive(eid, node[IsActiveNode].as<bool>());
+    }
+
     return eid;
   }
 

SHADE_Managed/src/Components/Renderable.cxx

@@ -47,11 +47,16 @@ namespace SHADE
         }
     }
     SHADE::Material Renderable::Material::get()
+    {
+        auto mat = GetNativeComponent()->GetModifiableMaterial();
+        return mat ? SHADE::Material(mat) : SHADE::Material();
+    }
+    SHADE::Material Renderable::SharedMaterial::get()
     {
         auto mat = GetNativeComponent()->GetMaterial();
         return mat ? SHADE::Material(mat) : SHADE::Material();
     }
-    void Renderable::Material::set(SHADE::Material value)
+    void Renderable::SharedMaterial::set(SHADE::Material value)
     {
         if (value)
         {

SHADE_Managed/src/Components/Renderable.hxx

@@ -55,9 +55,19 @@ namespace SHADE
             void set(MeshAsset value);
         }
         /// <summary>
-        /// Material used to render this Renderable.
+        /// Special instance of the shared Material for this Renderable. When accessing 
+        /// this property, a new instance of the shared Material is created and assigned 
+        /// to this Renderable. Hence, changes will only affect this Renderable.
         /// </summary>
         property SHADE::Material Material
+        {
+            SHADE::Material get();
+        }
+        /// <summary>
+        /// The shared Material used to render this Renderable and other Renderables
+        /// using the same base Material.
+        /// </summary>
+        property SHADE::Material SharedMaterial
         {
             SHADE::Material get();
             void set(SHADE::Material value);