FGFS-4.1/MQ-9
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stores: Update GBUs; other fixes

Browse Source
This commit is contained in:
J Maverick 16 2019-06-27 22:44:16 +02:00
parent 61e59ab6ab
commit 0888bb7cb4
16 changed files with 59102 additions and 3087 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
Models/Effects/glass/glass.eff Normal file
View File

@ -0,0 +1,118 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>canopy-reflections</name>
<inherits-from>Effects/glass</inherits-from>
<parameters>
<!-- functional masks -->
<texture n="2">
<image>Aircraft/f16/Models/Effects/glass/canopy.png</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>clamp</wrap-s>
<wrap-t>clamp</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<use-mask type="int">1</use-mask>
<overlay-color type="vec3d" n="0">1.0 1.0 1.0</overlay-color>
<!-- internal cockpit reflection -->
<texture n="3">
<type>cubemap</type>
<images>
<positive-x>Aircraft/f16/Models/Effects/glass/cockpit-cube-front.png</positive-x>
<negative-x>Aircraft/f16/Models/Effects/glass/cockpit-cube-back.png</negative-x>
<positive-y>Aircraft/f16/Models/Effects/glass/cockpit-cube-left.png</positive-y>
<negative-y>Aircraft/f16/Models/Effects/glass/cockpit-cube-right.png</negative-y>
<positive-z>Aircraft/f16/Models/Effects/glass/cockpit-cube-up.png</positive-z>
<negative-z>Aircraft/f16/Models/Effects/glass/cockpit-cube-down.png</negative-z>
</images>
</texture>
<use-reflection type="int">1</use-reflection>
<reflection-strength type="float">0.7</reflection-strength>
</parameters>
<!-- <technique n="1">
<predicate>
<and>
<equal>
<float-property>/old</float-property>
<value type="int">1</value>
</equal>
</and>
</predicate>
<pass>
<lighting>true</lighting>
<depth>
<write-mask type="bool">false</write-mask>
</depth>
<material>
<active>
<use>material/active</use>
</active>
<ambient>
<use>material/ambient</use>
</ambient>
<diffuse>
<use>material/diffuse</use>
</diffuse>
<specular>
<use>material/specular</use>
</specular>
<emissive>
<use>material/emissive</use>
</emissive>
<shininess>
<use>material/shininess</use>
</shininess>
<color-mode>
<use>material/color-mode</use>
</color-mode>
</material>
<blend>
<active>
<use>blend/active</use>
</active>
<source>
<use>blend/source</use>
</source>
<destination>
<use>blend/destination</use>
</destination>
</blend>
<shade-model>
<use>shade-model</use>
</shade-model>
<cull-face>
<use>cull-face</use>
</cull-face>
<render-bin>
<bin-number>111</bin-number>
<bin-name>DepthSortedBin</bin-name>
</render-bin>
<texture-unit>
<unit>0</unit>
<active>
<use>texture[0]/active</use>
</active>
<type>
<use>texture[0]/type</use>
</type>
<image>
<use>texture[0]/image</use>
</image>
<filter>
<use>texture[0]/filter</use>
</filter>
<wrap-s>
<use>texture[0]/wrap-s</use>
</wrap-s>
<wrap-t>
<use>texture[0]/wrap-t</use>
</wrap-t>
<environment>
<mode>modulate</mode>
</environment>
</texture-unit>
</pass>
</technique>-->
</PropertyList>

