Hi,
In the process of fixing the Generic aar.nas and also the Harrier I
propose this changes:
a) Generic/aar.nas fixed to follow AITanker.cxx
b) Added /systems/refuel/serviceable (bool) for those aircraft having a
particular condition to refueling like hose door or refuel boom. This
props would be set by the model and checked by aar.nas.
c) Harrier now use Aircraft/Generic/aar.nas and no longer use harrierAAR.nas
d) Harrier handle the boom option in a new script I called controls.nas.
Modified files:
---------------
Aircraft/Generic/aar.nas
Aircraft/harrier/harrier-set.xml
Deleted file:
-------------
Aircraft/harrier/harrierAAR.nas
New file:
---------
Aircraft/harrier/controls.nas
This changes shouldn't (?) brake anything, but I would like this
to be double checked before asking for commit.
Alexis
Index: Aircraft/Generic/aar.nas
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/Generic/aar.nas,v
retrieving revision 1.11
diff -u -p -r1.11 aar.nas
--- Aircraft/Generic/aar.nas 30 Mar 2007 20:27:07 -0000 1.11
+++ Aircraft/Generic/aar.nas 15 Jun 2007 22:38:01 -0000
@@ -47,7 +47,7 @@ var update_loop = func {
# check for contact with tanker aircraft
var tankers = [];
if (ai_enabled) {
- var ac = aimodelsN.getChildren("aircraft");
+ var ac = aimodelsN.getChildren("tanker");
var mp = aimodelsN.getChildren("multiplayer");
foreach (var a; ac ~ mp) {
@@ -60,8 +60,21 @@ var update_loop = func {
}
}
- var refueling = size(tankers) > 0;
- refuelingN.setBoolValue(refueling);
+
+
+ var serviceable = getprop("systems/refuel/serviceable");
+ var refueling = size(tankers) > 0 ;
+
+ if (serviceable == nil) { serviceable =1 }
+ if (serviceable) {
+ refuelingN.setBoolValue(refueling);
+ print("serv" ~ refueling);
+ } else {
+ refueling = 0;
+ refuelingN.setBoolValue(refueling);
+ print("noserv" ~ refueling);
+ }
+
if (fuel_freeze) {
return settimer(update_loop, UPDATE_PERIOD);
Index: Aircraft/harrier/harrier-set.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/harrier/harrier-set.xml,v
retrieving revision 1.8
diff -u -p -r1.8 harrier-set.xml
--- Aircraft/harrier/harrier-set.xml 13 May 2007 13:49:49 -0000 1.8
+++ Aircraft/harrier/harrier-set.xml 15 Jun 2007 22:36:12 -0000
@@ -222,6 +222,11 @@
<selected type="int">0</selected>
</radar>
</instrumentation>
+ <systems>
+ <refuel>
+ <serviceable type="bool">false</serviceable>
+ </refuel>
+ </systems>
<!-- keyboard-->
<input>
@@ -255,8 +260,11 @@
<!-- load nasal scripts -->
<nasal>
<aar>
- <file>Aircraft/harrier/harrierAAR.nas</file>
+ <file>Aircraft/Generic/aar.nas</file>
</aar>
+ <controls>
+ <file>Aircraft/harrier/controls.nas</file>
+ </controls>
<enav>
<file>Aircraft/harrier/Panel/enav/enav.nas</file>
</enav>
# HARRIER controls
# extra check to see if the harrier is carrying its AAR boom
var UPDATE_PERIOD = 0.3;
var update_loop = func {
var hasAARBoom = getprop("sim/weight[7]/selected") != "none";
var s = props.globals.getNode("systems/refuel/serviceable");
s.setBoolValue(0);
if ( hasAARBoom ){
s.setBoolValue(1);
}
settimer(update_loop, UPDATE_PERIOD);
}
setlistener("/sim/signals/fdm-initialized", func {
update_loop();
});
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
