Grid system WIP

VideojogosLusofona · Oct 31, 2024 · f71c510 · f71c510
1 parent 37ea313
commit f71c510
Show file tree

Hide file tree

Showing 151 changed files with 161,308 additions and 846 deletions.
diff --git a/Art/GridObject.png b/Art/GridObject.png
diff --git a/Assets/DefaultVolumeProfile.asset b/Assets/DefaultVolumeProfile.asset
diff --git a/Assets/DefaultVolumeProfile.asset.meta b/Assets/DefaultVolumeProfile.asset.meta
diff --git a/Assets/OkapiKit/Scripts/Actions/ActionChangeMovement.cs b/Assets/OkapiKit/Scripts/Actions/ActionChangeMovement.cs
@@ -337,7 +337,7 @@ public override void Execute()
                     }
                     else if (rb)
                     {
-                        velocity = rb.velocity;
+                        velocity = rb.linearVelocity;
                     }
 
                     float r = Random.Range(percentageValue.x, percentageValue.y);
@@ -352,7 +352,7 @@ public override void Execute()
                     }
                     else if (rb)
                     {
-                        velocity = rb.velocity;
+                        velocity = rb.linearVelocity;
                     }
 
                     float r = Random.Range(value.x, value.y);
@@ -410,7 +410,7 @@ public override void Execute()
                 }
                 else if (rb)
                 {
-                    rb.velocity = velocity;
+                    rb.linearVelocity = velocity;
                 }
             }
             else if (changeType == ChangeType.GravityScale)

diff --git a/Assets/OkapiKit/Scripts/Actions/ActionChangeRigidBody.cs b/Assets/OkapiKit/Scripts/Actions/ActionChangeRigidBody.cs
@@ -40,10 +40,10 @@ public override void Execute()
                     rb.mass = value;
                     break;
                 case ChangeType.LinearDrag:
-                    rb.drag = value;
+                    rb.linearDamping = value;
                     break;
                 case ChangeType.AngularDrag:
-                    rb.angularDrag = value;
+                    rb.angularDamping = value;
                     break;
                 case ChangeType.GravityScale:
                     rb.gravityScale = value;

