From 4eba6afa906147399f11ae13dc6a0e7c8c48d914 Mon Sep 17 00:00:00 2001 From: Durk Talsma Date: Mon, 3 Oct 2011 21:07:03 +0200 Subject: [PATCH 1/9] New Traffic files: Scandinavian airlines and Iberia. Updated traffic files: Delta and USAirways. Added a new material for groundnetwork testing. --- Textures/Symbols/unidirectionalgreen.png | Bin 0 -> 982 bytes Textures/Symbols/unidirectionalred.png | Bin 0 -> 984 bytes materials.xml | 23 +++++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 Textures/Symbols/unidirectionalgreen.png create mode 100644 Textures/Symbols/unidirectionalred.png diff --git a/Textures/Symbols/unidirectionalgreen.png b/Textures/Symbols/unidirectionalgreen.png new file mode 100644 index 0000000000000000000000000000000000000000..7f7f1731239f1a5d64cf8296e3f7e57527de48d5 GIT binary patch literal 982 zcmeAS@N?(olHy`uVBq!ia0y~yV2lN_9XQy4Y zApM_#!TomsBp{2kz$3Dlfq`2Xgc%uT&5-~KvX^-Jy0YKqVq!Cry_bKfhJk@O%+tj& zq~g}wJBE3}jv{Oiwkz{Busko|Epor4=s2~nNlVOBNYpn#Ysr<1L4iw(S%a+dcTJF* z-@tr8vQ2B+Hotk3@BaKJ9C2-V{QI*R%UAFBf3+dv*p%Xeo9=VgF5b=MdE%q1OTDb& zocuqMZ#GpQFPXh-<%O<8snhTNUE=d^{@zIUKdd_1f3J5`JgZNb9=o*KTJulWi){_5 zzFZr7B>a4LzS(rU=4I4b8SM?)!CRsih_;^A+wCPDl_9$B%%yjePyXF}f8kl5|H?@b z+A(D}O<&&gTm@ zpA=2?&fQ48zQlT-NQ~VQKQ0h29BA2^v_8?4ZDrhBE^zIBV-~aPg461P)N@e&HmjFa z@g}DCj->*f3)Hzsf0mVIg*3=;sBN=0MK5R#yOFwm;-yxxs8;Q@H*0U4Z>Uw9DK-Dc zrqk;@%WX7&_!yN2edyHR{YEQx^~|ehHa3~$Zg=2byW#XZA8)Ylw&a!X7thp_4|@El zC$`LY*JICvPn};ac>vB*bMxtSmt>#s?Nl^gy?t41+0D>h zVWz8RC9@@dZ&U+oyR_jhlm4DVdb@e2yyIJcx-(>t-ZfAd^*t_9GKDasuCB@IlUx$H zn>DVYHMUGz8=|r6ZeFnYSHr&xn$Ncj+AHtU&5>N$-BBTIIHzhV&-hnh%X8Xsk?@8^P`tN`nu8p#3`)F0|qD;$O~InMP8LL zKB4ngtitspFoZ9)ipL$*-n=DRt@HX*7p*w)>^GZMmmDv&oG1lhuFVQFJeUeWxd^R?y3G~oX9R_fByB_RA8oK@O1Ta JS?83{1OSwt*+BpR literal 0 HcmV?d00001 diff --git a/Textures/Symbols/unidirectionalred.png b/Textures/Symbols/unidirectionalred.png new file mode 100644 index 0000000000000000000000000000000000000000..da2ccd0be6122fa3f82e98332ff02a50d78ca212 GIT binary patch literal 984 zcmeAS@N?(olHy`uVBq!ia0y~yV2lN_9XQy4Y zApM_#!TomsBp{2kz$3Dlfq`2Xgc%uT&5-~KvX^-Jy0YKqVq!C4cx^1H%)r1L;pyTS zQgQ3;-HllyjxuZ?^n;fRd@)ri^;jCs>N0zY$eVL<8#Z=LI5xp9e0k4QmNk7LhFhPp z)-b%?7O%}O_GZ$~9oGBb3%1G2|DU;Y?ro`k^1OG?c`loC^=VyE)x?-w_jmT)pY2Y+ zUShp@-auFt6_;oqJq{bY?;t7ETPnIn56HT>njxgz^icbaNm znI*Dmddcx?(__nK>&HeLALn{=O609rhU>#kr`KI-6^m-s-n_+nXT1IzzF$v_w_Gi{ zupDGT_N7>VuKhPxS!zD%EKQgmyEHpHE&Ex7V_MR72W>8(VN>z`b_E={)77+`3!1!lO3-UNE2Wx6h`c znnyroYIiR#d0>2U)#N7s8ju;cX5E}+88%@V(0>a>%WlrieCfo!_R!R8Z}Ywoa^!~H zCn2HnCT~N@Zt?iZl*}TY-VHy5wPN_(!hYz<{iH7`o@syEgCg z-s{S@LO)h{%mxO@JBxfD9@EVgskc%=A+|bg^|Kj{H)&D&@aqO zcOQFQv`8yXJR4-@@j}Z$Q@v}TNV~NP7~*LY(%y2{!zhv_ZzL)XwzuZ<2;wz?lS4` zIi$C{ce>u54_a|ESA+OnptyS{vHra7>PKH!8UU5wEv(6lG_?~=L%2CDbNc~puu6!| zrFV@y_vopwdQ`d*6tCqn(}hDHC-nkNTDNxA+F8kLGh6R6t=EVvyBWIc!=cp`sng1~ zx6NL>@V4#DFHF_Pw-oI;2#l@o7BBzRnEY-1+Lw8?q8aFp_r;fF+Z65XmffEDV@vhU x`E%k_!qwWeD$f7bSwH#RnO~buzl;6EKL3{IA#u5YE?~A}@O1TaS?83{1ORd9;x_;Q literal 0 HcmV?d00001 diff --git a/materials.xml b/materials.xml index eb70fdced..8224eee8e 100644 --- a/materials.xml +++ b/materials.xml @@ -3381,6 +3381,29 @@ Shared parameters for various materials. 1.0 + + + UnidirectionalTaperRed + Symbols/unidirectionalred.png + + 0.92157 + 0.92157 + 0.76471 + 1.0 + + + + + UnidirectionalTaperGreen + Symbols/unidirectionalgreen.png + + 0.92157 + 0.92157 + 0.76471 + 1.0 + + + BidirectionalTaper From a79833070a5eb6995a519ee1848d879a758674e5 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sun, 9 Oct 2011 12:45:50 +0200 Subject: [PATCH 2/9] Switch to generic "open-browser" command. --- Docs/README.commands | 7 +++++-- gui/menubar.xml | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Docs/README.commands b/Docs/README.commands index 6df451b30..7ca81ccbb 100644 --- a/Docs/README.commands +++ b/Docs/README.commands @@ -120,6 +120,8 @@ script - execute a PSL script exit - prompt and quit FlightGear +pause - pause/resume the simulation + load - load properties from an XML file file: the name of the file to load, relative to the current directory (defaults to "fgfs.sav") @@ -234,6 +236,9 @@ dialog-apply - copy values from the active dialog box to FlightGear presets-commit - commit preset values from /sim/presets +open-browser - open the web browser and show given file + path: name of the local file to be opened. + url: URL to be opened (http://..., ftp://...). The following commands are temporary, and will soon disappear or be renamed; do NOT rely on them: @@ -280,8 +285,6 @@ old-ap-adjust-dialog - adjust the autopilot settings old-lat-lon-format-dialog - toggle the lat/lon format in the HUD -old-help-dialog - offer online help - Adding New Commands in C++ -------------------------- diff --git a/gui/menubar.xml b/gui/menubar.xml index 834c0c71b..3e0fa9247 100644 --- a/gui/menubar.xml +++ b/gui/menubar.xml @@ -759,7 +759,8 @@ help-browser - old-help-dialog + open-browser + Docs/index.html From f31f09e4d58f77817ea0bb381ea2eff10c0a039e Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sun, 9 Oct 2011 20:23:16 +0200 Subject: [PATCH 3/9] replay system: gui update --- gui/dialogs/replay.xml | 201 ++++++++++++++++++++++++++++++----------- 1 file changed, 148 insertions(+), 53 deletions(-) diff --git a/gui/dialogs/replay.xml b/gui/dialogs/replay.xml index acaef886c..d584a4c83 100644 --- a/gui/dialogs/replay.xml +++ b/gui/dialogs/replay.xml @@ -20,14 +20,40 @@ new : func( dlgRoot ) { var obj = { parents: [ReplayDialogController] }; obj.dlgRoot = dlgRoot; + obj.initViews(1); return obj; }, + # Populate the view combo box with a list of the available views + initViews : func(update) { + var combo = me.findElementByName( me.dlgRoot, "view-selector" ); + if (update) + combo.removeChildren("value"); + + var current_view = getprop("/sim/current-view/view-number"); + var i = 0; + foreach (var v; view.views) { + var name = "Unnamed view " ~ v.getIndex(); + if (v.getNode("name") != nil) { + name = v.getNode("name").getValue(); + } + + # Pre-populate the combo box selected value + if (i == current_view) { + setprop("/sim/replay/view-name", name); + } + if (update) + combo.getNode("value[" ~ i ~ "]", 1).setValue(name); + i = i + 1; + } + }, + open : func { var replaySlider = me.findElementByName( me.dlgRoot, "replay-time-slider" ); me.maxProp = replaySlider.getChild("max"); me.minProp = replaySlider.getChild("min"); - me.maxListenerId = setlistener( "/sim/speed-up", func(n) { me.updateListener(n); }, 1, 1 ); + me.speedUpListenerId = setlistener( "/sim/speed-up", func(n) { me.updateListener(n); }, 1, 1 ); + me.viewListenerId = setlistener( "/sim/current-view/view-number", func(n) { me.updateListener(n); }, 1, 1 ); if (getprop("/sim/replay/end-time")!=nil) { # update max/min range of replay-time slider @@ -45,10 +71,12 @@ SpeedUp = "1/" ~ SpeedUp; } setprop("/sim/gui/dialogs/replay/time-factor","" ~ SpeedUp ~ "x"); + me.initViews(0); }, close : func { - #removelistener( me.maxListenerId ); + removelistener( me.speedUpListenerId ); + removelistener( me.viewListenerId ); }, findElementByName : func(base,name) { @@ -66,6 +94,8 @@ var controller = ReplayDialogController.new( cmdarg() ); controller.open(); + if (props.globals.getNode("/rotors",0)!=nil) + setprop("/sim/replay/disable-my-controls",1); ]]> 1 - + + 80 + - + + + + + From 4280185393356ce9b060498ab86bcb0e11e9fefc Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sun, 9 Oct 2011 21:26:19 +0200 Subject: [PATCH 4/9] set "dme-fallback-to-loc" initial value if /sim/realism/dme-fallback-to-loc is true or absent, LOC will be treated as DME (realism is off) if /sim/realism/dme-fallback-to-loc is false, LOC will be NOT be treated as DME (realism is on) --- preferences.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/preferences.xml b/preferences.xml index f9bd58988..41e014afe 100644 --- a/preferences.xml +++ b/preferences.xml @@ -785,6 +785,9 @@ Started September 2000 by David Megginson, david@megginson.com /Aircraft/Generic/flightrecorder/generic-piston-propeller-4.xml + + false + From 759c8ded5a222af8feb4cc30293c2c08d05e5ba0 Mon Sep 17 00:00:00 2001 From: Vivian Meazza Date: Mon, 10 Oct 2011 10:51:25 +0100 Subject: [PATCH 5/9] Add taxiway symbols in dds. Signed-off-by: Vivian Meazza --- Textures/Symbols/unidirectionalgreen.dds | Bin 0 -> 11080 bytes Textures/Symbols/unidirectionalred.dds | Bin 0 -> 11080 bytes materials-dds.xml | 27 +++++++++++++++++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 Textures/Symbols/unidirectionalgreen.dds create mode 100644 Textures/Symbols/unidirectionalred.dds diff --git a/Textures/Symbols/unidirectionalgreen.dds b/Textures/Symbols/unidirectionalgreen.dds new file mode 100644 index 0000000000000000000000000000000000000000..f332527739c6c4e04a1c915b7db9c95c62adb8b6 GIT binary patch literal 11080 zcmc&)U2GIp6u#TCj7uDb0Goa6N?5D-uo4)2bkL%b7~JU0?uP8cV1k-xV0>tOkub&( zd9d*ZXL(ZAq{T!F1Y_F=(V5tgi3xPoFtaaood^_&Z9#sziJiBH&Z`Q3)87>0P^qQ@0wS@AfJqt9VAO2<4-ag3xj z;+i{Uxe#{#3;q5_d$O}F@|lgFOx{LFI1nf@>7>A!BUHI zFdx?AM{c@P%&^xxSf>~2mY_>ok+t3dUe;BG!3-b!xZW@e*a*SA7JIDOPYvppR_wpy zaWa5|`LG(7pQU~;#%t!*Q;GKI{1tVb`Yux56MNe)QQl*(|7+kI@Sa#Rtv(*yA61XA zas#)ax1uBmCOuBmitPDr(C0g6ZB^e9k1vJa->4Hpq=_+)Q`Ov(@t#;ypAki#Ip6nG z-|1JiT#1#Rx8iI-yfMT$e`2y><{9!`;3vPGnKqM|c&|R{aTLFGev5s*?5-y`Vy1uF z9k%+fAES9rQXHpw4hVm-^=y59Sf8Jg)Lx422>qeFL2FGc?ahWjqKYG3ULmTMbh*6y+fDJtbdczW=QOj}sk5soA@F+hRN) z*oD>j9O`?Dzv3^CE6By2!MD`K>)pa4K>hS;ceoQCEP=CLl z^uALO5*g8Hm=7WjlUVEg7W=xVW*H^T(>+c+_#^H(7c zNP-982Lk-yW!Cl&@XFOnH~c_so!??#)BcJB9{39Ne!i$l!F*VcYf<;LCwS)i2kZMZ z`X0TaXh^jGqA1Mk-_th{52zo|yrjV14|LRB{Yk?)jlLJfXKjB8b&!~JlyzrnrjpN> z0=uvp*Zc}UfZ_Q%`d*r}WPYHzYO0;jWLW9lilfyl9Yxi$Sld6q8$~<-4J2FV#p?Rv zM8nKrAJTq+l9zMAyjYFoTr)2mwznFjJ;6LLdYI;ghN3)*egN`fjg{U3j@9RJSbk;L z*7qSVUP3?6Q}6>4%!~Cn=~OuQfw2+s8MMSaFFNT~QktZb^tc}nnfJp7982Jl7yt05 zuYW$Q|9>+LIa%HrR_@;SS58ZW5Xu8`k-Z;~g2%xPm2y?>MR~~F4?dh~m=u3I^1@Os zr?TGv0bY-7?L&DOIv#AgJpZ}jAFd^+TJ-Z>rK)yj_(bG><(gV0wJ?0WBNO4A$grg+ z2@ZBg%GlSiZ?MkyJ03#65a)xL$IeFU*OhHj0KU5Z`)K%Y!fuL@gg+cTh2zot?i=lO zDUUeGUKf4-q73f}_dbU-ZA%@A2ZygC=ieNy2nIG>!*nC{sezw`*(2vuYiqz4GkmulZQlXELqj}QZGRm@um26`Pva5o zQ^RdSzmL;hm7bvZ=_AqN=`W*JDvknaJ3XI|fPdn4v%WdudP2UGi=5Zd{g1pfbiY!r zHt~Og|K>|tTbM=gQY2MzPbV}!JY?$@E; zTc-F|5m$j9`n)-dd<<;@rDiTG&xb!v^B<*v z|NH+Y#6N5UD|lYmadWkjLU}MJz6+jczBhFBGlGD#`ZDsE{LJ&+xBjMfa17T}p9QVY z5>I|VPUW-U4bb+CcsX_4mruH;-Z7iJVOs)TqngvsgJvZ)UmS;gYJPbuCC-xvQ2F`n zY?xLmHjf>td@(n-ozTCZ)ec*be>Hh(atLJv*;vIop~2c}=ZT}ude6l=%)XzmeecWL zo`8CMhWv`df&8v40Wk&p&JtYU8_CykA7)cN83w+eH|*X+&snWh^Zpy)WB literal 0 HcmV?d00001 diff --git a/Textures/Symbols/unidirectionalred.dds b/Textures/Symbols/unidirectionalred.dds new file mode 100644 index 0000000000000000000000000000000000000000..9654e3228ed91c9529c88a2c93e35c24f0ab869f GIT binary patch literal 11080 zcmc&)O>7%Q6rQoWOG?m;7+7_?vRu)<(rBpo`4yaTWwbKMC zLLh|X3*wMX0x1!PBIOVj4r`}sq3t1*SSl?@ael~83rf-)#%&>dV`~vg<21V_B(fw?fmO~{^mMmMlKi9c+-5q@AFC5e~fZ$pQ`;#nW^j1di8P3KeXD>9>AHEt+yjD zJd}m&7sQi6*^v^Hl85xM^CD>uS4m)968mBlH)zXJ5_3?)79$n*M=5fOkew)fV^8 z?Nb8s@s4Njz=_$Z`;;+gUhh7-<$v{Wp}&#qE)PbU8;EPr03cz0dcqb+ju1 zcsfb`eX|_O>99FDy&i`B#U$dLvu=AHQx;T|tOnex;H~6!(0FEyt=RV{>^>^uEst@V zTfV+ooO?AGqI~2Lc3--`r#$-&AuMCv)>t|bm8Q3|PQZBv*vnDAFbmjgfc_S6&(6@> zz&!xIGq2sIO~X~ZqioNbjznRzJ<7Tlcuz7+w^DNB9A|wy*Sdgve(C$}tZ%Apov^Q- zy`Uk^lZktX^D1!;eS$a-f}Q!uq7-;XY;%$Ve~{iuxBEjPzf*&KlplQTM~*E^Z%2;C zrv>htQ$By-kSx77%c;b@36pI; zpSykE)>GAATU?y;1zv93JTF=I*}L$AI?L>~zO{b85BX1jP*JUN1qY(C^mgQk{AV&_ z+SBldMohjPyz;D-^@T#Yqsae^cwD;vl-pw~8AdGFV>}v_UiUon5$pf}Jb}6=@lnOu z7umG5L=T^c3^dFR{A*o|&_GbO-i|z4woZL;_G-iQzk+hoYogqX64j?XOyQSxgez$Y2l~F2R zf9ITKd8sFT@l%#Xo(fo!Ru^&BW&R0`^kO_rK}#_Wgfb{1a_ilUJ)O4TC%n|_PA_+~Lw@ta4R7)_o*&KNjeyj5qECRj-41c#rl@lp#hk{2 zLtgehyIjFRHFY0#dOaE6sa)r|`O%7eb&$863wWrvQJ$Iy9Ard)4Dwz3gQ3;I_K-Mm z9{W19oI0GDHqUE7qGuZ$8;)K(r4y@NETlA3uk!QUIws^>?|VCUb4#s^HY+OnEgb9U zdLDURI(gol&RCUmggVg<&zYRXYVrJYYC}E%9Y1>yT|o8 zpgey~HyH^7f4tPIzMN?l@)1{j_|S{|{4LB}RSl6RZzq3T#6L#7CQckI`;Ylx5MJ%k zS_-p7n%T~}x~1K#UG4SAPc2#PiL{-mCHKePYCmmw#)oytg($y1x>bLda;t#;qZz)d zvBVbd+YF;FCHPzU@aHx7Z-JkM;TN{zFYrPn*i38UuC|(GX#CcUBf!ss+u%0x<;ZsY zGkh@O2k_L|XA1dAeVh1dwTHccAN%k;|0mV{YHaux>^^50t-QBqt9%-Ge3#kC_pp9O z?D@LSUf^x6DELob*qT2-A@apiN$@BCjrY4z$1!qhkn)KV+${<7)N#C5WR||J#tq%@ z2i5V}U#jEb Effects/water Lagoon - Lake - Terrain/water-lake.png + Terrain/water-lake.png 400 400 @@ -1373,6 +1372,7 @@ Shared parameters for various materials. Effects/water-inland + Lake Pond Reservoir Stream @@ -4777,6 +4777,29 @@ Shared parameters for various materials. + + UnidirectionalTaperRed + Symbols/unidirectionalred.dds + + 0.92157 + 0.92157 + 0.76471 + 1.0 + + + + + UnidirectionalTaperGreen + Symbols/unidirectionalgreen.dds + + 0.92157 + 0.92157 + 0.76471 + 1.0 + + + + BidirectionalTaper Symbols/bidirectional.dds From f76e302908d1cd87cfb2f70ae931c9d33e544c43 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Tue, 11 Oct 2011 22:09:01 +0200 Subject: [PATCH 6/9] Map dialog transparency option Helpful when keeping the map dialog open while flying. --- gui/dialogs/map.xml | 90 ++++++++++++++++++++++++++++----------- gui/dialogs/stopwatch.xml | 30 +++++++++++++ 2 files changed, 96 insertions(+), 24 deletions(-) diff --git a/gui/dialogs/map.xml b/gui/dialogs/map.xml index c80efd179..d2d1f6dac 100644 --- a/gui/dialogs/map.xml +++ b/gui/dialogs/map.xml @@ -16,9 +16,31 @@ command interface /autopilot/route-manager/input: vbox true + + 0.41 + 0.4 + 0.42 + 1.0 + 1.0 + + - + var mapDialog = cmdarg(); + var setTransparency = func(updateDialog){ + var alpha = (getprop("/gui/map/transparent") or 0); + mapDialog.getNode("color/alpha").setValue(1-alpha*0.3); + mapDialog.getNode("color/red").setValue(0.41-alpha*0.2); + mapDialog.getNode("color/green").setValue(0.4-alpha*0.2); + mapDialog.getNode("color/blue").setValue(0.42-alpha*0.2); + var n = props.Node.new({ "dialog-name": "map" }); + if (updateDialog) + { + fgcommand("dialog-close", n); + fgcommand("dialog-show", n); + } + } + setTransparency(0); @@ -128,6 +150,19 @@ command interface /autopilot/route-manager/input: true + + + 100 + /gui/map/magnetic-headings + true + + dialog-apply + + + property-toggle + + + 100 @@ -155,9 +190,9 @@ command interface /autopilot/route-manager/input: - + 100 - /gui/map/magnetic-headings + /gui/map/transparent true dialog-apply @@ -165,11 +200,16 @@ command interface /autopilot/route-manager/input: property-toggle + + nasal + + true - + + property-adjust + /gui/map/zoom + 0 + -1 + + + Zoom %d @@ -222,17 +263,18 @@ command interface /autopilot/route-manager/input: + + property-adjust + /gui/map/zoom + 1 + 12 + + diff --git a/gui/dialogs/stopwatch.xml b/gui/dialogs/stopwatch.xml index a2154c1f5..95a5fff4f 100644 --- a/gui/dialogs/stopwatch.xml +++ b/gui/dialogs/stopwatch.xml @@ -7,6 +7,12 @@ 8 -5 5 + + 0.2 + 0.2 + 0.2 + 0.7 + @@ -104,6 +110,12 @@ Start true 47 + + 0.3 + 0.3 + 0.3 + 0.8 + nasal @@ -114,6 +126,12 @@ Stop true 47 + + 0.3 + 0.3 + 0.3 + 0.8 + nasal @@ -124,6 +142,12 @@ Reset Delete 47 + + 0.3 + 0.3 + 0.3 + 0.8 + nasal @@ -132,6 +156,12 @@