1
0
Fork 0

Remove cruise ship reference from Truman AI scenario, fix Truman elevator rail timing issue, add wakes to Truman escort ships

This commit is contained in:
Thorsten Renk 2017-09-04 10:10:54 +03:00
parent f8f31d1c18
commit ac67816551
5 changed files with 556 additions and 109 deletions

View file

@ -30,7 +30,7 @@
- 3x Oliver Perry (Guided missile frigate)
- 1x LPD-17 San Antonio (Amphibious transport dock)
- 1x MH-60 Helicopter
and 1 cruise ship (Kalaupapa to Honolulu)
Notes:
USS Harry S.Truman is a highly detailed model, and may cause
@ -157,7 +157,7 @@
<entry>
<type>escort</type>
<model>Models/Maritime/Military/OliverPerryFFG.xml</model>
<model>Models/Maritime/Military/OliverPerryFFG-high-detail.xml</model>
<name>Escort-2</name>
<callsign>Escort-1</callsign>
<turn-radius-ft alias="../../parameters/turn-radius-ft"/>
@ -177,7 +177,7 @@
<entry>
<type>escort</type>
<model>Models/Maritime/Military/OliverPerryFFG.xml</model>
<model>Models/Maritime/Military/OliverPerryFFG-high-detail.xml</model>
<name>Escort-3</name>
<callsign>Escort-2</callsign>
<turn-radius-ft alias="../../parameters/turn-radius-ft"/>
@ -197,7 +197,7 @@
<entry>
<type>escort</type>
<model>Models/Maritime/Military/OliverPerryFFG.xml</model>
<model>Models/Maritime/Military/OliverPerryFFG-high-detail.xml</model>
<name>Escort-4</name>
<callsign>Escort-3</callsign>
<turn-radius-ft alias="../../parameters/turn-radius-ft"/>
@ -217,7 +217,7 @@
<entry>
<type>escort</type>
<model>Models/Maritime/Military/LPD17.xml</model>
<model>Models/Maritime/Military/LPD17-high-detail.xml</model>
<name>LPD 17</name>
<callsign>LPD 17</callsign>
<turn-radius-ft alias="../../parameters/turn-radius-ft"/>
@ -252,14 +252,6 @@
</station>
</entry>
<entry>
<type>ship</type>
<model>Models\Maritime\Civilian\Sun_Princess_Fantasy\Sun_Princess_Fantasy.xml</model>
<name>Cruise-1</name>
<turn-radius-ft>6000</turn-radius-ft>
<flightplan>CruiseShip_Hawaii.xml</flightplan>
<repeat>1</repeat>
</entry>
</scenario>
</PropertyList>

View file

