From 57d038912e2201254d8543bc01286afe46b00390 Mon Sep 17 00:00:00 2001 From: Alexsandro Percy Date: Tue, 27 Jun 2023 22:28:58 -0300 Subject: [PATCH] start of panel functions --- lib_planes/entities.lua | 7 +------ lib_planes/gauges.lua | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/lib_planes/entities.lua b/lib_planes/entities.lua index 946d7de..3952b63 100644 --- a/lib_planes/entities.lua +++ b/lib_planes/entities.lua @@ -408,7 +408,7 @@ function airutils.logic(self) local indicated_speed = longit_speed * 0.9 if indicated_speed < 0 then indicated_speed = 0 end self._indicated_speed = indicated_speed - local speed_angle = supercub.get_gauge_angle(indicated_speed, -45) + local speed_angle = airutils.get_gauge_angle(indicated_speed, -45) --adjust power indicator local power_indicator_angle = airutils.get_gauge_angle(self._power_lever/10) @@ -454,11 +454,6 @@ function airutils.logic(self) self._custom_step_additional_function(self) end - --set stick position - if self.stick then - self.stick:set_attach(self.object,'',self._stick_pos,{x=self._elevator_angle/2,y=0,z=self._rudder_angle}) - end - -- calculate energy consumption -- airutils.consumptionCalc(self, accel) diff --git a/lib_planes/gauges.lua b/lib_planes/gauges.lua index 3e5ac2c..778bcdc 100644 --- a/lib_planes/gauges.lua +++ b/lib_planes/gauges.lua @@ -34,7 +34,7 @@ local function get_pointer(pointer_angle, gauge_center_x, gauge_center_y, full_p return retval end -function airutils.plot_altimeter_gauge(self, scale, height, place_x, place_y) +function airutils.plot_altimeter_gauge(self, scale, place_x, place_y) local bg_width_height = 100 local pointer_img = 8 local gauge_center = (bg_width_height / 2) - (pointer_img/2) @@ -43,13 +43,13 @@ function airutils.plot_altimeter_gauge(self, scale, height, place_x, place_y) --altimeter - local altitude = (height / 0.32) / 100 + --[[local altitude = (height / 0.32) / 100 local hour, minutes = math.modf( altitude ) hour = math.fmod (hour, 10) minutes = minutes * 100 minutes = (minutes * 100) / 100 local minute_angle = (minutes*-360)/100 - local hour_angle = (hour*-360)/10 + ((minute_angle*36)/360) + local hour_angle = (hour*-360)/10 + ((minute_angle*36)/360)]]-- --[[ #### `[combine:x:,=:,=:...` @@ -68,46 +68,46 @@ function airutils.plot_altimeter_gauge(self, scale, height, place_x, place_y) local altimeter = "^[resize:"..scale.."x"..scale.."^[combine:"..bg_width_height.."x"..bg_width_height..":" ..place_x..","..place_y.."=airutils_altimeter_gauge.png:" - altimeter = altimeter..get_pointer(minute_angle+180, gauge_center_x, gauge_center_y, 1) - altimeter = altimeter..get_pointer(hour_angle+180, gauge_center_x, gauge_center_y, 0) + --altimeter = altimeter..get_pointer(minute_angle+180, gauge_center_x, gauge_center_y, 1) + --altimeter = altimeter..get_pointer(hour_angle+180, gauge_center_x, gauge_center_y, 0) return altimeter end -function airutils.plot_fuel_gauge(self, scale, curr_level, max_level, place_x, place_y) +function airutils.plot_fuel_gauge(self, scale, place_x, place_y) local bg_width_height = 100 local pointer_img = 8 local gauge_center = (bg_width_height / 2) - (pointer_img/2) local gauge_center_x = place_x + gauge_center local gauge_center_y = place_y + gauge_center - local fuel_percentage = (curr_level*100)/max_level - local fuel_angle = -(fuel_percentage*180)/100 + --local fuel_percentage = (curr_level*100)/max_level + --local fuel_angle = -(fuel_percentage*180)/100 --minetest.chat_send_all(dump(fuel_angle)) local fuel = "^[resize:"..scale.."x"..scale.."^[combine:"..bg_width_height.."x"..bg_width_height..":" ..place_x..","..place_y.."=airutils_fuel_gauge.png:" - fuel = fuel..get_pointer(fuel_angle-90, gauge_center_x, gauge_center_y, 1) + --fuel = fuel..get_pointer(fuel_angle-90, gauge_center_x, gauge_center_y, 1) return fuel end -function airutils.plot_speed_gauge(self, scale, curr_level, max_level, place_x, place_y) +function airutils.plot_speed_gauge(self, scale, place_x, place_y) local bg_width_height = 100 local pointer_img = 8 local gauge_center = (bg_width_height / 2) - (pointer_img/2) local gauge_center_x = place_x + gauge_center local gauge_center_y = place_y + gauge_center - local speed_percentage = (curr_level*100)/max_level - local speed_angle = -(speed_percentage*350)/100 + --local speed_percentage = (curr_level*100)/max_level + --local speed_angle = -(speed_percentage*350)/100 --minetest.chat_send_all(dump(fuel_angle)) local fuel = "^[resize:"..scale.."x"..scale.."^[combine:"..bg_width_height.."x"..bg_width_height..":" ..place_x..","..place_y.."=airutils_speed_gauge.png:" - fuel = fuel..get_pointer(speed_angle-180, gauge_center_x, gauge_center_y, 1) + --fuel = fuel..get_pointer(speed_angle-180, gauge_center_x, gauge_center_y, 1) return fuel end