From bd9a8f5fcac82dd9bbc7a5933877ae933d659bd2 Mon Sep 17 00:00:00 2001 From: sydadams Date: Mon, 16 Jul 2007 06:05:16 +0000 Subject: [PATCH] More Primus 1000 and Bravo updates... Flightdirector being reworked , modes currently not displayed correctly on the PFD --- .../Instruments-3d/primus-1000/Primus1000.nas | 3 +- .../primus-1000/primus1000-pfd-hotspots.xml | 122 +++++++++++++++- .../primus-1000/primus1000-pfd.ac | 136 +----------------- .../primus-1000/primus1000-pfd.xml | 91 ------------ 4 files changed, 127 insertions(+), 225 deletions(-) diff --git a/Aircraft/Instruments-3d/primus-1000/Primus1000.nas b/Aircraft/Instruments-3d/primus-1000/Primus1000.nas index 211b8e8ec..385b0afdb 100644 --- a/Aircraft/Instruments-3d/primus-1000/Primus1000.nas +++ b/Aircraft/Instruments-3d/primus-1000/Primus1000.nas @@ -30,6 +30,7 @@ get_pointer_offset = func{ if(test == 1){ offset=getprop("/instrumentation/nav/heading-deg"); + if(offset == nil){offset=0.0;} offset -= hdg; if(offset < -180){offset += 360;} elsif(offset > 180){offset -= 360;} @@ -134,7 +135,7 @@ setlistener("/sim/signals/fdm-initialized", func { DC550.getNode("ttg",1).setBoolValue(0); DC550.getNode("et",1).setBoolValue(0); DC550.getNode("fms",1).setBoolValue(0); - FMSMode.setValue(" VNV"); + FMSMode.setValue("VNV"); NavType.setIntValue(0); NavString.setValue("VOR1"); RAmode.setValue(0.0); diff --git a/Aircraft/Instruments-3d/primus-1000/primus1000-pfd-hotspots.xml b/Aircraft/Instruments-3d/primus-1000/primus1000-pfd-hotspots.xml index d4a216d98..fc4989873 100644 --- a/Aircraft/Instruments-3d/primus-1000/primus1000-pfd-hotspots.xml +++ b/Aircraft/Instruments-3d/primus-1000/primus1000-pfd-hotspots.xml @@ -31,7 +31,7 @@ Primus 1000 PFD hotspots x-shift - 28 + 30 y-shift @@ -92,11 +92,129 @@ Primus 1000 PFD hotspots y-shift - -5 + -6 + + Wind Speed + text + arial_black + 6 + + 0.7 + 0.7 + 0.3 + + + + number-value + environment/wind-speed-kt + %03.0f + + + + + x-shift + -55 + + + y-shift + -61 + + + + + + Ground Speed + text + arial_black + 6 + + 0.1 + 0.9 + 0.4 + + + + number-value + velocities/groundspeed-kt + %03.0f + + + + + x-shift + 22 + + + y-shift + -71 + + + + + + + + + LATERAL + text + arial_black + 6 + + 0.1 + 0.9 + 0.3 + + + + text-value + instrumentation/flightdirector/lateral-mode + + + + + x-shift + -35 + + + y-shift + 100 + + + + + + VERTICAL + text + arial_black + 6 + + 0.1 + 0.9 + 0.3 + + + + text-value + instrumentation/flightdirector/vertical-mode + + + + + x-shift + 10 + + + y-shift + 100 + + + + + diff --git a/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.ac b/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.ac index 7715ddbb2..c4b55d103 100644 --- a/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.ac +++ b/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.ac @@ -2,12 +2,12 @@ AC3Db MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0 MATERIAL "illum" rgb 1 1 1 amb 0 0 0 emis 1 1 1 spec 0 0 0 shi 0 trans 0 MATERIAL "gloss" rgb 1 1 1 amb 0 0 0 emis 0 0 0 spec 0.5 0.5 0.5 shi 32 trans 0 -MATERIAL "illum.green" rgb 0.19 0.65 0.2 amb 0 0 0 emis 0.346667 0.346667 0.346667 spec 0 0 0 shi 0 trans 0 -MATERIAL "illum.pink" rgb 0.878431 0.635294 0.635294 amb 0 0 0 emis 0.717132 0.717132 0.717132 spec 0 0 0 shi 0 trans 0 -MATERIAL "illum.yellow" rgb 0.904762 0.877883 0.286539 amb 0 0 0 emis 0.689728 0.689728 0.689728 spec 0 0 0 shi 0 trans 0 -MATERIAL "illum.blue" rgb 0.273054 0.632391 0.780538 amb 0 0 0 emis 0.561994 0.561994 0.561994 spec 0 0 0 shi 0 trans 0 +MATERIAL "illum.green" rgb 0 0 0 amb 0 0 0 emis 0.19 0.65 0.2 spec 0 0 0 shi 0 trans 0 +MATERIAL "illum.pink" rgb 0 0 0 amb 0 0 0 emis 0.88 0.63 0.63 spec 0 0 0 shi 0 trans 0 +MATERIAL "illum.yellow" rgb 0 0 0 amb 0 0 0 emis 0.90 0.87 0.28 spec 0 0 0 shi 0 trans 0 +MATERIAL "illum.blue" rgb 0 0 0 amb 0 0 0 emis 0.27 0.63 0.78 spec 0 0 0 shi 0 trans 0 OBJECT world -kids 66 +kids 60 OBJECT poly name "AI" data 8 @@ -2506,69 +2506,6 @@ refs 3 33 0.988388895988 0.979011774063 kids 0 OBJECT poly -name "gsptext" -data 8 -Mesh.063 -texture "digits.rgb" -texrep 1 1 -crease 30.000000 -numvert 4 -0.002042 -0.069922 -0.028695 -0.002042 -0.076512 -0.028695 -0.002042 -0.076512 -0.023935 -0.002042 -0.069922 -0.023935 -numsurf 1 -SURF 0x00 -mat 1 -refs 4 -0 0.371848881245 0.0891927108169 -3 0.316926956177 0.0891927108169 -2 0.316926956177 0.0147162750363 -1 0.371848881245 0.0147162750363 -kids 0 -OBJECT poly -name "gsptext.001" -data 8 -Mesh.047 -texture "digits.rgb" -texrep 1 1 -crease 30.000000 -numvert 4 -0.002042 -0.069922 -0.033466 -0.002042 -0.076512 -0.033466 -0.002042 -0.076512 -0.028706 -0.002042 -0.069922 -0.028706 -numsurf 1 -SURF 0x00 -mat 1 -refs 4 -0 0.370942592621 0.0891927108169 -3 0.316020667553 0.0891927108169 -2 0.316020667553 0.0147162750363 -1 0.370942592621 0.0147162750363 -kids 0 -OBJECT poly -name "gsptext.002" -data 8 -Mesh.050 -texture "digits.rgb" -texrep 1 1 -crease 30.000000 -numvert 4 -0.002042 -0.069922 -0.03822 -0.002042 -0.076512 -0.03822 -0.002042 -0.076512 -0.03346 -0.002042 -0.069922 -0.03346 -numsurf 1 -SURF 0x00 -mat 1 -refs 4 -0 0.370942592621 0.0891927108169 -3 0.316020667553 0.0891927108169 -2 0.316020667553 0.0147162750363 -1 0.370942592621 0.0147162750363 -kids 0 -OBJECT poly name "hdgbug" data 8 Mesh.017 @@ -2889,66 +2826,3 @@ refs 4 2 0.335650146008 0.632843852043 1 0.414371550083 0.632843852043 kids 0 -OBJECT poly -name "wspd" -data 8 -Mesh.024 -texture "digits.rgb" -texrep 1 1 -crease 30.000000 -numvert 4 -0.002042 -0.061474 0.050694 -0.002042 -0.067576 0.050694 -0.002042 -0.067576 0.055102 -0.002042 -0.061474 0.055102 -numsurf 1 -SURF 0x00 -mat 1 -refs 4 -0 0.371848881245 0.0891927108169 -3 0.316926956177 0.0891927108169 -2 0.316926956177 0.0147162750363 -1 0.371848881245 0.0147162750363 -kids 0 -OBJECT poly -name "wspd.001" -data 8 -Mesh.060 -texture "digits.rgb" -texrep 1 1 -crease 30.000000 -numvert 4 -0.002042 -0.061474 0.046277 -0.002042 -0.067576 0.046277 -0.002042 -0.067576 0.050685 -0.002042 -0.061474 0.050685 -numsurf 1 -SURF 0x00 -mat 1 -refs 4 -0 0.370942592621 0.0891927108169 -3 0.316020667553 0.0891927108169 -2 0.316020667553 0.0147162750363 -1 0.370942592621 0.0147162750363 -kids 0 -OBJECT poly -name "wspd.002" -data 8 -Mesh.059 -texture "digits.rgb" -texrep 1 1 -crease 30.000000 -numvert 4 -0.002042 -0.061474 0.041875 -0.002042 -0.067576 0.041875 -0.002042 -0.067576 0.046283 -0.002042 -0.061474 0.046283 -numsurf 1 -SURF 0x00 -mat 1 -refs 4 -0 0.370942592621 0.0891927108169 -3 0.316020667553 0.0891927108169 -2 0.316020667553 0.0147162750363 -1 0.370942592621 0.0147162750363 -kids 0 diff --git a/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.xml b/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.xml index 77f60e833..dd773d800 100644 --- a/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.xml +++ b/Aircraft/Instruments-3d/primus-1000/primus1000-pfd.xml @@ -636,58 +636,6 @@ Primus 1000 Primary Flight Display - - textranslate - gsptext - velocities/groundspeed-kt - 0.001 - 100 - - 0 - 1 - 0 - - - - - textranslate - gsptext.001 - velocities/groundspeed-kt - 0.01 - 10 - - 0 - 1 - 0 - - - - - textranslate - gsptext.002 - velocities/groundspeed-kt - 0.1 - 1 - - 0 - 1 - 0 - - - - - textranslate - mach.001 - velocities/mach - 1.0 - 0.1 - - 0 - 1 - 0 - - - textranslate mach.002 @@ -714,45 +662,6 @@ Primus 1000 Primary Flight Display - - textranslate - wspd - environment/wind-speed-kt - 0.001 - 100 - - 0 - 1 - 0 - - - - - textranslate - wspd.001 - environment/wind-speed-kt - 0.01 - 10 - - 0 - 1 - 0 - - - - - textranslate - wspd.002 - environment/wind-speed-kt - 0.1 - 1 - - 0 - 1 - 0 - - - textranslate crstext