From 1054e2bb97216285ed79b036c300b4d93f0a7803 Mon Sep 17 00:00:00 2001 From: Joshua Davidson <joshuadavidson2000@gmail.com> Date: Thu, 11 Oct 2018 19:40:53 -0400 Subject: [PATCH 1/6] GIT: Formatting --- Models/A320-100-CFM.xml | 4 ++-- Models/A320-200-CFM.xml | 4 ++-- Models/A320-200-IAE.xml | 4 ++-- Models/A320neo-CFM.xml | 4 ++-- Models/A320neo-PW.xml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Models/A320-100-CFM.xml b/Models/A320-100-CFM.xml index b03a9ab4..8b4889bd 100644 --- a/Models/A320-100-CFM.xml +++ b/Models/A320-100-CFM.xml @@ -346,10 +346,10 @@ <!-- Nasal code --> <nasal> <load> - var livery_update = aircraft.livery_update.new("Aircraft/IDG-A32X/Models/Liveries/A320/CFM-100"); + var livery_update = aircraft.livery_update.new("Aircraft/IDG-A32X/Models/Liveries/A320/CFM-100"); </load> <unload> - livery_update.stop(); + livery_update.stop(); </unload> </nasal> diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml index 4744be8e..e98b8c21 100644 --- a/Models/A320-200-CFM.xml +++ b/Models/A320-200-CFM.xml @@ -376,10 +376,10 @@ <!-- Nasal code --> <nasal> <load> - var livery_update = aircraft.livery_update.new("Aircraft/IDG-A32X/Models/Liveries/A320/CFM"); + var livery_update = aircraft.livery_update.new("Aircraft/IDG-A32X/Models/Liveries/A320/CFM"); </load> <unload> - livery_update.stop(); + livery_update.stop(); </unload> </nasal> diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml index 05569058..017b751d 100644 --- a/Models/A320-200-IAE.xml +++ b/Models/A320-200-IAE.xml @@ -375,10 +375,10 @@ <!-- Nasal code --> <nasal> <load> - var livery_update = aircraft.livery_update.new("Aircraft/IDG-A32X/Models/Liveries/A320/IAE"); + var livery_update = aircraft.livery_update.new("Aircraft/IDG-A32X/Models/Liveries/A320/IAE"); </load> <unload> - livery_update.stop(); + livery_update.stop(); </unload> </nasal> diff --git a/Models/A320neo-CFM.xml b/Models/A320neo-CFM.xml index 4f6911f6..2197419a 100644 --- a/Models/A320neo-CFM.xml +++ b/Models/A320neo-CFM.xml @@ -355,10 +355,10 @@ <!-- Nasal code --> <nasal> <load> - var livery_update = aircraft.livery_update.new("Aircraft/IDG-A32X/Models/Liveries/A320/CFM-NEO"); + var livery_update = aircraft.livery_update.new("Aircraft/IDG-A32X/Models/Liveries/A320/CFM-NEO"); </load> <unload> - livery_update.stop(); + livery_update.stop(); </unload> </nasal> diff --git a/Models/A320neo-PW.xml b/Models/A320neo-PW.xml index f20d9e2a..12ec93fe 100644 --- a/Models/A320neo-PW.xml +++ b/Models/A320neo-PW.xml @@ -362,10 +362,10 @@ <!-- Nasal code --> <nasal> <load> - var livery_update = aircraft.livery_update.new("Aircraft/IDG-A32X/Models/Liveries/A320/PW-NEO"); + var livery_update = aircraft.livery_update.new("Aircraft/IDG-A32X/Models/Liveries/A320/PW-NEO"); </load> <unload> - livery_update.stop(); + livery_update.stop(); </unload> </nasal> From 2e9f12f8a157cdd0e3c682587657d76bcdfbecdc Mon Sep 17 00:00:00 2001 From: Joshua Davidson <joshuadavidson2000@gmail.com> Date: Thu, 11 Oct 2018 19:43:51 -0400 Subject: [PATCH 2/6] GIT: Fix something that makes no sense --- Models/A320neo-PW.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Models/A320neo-PW.xml b/Models/A320neo-PW.xml index 12ec93fe..964be1eb 100644 --- a/Models/A320neo-PW.xml +++ b/Models/A320neo-PW.xml @@ -353,7 +353,7 @@ <!-- Engines --> <object-name>NacellePW1100G</object-name> <object-name>ReverserPW1100G</object-name> - <!-- Fuselage --> + <!-- Engines --> <property-base>sim/model/eng</property-base> <texture-prop>texture</texture-prop> <texture>PW_PurePower_1100G.png</texture> From 7a3e31c52613bd59bfbdf4945c444af05f91e52d Mon Sep 17 00:00:00 2001 From: Joshua Davidson <joshuadavidson2000@gmail.com> Date: Sat, 13 Oct 2018 14:21:47 -0400 Subject: [PATCH 3/6] Sim: View system major bugfix/overhaul --- A320-main.xml | 76 ++++---------------------------------- Nasal/zoom-views.nas | 62 +++++++++++++++++++++++++++++++ Systems/zoom-views.xml | 84 ------------------------------------------ revision.txt | 2 +- 4 files changed, 70 insertions(+), 154 deletions(-) create mode 100644 Nasal/zoom-views.nas delete mode 100644 Systems/zoom-views.xml diff --git a/A320-main.xml b/A320-main.xml index 649dd032..dac0ca36 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -160,9 +160,6 @@ <path>Aircraft/IDG-A32X/Systems/pfd.xml</path> </autopilot> <!-- 10 is sound --> - <autopilot n="11"> - <path>Aircraft/IDG-A32X/Systems/zoom-views.xml</path> - </autopilot> </systems> <sounde> @@ -383,10 +380,6 @@ <gui n="0" include="Systems/it-gui.xml"/> <current-view> - <z-offset-dec-step type="double">0.0</z-offset-dec-step> - <z-offset-inc-step type="double">0.0</z-offset-inc-step> - <can-change-z-offset type="bool">false</can-change-z-offset> - <z-offset-default type="float">80.0</z-offset-default> <z-offset-min-m type="float">30.0</z-offset-min-m> <z-offset-max-m type="float">300.0</z-offset-max-m> @@ -1016,18 +1009,7 @@ </condition> <command>nasal</command> <script> - if (getprop("/sim/current-view/can-change-z-offset")) { - var distance = getprop("/sim/current-view/z-offset-m"); - var multiple = getprop("/sim/current-view/z-offset-inc-step"); - var min_dist = getprop("/sim/current-view/z-offset-min-m"); - - distance = math.round(std.min(-min_dist, distance + multiple) / multiple) * multiple; - setprop("/sim/current-view/z-offset-m", distance); - - gui.popupTip(sprintf("%d meters", abs(distance))); - } else { - view.decrease(); - } + libraries.fovZoom(-1); </script> </binding> </button> @@ -1044,18 +1026,7 @@ </condition> <command>nasal</command> <script> - if (getprop("/sim/current-view/can-change-z-offset")) { - var distance = getprop("/sim/current-view/z-offset-m"); - var multiple = getprop("/sim/current-view/z-offset-dec-step"); - var max_dist = getprop("/sim/current-view/z-offset-max-m"); - - distance = math.round(std.max(-max_dist, distance + multiple) / multiple) * multiple; - setprop("/sim/current-view/z-offset-m", distance); - - gui.popupTip(sprintf("%d meters", abs(distance))); - } else { - view.increase(); - } + libraries.fovZoom(1); </script> </binding> </button> @@ -1090,15 +1061,7 @@ <desc>Reset zoom to default</desc> <binding> <command>nasal</command> - <script> - if (getprop("/sim/current-view/can-change-z-offset")) { - setprop("/sim/current-view/z-offset-m", getprop("/sim/current-view/z-offset-default") * -1); - - gui.popupTip(sprintf("%d meters", getprop("/sim/current-view/z-offset-default"))); - } else { - setprop("/sim/current-view/field-of-view", getprop("/sim/view/config/default-field-of-view-deg")); - } - </script> + <script>libraries.fovZoom(0);</script> </binding> </key> <key n="33"> @@ -1344,21 +1307,8 @@ <desc>Increase field of view</desc> <repeatable type="bool">true</repeatable> <binding> - <command>nasal</command> - <script> - if (getprop("/sim/current-view/can-change-z-offset")) { - var distance = getprop("/sim/current-view/z-offset-m"); - var multiple = getprop("/sim/current-view/z-offset-dec-step"); - var max_dist = getprop("/sim/current-view/z-offset-max-m"); - - distance = math.round(std.max(-max_dist, distance + multiple) / multiple) * multiple; - setprop("/sim/current-view/z-offset-m", distance); - - gui.popupTip(sprintf("%d meters", abs(distance))); - } else { - view.increase(); - } - </script> + <command>nasal</command> + <script>libraries.fovZoom(1);</script> </binding> </key> <key n="120"> @@ -1367,20 +1317,7 @@ <repeatable type="bool">true</repeatable> <binding> <command>nasal</command> - <script> - if (getprop("/sim/current-view/can-change-z-offset")) { - var distance = getprop("/sim/current-view/z-offset-m"); - var multiple = getprop("/sim/current-view/z-offset-inc-step"); - var min_dist = getprop("/sim/current-view/z-offset-min-m"); - - distance = math.round(std.min(-min_dist, distance + multiple) / multiple) * multiple; - setprop("/sim/current-view/z-offset-m", distance); - - gui.popupTip(sprintf("%d meters", abs(distance))); - } else { - view.decrease(); - } - </script> + <script>libraries.fovZoom(-1);</script> </binding> </key> <key n="127"> @@ -1509,6 +1446,7 @@ <file>Aircraft/IDG-A32X/Nasal/ECAM.nas</file> <file>Aircraft/IDG-A32X/Nasal/shake.nas</file> <file>Aircraft/IDG-A32X/Nasal/light-manager.nas</file> + <file>Aircraft/IDG-A32X/Nasal/zoom-views.nas</file> </libraries> <acconfig> <file>Aircraft/IDG-A32X/AircraftConfig/acconfig.nas</file> diff --git a/Nasal/zoom-views.nas b/Nasal/zoom-views.nas new file mode 100644 index 00000000..55df02b9 --- /dev/null +++ b/Nasal/zoom-views.nas @@ -0,0 +1,62 @@ +# IDG Distance Zooming +# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Based on PropertyRule file by onox + +var distance = 0; +var min_dist = 0; +var max_dist = 0; +var canChangeZOffset = 0; +var decStep = -5; +var incStep = 5; +var viewName = "XX"; + +var fovZoom = func(d) { + viewName = getprop("/sim/current-view/name"); + canChangeZOffset = getprop("/sim/current-view/type") == "lookat" and (viewName != "Tower View" or viewName != "Fly-By View" or viewName != "Chase View" or viewName != "Chase View Without Yaw" or viewName != "Walk View"); + + if (getprop("/sim/current-view/z-offset-m") <= -50) { + decStep = -10; + } else { + decStep = -5; + } + + if (getprop("/sim/current-view/z-offset-m") < -50) { # Not a typo, the conditions are different + incStep = 10; + } else { + incStep = 5; + } + + if (d == -1) { + if (canChangeZOffset) { + distance = getprop("/sim/current-view/z-offset-m"); + min_dist = getprop("/sim/current-view/z-offset-min-m"); + + distance = math.round(std.min(-min_dist, distance + incStep) / incStep, 0.1) * incStep; + setprop("/sim/current-view/z-offset-m", distance); + + gui.popupTip(sprintf("%d meters", abs(distance))); + } else { + view.decrease(); + } + } else if (d == 1) { + if (canChangeZOffset) { + distance = getprop("/sim/current-view/z-offset-m"); + max_dist = getprop("/sim/current-view/z-offset-max-m"); + + distance = math.round(std.max(-max_dist, distance + decStep) / decStep, 0.1) * decStep; + setprop("/sim/current-view/z-offset-m", distance); + + gui.popupTip(sprintf("%d meters", abs(distance))); + } else { + view.increase(); + } + } else if (d == 0) { + if (canChangeZOffset) { + setprop("/sim/current-view/z-offset-m", getprop("/sim/current-view/z-offset-default") * -1); + gui.popupTip(sprintf("%d meters", getprop("/sim/current-view/z-offset-default"))); + } else { + setprop("/sim/current-view/field-of-view", getprop("/sim/view/config/default-field-of-view-deg")); + gui.popupTip(sprintf("FOV: %.1f", getprop("/sim/current-view/field-of-view"))) + } + } +} diff --git a/Systems/zoom-views.xml b/Systems/zoom-views.xml deleted file mode 100644 index d6457789..00000000 --- a/Systems/zoom-views.xml +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- IDG Distance Zooming --> -<!-- Copyright (c) 2015-2017 onox --> -<!-- Modified by Joshua Davidson (it0uchpods) --> - -<PropertyList> - - <logic> - <name>View Zoom Enabled</name> - <input> - <and> - <equals> - <property>/sim/current-view/type</property> - <value>lookat</value> - </equals> - <not-equals> - <property>/sim/current-view/name</property> - <value>Tower View</value> - </not-equals> - <not-equals> - <property>/sim/current-view/name</property> - <value>Fly-By View</value> - </not-equals> - <not-equals> - <property>/sim/current-view/name</property> - <value>Chase View</value> - </not-equals> - <not-equals> - <property>/sim/current-view/name</property> - <value>Chase View Without Yaw</value> - </not-equals> - <not-equals> - <property>/sim/current-view/name</property> - <value>Walk View</value> - </not-equals> - </and> - </input> - <output> - <property>/sim/current-view/can-change-z-offset</property> - </output> - </logic> - - <filter> - <name>View Zoom Decrease Step</name> - <type>gain</type> - <input> - <condition> - <less-than-equals> - <property>/sim/current-view/z-offset-m</property> - <value>-50.0</value> - </less-than-equals> - </condition> - <value>-10.0</value> - </input> - <input> - <value>-5.0</value> - </input> - <output> - <property>/sim/current-view/z-offset-dec-step</property> - </output> - </filter> - - <filter> - <name>View Zoom Increase Step</name> - <type>gain</type> - <input> - <condition> - <less-than> - <property>/sim/current-view/z-offset-m</property> - <value>-50.0</value> - </less-than> - </condition> - <value>10.0</value> - </input> - <input> - <value>5.0</value> - </input> - <output> - <property>/sim/current-view/z-offset-inc-step</property> - </output> - </filter> - -</PropertyList> diff --git a/revision.txt b/revision.txt index b5d4cd6b..84e38ba4 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4667 \ No newline at end of file +4668 \ No newline at end of file From 4827e43aab6015bb796d865696414f80964a00d3 Mon Sep 17 00:00:00 2001 From: Joshua Davidson <joshuadavidson2000@gmail.com> Date: Sat, 13 Oct 2018 14:24:14 -0400 Subject: [PATCH 4/6] GIT: OCD fix --- A320-main.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index dac0ca36..aa156e93 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -1008,9 +1008,7 @@ </and> </condition> <command>nasal</command> - <script> - libraries.fovZoom(-1); - </script> + <script>libraries.fovZoom(-1);</script> </binding> </button> <button n="4"> @@ -1025,9 +1023,7 @@ </and> </condition> <command>nasal</command> - <script> - libraries.fovZoom(1); - </script> + <script>libraries.fovZoom(1);</script> </binding> </button> </mode> From 824f6490ac09c40409cc8048f6b53ec120ba4269 Mon Sep 17 00:00:00 2001 From: Joshua Davidson <joshuadavidson2000@gmail.com> Date: Sat, 13 Oct 2018 15:52:42 -0400 Subject: [PATCH 5/6] Sim: views bugfix -- I am stupid --- Nasal/zoom-views.nas | 2 +- revision.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Nasal/zoom-views.nas b/Nasal/zoom-views.nas index 55df02b9..415981c7 100644 --- a/Nasal/zoom-views.nas +++ b/Nasal/zoom-views.nas @@ -12,7 +12,7 @@ var viewName = "XX"; var fovZoom = func(d) { viewName = getprop("/sim/current-view/name"); - canChangeZOffset = getprop("/sim/current-view/type") == "lookat" and (viewName != "Tower View" or viewName != "Fly-By View" or viewName != "Chase View" or viewName != "Chase View Without Yaw" or viewName != "Walk View"); + canChangeZOffset = getprop("/sim/current-view/type") == "lookat" and viewName != "Tower View" and viewName != "Fly-By View" and viewName != "Chase View" and viewName != "Chase View Without Yaw" and viewName != "Walk View"; if (getprop("/sim/current-view/z-offset-m") <= -50) { decStep = -10; diff --git a/revision.txt b/revision.txt index 84e38ba4..7a8490ad 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4668 \ No newline at end of file +4669 \ No newline at end of file From 653054a0f4b7f289eb62db4edd3fe1c679b0a79e Mon Sep 17 00:00:00 2001 From: Joshua Davidson <joshuadavidson2000@gmail.com> Date: Sat, 13 Oct 2018 19:17:23 -0400 Subject: [PATCH 6/6] Sim: Improve the flight director --- Systems/flight-recorder.xml | 120 +++++++++++++++++------------------- revision.txt | 2 +- 2 files changed, 56 insertions(+), 66 deletions(-) diff --git a/Systems/flight-recorder.xml b/Systems/flight-recorder.xml index a27ccba8..10f4e180 100644 --- a/Systems/flight-recorder.xml +++ b/Systems/flight-recorder.xml @@ -6,117 +6,107 @@ ############################################## --> -<!-- A3XX FLight Recorder --> +<!-- A3XX Flight Recorder --> <PropertyList> - <replay-config type="int">0</replay-config> - - <config n="0"> - <name>A3XX Flight Recorder</name> - <!-- Include Generic Stuff --> - <signals include="/Aircraft/Generic/flightrecorder/components/position.xml" /> - <signals include="/Aircraft/Generic/flightrecorder/components/controls.xml" /> - <signals include="/Aircraft/Generic/flightrecorder/components/surfaces.xml"/> - <signals include="/Aircraft/Generic/flightrecorder/components/engine-jet.xml"> - <count type="int">2</count> - </signals> - <signals include="/Aircraft/Generic/flightrecorder/components/gear-retractable.xml"> - <count type="int">3</count> - </signals> - <signals include="/Aircraft/Generic/flightrecorder/components/tanks.xml"> - <count type="int">7</count> - </signals> - - <signals> <!-- Now Custom Stuff --> - <signal> - <type>double</type> - <property>gear/gear[0]/compression-ft</property> - </signal> - <signal> - <type>double</type> - <property>gear/gear[1]/compression-ft</property> - </signal> - <signal> - <type>double</type> - <property>gear/gear[2]/compression-ft</property> - </signal> - <signal> - <type>double</type> - <property>velocities/groundspeed-kt</property> - </signal> - <signal> - <type>double</type> - <property>position/gear-agl-ft</property> - </signal> - <signal> - <type>double</type> - <property>engines/engine[0]/reverser-pos-norm</property> - </signal> - <signal> - <type>double</type> - <property>engines/engine[1]/reverser-pos-norm</property> - </signal> + <replay-config type="int">0</replay-config> + + <config n="0"> + <name>A3XX Flight Recorder</name> + + <!-- Include Generic Stuff --> + <signals include="/Aircraft/Generic/flightrecorder/components/position.xml" /> + <signals include="/Aircraft/Generic/flightrecorder/components/controls.xml" /> + <signals include="/Aircraft/Generic/flightrecorder/components/surfaces.xml"/> + <signals include="/Aircraft/Generic/flightrecorder/components/engine-jet.xml"> + <count type="int">2</count> + </signals> + <signals include="/Aircraft/Generic/flightrecorder/components/gear-retractable.xml"> + <count type="int">3</count> + </signals> + <signals include="/Aircraft/Generic/flightrecorder/components/tanks.xml"> + <count type="int">5</count> + </signals> + + <!-- Now Custom Stuff --> + <signals> <signal> <type>double</type> - <property>fdm/jsbsim/fcs/slat-pos-norm</property> + <property>/velocities/groundspeed-kt</property> </signal> <signal> <type>double</type> - <property>engines/engine[0]/n1-actual</property> + <property>/position/gear-agl-ft</property> </signal> <signal> <type>double</type> - <property>engines/engine[1]/n1-actual</property> + <property>/engines/engine[0]/reverser-pos-norm</property> </signal> <signal> <type>double</type> - <property>engines/engine[0]/n2-actual</property> + <property>/engines/engine[1]/reverser-pos-norm</property> </signal> <signal> <type>double</type> - <property>engines/engine[1]/n2-actual</property> + <property>/fdm/jsbsim/fcs/slat-pos-norm</property> </signal> <signal> <type>double</type> - <property>fdm/jsbsim/hydraulics/spoiler-l1/final-deg</property> + <property>/engines/engine[0]/n1-actual</property> </signal> <signal> <type>double</type> - <property>fdm/jsbsim/hydraulics/spoiler-l2/final-deg</property> + <property>/engines/engine[1]/n1-actual</property> </signal> <signal> <type>double</type> - <property>fdm/jsbsim/hydraulics/spoiler-l3/final-deg</property> + <property>/engines/engine[0]/n2-actual</property> </signal> <signal> <type>double</type> - <property>fdm/jsbsim/hydraulics/spoiler-l4/final-deg</property> + <property>/engines/engine[1]/n2-actual</property> </signal> <signal> <type>double</type> - <property>fdm/jsbsim/hydraulics/spoiler-l5/final-deg</property> + <property>/fdm/jsbsim/hydraulics/spoiler-l1/final-deg</property> </signal> <signal> <type>double</type> - <property>fdm/jsbsim/hydraulics/spoiler-r1/final-deg</property> + <property>/fdm/jsbsim/hydraulics/spoiler-l2/final-deg</property> </signal> <signal> <type>double</type> - <property>fdm/jsbsim/hydraulics/spoiler-r2/final-deg</property> + <property>/fdm/jsbsim/hydraulics/spoiler-l3/final-deg</property> </signal> <signal> <type>double</type> - <property>fdm/jsbsim/hydraulics/spoiler-r3/final-deg</property> + <property>/fdm/jsbsim/hydraulics/spoiler-l4/final-deg</property> </signal> <signal> <type>double</type> - <property>fdm/jsbsim/hydraulics/spoiler-r4/final-deg</property> + <property>/fdm/jsbsim/hydraulics/spoiler-l5/final-deg</property> </signal> <signal> <type>double</type> - <property>fdm/jsbsim/hydraulics/spoiler-r5/final-deg</property> + <property>/fdm/jsbsim/hydraulics/spoiler-r1/final-deg</property> </signal> - </signals> - </config> + <signal> + <type>double</type> + <property>/fdm/jsbsim/hydraulics/spoiler-r2/final-deg</property> + </signal> + <signal> + <type>double</type> + <property>/fdm/jsbsim/hydraulics/spoiler-r3/final-deg</property> + </signal> + <signal> + <type>double</type> + <property>/fdm/jsbsim/hydraulics/spoiler-r4/final-deg</property> + </signal> + <signal> + <type>double</type> + <property>/fdm/jsbsim/hydraulics/spoiler-r5/final-deg</property> + </signal> + </signals> + </config> </PropertyList> \ No newline at end of file diff --git a/revision.txt b/revision.txt index 7a8490ad..bd6c0537 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4669 \ No newline at end of file +4670 \ No newline at end of file