37
Models/Effects/glass/glassIR.eff Normal file
View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<PropertyList>
<name>glass</name>
<inherits-from>Effects/model-combined-transparent</inherits-from>
<parameters>
<normalmap-enabled type="int">0</normalmap-enabled>
<lightmap-enabled type="int">0</lightmap-enabled>
<reflection-enabled type="int">1</reflection-enabled>
<reflection-correction type="float">0.5</reflection-correction>
<reflect-map-enabled type="int">0</reflect-map-enabled>
<reflection-fresnel type="float">0.5</reflection-fresnel>
<reflection-rainbow type="float">0.3</reflection-rainbow>
<reflection-noise type="float">0.0</reflection-noise>
<reflection-dynamic type="int">1</reflection-dynamic>
<texture n= "5" >
<type>cubemap</type>
<images>
<positive-x>Aircraft/Generic/Effects/fgfs-sky2/1.png</positive-x>
<negative-x>Aircraft/Generic/Effects/fgfs-sky2/4.png</negative-x>
<positive-y>Aircraft/Generic/Effects/fgfs-sky2/2.png</positive-y>
<negative-y>Aircraft/Generic/Effects/fgfs-sky2/3.png</negative-y>
<positive-z>Aircraft/Generic/Effects/fgfs-sky2/6.png</positive-z>
<negative-z>Aircraft/Generic/Effects/fgfs-sky2/5.png</negative-z>
</images>
</texture>
<ambient-correction type="float">0.2</ambient-correction>
<rendering-hint>transparent</rendering-hint>
<transparent>true</transparent>
<render-bin>
<bin-number>10</bin-number>
<bin-name>DepthSortedBin</bin-name>
</render-bin>
</parameters>
</PropertyList>

2
Models/MQ-9-2.xml
View File

@ -511,7 +511,7 @@
<type>rotate</type>
<object-name>Rudder</object-name>
<property>surface-positions/rudder-pos-norm</property>
<factor>20</factor>
<factor>-20</factor>
<axis>
<x1-m> 3.3652</x1-m>
<y1-m> 0.0000</y1-m>

2
Models/MQ-9.xml
View File

@ -508,7 +508,7 @@
<type>rotate</type>
<object-name>Rudder</object-name>
<property>surface-positions/rudder-pos-norm</property>
<factor>20</factor>
<factor>-20</factor>
<axis>
<x1-m> 3.3652</x1-m>
<y1-m> 0.0000</y1-m>

29
Models/Stores/GBU-12/GBU-12-3.xml
View File

@ -6,16 +6,43 @@
<enable-hot type="bool">false</enable-hot>
</animation>
<effect>
<inherits-from>Aircraft/MQ-9/Models/Effects/glass/glassIR</inherits-from>
<object-name>GBU-12_Glass</object-name>
</effect>
<animation>
<type>select</type>
<object-name>GBU-12_Glass</object-name>
<object-name>GBU-12</object-name>
<object-name>GBU-12_Hooks</object-name>
<object-name>GBU-12_Tail</object-name>
<object-name>GBU-12_FrontWing</object-name>
<object-name>GBU-12_Wing.001</object-name>
<object-name>GBU-12_Wing.002</object-name>
<object-name>GBU-12_Wing.003</object-name>
<object-name>GBU-12_Wing.004</object-name>
<condition>
<not>
<property>fdm/jsbsim/systems/armament/station3/released</property>
<property>fdm/jsbsim/systems/armament/station4/released</property>
</not>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>GBU-12_Wing.001</object-name>
<object-name>GBU-12_Wing.002</object-name>
<object-name>GBU-12_Wing.003</object-name>
<object-name>GBU-12_Wing.004</object-name>
<condition>
<equals>
<value>0</value>
<value>1</value>
</equals>
</condition>
</animation>
<animation>
<type>range</type>
<min-m>0</min-m>

27
Models/Stores/GBU-12/GBU-12-4.xml
View File

