DAER/visualisation-marsh
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Compare commits

base: DAER:aaef0b04757061e0260f1e63cca948be71d7bea9
Branches Tags
DAER:master
DAER:margaux
DAER:2025.11.28
..
compare: DAER:740a72bcb60c81b5c49650e159e918e25f4b250f
Branches Tags
DAER:master
DAER:margaux
DAER:2025.11.28

No commits in common. "aaef0b04757061e0260f1e63cca948be71d7bea9" and "740a72bcb60c81b5c49650e159e918e25f4b250f" have entirely different histories.
aaef0b0475 ... 740a72bcb6

2 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
project/instruments/pfd.gd
View file

@ -25,6 +25,10 @@ extends Node2D
set(value): set(value):
altitude = value altitude = value
var step = 1 var step = 1
if value > 49.5:
step = 5
if value > 99.5:
step = 10
altitude_label.text = str(int(step * round(value / step))) altitude_label.text = str(int(step * round(value / step)))
@export var climbrate: float = 1000: @export var climbrate: float = 1000:
@ -44,15 +48,3 @@ extends Node2D
func update(aircraft: Transform3D, velocity: Vector3): func update(aircraft: Transform3D, velocity: Vector3):
var godot_euler = aircraft.basis.get_euler() var godot_euler = aircraft.basis.get_euler()
euler_attitude_deg = Vector3(godot_euler.z, -godot_euler.x, -godot_euler.y) * rad_to_deg(1) euler_attitude_deg = Vector3(godot_euler.z, -godot_euler.x, -godot_euler.y) * rad_to_deg(1)
const mps_to_kt = 1.94384
var v_local = aircraft.basis.inverse() * velocity
airspeed = max(0, v_local.z) * mps_to_kt
var v_horizontal = Vector3(velocity.x, 0, velocity.z)
groundspeed = v_horizontal.length() * mps_to_kt
const mps_to_fpm = 196.848
climbrate = velocity.y * mps_to_fpm
const m_to_ft = 3.2808
altitude = aircraft.origin.y * m_to_ft

11
src/marshconnector.cpp
View file

@ -243,12 +243,7 @@ Transform3D MarshConnector::get_aircraft() {
return offset * marsh; return offset * marsh;
} }
Vector3 MarshConnector::get_velocity() { Vector3 MarshConnector::get_velocity() { return last_velocity; }
float heading_rad = parameters[NAV_OFS_HDG] * Math_PI / 180.0;
// To rotate clockwise looking from above, that's negative Y in Godot
Quaternion heading_offset = Quaternion(Vector3(0, 1, 0), -heading_rad);
return heading_offset.xform(last_velocity);
}
Vector2 MarshConnector::get_cyclic() { Vector2 MarshConnector::get_cyclic() {
return Vector2{last_controls.x, last_controls.y}; return Vector2{last_controls.x, last_controls.y};
@ -282,10 +277,6 @@ Vector2 MarshConnector::local_meters_from_global_degrees(double latitude,
// Y East is just length along the circle of latitude // Y East is just length along the circle of latitude
double y = (lon - lon0) * (EARTH_RADIUS * cos(lat0)); double y = (lon - lon0) * (EARTH_RADIUS * cos(lat0));
const double map_size = 3000.0;
x = (Math::fract(x / map_size + 0.5) - 0.5) * map_size;
y = (Math::fract(y / map_size + 0.5) - 0.5) * map_size;
return Vector2(x, y); return Vector2(x, y);
} }
void MarshConnector::handle_sim_state(mavlink_message_t message) { void MarshConnector::handle_sim_state(mavlink_message_t message) {