diff --git a/Aircraft/Instruments-3d/RDR-160/RDR-160.xml b/Aircraft/Instruments-3d/RDR-160/RDR-160.xml index 96a387040..72d32cefd 100644 --- a/Aircraft/Instruments-3d/RDR-160/RDR-160.xml +++ b/Aircraft/Instruments-3d/RDR-160/RDR-160.xml @@ -7,6 +7,26 @@ Syd Adams RDR160.ac + + Radar + Aircraft/Instruments-3d/RDR-160/radar.xml + + 0.003 + -0.050 + -0.033 + + + 0.003 + 0.050 + -0.033 + + + 0.003 + -0.050 + 0.049 + + + material RDR160.labels @@ -72,7 +92,7 @@ Syd Adams rotate RDR160.power - /instrumentation/radar/switch-pos + instrumentation/radar/switch-pos 00 140 @@ -91,11 +111,11 @@ Syd Adams - - + pick - brt.up + RDR160.brt true @@ -112,9 +132,9 @@ Syd Adams pick - brt.dwn + RDR160.brt - + true property-adjust @@ -129,7 +149,7 @@ Syd Adams pick - tilt.up + RDR160.tilt false @@ -146,9 +166,9 @@ Syd Adams pick - tilt.dwn + RDR160.tilt - + false property-adjust @@ -163,34 +183,24 @@ Syd Adams pick - pwr.off + RDR160.power - - false + - property-adjust - instrumentation/radar/switch-pos - -1 - 0 - 3 - false + nasal + pick - pwr.on + RDR160.power - false - property-adjust - instrumentation/radar/switch-pos - 1 - 0 - 3 - false + nasal + @@ -202,9 +212,8 @@ Syd Adams false - property-assign - instrumentation/radar/set-range - 1 + nasal + @@ -216,9 +225,8 @@ Syd Adams false - property-assign - instrumentation/radar/set-range - -1 + nasal + @@ -248,5 +256,5 @@ Syd Adams ---> + \ No newline at end of file diff --git a/Aircraft/Instruments-3d/RDR-160/RDR160.ac b/Aircraft/Instruments-3d/RDR-160/RDR160.ac index 0fabc4660..b3e42f446 100644 --- a/Aircraft/Instruments-3d/RDR-160/RDR160.ac +++ b/Aircraft/Instruments-3d/RDR-160/RDR160.ac @@ -44,7 +44,7 @@ OBJECT poly name "RDR160" data 8 Mesh.223 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 86 @@ -484,7 +484,7 @@ OBJECT poly name "RDR160.bkgr" data 9 Plane.004 -texture "bkgrd.rgb" +texture "bkgrd.png" texrep 1 1 crease 30.000000 numvert 4 @@ -505,7 +505,7 @@ OBJECT poly name "RDR160.brt" data 12 Cylinder.011 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 38 @@ -815,7 +815,7 @@ OBJECT poly name "RDR160.btn1" data 8 Cube.005 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 8 @@ -868,7 +868,7 @@ OBJECT poly name "RDR160.btn2" data 8 Cube.008 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 8 @@ -921,7 +921,7 @@ OBJECT poly name "RDR160.gain" data 12 Cylinder.015 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 38 @@ -1231,7 +1231,7 @@ OBJECT poly name "RDR160.hold" data 8 Cube.009 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 8 @@ -1284,7 +1284,7 @@ OBJECT poly name "RDR160.labels" data 9 Plane.052 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 52 @@ -1437,7 +1437,7 @@ OBJECT poly name "RDR160.modedwn" data 8 Cube.006 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 8 @@ -1490,7 +1490,7 @@ OBJECT poly name "RDR160.modeup" data 8 Cube.012 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 8 @@ -1543,7 +1543,7 @@ OBJECT poly name "RDR160.nav" data 8 Cube.007 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 8 @@ -1596,7 +1596,7 @@ OBJECT poly name "RDR160.power" data 12 Cylinder.014 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 38 @@ -1906,7 +1906,7 @@ OBJECT poly name "RDR160.rngdwn" data 8 Cube.014 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 8 @@ -1959,7 +1959,7 @@ OBJECT poly name "RDR160.rngup" data 8 Cube.013 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 8 @@ -2012,7 +2012,7 @@ OBJECT poly name "RDR160.tilt" data 12 Cylinder.012 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 38 @@ -2322,7 +2322,7 @@ OBJECT poly name "RDR160.trkdwn" data 8 Cube.010 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 8 @@ -2375,7 +2375,7 @@ OBJECT poly name "RDR160.trkup" data 8 Cube.011 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 8 @@ -2542,7 +2542,7 @@ OBJECT poly name "tilt.dwn" data 9 Plane.060 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 4 @@ -2563,7 +2563,7 @@ OBJECT poly name "tilt.up" data 9 Plane.070 -texture "RDR160.rgb" +texture "RDR160.png" texrep 1 1 crease 30.000000 numvert 4 diff --git a/Aircraft/Instruments-3d/RDR-160/RDR160.nas b/Aircraft/Instruments-3d/RDR-160/RDR160.nas index 605a9fefd..8350903b3 100644 --- a/Aircraft/Instruments-3d/RDR-160/RDR160.nas +++ b/Aircraft/Instruments-3d/RDR-160/RDR160.nas @@ -1,58 +1,36 @@ -#### King RDR-160 Weather Radar #### -#### Syd Adams #### -#### -#### Include this file in the Set file to run the RDR-160 radar -#### -#### Switch Modes 0 = off ; 1 = stby ; 2 = tst ; 3 = on; -#### Radar Modes WX ; WXA ; MAP -#### Ranges : 10 , 20, 40, 80 , 160 +# This file should be loaded in the aircraft set file like so: +# +# +# Aircraft/Instruments-3d/RDR-160/RDR160.nas +# +# +# +# -RADAR = props.globals.getNode("/instrumentation/radar",1); -FDM_ON = 0; -P_Str =["off","stby", "tst","on"]; -RADAR.getNode("serviceable",1).setBoolValue(1); -RADAR.getNode("range",1).setIntValue(20); -RADAR.getNode("heading-marker",1).setBoolValue(0); -RADAR.getNode("lightning",1).setBoolValue(0); -RADAR.getNode("set-range",1).setIntValue(0); -RADAR.getNode("minimized",1).setBoolValue(0); -RADAR.getNode("switch",1).setValue("off"); -RADAR.getNode("switch-pos",1).setIntValue(0); -RADAR.getNode("mode",1).setValue("WX"); -RADAR.getNode("mode-control",1).setIntValue(3); -RADAR.getNode("display-mode",1).setValue("arc"); -RADAR.getNode("dim",1).setDoubleValue(0.5); -RADAR.getNode("display-controls/WX",1).setBoolValue(1); -RADAR.getNode("display-controls/data",1).setBoolValue(0); -RADAR.getNode("display-controls/pos",1).setBoolValue(0); -setlistener("/sim/signals/fdm-initialized", func { - FDM_ON = 1; - print("KING RDR-160 ... OK"); - }); + var switch_mode=["off","stby","tst","on"]; + var s_pos =props.globals.initNode("instrumentation/radar/switch-pos",0,"INT"); + var r_rng =props.globals.initNode("instrumentation/radar/range",10,"DOUBLE"); + var r_sw =props.globals.initNode("instrumentation/radar/switch","off"); -setlistener("/instrumentation/radar/switch-pos", func(n) { - if(FDM_ON != 0){ - var swtch = n.getValue(); - RADAR.getNode("switch",1).setValue(P_Str[swtch]); + var set_range=func(rng){ + var Rng = r_rng.getValue(); + if(rng==1){ + Rng=Rng*2; + if(Rng >160)Rng=160; + }elsif(rng==-1){ + Rng=Rng*0.5; + if(Rng <10)Rng=10; } - }); + r_rng.setValue(Rng); + }; -setlistener("/instrumentation/radar/set-range", func(n) { - if(FDM_ON != 0){ - var rng = RADAR.getNode("range").getValue(); - var num = n.getValue(); - n.setValue(0); - if(num > 0){ - rng *= 2; - if(rng > 160){rng = 160.0;} - }else{ - if(num < 0){ - rng *=0.5; - if(rng < 10){rng = 10.0;} - } - } - RADAR.getNode("range").setValue(rng); - } - }); + var set_switch=func(sw){ + var switchpos=s_pos.getValue() or 0; + switchpos+=sw; + if(switchpos>3)switchpos=3; + if(switchpos<0)switchpos=0; + s_pos.setValue(switchpos); + r_sw.setValue(switch_mode[switchpos]); + }; diff --git a/Aircraft/Instruments-3d/RDR-160/RDR160.png b/Aircraft/Instruments-3d/RDR-160/RDR160.png new file mode 100644 index 000000000..aa61a63a2 Binary files /dev/null and b/Aircraft/Instruments-3d/RDR-160/RDR160.png differ diff --git a/Aircraft/Instruments-3d/RDR-160/RDR160.rgb b/Aircraft/Instruments-3d/RDR-160/RDR160.rgb deleted file mode 100644 index 2bea57108..000000000 Binary files a/Aircraft/Instruments-3d/RDR-160/RDR160.rgb and /dev/null differ diff --git a/Aircraft/Instruments-3d/RDR-160/bkgrd.png b/Aircraft/Instruments-3d/RDR-160/bkgrd.png new file mode 100644 index 000000000..49710b930 Binary files /dev/null and b/Aircraft/Instruments-3d/RDR-160/bkgrd.png differ diff --git a/Aircraft/Instruments-3d/RDR-160/bkgrd.rgb b/Aircraft/Instruments-3d/RDR-160/bkgrd.rgb deleted file mode 100644 index be43a765a..000000000 Binary files a/Aircraft/Instruments-3d/RDR-160/bkgrd.rgb and /dev/null differ diff --git a/Aircraft/Instruments-3d/RDR-160/od_wxradar.png b/Aircraft/Instruments-3d/RDR-160/od_wxradar.png new file mode 100644 index 000000000..e53ad9a2b Binary files /dev/null and b/Aircraft/Instruments-3d/RDR-160/od_wxradar.png differ diff --git a/Aircraft/Instruments-3d/RDR-160/od_wxradar.rgb b/Aircraft/Instruments-3d/RDR-160/od_wxradar.rgb deleted file mode 100644 index d103e3e13..000000000 Binary files a/Aircraft/Instruments-3d/RDR-160/od_wxradar.rgb and /dev/null differ diff --git a/Aircraft/Instruments-3d/RDR-160/pnl.png b/Aircraft/Instruments-3d/RDR-160/pnl.png new file mode 100644 index 000000000..f5ade040e Binary files /dev/null and b/Aircraft/Instruments-3d/RDR-160/pnl.png differ diff --git a/Aircraft/Instruments-3d/RDR-160/radar-display.xml b/Aircraft/Instruments-3d/RDR-160/radar-display.xml new file mode 100644 index 000000000..db7a5241a --- /dev/null +++ b/Aircraft/Instruments-3d/RDR-160/radar-display.xml @@ -0,0 +1,208 @@ + + + + + + radar display + 256 + 256 + 256 + 256 + + + + + + + instrumentation/radar/switch + off + + + background + + Aircraft/Instruments-3d/RDR-160/bkgrd.png + 0.07 + 0.05 + 0.930 + 0.910 + + true + + + + + + instrumentation/radar/switch + on + + + radar data + + Aircraft/Instruments-3d/RDR-160/od_wxradar.png + 0.0 + 0.0 + 1.0 + 1.0 + + true + + + + + + instrumentation/radar/switch + off + + + RNG1 + text + arial_black + 10 + + 0.39 + 0.55 + 0.69 + + + + number-value + instrumentation/radar/range + %3.0f + + + + + x-shift + 99 + + + y-shift + 70 + + + + + + + + instrumentation/radar/switch + off + + + RNG2 + text + arial_black + 10 + + 0.39 + 0.55 + 0.69 + + + + number-value + instrumentation/radar/range + 0.75 + %3.1f + + + + + x-shift + 99 + + + y-shift + 0 + + + + + + + + instrumentation/radar/switch + off + + + RNG3 + text + arial_black + 10 + + 0.39 + 0.55 + 0.69 + + + + number-value + instrumentation/radar/range + 0.5 + %3.1f + + + + + x-shift + 67 + + + y-shift + -31 + + + + + + + + instrumentation/radar/switch + off + + + RNG4 + text + arial_black + 10 + + 0.39 + 0.55 + 0.69 + + + + number-value + instrumentation/radar/range + 0.25 + %3.1f + + + + + x-shift + 38 + + + y-shift + -60 + + + + + + + + + + + \ No newline at end of file diff --git a/Aircraft/Instruments-3d/RDR-160/radar.xml b/Aircraft/Instruments-3d/RDR-160/radar.xml new file mode 100644 index 000000000..1cadf30a0 --- /dev/null +++ b/Aircraft/Instruments-3d/RDR-160/radar.xml @@ -0,0 +1,21 @@ + + + +Radar Panel +Aircraft/Instruments-3d/RDR-160/transparent-bg.png +330 +256 + + + + + radar screen + 165 + 128 + 256 + 256 + + + + + \ No newline at end of file diff --git a/Aircraft/Instruments-3d/RDR-160/transparent-bg.png b/Aircraft/Instruments-3d/RDR-160/transparent-bg.png new file mode 100644 index 000000000..4c59fcac7 Binary files /dev/null and b/Aircraft/Instruments-3d/RDR-160/transparent-bg.png differ diff --git a/Aircraft/Instruments-3d/RDR-160/wxecho.png b/Aircraft/Instruments-3d/RDR-160/wxecho.png new file mode 100644 index 000000000..a558112e2 Binary files /dev/null and b/Aircraft/Instruments-3d/RDR-160/wxecho.png differ diff --git a/Aircraft/Instruments-3d/RDR-160/wxradar-hotspots.xml b/Aircraft/Instruments-3d/RDR-160/wxradar-hotspots.xml index 09762172c..99103e3f7 100644 --- a/Aircraft/Instruments-3d/RDR-160/wxradar-hotspots.xml +++ b/Aircraft/Instruments-3d/RDR-160/wxradar-hotspots.xml @@ -4,8 +4,7 @@ wxradar hotspots - 160 - 120 + Aircraft/Instruments-3d/RDR-160/pnl.png 160 120 @@ -22,7 +21,7 @@ - Aircraft/Instruments-3d/RDR-160/bkgrd.rgb + Aircraft/Instruments-3d/RDR-160/bkgrd.png 0.030 0.112 0.979 @@ -49,7 +48,7 @@ - Aircraft/Instruments-3d/RDR-160/od_wxradar.rgb + Aircraft/Instruments-3d/RDR-160/od_wxradar.png 0.0 0.0 1.0 @@ -234,176 +233,6 @@ - - - - - data toggle - - -74 - -2 - 12 - 8 - - property-toggle - instrumentation/radar/display-controls/data - - - - - pos toggle - - -74 - -20 - 12 - 8 - - property-toggle - instrumentation/radar/display-controls/pos - - - - - range increase - - 64 - -2 - 12 - 8 - - property-assign - instrumentation/radar/set-range - 1 - - - - - range decrease - - 64 - -20 - 12 - 8 - - property-assign - instrumentation/radar/set-range - -1 - - - - - pwroff - - -80 - -51 - 12 - 20 - - property-adjust - instrumentation/radar/switch-pos - -1 - 0 - 3 - false - - - - - pwron - - -68 - -51 - 12 - 20 - - property-adjust - instrumentation/radar/switch-pos - 1 - 0 - 3 - false - - - - - tiltup - - 67 - -55 - 12 - 20 - - property-adjust - instrumentation/radar/tilt - 5.0 - -15.0 - 15.0 - false - - - - - tiltdown - - 55 - -55 - 12 - 20 - - property-adjust - instrumentation/radar/tilt - -5.0 - -15.0 - 15.0 - false - - - - - brtup - - -68 - 39 - 12 - 20 - - property-adjust - instrumentation/radar/dim - 0.05 - 0.0 - 1.0 - false - - - - - brtdwn - - -80 - 39 - 12 - 20 - - property-adjust - instrumentation/radar/dim - -0.05 - 0.0 - 1.0 - false - - - - - \ No newline at end of file