@ -358,7 +358,7 @@ by Thorsten Renk 2017
print ("Elevator ", i+1, " down.");
elevator_array[i].close();
}
settimer( func {check_rails(i);}, elevator_transit_time);
settimer( func {check_rails(i);}, elevator_transit_time + 1.0);
}
var door_operate = func (i){

View file

@ -3,57 +3,8 @@
<PropertyList>
<path>CG-57.ac</path>
<offsets>
<x-m>0.0</x-m>
<y-m>0.0</y-m>
<z-m>-1.5</z-m>
</offsets>
<!-- *** Effects *** -->
<nasal>
<load>
print("LOAD CG-57", cmdarg().getPath());
var fg_root = getprop("/sim/fg-root");
var self = cmdarg();
########
# properties used to calculate rel wind for the bow-wave shader
var speed_Node = self.getNode("velocities/speed-kts", 1);
var hdg_Node = self.getNode("orientation/true-heading-deg", 1);
var wind_speed_Node = self.getNode("environment/rel-wind-speed-kts", 1);
wind_speed_Node.setDoubleValue(0);
########
# the main loop
var update = func {
var value = wind_speed_Node.getValue();
setprop("/environment/CG-57/rel-wind-speed-kts", value);
value = speed_Node.getValue();
setprop("/environment/CG-57/spd-kt", value);
value = hdg_Node.getValue();
setprop("/environment/CG-57/hdg-deg", value);
settimer(update,0);
}
########
#start the main loop
update();
</load>
</nasal>
<unload>
#print("UNLOAD CG-57 ", cmdarg().getPath());
</unload>
<model>
<name>Ensign</name>
<path>Models/Maritime/Military/CG-57/ensign.xml</path>
@ -67,8 +18,7 @@
<model>
<name>Bow-Wave</name>
<!--<path>/Models/Effects/Wakes/bow_wave.xml</path>-->
<path>Models/Maritime/Military/CG-57/bow_wave.xml</path>
<!--<path>Models/Geometry/Nimitz/bow_wave.xml</path>-->
<path>Models/Geometry/Nimitz/Models/Effects/bow_wave_carrier.xml</path>
<offsets>
<x-m>25</x-m>
<z-m>-0.001</z-m>
@ -77,11 +27,11 @@
<model>
<name>bowwake-stbd</name>
<path>/Models/Effects/Wakes/wake.xml</path>
<path>Models/Geometry/Nimitz/Models/Effects/wake_carrier.xml</path>
<offsets>
<x-m>-45.0</x-m>
<y-m>0</y-m>
<z-m>0.0</z-m>
<z-m>1.0</z-m>
<heading-deg>0</heading-deg>
</offsets>
<overlay>
@ -110,19 +60,15 @@
</vertex>
</placer>
<shooter>
<theta-min-deg>90</theta-min-deg>
<theta-max-deg>90</theta-max-deg>
<phi-min-deg>90</phi-min-deg>
<phi-max-deg>90</phi-max-deg>
<speed-mps>
<property>/environment/CG-57/spd-kt</property>
<property>velocities/speed-kts</property>
<factor>0.5144</factor>
<spread>2</spread>
</speed-mps>
</shooter>
<counter>
<particles-per-sec>
<property>/environment/CG-57/spd-kt</property>
<property>velocities/speed-kts</property>
</particles-per-sec>
</counter>
<particle>
@ -136,11 +82,11 @@
<model>
<name>bowwake-port</name>
<path>Models/Effects/Wakes/wake.xml</path>
<path>Models/Geometry/Nimitz/Models/Effects/wake_carrier.xml</path>
<offsets>
<x-m>-45.0</x-m>
<y-m>0</y-m>
<z-m>0.0</z-m>
<z-m>1.0</z-m>
<heading-deg>0</heading-deg>
</offsets>
<overlay>
@ -169,19 +115,19 @@
</vertex>
</placer>
<shooter>
<theta-min-deg>-90</theta-min-deg>
<theta-max-deg>-90</theta-max-deg>
<phi-min-deg>90</phi-min-deg>
<theta-min-deg>-80</theta-min-deg>
<theta-max-deg>-100</theta-max-deg>
<phi-min-deg>88</phi-min-deg>
<phi-max-deg>90</phi-max-deg>
<speed-mps>
<property>/environment/CG-57/spd-kt</property>
<property>velocities/speed-kts</property>
<factor>0.5144</factor>
<spread>2</spread>
</speed-mps>
</shooter>
<counter>
<particles-per-sec>
<property>/environment/CG-57/spd-kt</property>
<property>velocities/speed-kts</property>
</particles-per-sec>
</counter>
<particle>
@ -195,9 +141,9 @@
<model>
<name>Stern-Wake</name>
<path>Models/Effects/Wakes/wake2.xml</path>
<path>Models/Geometry/Nimitz/Models/Effects/wake2_carrier.xml</path>
<offsets>
<x-m>105</x-m>
<x-m>100</x-m>
<y-m>0</y-m>
<z-m>2.0</z-m>
<heading-deg>0</heading-deg>
@ -238,7 +184,7 @@
<phi-min-deg>88</phi-min-deg>
<phi-max-deg>90</phi-max-deg>
<speed-mps>
<property>/environment/CG-57/spd-kt</property>
<property>velocities/speed-kts</property>
<factor>1.0</factor>
<spread>5</spread>
</speed-mps>
@ -252,7 +198,6 @@
</overlay>
</model>
<animation>
<type>rotate</type>
<object-name>Wake</object-name>
@ -272,13 +217,16 @@
</axis>
</animation>
<!--
<animation>
<type>rotate</type>
<object-name>Bow-Wave</object-name>
<object-name>Wake</object-name>
<object-name>Stern-Wake</object-name>
<property>wave-motion/damped-pitch-deg</property>
-->
<!--<property>wave-motion/calculated-pitch-deg</property>-->
<!--
<factor>-1</factor>
<center>
<x-m>46.3938</x-m>
@ -291,7 +239,7 @@
<z>0</z>
</axis>
</animation>
-->
<!--<animation>
<type>translate</type>
<property>wave-motion/calculated-elevation-ft</property>
@ -307,7 +255,7 @@
<z>1</z>
</axis>
</animation>-->
<!--
<animation>
<type>translate</type>
<object-name>Bow-Wave</object-name>
@ -318,9 +266,7 @@
<center>
<x-m>46.3938</x-m>
<y-m>0.0</y-m>
<!--<z-m>4.13756</z-m>-->
<z-m>4.2</z-m>
</center>
<axis>
<x>0</x>
@ -328,16 +274,12 @@
<z>1</z>
</axis>
</animation>
-->
<!--
<animation>
<type>rotate</type>
<property>orientation/pitch-deg</property>
<factor>-1</factor>
<!--<center>
<x-m>46.3938</x-m>
<y-m>0.0</y-m>
<z-m>4.13756</z-m>
</center> -->
<axis>
<x>0</x>
<y>1</y>
@ -345,9 +287,8 @@
</axis>
</animation>
<animation>
<animation>
<type>rotate</type>
<!-- <property>wave-motion/calculated-pitch-deg</property>-->
<property>wave-motion/damped-pitch-deg</property>
<factor>1</factor>
<center>
@ -361,11 +302,11 @@
<z>0</z>
</axis>
</animation>
-->
<animation>
<object-name>Bow-Wave</object-name>
<type>scale</type>
<property>/environment/CG-57/spd-kt</property>
<property>velocities/speed-kts</property>
<x-factor>0.04</x-factor>
<y-factor>0.0</y-factor>
<z-factor>0.0</z-factor>
@ -381,7 +322,7 @@
</center>
</animation>
<animation>
<!--<animation>
<type>select</type>
<object-name>Wake</object-name>
<condition>
@ -389,8 +330,8 @@
<property>/sim/rendering/particles</property>
</not>
</condition>
</animation>
</animation>-->
<!--
<animation>
<type>rotate</type>
<object-name>radar-1b</object-name>
@ -407,7 +348,7 @@
<z>1</z>
</axis>
</animation>
-->
<animation>
<type>rotate</type>
<object-name>SPS-49-Antenna</object-name>
@ -428,16 +369,11 @@
<effect>
<inherits-from>/Effects/model-transparent</inherits-from>
<object-name>net</object-name>
<object-name>SPS-49-net-tranparent</object-name>
<object-name>SPS-49-net-transparent</object-name>
</effect>
<!--******************* LOD *****************-->
<animation>
<type>range</type>
<min-m>0</min-m>
<max-m>15000</max-m>
</animation>
<animation>
<type>range</type>
@ -447,11 +383,12 @@
<max-m>1000</max-m>
</animation>
<!--
<animation>
<type>range</type>
<object-name>1000m</object-name>
<min-m>0</min-m>
<max-m>1000</max-m>
</animation>
-->
</PropertyList>

View file

@ -0,0 +1,238 @@
<?xml version="1.0"?>
<PropertyList>
<path>LPD17.ac</path>
<model>
<name>Bow-Wave</name>
<path>Models/Geometry/Nimitz/Models/Effects/bow_wave_carrier.xml</path>
<offsets>
<x-m>25</x-m>
<z-m>-0.001</z-m>
</offsets>
</model>
<model>
<name>bowwake-stbd</name>
<path>Models/Geometry/Nimitz/Models/Effects/wake_carrier.xml</path>
<offsets>
<x-m>-40.0</x-m>
<y-m>0</y-m>
<z-m>1.0</z-m>
<heading-deg>0</heading-deg>
</offsets>
<overlay>
<particlesystem>
<placer>
<type>segments</type>
<vertex>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>0</x-m>
<y-m>0.5</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>-10.0</x-m>
<y-m>1.65</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>-20.0</x-m>
<y-m>3.9</y-m>
<z-m>0</z-m>
</vertex>
</placer>
<shooter>
<speed-mps>
<property>velocities/speed-kts</property>
<factor>0.5144</factor>
<spread>2</spread>
</speed-mps>
</shooter>
<counter>
<particles-per-sec>
<property>velocities/speed-kts</property>
</particles-per-sec>
</counter>
<particle>
<life-sec>
<value>90</value>
</life-sec>
</particle>
</particlesystem>
</overlay>
</model>
<model>
<name>bowwake-port</name>
<path>Models/Geometry/Nimitz/Models/Effects/wake_carrier.xml</path>
<offsets>
<x-m>-40.0</x-m>
<y-m>0</y-m>
<z-m>1.0</z-m>
<heading-deg>0</heading-deg>
</offsets>
<overlay>
<particlesystem>
<placer>
<type>segments</type>
<vertex>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>0</x-m>
<y-m>-0.5</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>-10.0</x-m>
<y-m>-1.65</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>-20.0</x-m>
<y-m>-3.9</y-m>
<z-m>0</z-m>
</vertex>
</placer>
<shooter>
<theta-min-deg>-80</theta-min-deg>
<theta-max-deg>-100</theta-max-deg>
<phi-min-deg>88</phi-min-deg>
<phi-max-deg>90</phi-max-deg>
<speed-mps>
<property>velocities/speed-kts</property>
<factor>0.5144</factor>
<spread>2</spread>
</speed-mps>
</shooter>
<counter>
<particles-per-sec>
<property>velocities/speed-kts</property>
</particles-per-sec>
</counter>
<particle>
<life-sec>
<value>90</value>
</life-sec>
</particle>
</particlesystem>
</overlay>
</model>
<model>
<name>Stern-Wake</name>
<path>Models/Geometry/Nimitz/Models/Effects/wake2_carrier.xml</path>
<offsets>
<x-m>65</x-m>
<y-m>0</y-m>
<z-m>2.0</z-m>
<heading-deg>0</heading-deg>
</offsets>
<overlay>
<particlesystem>
<placer>
<type>segments</type>
<vertex>
<x-m>0</x-m>
<y-m>-4</y-m>
<z-m>-2</z-m>
</vertex>
<vertex>
<x-m>0</x-m>
<y-m>-3.5</y-m>
<z-m>-1</z-m>
</vertex>
<vertex>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>0</x-m>
<y-m>3.5</y-m>
<z-m>-1</z-m>
</vertex>
<vertex>
<x-m>0</x-m>
<y-m>4</y-m>
<z-m>-2</z-m>
</vertex>
</placer>
<shooter>
<theta-min-deg>-80</theta-min-deg>
<theta-max-deg>-100</theta-max-deg>
<phi-min-deg>88</phi-min-deg>
<phi-max-deg>90</phi-max-deg>
<speed-mps>
<property>velocities/speed-kts</property>
<factor>1.0</factor>
<spread>5</spread>
</speed-mps>
</shooter>
<particle>
<life-sec>
<value>90</value>
</life-sec>
</particle>
</particlesystem>
</overlay>
</model>
<animation>
<type>rotate</type>
<object-name>Wake</object-name>
<object-name>Bow-Wave</object-name>
<object-name>Stern-Wake</object-name>
<property>orientation/roll-deg</property>
<factor>1</factor>
<center>
<x-m>105.814</x-m>
<y-m>0.00</y-m>
<z-m>1.5</z-m>
</center>
<axis>
<x>1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<animation>
<object-name>Bow-Wave</object-name>
<type>scale</type>
<property>velocities/speed-kts</property>
<x-factor>0.04</x-factor>
<y-factor>0.0</y-factor>
<z-factor>0.0</z-factor>
<x-offset>0.2</x-offset>
<y-offset>0.6</y-offset>
<z-offset>1.0</z-offset>
<x-min>0.4</x-min>
<x-max>1.2</x-max>
<center>
<x-m>-55.0</x-m>
<y-m>0.0</y-m>
<z-m>0.0</z-m>
</center>
</animation>
<animation>
<type>select</type>
<object-name>Wake</object-name>
<condition>
<not>
<property>/sim/rendering/particles</property>
</not>
</condition>
</animation>
</PropertyList>

View file

@ -0,0 +1,280 @@
<?xml version="1.0"?>
<PropertyList>
<path>OliverPerryFFG.ac</path>
<animation>
<type>rotate</type>
<object-name>SPS-49-Antenna</object-name>
<property>/sim/time/elapsed-sec</property>
<factor>50</factor>
<center><x-m>-14.7</x-m></center>
<axis><z>1</z></axis>
</animation>
<animation>
<type>rotate</type>
<object-name>radar-1b</object-name>
<property>/sim/time/elapsed-sec</property>
<factor>65</factor>
<center><x-m>-7.48</x-m></center>
<axis><z>1</z></axis>
</animation>
<!-- *** LoD *** -->
<animation>
<type>range</type>
<max-m>50000</max-m>
</animation>
<animation>
<type>range</type>
<object-name>4000m</object-name>
<object-name>SPS-49-Antenna</object-name>
<max-m>1000m</max-m>
</animation>
<animation>
<type>range</type>
<object-name>1000m</object-name>
<max-m>1000</max-m>
</animation>
<animation>
<type>range</type>
<object-name>railing</object-name>
<object-name>nets</object-name>
<max-m>400</max-m>
</animation>
<model>
<name>Bow-Wave</name>
<path>Models/Geometry/Nimitz/Models/Effects/bow_wave_carrier.xml</path>
<offsets>
<x-m>25</x-m>
<z-m>-0.001</z-m>
</offsets>
</model>
<model>
<name>bowwake-stbd</name>
<path>Models/Geometry/Nimitz/Models/Effects/wake_carrier.xml</path>
<offsets>
<x-m>-40.0</x-m>
<y-m>0</y-m>
<z-m>1.0</z-m>
<heading-deg>0</heading-deg>
</offsets>
<overlay>
<particlesystem>
<placer>
<type>segments</type>
<vertex>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>0</x-m>
<y-m>0.5</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>-10.0</x-m>
<y-m>1.65</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>-20.0</x-m>
<y-m>3.9</y-m>
<z-m>0</z-m>
</vertex>
</placer>
<shooter>
<speed-mps>
<property>velocities/speed-kts</property>
<factor>0.5144</factor>
<spread>2</spread>
</speed-mps>
</shooter>
<counter>
<particles-per-sec>
<property>velocities/speed-kts</property>
</particles-per-sec>
</counter>
<particle>
<life-sec>
<value>90</value>
</life-sec>
</particle>
</particlesystem>
</overlay>
</model>
<model>
<name>bowwake-port</name>
<path>Models/Geometry/Nimitz/Models/Effects/wake_carrier.xml</path>
<offsets>
<x-m>-40.0</x-m>
<y-m>0</y-m>
<z-m>1.0</z-m>
<heading-deg>0</heading-deg>
</offsets>
<overlay>
<particlesystem>
<placer>
<type>segments</type>
<vertex>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>0</x-m>
<y-m>-0.5</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>-10.0</x-m>
<y-m>-1.65</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>-20.0</x-m>
<y-m>-3.9</y-m>
<z-m>0</z-m>
</vertex>
</placer>
<shooter>
<theta-min-deg>-80</theta-min-deg>
<theta-max-deg>-100</theta-max-deg>
<phi-min-deg>88</phi-min-deg>
<phi-max-deg>90</phi-max-deg>
<speed-mps>
<property>velocities/speed-kts</property>
<factor>0.5144</factor>
<spread>2</spread>
</speed-mps>
</shooter>
<counter>
<particles-per-sec>
<property>velocities/speed-kts</property>
</particles-per-sec>
</counter>
<particle>
<life-sec>
<value>90</value>
</life-sec>
</particle>
</particlesystem>
</overlay>
</model>
<model>
<name>Stern-Wake</name>
<path>Models/Geometry/Nimitz/Models/Effects/wake2_carrier.xml</path>
<offsets>
<x-m>65</x-m>
<y-m>0</y-m>
<z-m>2.0</z-m>
<heading-deg>0</heading-deg>
</offsets>
<overlay>
<particlesystem>
<placer>
<type>segments</type>
<vertex>
<x-m>0</x-m>
<y-m>-4</y-m>
<z-m>-2</z-m>
</vertex>
<vertex>
<x-m>0</x-m>
<y-m>-3.5</y-m>
<z-m>-1</z-m>
</vertex>
<vertex>
<x-m>0</x-m>
<y-m>0</y-m>
<z-m>0</z-m>
</vertex>
<vertex>
<x-m>0</x-m>
<y-m>3.5</y-m>
<z-m>-1</z-m>
</vertex>
<vertex>
<x-m>0</x-m>
<y-m>4</y-m>
<z-m>-2</z-m>
</vertex>
</placer>
<shooter>
<theta-min-deg>-80</theta-min-deg>
<theta-max-deg>-100</theta-max-deg>
<phi-min-deg>88</phi-min-deg>
<phi-max-deg>90</phi-max-deg>
<speed-mps>
<property>velocities/speed-kts</property>
<factor>1.0</factor>
<spread>5</spread>
</speed-mps>
</shooter>
<particle>
<life-sec>
<value>90</value>
</life-sec>
</particle>
</particlesystem>
</overlay>
</model>
<animation>
<type>rotate</type>
<object-name>Wake</object-name>
<object-name>Bow-Wave</object-name>
<object-name>Stern-Wake</object-name>
<property>orientation/roll-deg</property>
<factor>1</factor>
<center>
<x-m>105.814</x-m>
<y-m>0.00</y-m>
<z-m>1.5</z-m>
</center>
<axis>
<x>1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<animation>
<object-name>Bow-Wave</object-name>
<type>scale</type>
<property>velocities/speed-kts</property>
<x-factor>0.04</x-factor>
<y-factor>0.0</y-factor>
<z-factor>0.0</z-factor>
<x-offset>0.2</x-offset>
<y-offset>0.6</y-offset>
<z-offset>1.0</z-offset>
<x-min>0.4</x-min>
<x-max>1.2</x-max>
<center>
<x-m>-55.0</x-m>
<y-m>0.0</y-m>
<z-m>0.0</z-m>
</center>
</animation>
<animation>
<type>select</type>
<object-name>Wake</object-name>
<condition>
<not>
<property>/sim/rendering/particles</property>
</not>
</condition>
</animation>
</PropertyList>