2023-02-21 15:49:10 +08:00
7 changed files with 183 additions and 30 deletions
--- a/Assets/Scenes/MainGame.shade
+++ b/Assets/Scenes/MainGame.shade
@ -9563,6 +9563,7 @@
      timer: 200
      scoreText: 237
      timeText: 206
+      gamePauseText: 11
      multiplierText: 139
      maxMultiplierDuration: 5
      maxMultiplierCombo: 10
@ -9570,7 +9571,7 @@
 - EID: 199
  Name: =====Text====
  IsActive: true
-  NumberOfChildren: 3
+  NumberOfChildren: 4
  Components: ~
  Scripts: ~
 - EID: 237
@ -9618,6 +9619,21 @@
      Font: 176667660
      IsActive: true
  Scripts: ~
+- EID: 11
+  Name: GamePause
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -145, y: 200, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 60, y: 60, z: 60}
+      IsActive: true
+    Text Renderer Component:
+      Text: Game Pause
+      Font: 176667660
+      IsActive: true
+  Scripts: ~
 - EID: 198
  Name: ====Raccoon====
  IsActive: true
@ -9677,18 +9693,20 @@
      maxJumpTime: 0.75
      fallMultipler: 3
      jumpPadMultiplayer: 1.20000005
-      lightMultiper: 0.75
-      mediumMultiper: 0.5
-      heavyMultiper: 0.25
+      lightMultiper: 0.899999976
+      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
@ -9715,30 +9733,31 @@
      Pitch: 0
      Yaw: 360
      Roll: 1.28065994e-06
-      Width: 1920
-      Height: 1080
+      Width: 1055
+      Height: 604
      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
-      turnSpeedYaw: 0.5
-      pitchClamp: 45
+      turnSpeedPitch: 0.200000003
+      turnSpeedYaw: 0.400000006
      inverseXControls: false
-      inverseYControls: true
-      lowerClamp: 5
+      inverseYControls: false
+      pitchUpperClamp: 45
+      pitchLowerClamp: 5
 - EID: 9
  Name: PlayerBag
  IsActive: true
@ -10533,28 +10552,108 @@
      distanceToCapture: 0.5
      captureTime: 0.5
      footstepSFXIntervalMultiplier: 0.5
- EID: 16
-  Name: Default
+- EID: 12
+  Name: Mesh_Meat
  IsActive: true
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 3.43332767, y: 0.149463654, z: 6.84711409}
+      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: 0
+          Collision Tag: 2
          Type: Box
-          Half Extents: {x: 1, y: 0.25, z: 1}
+          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
+      Enabled: true
+- EID: 10
+  Name: Canvas
+  IsActive: false
+  NumberOfChildren: 1
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      IsActive: false
+  Scripts: ~
+- EID: 8
+  Name: Default
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, 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: ~
--- a/Assets/Scripts/Audio/AudioHandler.cs
+++ b/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);
+      }
+    }
  }
 }
--- a/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs
+++ b/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);
+  }
+

 }
--- a/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs
+++ b/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;
        }
      }
    }
--- a/Assets/Scripts/Gameplay/SC_GameManager.cs
+++ b/Assets/Scripts/Gameplay/SC_GameManager.cs
@ -26,6 +26,7 @@ public class GameManager : Script

  public GameObject scoreText;
  public GameObject timeText;
+  public GameObject gamePauseText;

  //mulitpler info
  public GameObject multiplierText;
@ -38,6 +39,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()
  {
@ -76,6 +80,7 @@ public class GameManager : Script
    currMultiplierCombo = 1;
    currMultiplierDuration = 0;
    fontScalar = new Vector3(multiplierFont / maxMultiplierDuration, multiplierFont / maxMultiplierDuration , multiplierFont / maxMultiplierDuration);
+    GamePause = false;

    AudioHandler.audioClipHandlers["BGMWin"] = Audio.CreateAudioClip("event:/Music/stingers/game_win");
    AudioHandler.audioClipHandlers["BGMLose"] = Audio.CreateAudioClip("event:/Music/stingers/game_lose");
@ -83,7 +88,26 @@ public class GameManager : Script

  protected override void update()
  {
-    Cheats();
+    if (GamePause)
+    {
+      if (Input.GetKeyDown(Input.KeyCode.Escape) && GamePause)
+      {
+        GamePause = false;
+        AudioHandler.pauseAllSounds(false);
+        gamePauseText.GetComponent<TextRenderable>().Enabled = false;
+      }
+      return;
+    }
+
+    //Cheats();
+
+    if (Input.GetKeyDown(Input.KeyCode.Escape) && !GamePause)
+    {
+      GamePause = true;
+      AudioHandler.pauseAllSounds(true);
+      gamePauseText.GetComponent<TextRenderable>().Enabled = true;
+    }
+
    if (currGameState == GameState.START)
    {
      timer -= Time.DeltaTimeF;
--- a/SHADE_Engine/src/Graphics/MiddleEnd/TextRendering/SHTextRenderingSubSystem.cpp
+++ b/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;
--- a/SHADE_Engine/src/Serialization/SHSerialization.cpp
+++ b/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;
  }