From f6d743922aa96fdd8d4c9d579e94ba4c964731c4 Mon Sep 17 00:00:00 2001
From: baletiballo <75846481+baletiballo@users.noreply.github.com>
Date: Wed, 15 Jan 2025 10:02:11 +0100
Subject: [PATCH] Disable more controlMappings when leaving a world
Disable more controlMappings when leaving a world
Not disabling them causes a memory leak according to unity. There is still one more instance of this happening I couldn't find.
.. missed two files
---
.../Scripts/FirstPersonController1.cs | 1 +
.../FirstPersonCharacter/Scripts/MouseLook1.cs | 6 ++++++
.../Scripts/RigidbodyFirstPersonController1.cs | 5 +++++
.../Scripts/ThirdPersonMovementScript.cs | 10 ++++++++++
Assets/Scripts/UI/PlayerControls/TestInput.cs | 2 +-
5 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs
index 65e76902..1cd851ee 100644
--- a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs
+++ b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/FirstPersonController1.cs
@@ -118,6 +118,7 @@ private void OnDisable()
input_ControlMapping.Actnmp_HC.Move_Right.Disable();
input_ControlMapping.Actnmp_HC.Move_Forward.Disable();
input_ControlMapping.Actnmp_HC.Move_Backwards.Disable();
+ m_MouseLook.disable();
}
diff --git a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs
index 46dfda3d..f9af9c76 100644
--- a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs
+++ b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/MouseLook1.cs
@@ -56,6 +56,12 @@ private void OnDisable()
}
+ public void disable()
+ {
+ input_ControlMapping.Actionmap1.LookCamera.Disable();
+ input_ControlMapping.Actnmp_HC.LookCamera.Disable();
+ }
+
diff --git a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/RigidbodyFirstPersonController1.cs b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/RigidbodyFirstPersonController1.cs
index ad77e0bc..5aecebdc 100644
--- a/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/RigidbodyFirstPersonController1.cs
+++ b/Assets/Scripts/UI/Characters/FirstPersonCharacter/Scripts/RigidbodyFirstPersonController1.cs
@@ -126,6 +126,11 @@ private void Start()
mouseLook.Init(transform, cam.transform);
}
+ private void OnDisable()
+ {
+ mouseLook.disable();
+ }
+
private void Update()
{
diff --git a/Assets/Scripts/UI/Characters/ThirdPersonCharacter/Scripts/ThirdPersonMovementScript.cs b/Assets/Scripts/UI/Characters/ThirdPersonCharacter/Scripts/ThirdPersonMovementScript.cs
index 0e2f9daa..be28e278 100644
--- a/Assets/Scripts/UI/Characters/ThirdPersonCharacter/Scripts/ThirdPersonMovementScript.cs
+++ b/Assets/Scripts/UI/Characters/ThirdPersonCharacter/Scripts/ThirdPersonMovementScript.cs
@@ -52,6 +52,16 @@ private void Start()
m_CharacterController = controller;
}
+ private void OnEnable()
+ {
+ input_ControlMapping.Actionmap1.Movement.Enable();
+ }
+
+ private void OnDisable()
+ {
+ input_ControlMapping.Actionmap1.Movement.Disable();
+ }
+
// Update is called once per frame
void Update2()
{
diff --git a/Assets/Scripts/UI/PlayerControls/TestInput.cs b/Assets/Scripts/UI/PlayerControls/TestInput.cs
index 1046cb00..43a02646 100644
--- a/Assets/Scripts/UI/PlayerControls/TestInput.cs
+++ b/Assets/Scripts/UI/PlayerControls/TestInput.cs
@@ -25,7 +25,7 @@ private void Awake()
}
private void OnEnable()
{
- input_ControlMapping = new ControlMapping();
+ //input_ControlMapping = new ControlMapping();
input_ControlMapping.Actionmap1.Movement.Enable();
--
GitLab