From b1dc60ae24514b23ca644e185c8bc6328eb3ead0 Mon Sep 17 00:00:00 2001 From: jmt Date: Sat, 14 Nov 2009 11:00:34 +0000 Subject: [PATCH] From Dave Perry: Changes deflection input variables to match nasal lowpass filter output for cdi and gs needle deflections. I did a search of the data/Aircraft to make sure this will not break other ac. --- Aircraft/Instruments-3d/vor/vor.ac | 59 ++++++++-------------------- Aircraft/Instruments-3d/vor/vor.xml | 17 +------- Aircraft/Instruments-3d/vor/vor2.xml | 17 +------- 3 files changed, 20 insertions(+), 73 deletions(-) diff --git a/Aircraft/Instruments-3d/vor/vor.ac b/Aircraft/Instruments-3d/vor/vor.ac index 343955c69..f53647c8b 100644 --- a/Aircraft/Instruments-3d/vor/vor.ac +++ b/Aircraft/Instruments-3d/vor/vor.ac @@ -4,33 +4,25 @@ MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 MATERIAL "ac3dmat6" rgb 0 1 0 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 trans 1 MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0.15 0.15 0.15 spec 0.5 0.5 0.5 shi 64 trans 0 OBJECT world -kids 14 +kids 13 OBJECT poly -name "GlideslopeNeedlePark" -loc -0.003005 0 -0.00318549 +name "GS_in_range" +loc -0.00526316 -0.000228833 0.0199084 +texture "GS.rgb" crease 45.000000 -numvert 6 -0 0.000533 0.0187818 -0 0.000533 -0.0124695 -0 -0.000532 -0.0124695 -0 0.000533 0.00311013 -0 -0.000532 0.0187818 -0 -0.000532 0.00311013 -numsurf 2 -SURF 0x0 -mat 3 +numvert 4 +0 -0.00503432 -0.00480549 +0 -0.00503432 0.00389016 +0 0.00572082 0.00389016 +0 0.00572082 -0.00480549 +numsurf 1 +SURF 0x30 +mat 0 refs 4 -5 0 0 -3 0 0 -0 0 0 -4 0 0 -SURF 0x0 -mat 3 -refs 4 -5 0 0 -2 0 0 -1 0 0 -3 0 0 +3 0.484375 0.828125 +2 0.046875 0.828125 +1 0.046875 0.109375 +0 0.484375 0.109375 kids 0 OBJECT poly name "GS_out_of_range" @@ -486,22 +478,3 @@ refs 4 3 0.125 0 1 0.125 1 kids 0 -OBJECT poly -name "GS_in_range" -loc -0.00526316 -0.000915332 0.0210526 -texture "GS.rgb" -crease 45.000000 -numvert 4 -0 -0.00503432 -0.00480549 -0 -0.00503432 0.00389016 -0 0.00572082 0.00389016 -0 0.00572082 -0.00480549 -numsurf 1 -SURF 0x30 -mat 0 -refs 4 -3 0.484375 0.828125 -2 0.046875 0.828125 -1 0.046875 0.109375 -0 0.484375 0.109375 -kids 0 diff --git a/Aircraft/Instruments-3d/vor/vor.xml b/Aircraft/Instruments-3d/vor/vor.xml index 02ac5ba9c..5f063dbf1 100644 --- a/Aircraft/Instruments-3d/vor/vor.xml +++ b/Aircraft/Instruments-3d/vor/vor.xml @@ -6,8 +6,8 @@ /instrumentation/nav[0]/to-flag /instrumentation/nav[0]/from-flag /instrumentation/nav[0]/radials/selected-deg - /instrumentation/nav[0]/gs-needle-deflection-norm - /instrumentation/nav[0]/heading-needle-deflection + /instrumentation/nav[0]/filtered-gsNAV0-deflection + /instrumentation/nav[0]/filtered-cdiNAV0-deflection /instrumentation/nav[0]/in-range /instrumentation/nav[0]/gs-in-range @@ -18,7 +18,6 @@ material Face GlideslopeNeedle - GlideslopeNeedlePark Ring LocalizerNeedle Front @@ -64,14 +63,6 @@ - - select - GlideslopeNeedle - - - - - select GS_in_range @@ -83,7 +74,6 @@ select GS_out_of_range - GlideslopeNeedlePark @@ -117,9 +107,6 @@ - - - GlideslopeNeedleTransform rotate diff --git a/Aircraft/Instruments-3d/vor/vor2.xml b/Aircraft/Instruments-3d/vor/vor2.xml index 491b10a2c..1a0d6e323 100644 --- a/Aircraft/Instruments-3d/vor/vor2.xml +++ b/Aircraft/Instruments-3d/vor/vor2.xml @@ -6,8 +6,8 @@ /instrumentation/nav[1]/to-flag /instrumentation/nav[1]/from-flag /instrumentation/nav[1]/radials/selected-deg - /instrumentation/nav[1]/gs-needle-deflection-norm - /instrumentation/nav[1]/heading-needle-deflection + /instrumentation/nav[1]/filtered-gsNAV1-deflection + /instrumentation/nav[1]/filtered-cdiNAV1-deflection /instrumentation/nav[1]/in-range /instrumentation/nav[1]/gs-in-range @@ -18,7 +18,6 @@ material Face GlideslopeNeedle - GlideslopeNeedlePark Ring LocalizerNeedle Front @@ -64,14 +63,6 @@ - - select - GlideslopeNeedle - - - - - select GS_in_range @@ -83,7 +74,6 @@ select GS_out_of_range - GlideslopeNeedlePark @@ -117,9 +107,6 @@ - - - GlideslopeNeedleTransform rotate