added AgentFacingAgentConnector

Author: EliphasNUIT

GW2EIBuilders/Resources/JS/CR-JS/animator.js

@@ -31,6 +31,9 @@ facingIcon.onload = function () {
 function ToRadians(degrees) {
     return degrees * (Math.PI / 180);
 }
+function ToDegrees(radians) {
+    return radians / (Math.PI / 180);
+}
 
 const resolutionMultiplier = 2.0;
 

GW2EIBuilders/Resources/JS/CR-JS/decorations.js

@@ -79,7 +79,7 @@ function noAngleFetcher(connection, master, start, end) {
     return 0;
 }
 
-function interpolatedAngleFetcher(connection, master, start, end) {
+function interpolatedAngleFetcher(connection, master, dstMaster, start, end) {
     var index = -1;
     var totalPoints = connection.angles.length / 2;
     var time = animator.reactiveDataStatus.time;
@@ -110,19 +110,35 @@ function interpolatedAngleFetcher(connection, master, start, end) {
     }
 }
 
-function staticAngleFetcher(connection, master, start, end) {
+function staticAngleFetcher(connection, master, dstMaster, start, end) {
     var time = animator.reactiveDataStatus.time;
     var velocity = Math.min((time - start) / (end - start), 1.0);
     return connection.angles[0] + velocity * connection.angles[1];
 }
 
-function masterRotationFetcher(connection, master, start, end) {
+function masterRotationFetcher(connection, master, dstMaster, start, end) {
     if (!master) {
         return null;
     }
     return master.getRotation();
 }
 
+function masterToMasterRotationFetcher(connection, master, dstMaster, start, end) {
+    if (!master || !dstMaster) {
+        return null;
+    }
+    var origin = master.getPosition();
+    var dst = dstMaster.getPosition();
+    if (!origin || !dst) {
+        return null;
+    }
+    var vector = {
+        x: dst.x - origin.x,
+        y: dst.y - origin.y,
+    }
+    return -ToDegrees(Math.atan2(vector.y, vector.x));
+}
+
 const RotationOffsetMode = {
     addToMaster: 0,
     absoluteOrientation: 1,
@@ -155,6 +171,8 @@ class MechanicDrawable {
                 this.rotationConnectedTo = interpolatedAngleFetcher;
             } else if (rotationConnectedTo.angles) {
                 this.rotationFetcher = staticAngleFetcher;
+            } else if (rotationConnectedTo.dstMasterId) {
+                this.rotationFetcher = masterToMasterRotationFetcher;
             } else if (rotationConnectedTo.masterId) {
                 this.rotationFetcher = masterRotationFetcher;
                 this.rotationOffset = rotationConnectedTo.rotationOffset;
@@ -163,6 +181,7 @@ class MechanicDrawable {
         }
         this.master = null;
         this.rotationMaster = null;
+        this.dstRotationMaster = null;
         // Skill mode
         this.ownerID = null;
         this.owner = null;
@@ -193,7 +212,7 @@ class MechanicDrawable {
         if (this.start !== -1 && (this.start > time || this.end < time)) {
             return null;
         }
-        return this.rotationFetcher(this.rotationConnectedTo, this.rotationMaster, this.start, this.end);
+        return this.rotationFetcher(this.rotationConnectedTo, this.rotationMaster, this.dstRotationMaster, this.start, this.end);
     }
 
     getPosition() {
@@ -242,14 +261,23 @@ class MechanicDrawable {
                 return false;
             }
         }
-        if (this.rotationFetcher === masterRotationFetcher) {
+        if (this.rotationFetcher === masterRotationFetcher || this.rotationFetcher === masterToMasterRotationFetcher) {
             if (this.rotationMaster === null) {
                 let masterId = this.rotationConnectedTo.masterId;
                 this.rotationMaster = animator.getActorData(masterId);
             }
             if (!this.rotationMaster || (!this.rotationMaster.canDraw() && !this.ownerID)) {
                 return false;
             }
+            if (this.rotationFetcher === masterToMasterRotationFetcher) {
+                if (this.dstRotationMaster === null) {
+                    let dstMasterId = this.rotationConnectedTo.dstMasterId;
+                    this.dstRotationMaster = animator.getActorData(dstMasterId);
+                }
+                if (!this.dstRotationMaster || (!this.dstRotationMaster.canDraw() && !this.ownerID)) {
+                    return false;
+                }
+            }
         }
         if (this.ownerID !== null) {
             if (this.owner === null) {

GW2EIEvtcParser/EIData/CombatReplay/Decorations/Connector/RotationConnector/AgentFacingAgentConnector.cs

@@ -0,0 +1,31 @@
+using GW2EIEvtcParser.ParsedData;
+
+namespace GW2EIEvtcParser.EIData
+{
+    internal class AgentFacingAgentConnector : AgentFacingConnector
+    {
+        public AgentItem DstAgent { get; }
+
+        public AgentFacingAgentConnector(AbstractSingleActor agent, AbstractSingleActor dstAgent) : this(agent.AgentItem, dstAgent.AgentItem)
+        {
+        }
+
+        public AgentFacingAgentConnector(AgentItem agent, AgentItem dstAgent) : base(agent)
+        {
+            DstAgent = dstAgent;
+        }
+        public class AgentFacingAgentConnectorDescriptor : AgentFacingConnectorDescriptor
+        {
+            public int DstMasterId { get; private set; }
+            public AgentFacingAgentConnectorDescriptor(AgentFacingAgentConnector connector, CombatReplayMap map) : base(connector, map)
+            {
+                DstMasterId = connector.DstAgent.UniqueID;
+            }
+        }
+
+        public override object GetConnectedTo(CombatReplayMap map, ParsedEvtcLog log)
+        {
+            return new AgentFacingAgentConnectorDescriptor(this, map);
+        }
+    }
+}