Adding Sequence methods (#673)

ACEmulator · Mar 6, 2018 · a5bb9f2 · a5bb9f2
1 parent 41c04c3
commit a5bb9f2
Show file tree

Hide file tree

Showing 9 changed files with 329 additions and 65 deletions.
diff --git a/Source/ACE.Server/Physics/Animation/AFrame.cs b/Source/ACE.Server/Physics/Animation/AFrame.cs
@@ -3,7 +3,7 @@
 using ACE.Server.Physics.Extensions;
 
 namespace ACE.Server.Physics.Animation
-{ 
+{
     public class AFrame
     {
         public Vector3 Origin;
@@ -101,12 +101,10 @@ public void Rotate(Quaternion rotation)
             Orientation = Quaternion.Multiply(rotation, Orientation);
         }
 
-        public static AFrame Subtract(AFrame a, AFrame b)
+        public void Subtract(AFrame frame)
         {
-            var frame = new AFrame();
-            frame.Origin = a.Origin - Vector3.Transform(b.Origin, a.Orientation);
-            frame.Orientation = Quaternion.Multiply(a.Orientation, b.Orientation);
-            return frame;
+            Origin -= Vector3.Transform(frame.Origin, frame.Orientation);
+            Orientation = Quaternion.Multiply(Orientation, frame.Orientation);
         }
 
         public bool close_rotation(AFrame a, AFrame b)

diff --git a/Source/ACE.Server/Physics/Animation/AnimHook.cs b/Source/ACE.Server/Physics/Animation/AnimHook.cs
@@ -2,10 +2,18 @@
 
 namespace ACE.Server.Physics.Animation
 {
+    public enum AnimHookDir
+    {
+        Unknown = -2,
+        Backward = -1,
+        Both = 0,
+        Forward = 1,
+    }
+
     public class AnimHook
     {
         public AnimHook NextHook;
-        public int Direction;
+        public AnimHookDir Direction;
 
         public bool Execute(PhysicsObj obj)
         {

diff --git a/Source/ACE.Server/Physics/Animation/AnimSequenceNode.cs b/Source/ACE.Server/Physics/Animation/AnimSequenceNode.cs
@@ -27,12 +27,12 @@ public AnimSequenceNode(AnimData animData)
             set_animation_id(animData.AnimId);
         }
 
-        public Animation GetNext()
+        public AnimSequenceNode GetNext()
         {
             return null;
         }
 
-        public Animation GetPev()
+        public AnimSequenceNode GetPev()
         {
             return null;
         }
@@ -86,7 +86,7 @@ public float get_starting_frame()
                 return HighFrame + 1 - PhysicsGlobals.EPSILON;
         }
 
-        public bool has_anim(int appraisalProfile)
+        public bool has_anim(int appraisalProfile = 0)
         {
             return Anim != null;
         }

diff --git a/Source/ACE.Server/Physics/Animation/ObjectInfo.cs b/Source/ACE.Server/Physics/Animation/ObjectInfo.cs
@@ -148,10 +148,8 @@ public TransitionState ValidateWalkable(Sphere checkPos, Plane contactPlane, boo
                     {
                         collision.SetCollisionNormal(contactPlane.Normal);
                         collision.CollidedWithEnvironment = true;
-                        return TransitionState.Adjusted;
                     }
-                    else
-                        return TransitionState.Adjusted;
+                    return TransitionState.Adjusted;
                 }
             }
         }