diff --git a/Assets/OkapiKit/Scripts/Actions/ActionTagged.cs b/Assets/OkapiKit/Scripts/Actions/ActionTagged.cs
@@ -253,7 +253,7 @@ void RefreshActions()
         {
             if (searchType == SearchType.Global)
             {
-                targetActions = new List<Action>(GameObject.FindObjectsOfType<Action>());
+                targetActions = new List<Action>(GameObject.FindObjectsByType<Action>(FindObjectsSortMode.None));
 
                 targetActions.RemoveAll((action) => !action.HasTag(triggerTags));
             }

diff --git a/Assets/OkapiKit/Scripts/Base/OkapiValue.cs b/Assets/OkapiKit/Scripts/Base/OkapiValue.cs
@@ -10,7 +10,6 @@ public struct OkapiValue
     {
         public enum Type { Float = 0, Integer = 1, VariableInstance = 2, Variable = 3 };
 
-        [SerializeField] private bool               init;
         [SerializeField] private Type               type;
         [SerializeField] private VariableInstance   variableInstance;
         [SerializeField] private Variable           variable;
@@ -20,14 +19,12 @@ public enum Type { Float = 0, Integer = 1, VariableInstance = 2, Variable = 3 };
 
         public OkapiValue(float v) : this()
         {
-            this.init = true;
             this.type = Type.Float;
             this.floatValue = v;
         }
 
         public OkapiValue(int v) : this()
         {
-            this.init = true;
             this.type = Type.Integer;
             this.intValue = v;
         }

diff --git a/Assets/OkapiKit/Scripts/Editor/GridObjectEditor.cs b/Assets/OkapiKit/Scripts/Editor/GridObjectEditor.cs
@@ -0,0 +1,53 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+
+namespace OkapiKit.Editor
+{
+    [CustomEditor(typeof(GridObject))]
+    public class GridObjectEditor : OkapiBaseEditor
+    {
+        protected override void OnEnable()
+        {
+            base.OnEnable();
+        }
+
+        public override void OnInspectorGUI()
+        {
+            serializedObject.Update();
+
+            if (WriteTitle())
+            {
+                EditorGUI.BeginChangeCheck();
+
+                EditorGUI.EndChangeCheck();
+
+                serializedObject.ApplyModifiedProperties();
+                (target as OkapiElement).UpdateExplanation();
+            }
+        }
+
+        protected override GUIStyle GetTitleSyle()
+        {
+            return GUIUtils.GetActionTitleStyle();
+        }
+
+        protected override GUIStyle GetExplanationStyle()
+        {
+            return GUIUtils.GetActionExplanationStyle();
+        }
+
+        protected override string GetTitle()
+        {
+            return "Grid Object";
+        }
+
+        protected override Texture2D GetIcon()
+        {
+            return GUIUtils.GetTexture("GridObject");
+        }
+
+        protected override (Color, Color, Color) GetColors() => (GUIUtils.ColorFromHex("#d1d283"), GUIUtils.ColorFromHex("#2f4858"), GUIUtils.ColorFromHex("#969721"));
+    }
+}
diff --git a/Assets/OkapiKit/Scripts/Editor/GridObjectEditor.cs.meta b/Assets/OkapiKit/Scripts/Editor/GridObjectEditor.cs.meta
diff --git a/Assets/OkapiKit/Scripts/Hypertag/HypertaggedObject.cs b/Assets/OkapiKit/Scripts/Hypertag/HypertaggedObject.cs
@@ -236,7 +236,7 @@ public static List<T> FindObjectsByHypertag<T>(Hypertag tag, List<T> ret) where
             {
                 if (!UnityEditor.EditorApplication.isPlaying)
                 {
-                    var hos = FindObjectsOfType<HypertaggedObject>(tag);
+                    var hos = FindObjectsByType<HypertaggedObject>(FindObjectsSortMode.None);
                     foreach (var ho in hos)
                     {
                         if (ho.Has(tag))

diff --git a/Assets/OkapiKit/Scripts/Movement/Movement.cs b/Assets/OkapiKit/Scripts/Movement/Movement.cs
@@ -31,7 +31,7 @@ protected void MoveDelta(Vector3 delta)
         {
             if (rb != null)
             {
-                rb.velocity = delta / Time.deltaTime;
+                rb.linearVelocity = delta / Time.deltaTime;
             }
             else
             {
@@ -44,7 +44,7 @@ protected void StopMovement()
         {
             if (rb != null)
             {
-                rb.velocity = Vector2.zero;
+                rb.linearVelocity = Vector2.zero;
             }
         }
 

diff --git a/Assets/OkapiKit/Scripts/Movement/MovementGrid.cs b/Assets/OkapiKit/Scripts/Movement/MovementGrid.cs
@@ -0,0 +1,8 @@
+using UnityEngine;
+
+namespace OkapiKit
+{
+    public abstract class MovementGrid : Movement
+    {
+    }
+}
diff --git a/Assets/OkapiKit/Scripts/Movement/MovementGrid.cs.meta b/Assets/OkapiKit/Scripts/Movement/MovementGrid.cs.meta
diff --git a/Assets/OkapiKit/Scripts/Movement/MovementPlatformer.cs b/Assets/OkapiKit/Scripts/Movement/MovementPlatformer.cs
@@ -506,7 +506,7 @@ void FixedUpdate()
                     }
                     else if ((Time.time - jumpTime) < jumpHoldMaxTime)
                     {
-                        rb.velocity = new Vector2(rb.velocity.x, speed.y);
+                        rb.linearVelocity = new Vector2(rb.linearVelocity.x, speed.y);
                     }
                 }
                 else
@@ -545,18 +545,18 @@ void FixedUpdate()
 
             if (limitFallSpeed)
             {
-                var currentVelocity = rb.velocity;
+                var currentVelocity = rb.linearVelocity;
                 if (currentVelocity.y < -maxFallSpeed)
                 {
                     currentVelocity.y = -maxFallSpeed;
-                    rb.velocity = currentVelocity;
+                    rb.linearVelocity = currentVelocity;
                 }
             }
         }
 
         void Jump()
         {
-            rb.velocity = new Vector2(rb.velocity.x, speed.y);
+            rb.linearVelocity = new Vector2(rb.linearVelocity.x, speed.y);
             jumpBufferingTimer = 0.0f;
             coyoteTimer = 0;
             jumpTime = Time.time;
@@ -634,7 +634,7 @@ void Update()
                         break;
                 }
 
-                rb.velocity = new Vector2(deltaX, rb.velocity.y);
+                rb.linearVelocity = new Vector2(deltaX, rb.linearVelocity.y);
             }
 
             // Need to check with actual is grounded or else coyote time will make the jump count reset immediately after flying off
@@ -653,7 +653,7 @@ void Update()
                 if (groundCollider) groundCollider.enabled = false;
             }
 
-            var currentVelocity = rb.velocity;
+            var currentVelocity = rb.linearVelocity;
 
             if ((useAnimator) && (animator))
             {
@@ -718,7 +718,7 @@ void UpdateGroundState()
                 else
                 {
                     actualIsGrounded = false;
-                    if (rb.velocity.y > 0)
+                    if (rb.linearVelocity.y > 0)
                     {
                         coyoteTimer = 0;
                     }

diff --git a/Assets/OkapiKit/Scripts/Movement/MovementRotate.cs b/Assets/OkapiKit/Scripts/Movement/MovementRotate.cs
@@ -314,7 +314,7 @@ void FixedUpdate()
             else if (mode == RotateMode.Movement)
             {
                 Vector3 dir = Vector3.zero;
-                if (rb) dir = rb.velocity;
+                if (rb) dir = rb.linearVelocity;
                 if (dir.sqrMagnitude < 1e-6)
                 {
                     dir = transform.position - prevPosition;

diff --git a/Assets/OkapiKit/Scripts/Movement/MovementXY.cs b/Assets/OkapiKit/Scripts/Movement/MovementXY.cs
@@ -1,8 +1,5 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using NaughtyAttributes;
-using static OkapiKit.MovementRotate;
 
 namespace OkapiKit
 {