@ -6,9 +6,22 @@
<enable-hot type="bool">false</enable-hot>
</animation>
<effect>
<inherits-from>Aircraft/MQ-9/Models/Effects/glass/glassIR</inherits-from>
<object-name>GBU-12_Glass</object-name>
</effect>
<animation>
<type>select</type>
<object-name>GBU-12_Glass</object-name>
<object-name>GBU-12</object-name>
<object-name>GBU-12_Hooks</object-name>
<object-name>GBU-12_Tail</object-name>
<object-name>GBU-12_FrontWing</object-name>
<object-name>GBU-12_Wing.001</object-name>
<object-name>GBU-12_Wing.002</object-name>
<object-name>GBU-12_Wing.003</object-name>
<object-name>GBU-12_Wing.004</object-name>
<condition>
<not>
<property>fdm/jsbsim/systems/armament/station4/released</property>
@ -16,6 +29,20 @@
</condition>
</animation>
<animation>
<type>select</type>
<object-name>GBU-12_Wing.001</object-name>
<object-name>GBU-12_Wing.002</object-name>
<object-name>GBU-12_Wing.003</object-name>
<object-name>GBU-12_Wing.004</object-name>
<condition>
<equals>
<value>0</value>
<value>1</value>
</equals>
</condition>
</animation>
<animation>
<type>range</type>
<min-m>0</min-m>

40388
Models/Stores/GBU-12/GBU-12.ac
View File

File diff suppressed because it is too large Load Diff

BIN
Models/Stores/GBU-12/GBU-12.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 70 KiB

BIN
Models/Stores/GBU-12/Texture.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

31
Models/Stores/GBU-54/GBU-54-3.xml Normal file
View File

@ -0,0 +1,31 @@
<PropertyList>
<path>GBU-54.ac</path>
<animation>
<enable-hot type="bool">false</enable-hot>
</animation>
<animation>
<type>select</type>
<object-name>GBU-54</object-name>
<object-name>LJDAM_belly</object-name>
<object-name>LJDAM_tip</object-name>
<object-name>LJDAM_seeker</object-name>
<object-name>LJDAM_wings</object-name>
<object-name>LJDAM_body</object-name>
<object-name>LJDAM_top</object-name>
<condition>
<not>
<property>fdm/jsbsim/systems/armament/station4/released</property>
</not>
</condition>
</animation>
<animation>
<type>range</type>
<min-m>0</min-m>
<max-m>12000</max-m>
</animation>
</PropertyList>

31
Models/Stores/GBU-54/GBU-54-4.xml Normal file
View File

@ -0,0 +1,31 @@
<PropertyList>
<path>GBU-54.ac</path>
<animation>
<enable-hot type="bool">false</enable-hot>
</animation>
<animation>
<type>select</type>
<object-name>GBU-54</object-name>
<object-name>LJDAM_belly</object-name>
<object-name>LJDAM_tip</object-name>
<object-name>LJDAM_seeker</object-name>
<object-name>LJDAM_wings</object-name>
<object-name>LJDAM_body</object-name>
<object-name>LJDAM_top</object-name>
<condition>
<not>
<property>fdm/jsbsim/systems/armament/station4/released</property>
</not>
</condition>
</animation>
<animation>
<type>range</type>
<min-m>0</min-m>
<max-m>12000</max-m>
</animation>
</PropertyList>

21424
Models/Stores/GBU-54/GBU-54.ac Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
Models/Stores/GBU-54/GBU-54.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 60 KiB

24
Models/Stores/Stores.xml
View File

@ -45,7 +45,7 @@
<offsets>
<x-m>-0.6217</x-m>
<y-m>-1.2284</y-m>
<z-m> 0.0517</z-m>
<z-m>-0.043</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
@ -55,9 +55,29 @@
<offsets>
<x-m>-0.6217</x-m>
<y-m> 1.2284</y-m>
<z-m> 0.0517</z-m>
<z-m>-0.043</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<!--model>
<path>Aircraft/MQ-9/Models/Stores/GBU-54/GBU-54-3.xml</path>
<offsets>
<x-m>-0.1817</x-m>
<y-m>-1.2284</y-m>
<z-m>-0.0425</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/MQ-9/Models/Stores/GBU-54/GBU-54-4.xml</path>
<offsets>
<x-m>-0.1817</x-m>
<y-m> 1.2284</y-m>
<z-m>-0.0425</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model-->
</PropertyList>

