Merge pull request #600 from Pax1601/fix-aim-errors

Fixed error in lead calculation code

client/src/constants/constants.ts

@@ -243,6 +243,7 @@ export enum DataIndexes {
     horizontalVelocity,
     verticalVelocity,
     heading,
+    track,
     isActiveTanker,
     isActiveAWACS,
     onOff,

client/src/interfaces.ts

@@ -156,6 +156,7 @@ export interface UnitData {
     horizontalVelocity: number;
     verticalVelocity: number;
     heading: number;
+    track: number;
     isActiveTanker: boolean;
     isActiveAWACS: boolean;
     onOff: boolean;

client/src/unit/unit.ts

@@ -45,6 +45,7 @@ export abstract class Unit extends CustomMarker {
     #horizontalVelocity: number = 0;
     #verticalVelocity: number = 0;
     #heading: number = 0;
+    #track: number = 0;
     #isActiveTanker: boolean = false;
     #isActiveAWACS: boolean = false;
     #onOff: boolean = true;
@@ -127,6 +128,7 @@ export abstract class Unit extends CustomMarker {
     getHorizontalVelocity() { return this.#horizontalVelocity };
     getVerticalVelocity() { return this.#verticalVelocity };
     getHeading() { return this.#heading };
+    getTrack() { return this.#track };
     getIsActiveAWACS() { return this.#isActiveAWACS };
     getIsActiveTanker() { return this.#isActiveTanker };
     getOnOff() { return this.#onOff };
@@ -278,6 +280,7 @@ export abstract class Unit extends CustomMarker {
                 case DataIndexes.horizontalVelocity: this.#horizontalVelocity = dataExtractor.extractFloat64(); break;
                 case DataIndexes.verticalVelocity: this.#verticalVelocity = dataExtractor.extractFloat64(); break;
                 case DataIndexes.heading: this.#heading = dataExtractor.extractFloat64(); updateMarker = true; break;
+                case DataIndexes.track: this.#track = dataExtractor.extractFloat64(); updateMarker = true; break;
                 case DataIndexes.isActiveTanker: this.#isActiveTanker = dataExtractor.extractBool(); break;
                 case DataIndexes.isActiveAWACS: this.#isActiveAWACS = dataExtractor.extractBool(); break;
                 case DataIndexes.onOff: this.#onOff = dataExtractor.extractBool(); break;
@@ -355,6 +358,7 @@ export abstract class Unit extends CustomMarker {
             horizontalVelocity: this.#horizontalVelocity,
             verticalVelocity: this.#verticalVelocity,
             heading: this.#heading,
+            track: this.#track,
             isActiveTanker: this.#isActiveTanker,
             isActiveAWACS: this.#isActiveAWACS,
             onOff: this.#onOff,
@@ -1167,7 +1171,7 @@ export abstract class Unit extends CustomMarker {
 
                 /* Rotate elements according to heading */
                 element.querySelectorAll("[data-rotate-to-heading]").forEach(el => {
-                    const headingDeg = rad2deg(this.#heading);
+                    const headingDeg = rad2deg(this.#track);
                     let currentStyle = el.getAttribute("style") || "";
                     el.setAttribute("style", currentStyle + `transform:rotate(${headingDeg}deg);`);
                 });

scripts/OlympusCommand.lua

@@ -992,7 +992,7 @@ function Olympus.setUnitsData(arg, time)
 					local position = unit:getPosition()
 					local heading = math.atan2( position.x.z, position.x.x )
 					local velocity = unit:getVelocity();
-
+					
 					-- Fill the data table
 					table["name"] = unit:getTypeName()
 					table["coalitionID"] = unit:getCoalition()
@@ -1004,6 +1004,16 @@ function Olympus.setUnitsData(arg, time)
 					table["horizontalVelocity"] =  math.sqrt(velocity.x * velocity.x + velocity.z * velocity.z)
 					table["verticalVelocity"] = velocity.y
 					table["heading"] = heading 
+
+					-- Track angles are wrong because of weird reference systems, approximate it using latitude and longitude differences
+					if Olympus.unitsData["units"][ID] ~= nil and Olympus.unitsData["units"][ID]["position"] ~= nil and Olympus.unitsData["units"][ID]["position"]["lat"] ~= nil and Olympus.unitsData["units"][ID]["position"]["lng"] ~= nil then
+						local latDifference = lat - Olympus.unitsData["units"][ID]["position"]["lat"]
+						local lngDifference = lng - Olympus.unitsData["units"][ID]["position"]["lng"]
+						table["track"] = math.atan2(lngDifference * math.cos(lat / 57.29577), latDifference)
+					else
+						table["track"] = math.atan2(velocity.z, velocity.x)
+					end
+
 					table["isAlive"] = unit:isExist() and unit:isActive() and unit:getLife() >= 1
 					
 					local group = unit:getGroup()

src/core/include/datatypes.h

@@ -22,6 +22,7 @@ namespace DataIndex {
 		horizontalVelocity,
 		verticalVelocity,
 		heading,
+		track,
 		isActiveTanker,
 		isActiveAWACS,
 		onOff,

src/core/include/unit.h

@@ -80,6 +80,7 @@ public:
 	virtual void setHorizontalVelocity(double newValue) { updateValue(horizontalVelocity, newValue, DataIndex::horizontalVelocity); }
 	virtual void setVerticalVelocity(double newValue) { updateValue(verticalVelocity, newValue, DataIndex::verticalVelocity); }
 	virtual void setHeading(double newValue) { updateValue(heading, newValue, DataIndex::heading); }
+	virtual void setTrack(double newValue) { updateValue(track, newValue, DataIndex::track); }
 	virtual void setIsActiveTanker(bool newValue);
 	virtual void setIsActiveAWACS(bool newValue);
 	virtual void setOnOff(bool newValue, bool force = false) { updateValue(onOff, newValue, DataIndex::onOff); };
@@ -126,6 +127,7 @@ public:
 	virtual double getHorizontalVelocity() { return horizontalVelocity; }
 	virtual double getVerticalVelocity() { return verticalVelocity; }
 	virtual double getHeading() { return heading; }
+	virtual double getTrack() { return track; }
 	virtual bool getIsActiveTanker() { return isActiveTanker; }
 	virtual bool getIsActiveAWACS() { return isActiveAWACS; }
 	virtual bool getOnOff() { return onOff; };
@@ -174,6 +176,7 @@ protected:
 	double horizontalVelocity = NULL;
 	double verticalVelocity = NULL;
 	double heading = NULL;
+	double track = NULL;
 	bool isActiveTanker = false;
 	bool isActiveAWACS = false;
 	bool onOff = true;

src/core/src/groundunit.cpp

@@ -371,7 +371,7 @@ void GroundUnit::AIloop()
 						double aimDistance = target->getHorizontalVelocity() * aimTime + scatterDistance;
 						double aimLat = 0;
 						double aimLng = 0;
-						Geodesic::WGS84().Direct(target->getPosition().lat, target->getPosition().lng, target->getHeading() * 57.29577, aimDistance, aimLat, aimLng); /* TODO make util to convert degrees and radians function */
+						Geodesic::WGS84().Direct(target->getPosition().lat, target->getPosition().lng, target->getTrack() * 57.29577, aimDistance, aimLat, aimLng); /* TODO make util to convert degrees and radians function */
 						double aimAlt = target->getPosition().alt + target->getVerticalVelocity() * aimTime + distance * tan(shotsBaseScatter * (ShotsScatter::LOW - shotsScatter) / 57.29577) * RANDOM_ZERO_TO_ONE; // Force to always miss high never low
 
 						/* Send the command */

src/core/src/unit.cpp

@@ -66,6 +66,9 @@ void Unit::update(json::value json, double dt)
 	if (json.has_number_field(L"heading"))
 		setHeading(json[L"heading"].as_number().to_double());
 
+	if (json.has_number_field(L"track"))
+		setTrack(json[L"track"].as_number().to_double());
+
 	if (json.has_number_field(L"speed"))
 		setSpeed(json[L"speed"].as_number().to_double());
 
@@ -261,6 +264,7 @@ void Unit::getData(stringstream& ss, unsigned long long time)
 					case DataIndex::horizontalVelocity:			appendNumeric(ss, datumIndex, horizontalVelocity); break;
 					case DataIndex::verticalVelocity:			appendNumeric(ss, datumIndex, verticalVelocity); break;
 					case DataIndex::heading:					appendNumeric(ss, datumIndex, heading); break;
+					case DataIndex::track:						appendNumeric(ss, datumIndex, track); break;
 					case DataIndex::isActiveTanker:				appendNumeric(ss, datumIndex, isActiveTanker); break;
 					case DataIndex::isActiveAWACS:				appendNumeric(ss, datumIndex, isActiveAWACS); break;
 					case DataIndex::onOff:						appendNumeric(ss, datumIndex, onOff); break;