66
Models/Submodels.xml
View File

@ -148,4 +148,70 @@
<submodel-path>Aircraft/MQ-9/Models/Effects/Bomb/Bomb-Submodel.xml</submodel-path>
</submodel>
<submodel>
<name>GBU-12-3</name>
<model>Aircraft/MQ-9/Models/Stores/GBU-12/GBU-12-3.xml</model>
<trigger>fdm/jsbsim/systems/armament/station3/released</trigger>
<trigger-once>true</trigger-once>
<speed>0.0</speed>
<count>1</count>
<x-offset>0</x-offset>
<y-offset>-1.2308</y-offset>
<z-offset>-1</z-offset>
<yaw-offset>0.0</yaw-offset>
<pitch-offset>-4.0</pitch-offset>
<eda>1.0</eda>
<weight>520.0</weight>
<cd>0.3</cd>
<collision>true</collision>
<collision-report>sim/ai/aircraft/collision/cannon</collision-report>
<impact>true</impact>
<impact-report>sim/ai/aircraft/impact/bomb</impact-report>
<submodel-path>Aircraft/MQ-9/Models/Effects/Bomb/Bomb-Submodel.xml</submodel-path>
</submodel>
<!--submodel>
<name>GBU-54-4</name>
<model>Aircraft/MQ-9/Models/Stores/GBU-54/GBU-54-4.xml</model>
<trigger>fdm/jsbsim/systems/armament/station4/released</trigger>
<trigger-once>true</trigger-once>
<speed>0.0</speed>
<count>1</count>
<x-offset>0</x-offset>
<y-offset>1.2308</y-offset>
<z-offset>-1</z-offset>
<yaw-offset>0.0</yaw-offset>
<pitch-offset>-4.0</pitch-offset>
<eda>1.0</eda>
<weight>520.0</weight>
<cd>0.3</cd>
<collision>true</collision>
<collision-report>sim/ai/aircraft/collision/cannon</collision-report>
<impact>true</impact>
<impact-report>sim/ai/aircraft/impact/bomb</impact-report>
<submodel-path>Aircraft/MQ-9/Models/Effects/Bomb/Bomb-Submodel.xml</submodel-path>
</submodel>
<submodel>
<name>GBU-54-3</name>
<model>Aircraft/MQ-9/Models/Stores/GBU-54/GBU-54-3.xml</model>
<trigger>fdm/jsbsim/systems/armament/station3/released</trigger>
<trigger-once>true</trigger-once>
<speed>0.0</speed>
<count>1</count>
<x-offset>0</x-offset>
<y-offset>-1.2308</y-offset>
<z-offset>-1</z-offset>
<yaw-offset>0.0</yaw-offset>
<pitch-offset>-4.0</pitch-offset>
<eda>1.0</eda>
<weight>520.0</weight>
<cd>0.3</cd>
<collision>true</collision>
<collision-report>sim/ai/aircraft/collision/cannon</collision-report>
<impact>true</impact>
<impact-report>sim/ai/aircraft/impact/bomb</impact-report>
<submodel-path>Aircraft/MQ-9/Models/Effects/Bomb/Bomb-Submodel.xml</submodel-path>
</submodel-->
</PropertyList>

10
Nasal/HUD.nas
View File

@ -1,2 +1,12 @@
# turn off hud in views
setlistener("/sim/current-view/view-number", func(n) { setprop("/sim/hud/visibility[1]", n.getValue() == 8) },1);
#var fast_loop = func {
# var viewName = getprop("/sim/current-view/name");
# if (viewName == "Sensor View") {
# setprop("aircraft/flir/target/view-enabled", viewName == "Sensor Vew");
# setprop("sim/rendering/als-filters/use-filtering", 1);
# setprop("sim/rendering/als-filters/use-IR-vision", 1);
# setprop("sim/rendering/als-filters/use-night-vision", 1);
# }
#}