Menu
▾
▴
[Flightgear-fgaddon-commitlogs] r6160 - trunk/Aircraft/F9F-Panther: Grumman F9F Panther: Improved normalmap.
|
From: <fli...@li...> - 2021-11-11 13:56:52
|
Revision: 6160
http://sourceforge.net/p/flightgear/fgaddon/6160
Author: helijah
Date: 2021-11-11 13:56:47 +0000 (Thu, 11 Nov 2021)
Log Message:
-----------
Grumman F9F Panther: Improved normalmap. Procedural lights. New dashboard
Modified Paths:
--------------
trunk/Aircraft/F9F-Panther/Dialogs/f9f-menu.xml
trunk/Aircraft/F9F-Panther/Models/Effects/Bump/normalmap.png
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion.ac
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion.xml
trunk/Aircraft/F9F-Panther/Models/Effects/ground/ground0.xml
trunk/Aircraft/F9F-Panther/Models/Effects/ground/ground1.xml
trunk/Aircraft/F9F-Panther/Models/Effects/ground/ground2.xml
trunk/Aircraft/F9F-Panther/Models/Effects/guns/explosion.xml
trunk/Aircraft/F9F-Panther/Models/Effects/guns/fire.xml
trunk/Aircraft/F9F-Panther/Models/Effects/guns/submodels.xml
trunk/Aircraft/F9F-Panther/Models/Effects/smoke/noise3.png
trunk/Aircraft/F9F-Panther/Models/Effects/smoke/smoke.xml
trunk/Aircraft/F9F-Panther/Models/Effects/tiptrail/tiptrail.xml
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/ai/ai.ac
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/ai/ai.xml
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/airspeed/airspeed.ac
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/airspeed/airspeed.xml
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/alt/alt.ac
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/alt/alt.xml
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/clock/clock.ac
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/clock/clock.xml
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/compass/compass.ac
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/compass/compass.xml
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/fuel/fuel.ac
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/fuel/fuel.xml
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/turn/turn.ac
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/turn/turn.xml
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/vsi/vsi.ac
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/vsi/vsi.xml
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Left/left.ac
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Right/right.ac
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/panel.ac
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/panel.xml
trunk/Aircraft/F9F-Panther/Models/Interior/interior.ac
trunk/Aircraft/F9F-Panther/Models/Interior/interior.xml
trunk/Aircraft/F9F-Panther/Models/f9f.ac
trunk/Aircraft/F9F-Panther/Models/f9f.xml
trunk/Aircraft/F9F-Panther/Models/light/GreenLight.xml
trunk/Aircraft/F9F-Panther/Models/light/RedLight.xml
trunk/Aircraft/F9F-Panther/Models/light/StrobeLight.xml
trunk/Aircraft/F9F-Panther/Models/light/WhiteLight.xml
trunk/Aircraft/F9F-Panther/Models/light/beacon.xml
trunk/Aircraft/F9F-Panther/Models/light/light-cone.xml
trunk/Aircraft/F9F-Panther/Models/texture.png
trunk/Aircraft/F9F-Panther/Models/texture.xcf.gz
trunk/Aircraft/F9F-Panther/Models/weapons/all-weapons.xml
trunk/Aircraft/F9F-Panther/Models/weapons/rocket127mm/rocket127mm_smoke.xml
trunk/Aircraft/F9F-Panther/Models/weapons/rocket127mm/smoke.xml
trunk/Aircraft/F9F-Panther/Read-Me.txt
trunk/Aircraft/F9F-Panther/Sounds/f9f-sound.xml
trunk/Aircraft/F9F-Panther/Sounds/mp-sound.xml
trunk/Aircraft/F9F-Panther/Systems/consumables.xml
trunk/Aircraft/F9F-Panther/Systems/controls.xml
trunk/Aircraft/F9F-Panther/Systems/f9f-base.xml
trunk/Aircraft/F9F-Panther/Systems/f9f-keyboard.xml
trunk/Aircraft/F9F-Panther/Systems/f9f-yasim.xml
trunk/Aircraft/F9F-Panther/Systems/help.xml
trunk/Aircraft/F9F-Panther/Systems/views.xml
trunk/Aircraft/F9F-Panther/f9f-set.xml
Added Paths:
-----------
trunk/Aircraft/F9F-Panther/Models/Effects/Glass/glassrain.eff
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/NO_ALS/
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustionALS.xml
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion_Day.xml
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion_Dusk.xml
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion_Night.xml
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/flame_Day.eff
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/flame_Dusk.eff
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/flame_Night.eff
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/reheattest.png
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/thrust-flame.eff
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/thrust_flame.ac
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/thrustflame-ALS.frag
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/thrustflame-ALS.vert
trunk/Aircraft/F9F-Panther/Models/Effects/guns/ExplosionFire.xml
trunk/Aircraft/F9F-Panther/Models/Effects/guns/ExplosionSmoke.xml
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/accel/
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/adf/
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/compass2/
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/egt/
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/fuelflow/
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/guns/
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/info/
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/tach/
trunk/Aircraft/F9F-Panther/Models/Liveries/2048x2048/empty.png
trunk/Aircraft/F9F-Panther/Models/Liveries/empty.xml
trunk/Aircraft/F9F-Panther/Models/light/BlueLight.xml
trunk/Aircraft/F9F-Panther/Models/light/Classic/
trunk/Aircraft/F9F-Panther/Models/light/Procedural/
trunk/Aircraft/F9F-Panther/Nasal/Electrical.nas
trunk/Aircraft/F9F-Panther/Nasal/convert.nas
trunk/Aircraft/F9F-Panther/Nasal/engines-yasim.nas
trunk/Aircraft/F9F-Panther/Nasal/pilot-g.nas
trunk/Aircraft/F9F-Panther/Previews/
trunk/Aircraft/F9F-Panther/Sounds/canopy_slide.wav
trunk/Aircraft/F9F-Panther/Sounds/flaps.wav
trunk/Aircraft/F9F-Panther/Sounds/gear.wav
trunk/Aircraft/F9F-Panther/Sounds/gunfire.wav
trunk/Aircraft/F9F-Panther/Sounds/shutdown.wav
trunk/Aircraft/F9F-Panther/Sounds/squeal.wav
trunk/Aircraft/F9F-Panther/Sounds/starter.wav
trunk/Aircraft/F9F-Panther/Sounds/turbine1.wav
trunk/Aircraft/F9F-Panther/Sounds/turbine2.wav
trunk/Aircraft/F9F-Panther/Sounds/wind.wav
trunk/Aircraft/F9F-Panther/Systems/glass-rain.xml
trunk/Aircraft/F9F-Panther/Systems/rules.xml
Removed Paths:
-------------
trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion.png
trunk/Aircraft/F9F-Panther/Models/Effects/guns/apibullet-tracer.ac
trunk/Aircraft/F9F-Panther/Models/Effects/guns/apibullet-tracer.png
trunk/Aircraft/F9F-Panther/Models/Effects/guns/apibullet-tracer.xml
trunk/Aircraft/F9F-Panther/Models/Effects/guns/flack.ac
trunk/Aircraft/F9F-Panther/Models/Effects/guns/flack.png
trunk/Aircraft/F9F-Panther/Models/Effects/guns/flack.xml
trunk/Aircraft/F9F-Panther/Models/Effects/guns/puff.ac
trunk/Aircraft/F9F-Panther/Models/Effects/guns/puff.png
trunk/Aircraft/F9F-Panther/Models/Effects/guns/smoke.xml
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/ai/glass.eff
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/airspeed/glass.eff
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/alt/glass.eff
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/clock/glass.eff
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/compass/glass.eff
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/fuel/glass.eff
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/turn/glass.eff
trunk/Aircraft/F9F-Panther/Models/Interior/Panel/Instruments/vsi/glass.eff
trunk/Aircraft/F9F-Panther/Models/light/GreenLight.ac
trunk/Aircraft/F9F-Panther/Models/light/RedLight.ac
trunk/Aircraft/F9F-Panther/Models/light/WhiteLight.ac
trunk/Aircraft/F9F-Panther/Models/light/light-cone.ac
trunk/Aircraft/F9F-Panther/Models/light/light-gradient-lamp.png
trunk/Aircraft/F9F-Panther/Models/light/lights.png
trunk/Aircraft/F9F-Panther/Models/shadow.ac
trunk/Aircraft/F9F-Panther/Models/shadow.png
trunk/Aircraft/F9F-Panther/Models/shadow.xml
trunk/Aircraft/F9F-Panther/Sounds/gunfire_1.wav
Modified: trunk/Aircraft/F9F-Panther/Dialogs/f9f-menu.xml
===================================================================
--- trunk/Aircraft/F9F-Panther/Dialogs/f9f-menu.xml 2021-11-11 09:26:35 UTC (rev 6159)
+++ trunk/Aircraft/F9F-Panther/Dialogs/f9f-menu.xml 2021-11-11 13:56:47 UTC (rev 6160)
@@ -7,21 +7,73 @@
<label>F9F Panther</label>
<enabled type="bool">true</enabled>
<item>
- <label>Select Livery</label>
+ <label>Autostart</label>
<binding>
+ <command>property-toggle</command>
+ <property>controls/electric/battery-switch</property>
+ </binding>
+ <binding>
+ <command>property-toggle</command>
+ <property>controls/electric/engine/generator</property>
+ </binding>
+ <binding>
+ <command>property-toggle</command>
+ <property>controls/lighting/instrument-lights</property>
+ </binding>
+ <binding>
+ <command>property-toggle</command>
+ <property>controls/lighting/nav-lights</property>
+ </binding>
+ <binding>
+ <command>property-toggle</command>
+ <property>controls/lighting/beacon</property>
+ </binding>
+ <binding>
+ <command>property-toggle</command>
+ <property>controls/lighting/strobe</property>
+ </binding>
+ <binding>
+ <command>property-toggle</command>
+ <property>controls/switches/starterkey-insert</property>
+ </binding>
+ <binding>
+ <command>property-toggle</command>
+ <property>controls/engines/engine[0]/fuel-pump</property>
+ </binding>
+ <binding>
+ <command>property-toggle</command>
+ <property>controls/engines/engine[1]/fuel-pump</property>
+ </binding>
+ <!-- Magnetos ON -->
+ <binding>
+ <condition>
+ <property>controls/switches/starterkey-insert</property>
+ </condition>
+ <command>property-assign</command>
+ <property>controls/engines/engine[0]/magnetos</property>
+ <value>3</value>
+ </binding>
+ <!-- Magnetos OFF -->
+ <binding>
+ <condition>
+ <not><property>controls/switches/starterkey-insert</property></not>
+ </condition>
+ <command>property-assign</command>
+ <property>controls/engines/engine[0]/magnetos</property>
+ <value>0</value>
+ </binding>
+ <binding>
<command>nasal</command>
- <script>aircraft.livery.dialog.toggle()</script>
+ <script>engines.autostart();</script>
</binding>
</item>
-<!--
<item>
- <label>Immatriculation</label>
+ <label>Select Livery</label>
<binding>
<command>nasal</command>
- <script>gloster-meteor.immat_dialog.toggle()</script>
+ <script>aircraft.livery.dialog.toggle()</script>
</binding>
</item>
--->
</menu>
</default>
Modified: trunk/Aircraft/F9F-Panther/Models/Effects/Bump/normalmap.png
===================================================================
(Binary files differ)
Added: trunk/Aircraft/F9F-Panther/Models/Effects/Glass/glassrain.eff
===================================================================
--- trunk/Aircraft/F9F-Panther/Models/Effects/Glass/glassrain.eff (rev 0)
+++ trunk/Aircraft/F9F-Panther/Models/Effects/Glass/glassrain.eff 2021-11-11 13:56:47 UTC (rev 6160)
@@ -0,0 +1,529 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<PropertyList>
+
+ <name>glassrain</name>
+ <inherits-from>Effects/model-default</inherits-from>
+
+ <parameters>
+ <texture n="1">
+ <image>Aircraft/Generic/Effects/window_frost.png</image>
+ <type>2d</type>
+ <filter>linear-mipmap-linear</filter>
+ <wrap-s>repeat</wrap-s>
+ <wrap-t>repeat</wrap-t>
+ <internal-format>normalized</internal-format>
+ </texture>
+
+ <!-- placeholder for the function texture used for fogging, wiper area,...-->
+ <texture n="2">
+ <type>white</type>
+ </texture>
+
+ <!-- texture for reflections in the glass -->
+ <texture n="3">
+ <type>cubemap</type>
+ <images>
+ <positive-x>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_px.png</positive-x>
+ <negative-x>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_nx.png</negative-x>
+ <positive-y>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_py.png</positive-y>
+ <negative-y>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_ny.png</negative-y>
+ <positive-z>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_pz.png</positive-z>
+ <negative-z>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_nz.png</negative-z>
+ </images>
+ </texture>
+
+ <!-- placeholder lightmap texture for reflections in the glass -->
+ <texture n="4">
+ <type>cubemap</type>
+ <images>
+ <positive-x>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_px.png</positive-x>
+ <negative-x>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_nx.png</negative-x>
+ <positive-y>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_py.png</positive-y>
+ <negative-y>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_ny.png</negative-y>
+ <positive-z>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_pz.png</positive-z>
+ <negative-z>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_nz.png</negative-z>
+ </images>
+ </texture>
+
+ <glass-tint type="vec4d" n="0"> 1.0 1.0 1.0 1.0</glass-tint>
+ <overlay-color type="vec3d" n="0"> 1.0 1.0 1.0</overlay-color>
+ <splash-x><use>/environment/aircraft-effects/splash-vector-x</use></splash-x>
+ <splash-y><use>/environment/aircraft-effects/splash-vector-y</use></splash-y>
+ <splash-z><use>/environment/aircraft-effects/splash-vector-z</use></splash-z>
+ <rnorm><use>/environment/rain-norm</use></rnorm>
+ <gsnorm><use>/environment/aircraft-effects/ground-splash-norm</use></gsnorm>
+ <frost-level><use>/environment/aircraft-effects/frost-level</use></frost-level>
+ <surface-mapping-scheme type="int">0</surface-mapping-scheme>
+ <fog-level><use>/environment/aircraft-effects/fog-level</use></fog-level>
+ <use-wipers><use>/environment/aircraft-effects/use-wipers</use></use-wipers>
+ <use-overlay><use>/environment/aircraft-effects/use-overlay</use></use-overlay>
+ <overlay-alpha><use>/environment/aircraft-effects/overlay-alpha</use></overlay-alpha>
+ <overlay-glare type="float">0.5</overlay-glare>
+ <use-reflection type="int">0</use-reflection>
+ <reflection-strength type="float">1.0</reflection-strength>
+ <use-mask type="int">0</use-mask>
+ <use-reflection-lightmap type="int">0</use-reflection-lightmap>
+ <lightmap-multi type="int">0</lightmap-multi>
+ <lightmap-factor type="float" n="0">1.0</lightmap-factor>
+ <lightmap-color type="vec3d" n="0"> 1.0 1.0 1.0 </lightmap-color>
+ <lightmap-factor type="float" n="1">1.0</lightmap-factor>
+ <lightmap-color type="vec3d" n="1"> 1.0 1.0 1.0 </lightmap-color>
+ <lightmap-factor type="float" n="2">1.0</lightmap-factor>
+ <lightmap-color type="vec3d" n="2"> 1.0 1.0 1.0 </lightmap-color>
+ <lightmap-factor type="float" n="3">1.0</lightmap-factor>
+ <lightmap-color type="vec3d" n="3"> 1.0 1.0 1.0 </lightmap-color>
+ </parameters>
+
+ <technique n="4">
+ <predicate>
+ <and>
+ <property>/sim/rendering/shaders/skydome</property>
+ <or>
+ <less-equal>
+ <value type="float">2.0</value>
+ <glversion/>
+ </less-equal>
+ <and>
+ <extension-supported>GL_ARB_shader_objects</extension-supported>
+ <extension-supported>GL_ARB_shading_language_100</extension-supported>
+ <extension-supported>GL_ARB_vertex_shader</extension-supported>
+ <extension-supported>GL_ARB_fragment_shader</extension-supported>
+ </and>
+ </or>
+ </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>
+ <rendering-hint><use>rendering-hint</use></rendering-hint>
+ <render-bin>
+ <bin-number>111</bin-number>
+ <bin-name>DepthSortedBin</bin-name>
+ </render-bin>
+ <texture-unit>
+ <!-- The texture unit is always active because the shaders expect
+ that. -->
+ <unit>0</unit>
+ <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>
+ <internal-format> <use>texture[0]/internal-format</use> </internal-format>
+ </texture-unit>
+ <texture-unit>
+ <unit>1</unit>
+ <type><use>texture[1]/type</use></type>
+ <image><use>texture[1]/image</use></image>
+ <filter><use>texture[1]/filter</use></filter>
+ <wrap-s><use>texture[1]/wrap-s</use></wrap-s>
+ <wrap-t><use>texture[1]/wrap-t</use></wrap-t>
+ <internal-format><use>texture[1]/internal-format</use></internal-format>
+ </texture-unit>
+ <texture-unit>
+ <unit>2</unit>
+ <type><use>texture[2]/type</use></type>
+ <image><use>texture[2]/image</use></image>
+ <filter><use>texture[2]/filter</use></filter>
+ <wrap-s><use>texture[2]/wrap-s</use></wrap-s>
+ <wrap-t><use>texture[2]/wrap-t</use></wrap-t>
+ <internal-format><use>texture[2]/internal-format</use></internal-format>
+ </texture-unit>
+ <texture-unit>
+ <unit>3</unit>
+ <type><use>texture[3]/type</use></type>
+ <images><use>texture[3]/images</use></images>
+ </texture-unit>
+ <texture-unit>
+ <unit>4</unit>
+ <type><use>texture[4]/type</use></type>
+ <images><use>texture[4]/images</use></images>
+ </texture-unit>
+ <vertex-program-two-side>
+ <use>vertex-program-two-side</use>
+ </vertex-program-two-side>
+ <program>
+ <vertex-shader>Shaders/glass-ALS.vert</vertex-shader>
+ <fragment-shader>Shaders/glass-ALS.frag</fragment-shader>
+ <fragment-shader>Shaders/noise.frag</fragment-shader>
+ <fragment-shader>Shaders/filters-ALS.frag</fragment-shader>
+ </program>
+
+ <uniform>
+ <name>tint</name>
+ <type>float-vec4</type>
+ <value><use>glass-tint</use></value>
+ </uniform>
+ <uniform>
+ <name>overlay_color</name>
+ <type>float-vec3</type>
+ <value><use>overlay-color</use></value>
+ </uniform>
+ <uniform>
+ <name>lightmap_r_factor</name>
+ <type>float</type>
+ <value><use>lightmap-factor[0]</use></value>
+ </uniform>
+ <uniform>
+ <name>lightmap_r_color</name>
+ <type>float-vec3</type>
+ <value><use>lightmap-color[0]</use></value>
+ </uniform>
+ <uniform>
+ <name>lightmap_g_factor</name>
+ <type>float</type>
+ <value><use>lightmap-factor[1]</use></value>
+ </uniform>
+ <uniform>
+ <name>lightmap_g_color</name>
+ <type>float-vec3</type>
+ <value><use>lightmap-color[1]</use></value>
+ </uniform>
+ <uniform>
+ <name>lightmap_b_factor</name>
+ <type>float</type>
+ <value><use>lightmap-factor[2]</use></value>
+ </uniform>
+ <uniform>
+ <name>lightmap_b_color</name>
+ <type>float-vec3</type>
+ <value><use>lightmap-color[2]</use></value>
+ </uniform>
+ <uniform>
+ <name>lightmap_a_factor</name>
+ <type>float</type>
+ <value><use>lightmap-factor[3]</use></value>
+ </uniform>
+ <uniform>
+ <name>lightmap_a_color</name>
+ <type>float-vec3</type>
+ <value><use>lightmap-color[3]</use></value>
+ </uniform>
+ <uniform>
+ <name>splash_x</name>
+ <type>float</type>
+ <value><use>splash-x</use></value>
+ </uniform>
+ <uniform>
+ <name>splash_y</name>
+ <type>float</type>
+ <value><use>splash-y</use></value>
+ </uniform>
+ <uniform>
+ <name>splash_z</name>
+ <type>float</type>
+ <value><use>splash-z</use></value>
+ </uniform>
+ <uniform>
+ <name>rain_norm</name>
+ <type>float</type>
+ <value><use>rnorm</use></value>
+ </uniform>
+ <uniform>
+ <name>ground_splash_norm</name>
+ <type>float</type>
+ <value><use>gsnorm</use></value>
+ </uniform>
+ <uniform>
+ <name>frost_level</name>
+ <type>float</type>
+ <value><use>frost-level</use></value>
+ </uniform>
+ <uniform>
+ <name>fog_level</name>
+ <type>float</type>
+ <value><use>fog-level</use></value>
+ </uniform>
+ <uniform>
+ <name>scattering</name>
+ <type>float</type>
+ <value><use>scattering</use></value>
+ </uniform>
+ <uniform>
+ <name>terminator</name>
+ <type>float</type>
+ <value><use>terminator</use></value>
+ </uniform>
+ <uniform>
+ <name>ground_scattering</name>
+ <type>float</type>
+ <value><use>ground_scattering</use></value>
+ </uniform>
+ <uniform>
+ <name>terminator</name>
+ <type>float</type>
+ <value><use>terminator</use></value>
+ </uniform>
+ <uniform>
+ <name>overcast</name>
+ <type>float</type>
+ <value><use>overcast</use></value>
+ </uniform>
+ <uniform>
+ <name>hazeLayerAltitude</name>
+ <type>float</type>
+ <value><use>lthickness</use></value>
+ </uniform>
+ <uniform>
+ <name>eye_alt</name>
+ <type>float</type>
+ <value><use>eye_alt</use></value>
+ </uniform>
+ <uniform>
+ <name>cloud_self_shading</name>
+ <type>float</type>
+ <value><use>cloud_self_shading</use></value>
+ </uniform>
+ <uniform>
+ <name>moonlight</name>
+ <type>float</type>
+ <value><use>moonlight</use></value>
+ </uniform>
+ <uniform>
+ <name>air_pollution</name>
+ <type>float</type>
+ <value><use>air_pollution</use></value>
+ </uniform>
+ <uniform>
+ <name>reflection_strength</name>
+ <type>float</type>
+ <value><use>reflection-strength</use></value>
+ </uniform>
+ <uniform>
+ <name>overlay_alpha</name>
+ <type>float</type>
+ <value><use>overlay-alpha</use></value>
+ </uniform>
+ <uniform>
+ <name>overlay_glare</name>
+ <type>float</type>
+ <value><use>overlay-glare</use></value>
+ </uniform>
+ <!-- filtering -->
+ <uniform>
+ <name>gamma</name>
+ <type>float</type>
+ <value><use>gamma</use></value>
+ </uniform>
+ <uniform>
+ <name>brightness</name>
+ <type>float</type>
+ <value><use>brightness</use></value>
+ </uniform>
+ <uniform>
+ <name>use_filtering</name>
+ <type>bool</type>
+ <value><use>use_filtering</use></value>
+ </uniform>
+ <uniform>
+ <name>use_night_vision</name>
+ <type>bool</type>
+ <value><use>use_night_vision</use></value>
+ </uniform>
+ <uniform>
+ <name>use_IR_vision</name>
+ <type>bool</type>
+ <value><use>use_IR_vision</use></value>
+ </uniform>
+ <uniform>
+ <name>delta_T</name>
+ <type>float</type>
+ <value><use>delta_T</use></value>
+ </uniform>
+ <uniform>
+ <name>fact_grey</name>
+ <type>float</type>
+ <value><use>fact_grey</use></value>
+ </uniform>
+ <uniform>
+ <name>fact_black</name>
+ <type>float</type>
+ <value><use>fact_black</use></value>
+ </uniform>
+ <uniform>
+ <name>display_xsize</name>
+ <type>int</type>
+ <value><use>display_xsize</use></value>
+ </uniform>
+ <uniform>
+ <name>display_ysize</name>
+ <type>int</type>
+ <value><use>display_ysize</use></value>
+ </uniform>
+
+ <uniform>
+ <name>texture</name>
+ <type>sampler-2d</type>
+ <value type="int">0</value>
+ </uniform>
+ <uniform>
+ <name>frost_texture</name>
+ <type>sampler-2d</type>
+ <value type="int">1</value>
+ </uniform>
+ <uniform>
+ <name>func_texture</name>
+ <type>sampler-2d</type>
+ <value type="int">2</value>
+ </uniform>
+ <uniform>
+ <name>cube_texture</name>
+ <type>sampler-cube</type>
+ <value type="int">3</value>
+ </uniform>
+ <uniform>
+ <name>cube_light_texture</name>
+ <type>sampler-cube</type>
+ <value type="int">4</value>
+ </uniform>
+ <uniform>
+ <name>use_reflection</name>
+ <type>int</type>
+ <value><use>use-reflection</use></value>
+ </uniform>
+ <uniform>
+ <name>use_mask</name>
+ <type>int</type>
+ <value><use>use-mask</use></value>
+ </uniform>
+ <uniform>
+ <name>use_wipers</name>
+ <type>int</type>
+ <value><use>use-wipers</use></value>
+ </uniform>
+ <uniform>
+ <name>use_overlay</name>
+ <type>int</type>
+ <value><use>use-overlay</use></value>
+ </uniform>
+ <uniform>
+ <name>use_reflection_lightmap</name>
+ <type>int</type>
+ <value><use>use-reflection-lightmap</use></value>
+ </uniform>
+ <uniform>
+ <name>lightmap_multi</name>
+ <type>int</type>
+ <value><use>lightmap-multi</use></value>
+ </uniform>
+ <uniform>
+ <name>adaptive_mapping</name>
+ <type>int</type>
+ <value><use>surface-mapping-scheme</use></value>
+ </uniform>
+ <uniform>
+ <name>colorMode</name>
+ <type>int</type>
+ <value><use>material/color-mode-uniform</use></value>
+ </uniform>
+ </pass>
+
+ </technique>
+
+ <!-- fall back to a fixed pipeline technique equivalent to model-transparent otherwise -->
+ <!-- Rembrandt technique of model-default comes at 10, so we insert before that -->
+ <technique n="9">
+ <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>
Modified: trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion.ac
===================================================================
--- trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion.ac 2021-11-11 09:26:35 UTC (rev 6159)
+++ trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion.ac 2021-11-11 13:56:47 UTC (rev 6160)
@@ -4,109 +4,109 @@
kids 3
OBJECT poly
name "ExternalFlame"
-loc 0 0 -0
+loc 0.312533 0 -0.006129
data 13
ExternalFlame
-texture "combustion.png"
+texture "reheattest.png"
texrep 1.000000 1.000000
-crease 30.000001
+crease 180.000005
numvert 96
--0.405523 0.000001 -0.206009
-2.260804 0.000001 -0.121074
--0.405523 -0.039424 -0.202126
-2.260804 -0.022853 -0.118823
--0.405523 -0.077332 -0.190627
-2.260804 -0.044828 -0.112157
--0.405523 -0.112269 -0.171952
-2.260804 -0.065081 -0.101332
--0.405523 -0.14289 -0.146821
-2.260804 -0.082833 -0.086764
--0.405523 -0.168022 -0.116199
-2.260804 -0.097402 -0.069013
--0.405523 -0.186695 -0.081263
-2.260804 -0.108226 -0.04876
--0.405523 -0.198195 -0.043354
-2.260804 -0.114892 -0.026784
--0.405523 -0.202078 -0.003931
-2.260804 -0.117143 -0.003931
--0.405523 -0.198195 0.035493
-2.260804 -0.114893 0.018923
--0.405523 -0.186695 0.073402
-2.260804 -0.108226 0.040898
--0.405523 -0.168022 0.108338
-2.260804 -0.097402 0.061151
--0.405523 -0.142891 0.138961
-2.260804 -0.082833 0.078903
--0.405523 -0.112269 0.164092
-2.260804 -0.065081 0.093471
--0.405523 -0.077332 0.182765
-2.260804 -0.044828 0.104297
--0.405523 -0.039424 0.194265
-2.260804 -0.022853 0.110962
--0.405523 0.000001 0.198148
-2.260804 0.000001 0.113213
--0.405523 0.039424 0.194265
-2.260804 0.022854 0.110962
--0.405523 0.077332 0.182765
-2.260804 0.04483 0.104297
--0.405523 0.112269 0.164092
-2.260804 0.065082 0.093471
--0.405523 0.142891 0.138961
-2.260804 0.082834 0.078903
--0.405523 0.168023 0.108338
-2.260804 0.097402 0.061151
--0.405523 0.186696 0.073402
-2.260804 0.108227 0.040898
--0.405523 0.198196 0.035493
-2.260804 0.114893 0.018923
--0.405523 0.202078 -0.003931
-2.260804 0.117144 -0.003931
--0.405523 0.198195 -0.043354
-2.260804 0.114893 -0.026784
--0.405523 0.186696 -0.081263
-2.260804 0.108227 -0.04876
--0.405523 0.168022 -0.116199
-2.260804 0.097402 -0.069013
--0.405523 0.142891 -0.146821
-2.260804 0.082834 -0.086764
--0.405523 0.112268 -0.171952
-2.260804 0.065082 -0.101332
--0.405523 0.077332 -0.190627
-2.260804 0.044829 -0.112157
--0.405523 0.039424 -0.202126
-2.260804 0.022854 -0.118824
--0.413215 0 -0.183676
--0.413215 -0.035066 -0.180222
--0.413215 -0.068786 -0.169994
--0.413215 -0.099861 -0.153383
--0.413215 -0.127099 -0.131029
--0.413215 -0.149453 -0.103792
--0.413215 -0.166064 -0.072716
--0.413215 -0.176292 -0.038997
--0.413215 -0.179746 -0.003931
--0.413215 -0.176292 0.031136
--0.413215 -0.166064 0.064855
--0.413215 -0.149453 0.095931
--0.413215 -0.127099 0.123169
--0.413215 -0.099861 0.145523
--0.413215 -0.068786 0.162133
--0.413215 -0.035066 0.172361
--0.413215 0 0.175815
--0.413215 0.035066 0.172361
--0.413215 0.068785 0.162133
--0.413215 0.099861 0.145523
--0.413215 0.127099 0.123169
--0.413215 0.149453 0.095931
--0.413215 0.166063 0.064855
--0.413215 0.176292 0.031136
--0.413215 0.179745 -0.003931
--0.413215 0.176292 -0.038997
--0.413215 0.166063 -0.072716
--0.413215 0.149453 -0.103792
--0.413215 0.127099 -0.131029
--0.413215 0.099861 -0.153383
--0.413215 0.068785 -0.169994
--0.413215 0.035066 -0.180222
+0.001494 0 -0.129459
+1.685465 0.000001 -0.035641
+0.001494 -0.025256 -0.126971
+1.685465 -0.006953 -0.034956
+0.001494 -0.049542 -0.119604
+1.685465 -0.013639 -0.032928
+0.001494 -0.071923 -0.107641
+1.685465 -0.019801 -0.029635
+0.001494 -0.091541 -0.091541
+1.685465 -0.025202 -0.025202
+0.001494 -0.107641 -0.071923
+1.685465 -0.029634 -0.019801
+0.001494 -0.119604 -0.049542
+1.685465 -0.032928 -0.013639
+0.001494 -0.126971 -0.025256
+1.685465 -0.034956 -0.006953
+0.001494 -0.129458 0
+1.685465 -0.035641 -0
+0.001494 -0.126971 0.025256
+1.685465 -0.034956 0.006953
+0.001494 -0.119604 0.049542
+1.685465 -0.032928 0.013639
+0.001494 -0.107641 0.071924
+1.685465 -0.029634 0.019801
+0.001494 -0.091541 0.091541
+1.685465 -0.025202 0.025202
+0.001494 -0.071923 0.107641
+1.685465 -0.019801 0.029635
+0.001494 -0.049542 0.119605
+1.685465 -0.013639 0.032928
+0.001494 -0.025256 0.126971
+1.685465 -0.006953 0.034956
+0.001494 0 0.129459
+1.685465 0.000001 0.035641
+0.001494 0.025256 0.126971
+1.685465 0.006954 0.034956
+0.001494 0.049542 0.119605
+1.685465 0.01364 0.032928
+0.001494 0.071924 0.107641
+1.685465 0.019802 0.029635
+0.001494 0.091541 0.091541
+1.685465 0.025203 0.025202
+0.001494 0.107642 0.071924
+1.685465 0.029635 0.019801
+0.001494 0.119605 0.049542
+1.685465 0.032929 0.013639
+0.001494 0.126972 0.025256
+1.685465 0.034957 0.006953
+0.001494 0.129459 0
+1.685465 0.035642 -0
+0.001494 0.126971 -0.025256
+1.685465 0.034957 -0.006953
+0.001494 0.119605 -0.049542
+1.685465 0.032929 -0.013639
+0.001494 0.107641 -0.071923
+1.685465 0.029635 -0.019801
+0.001494 0.091541 -0.091541
+1.685465 0.025203 -0.025202
+0.001494 0.071923 -0.107641
+1.685465 0.019802 -0.029635
+0.001494 0.049542 -0.119604
+1.685465 0.01364 -0.032928
+0.001494 0.025256 -0.126971
+1.685465 0.006954 -0.034957
+-0.001494 0 -0.115152
+-0.001494 -0.022465 -0.112939
+-0.001494 -0.044067 -0.106386
+-0.001494 -0.063975 -0.095745
+-0.001494 -0.081425 -0.081424
+-0.001494 -0.095745 -0.063975
+-0.001494 -0.106386 -0.044066
+-0.001494 -0.112939 -0.022465
+-0.001494 -0.115152 0
+-0.001494 -0.112939 0.022465
+-0.001494 -0.106386 0.044067
+-0.001494 -0.095745 0.063975
+-0.001494 -0.081425 0.081425
+-0.001494 -0.063975 0.095745
+-0.001494 -0.044067 0.106386
+-0.001494 -0.022465 0.112939
+-0.001494 0 0.115152
+-0.001494 0.022465 0.112939
+-0.001494 0.044066 0.106386
+-0.001494 0.063975 0.095745
+-0.001494 0.081424 0.081425
+-0.001494 0.095745 0.063975
+-0.001494 0.106386 0.044067
+-0.001494 0.112939 0.022465
+-0.001494 0.115151 0
+-0.001494 0.112939 -0.022465
+-0.001494 0.106386 -0.044067
+-0.001494 0.095745 -0.063975
+-0.001494 0.081424 -0.081424
+-0.001494 0.063975 -0.095745
+-0.001494 0.044066 -0.106386
+-0.001494 0.022465 -0.112939
numsurf 124
SURF 0x10
mat 0
@@ -919,85 +919,85 @@
kids 0
OBJECT poly
name "ReheatInner"
-loc 0 0 -0
+loc 0.570934 0 -0.002037
data 11
ReheatInner
-texture "combustion.png"
+texture "reheattest.png"
texrep 1.000000 1.000000
-crease 30.000001
+crease 180.000005
numvert 72
--1.357949 0.219949 0.04975
--0.474139 0.19072 0.043139
--1.357949 0.22533 -0.008872
--0.474139 0.195386 -0.007693
--1.357949 0.215356 -0.06689
--0.474139 0.186738 -0.058001
--1.357949 0.190705 -0.120349
--0.474139 0.165363 -0.104356
--1.357949 0.153059 -0.165607
--0.474139 0.132719 -0.143599
--1.357949 0.104981 -0.199578
--0.474139 0.09103 -0.173056
--1.357949 0.04975 -0.219948
--0.474139 0.043139 -0.19072
--1.357949 -0.008873 -0.22533
--0.474139 -0.007693 -0.195386
--1.357949 -0.066889 -0.215356
--0.474139 -0.058001 -0.186738
--1.357949 -0.120349 -0.190706
--0.474139 -0.104356 -0.165363
--1.357949 -0.165606 -0.153059
--0.474139 -0.143599 -0.132719
--1.357949 -0.199578 -0.104981
--0.474139 -0.173056 -0.091031
--1.357949 -0.219949 -0.04975
--0.474139 -0.19072 -0.043139
--1.357949 -0.22533 0.008872
--0.474139 -0.195386 0.007693
--1.357949 -0.215356 0.06689
--0.474139 -0.186737 0.058001
--1.357949 -0.190705 0.120349
--0.474139 -0.165362 0.104356
--1.357949 -0.153059 0.165606
--0.474139 -0.132719 0.143599
--1.357949 -0.104981 0.199578
--0.474139 -0.091031 0.173056
--1.357949 -0.04975 0.219948
--0.474139 -0.043139 0.19072
--1.357949 0.008872 0.22533
--0.474139 0.007693 0.195386
--1.357949 0.06689 0.215356
--0.474139 0.058001 0.186738
--1.357949 0.120349 0.190706
--0.474139 0.104356 0.165363
--1.357949 0.165607 0.153059
--0.474139 0.143599 0.132719
--1.357949 0.199578 0.104981
--0.474139 0.173056 0.091031
--1.24849 0.043633 0.009869
--1.24849 0.044701 -0.00176
--1.24849 0.042722 -0.01327
--1.24849 0.037832 -0.023875
--1.24849 0.030364 -0.032853
--1.24849 0.020827 -0.039593
--1.24849 0.009869 -0.043634
--1.24849 -0.00176 -0.044701
--1.24849 -0.01327 -0.042722
--1.24849 -0.023875 -0.037832
--1.24849 -0.032853 -0.030364
--1.24849 -0.039592 -0.020827
--1.24849 -0.043633 -0.009869
--1.24849 -0.044701 0.00176
--1.24849 -0.042722 0.01327
--1.24849 -0.037832 0.023875
--1.24849 -0.030364 0.032853
--1.24849 -0.020826 0.039593
--1.24849 -0.009869 0.043634
--1.24849 0.00176 0.044701
--1.24849 0.01327 0.042722
--1.24849 0.023875 0.037832
--1.24849 0.032853 0.030364
--1.24849 0.039592 0.020827
+-0.857164 0.228963 0.051789
+-0.299285 0.198536 0.044906
+-0.857164 0.234565 -0.009236
+-0.299285 0.203394 -0.008009
+-0.857164 0.224182 -0.069631
+-0.299285 0.194391 -0.060378
+-0.857164 0.198521 -0.125281
+-0.299285 0.17214 -0.108633
+-0.857164 0.159332 -0.172394
+-0.299285 0.138158 -0.149484
+-0.857164 0.109284 -0.207757
+-0.299285 0.094761 -0.180149
+-0.857164 0.051789 -0.228962
+-0.299285 0.044906 -0.198537
+-0.857164 -0.009236 -0.234565
+-0.299285 -0.008009 -0.203394
+-0.857164 -0.069631 -0.224182
+-0.299285 -0.060378 -0.194391
+-0.857164 -0.125281 -0.198522
+-0.299285 -0.108633 -0.17214
+-0.857164 -0.172393 -0.159332
+-0.299285 -0.149484 -0.138159
+-0.857164 -0.207757 -0.109284
+-0.299285 -0.180149 -0.094762
+-0.857164 -0.228963 -0.051789
+-0.299285 -0.198536 -0.044906
+-0.857164 -0.234565 0.009236
+-0.299285 -0.203394 0.008009
+-0.857164 -0.224182 0.069631
+-0.299285 -0.19439 0.060378
+-0.857164 -0.198521 0.125281
+-0.299285 -0.17214 0.108633
+-0.857164 -0.159332 0.172393
+-0.299285 -0.138158 0.149484
+-0.857164 -0.109284 0.207757
+-0.299285 -0.094762 0.180149
+-0.857164 -0.051789 0.228962
+-0.299285 -0.044906 0.198537
+-0.857164 0.009236 0.234565
+-0.299285 0.008009 0.203394
+-0.857164 0.069631 0.224182
+-0.299285 0.060378 0.194391
+-0.857164 0.125281 0.198522
+-0.299285 0.108633 0.17214
+-0.857164 0.172394 0.159332
+-0.299285 0.149484 0.138159
+-0.857164 0.207757 0.109284
+-0.299285 0.180149 0.094762
+-0.788071 0.045422 0.010274
+-0.788071 0.046533 -0.001832
+-0.788071 0.044473 -0.013814
+-0.788071 0.039383 -0.024854
+-0.788071 0.031608 -0.0342
+-0.788071 0.02168 -0.041215
+-0.788071 0.010274 -0.045422
+-0.788071 -0.001832 -0.046533
+-0.788071 -0.013813 -0.044473
+-0.788071 -0.024854 -0.039383
+-0.788071 -0.034199 -0.031608
+-0.788071 -0.041215 -0.02168
+-0.788071 -0.045422 -0.010274
+-0.788071 -0.046533 0.001832
+-0.788071 -0.044473 0.013814
+-0.788071 -0.039382 0.024854
+-0.788071 -0.031608 0.0342
+-0.788071 -0.021679 0.041215
+-0.788071 -0.010274 0.045422
+-0.788071 0.001832 0.046533
+-0.788071 0.013814 0.044473
+-0.788071 0.024853 0.039383
+-0.788071 0.034199 0.031608
+-0.788071 0.041215 0.02168
numsurf 48
SURF 0x10
mat 0
@@ -1338,85 +1338,85 @@
kids 0
OBJECT poly
name "ReheatOuter"
-loc 0 0 -0
+loc 0.570934 0 -0.002037
data 11
ReheatOuter
-texture "combustion.png"
+texture "reheattest.png"
texrep 1.000000 1.000000
-crease 30.000001
+crease 180.000005
numvert 72
--0.911855 0.19381 0.115282
-0.005612 0.19381 0.115282
--0.911855 0.217043 0.061193
-0.005612 0.217043 0.061193
--0.911855 0.225485 0.002933
-0.005612 0.225485 0.002933
--0.911855 0.218562 -0.055527
-0.005612 0.218562 -0.055527
--0.911855 0.196743 -0.110203
-0.005612 0.196743 -0.110203
--0.911855 0.161516 -0.157369
-0.005612 0.161516 -0.157369
--0.911855 0.115283 -0.19381
-0.005612 0.115283 -0.19381
--0.911855 0.061193 -0.217043
-0.005612 0.061193 -0.217043
--0.911855 0.002932 -0.225485
-0.005612 0.002932 -0.225485
--0.911855 -0.055528 -0.218561
-0.005612 -0.055528 -0.218561
--0.911855 -0.110203 -0.196742
-0.005612 -0.110203 -0.196742
--0.911855 -0.157369 -0.161516
-0.005612 -0.157369 -0.161516
--0.911855 -0.19381 -0.115282
-0.005612 -0.19381 -0.115282
--0.911855 -0.217043 -0.061193
-0.005612 -0.217043 -0.061193
--0.911855 -0.225486 -0.002933
-0.005612 -0.225486 -0.002933
--0.911855 -0.218561 0.055527
-0.005612 -0.218561 0.055527
--0.911855 -0.196742 0.110203
-0.005612 -0.196742 0.110203
--0.911855 -0.161516 0.157368
-0.005612 -0.161516 0.157368
--0.911855 -0.115283 0.19381
-0.005612 -0.115283 0.19381
--0.911855 -0.061193 0.217043
-0.005612 -0.061193 0.217043
--0.911855 -0.002933 0.225485
-0.005612 -0.002933 0.225485
--0.911855 0.055528 0.218561
-0.005612 0.055528 0.218561
--0.911855 0.110203 0.196742
-0.005612 0.110203 0.196742
--0.911855 0.157369 0.161516
-0.005612 0.157369 0.161516
--0.8288 0.147493 0.087732
--0.8288 0.165174 0.046569
--0.8288 0.171599 0.002231
--0.8288 0.16633 -0.042257
--0.8288 0.149725 -0.083867
--0.8288 0.122917 -0.119761
--0.8288 0.087733 -0.147494
--0.8288 0.046569 -0.165174
--0.8288 0.002232 -0.171599
--0.8288 -0.042257 -0.16633
--0.8288 -0.083867 -0.149726
--0.8288 -0.119761 -0.122917
--0.8288 -0.147493 -0.087732
--0.8288 -0.165175 -0.046569
--0.8288 -0.171599 -0.002232
--0.8288 -0.16633 0.042257
--0.8288 -0.149725 0.083867
--0.8288 -0.122918 0.119761
--0.8288 -0.087732 0.147494
--0.8288 -0.046569 0.165174
--0.8288 -0.002232 0.171599
--0.8288 0.042257 0.16633
--0.8288 0.083867 0.149726
--0.8288 0.119761 0.122917
+-0.575581 0.201753 0.120007
+0.003543 0.111042 0.06605
+-0.575581 0.225938 0.063701
+0.003543 0.124353 0.03506
+-0.575581 0.234727 0.003053
+0.003543 0.12919 0.00168
+-0.575581 0.227519 -0.057803
+0.003543 0.125223 -0.031814
+-0.575581 0.204806 -0.11472
+0.003543 0.112722 -0.06314
+-0.575581 0.168136 -0.163819
+0.003543 0.092539 -0.090163
+-0.575581 0.120008 -0.201753
+0.003543 0.06605 -0.111042
+-0.575581 0.063701 -0.225939
+0.003543 0.03506 -0.124353
+-0.575581 0.003053 -0.234727
+0.003543 0.00168 -0.12919
+-0.575581 -0.057803 -0.227519
+0.003543 -0.031814 -0.125223
+-0.575581 -0.11472 -0.204806
+0.003543 -0.06314 -0.112722
+-0.575581 -0.163818 -0.168136
+0.003543 -0.090163 -0.092539
+-0.575581 -0.201753 -0.120007
+0.003543 -0.111042 -0.06605
+-0.575581 -0.225939 -0.063701
+0.003543 -0.124353 -0.03506
+-0.575581 -0.234727 -0.003053
+0.003543 -0.12919 -0.00168
+-0.575581 -0.227519 0.057803
+0.003543 -0.125223 0.031814
+-0.575581 -0.204806 0.11472
+0.003543 -0.112722 0.06314
+-0.575581 -0.168136 0.163818
+0.003543 -0.092539 0.090163
+-0.575581 -0.120008 0.201753
+0.003543 -0.06605 0.111042
+-0.575581 -0.063701 0.225939
+0.003543 -0.03506 0.124353
+-0.575581 -0.003053 0.234727
+0.003543 -0.001681 0.12919
+-0.575581 0.057803 0.227519
+0.003543 0.031814 0.125223
+-0.575581 0.11472 0.204806
+0.003543 0.06314 0.112722
+-0.575581 0.163818 0.168136
+0.003543 0.090163 0.092539
+-0.523155 0.153538 0.091328
+-0.523155 0.171944 0.048478
+-0.523155 0.178632 0.002323
+-0.523155 0.173147 -0.04399
+-0.523155 0.155861 -0.087304
+-0.523155 0.127955 -0.124669
+-0.523155 0.091328 -0.153539
+-0.523155 0.048477 -0.171944
+-0.523155 0.002323 -0.178632
+-0.523155 -0.043989 -0.173146
+-0.523155 -0.087304 -0.155862
+-0.523155 -0.124669 -0.127955
+-0.523155 -0.153538 -0.091328
+-0.523155 -0.171944 -0.048478
+-0.523155 -0.178632 -0.002323
+-0.523155 -0.173146 0.04399
+-0.523155 -0.155861 0.087304
+-0.523155 -0.127955 0.124669
+-0.523155 -0.091328 0.153539
+-0.523155 -0.048477 0.171944
+-0.523155 -0.002323 0.178632
+-0.523155 0.043989 0.173146
+-0.523155 0.087304 0.155862
+-0.523155 0.124669 0.127955
numsurf 48
SURF 0x10
mat 0
Deleted: trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion.png
===================================================================
(Binary files differ)
Modified: trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion.xml
===================================================================
--- trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion.xml 2021-11-11 09:26:35 UTC (rev 6159)
+++ trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion.xml 2021-11-11 13:56:47 UTC (rev 6160)
@@ -1,99 +1,41 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<PropertyList>
-
- <path>combustion.ac</path>
-
- <animation>
- <object-name>ReheatInner</object-name>
- <object-name>ReheatOuter</object-name>
- <object-name>ExternalFlame</object-name>
- </animation>
-
- <effect>
- <inherits-from>Effects/model-transparent</inherits-from>
- <object-name>ReheatInner</object-name>
- <object-name>ReheatOuter</object-name>
- <object-name>ExternalFlame</object-name>
- </effect>
-
- <animation>
- <type>select</type>
- <object-name>ReheatInner</object-name>
- <object-name>ReheatOuter</object-name>
- <object-name>ExternalFlame</object-name>
- <condition>
- <greater-than>
- <!-- controls/engines/engine[0]/throttle -->
- <property>sim/multiplay/generic/float[12]</property>
- <value>0.2</value>
- </greater-than>
- </condition>
- </animation>
-
- <animation>
- <type>scale</type>
- <object-name>ExternalFlame</object-name>
- <!-- controls/engines/engine[0]/throttle -->
- <property>sim/multiplay/generic/float[12]</property>
- <x-min> 0.2 </x-min>
- <y-min> 0.9 </y-min>
- <z-min> 0.9 </z-min>
- <x-factor> 1.30 </x-factor>
- <y-factor> 0.25 </y-factor>
- <z-factor> 0.25 </z-factor>
- </animation>
-
- <animation>
- <object-name>ExternalFlame</object-name>
- <type>spin</type>
- <!-- engines/engine[0]/n1 -->
- <property>sim/multiplay/generic/float[4]</property>
- <factor> 240 </factor>
- <axis>
- <x> 1 </x>
- <y> 0 </y>
- <z> 0 </z>
- </axis>
- </animation>
-
- <animation>
- <type>spin</type>
- <object-name>ReheatOuter</object-name>
- <object-name>ReheatInner</object-name>
- <!-- engines/engine[0]/n1 -->
- <property>sim/multiplay/generic/float[4]</property>
- <factor> 437 </factor>
- <axis>
- <x> -1 </x>
- <y> 0 </y>
- <z> 0 </z>
- </axis>
- </animation>
-
- <animation>
- <type>material</type>
- <object-name>ReheatInner</object-name>
- <emission>
- <!-- controls/engines/engine[0]/throttle -->
- <factor-prop>sim/multiplay/generic/float[12]</factor-prop>
- <red> 1 </red>
- <green-prop>sim/multiplay/generic/float[12]</green-prop>
- <blue-prop>sim/multiplay/generic/float[12]</blue-prop>
- </emission>
- </animation>
-
- <animation>
- <type>material</type>
- <object-name>ReheatOuter</object-name>
- <object-name>ExternalFlame</object-name>
- <emission>
- <!-- controls/engines/engine[0]/throttle -->
- <factor-prop>sim/multiplay/generic/float[12]</factor-prop>
- <red> 2 </red>
- <green> 2 </green>
- <blue> 2 </blue>
- </emission>
- </animation>
-
-</PropertyList>
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<PropertyList>
+
+ <model>
+ <name>FlammeALS</name>
+ <path>combustionALS.xml</path>
+ <offsets>
+ <x-m> 0.1 </x-m>
+ <y-m> 0.0 </y-m>
+ <z-m> 0.0 </z-m>
+ </offsets>
+ </model>
+
+ <animation>
+ <type>select</type>
+ <object-name>FlammeALS</object-name>
+ <condition>
+ <property>sim/rendering/shaders/skydome</property>
+ </condition>
+ </animation>
+
+ <model>
+ <name>flammeNO_ALS</name>
+ <path>NO_ALS/combustion.xml</path>
+ <offsets>
+ <x-m> 0.1 </x-m>
+ <y-m> 0.0 </y-m>
+ <z-m> 0.0 </z-m>
+ </offsets>
+ </model>
+
+ <animation>
+ <type>select</type>
+ <object-name>flammeNO_ALS</object-name>
+ <condition>
+ <not><property>sim/rendering/shaders/skydome</property></not>
+ </condition>
+ </animation>
+
+</PropertyList>
Added: trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustionALS.xml
===================================================================
--- trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustionALS.xml (rev 0)
+++ trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustionALS.xml 2021-11-11 13:56:47 UTC (rev 6160)
@@ -0,0 +1,277 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<PropertyList>
+
+ <path>combustion.ac</path>
+
+ <animation>
+ <object-name>ReheatInner</object-name>
+ <object-name>ReheatOuter</object-name>
+ <object-name>ExternalFlame</object-name>
+ </animation>
+
+ <animation>
+ <type>noshadow</type>
+ <object-name>ReheatInner</object-name>
+ <object-name>ReheatOuter</object-name>
+ <object-name>ExternalFlame</object-name>
+ </animation>
+
+ <effect>
+ <inherits-from>Effects/model-transparent</inherits-from>
+ <object-name>ReheatInner</object-name>
+ <object-name>ReheatOuter</object-name>
+ <object-name>ExternalFlame</object-name>
+ </effect>
+
+ <model>
+ <name>flammeNight</name>
+ <path>combustion_Night.xml</path>
+ <offsets>
+ <x-m> 0.1 </x-m>
+ <y-m> 0.0 </y-m>
+ <z-m> 0.0 </z-m>
+ </offsets>
+ </model>
+
+ <model>
+ <name>flammeDay</name>
+ <path>combustion_Day.xml</path>
+ <offsets>
+ <x-m> 0.1 </x-m>
+ <y-m> 0.0 </y-m>
+ <z-m> 0.0 </z-m>
+ </offsets>
+ </model>
+
+ <model>
+ <name>flammeDusk</name>
+ <path>combustion_Dusk.xml</path>
+ <offsets>
+ <x-m> 0.1 </x-m>
+ <y-m> 0.0 </y-m>
+ <z-m> 0.0 </z-m>
+ </offsets>
+ </model>
+
+ <animation>
+ <type>select</type>
+ <object-name>ReheatOuter</object-name>
+ <object-name>ExternalFlame</object-name>
+ <object-name>flammeNight</object-name>
+ <object-name>flammeDay</object-name>
+ <object-name>flammeDusk</object-name>
+ <condition>
+ <greater-than>
+ <!-- /controls/engines/engine[0]/throttle -->
+ <property>sim/multiplay/generic/float[12]</property>
+ <value>0.2</value>
+ </greater-than>
+ </condition>
+ </animation>
+
+ <animation>
+ <type>spin</type>
+ <object-name>ReheatOuter</object-name>
+ <object-name>ReheatInner</object-name>
+ <object-name>ExternalFlame</object-name>
+ <!-- engines/engine[0]/n1 -->
+ <property>sim/multiplay/generic/float[4]</property>
+ <factor>437</factor>
+ <axis>
+ <x>-1</x>
+ <y> 0</y>
+ <z> 0</z>
+ </axis>
+ </animation>
+
+ <!-- ############### NIGHT FLAMME #################### -->
+ <animation>
+ <type>material</type>
+ <object-name>ReheatInner</object-name>
+ <condition>
+ <greater-than>
+ <property>sim/time/sun-angle-rad</property>
+ <value>1.7</value>
+ </greater-than>
+ </condition>
+ <emission>
+ <red> 0.6 </red>
+ <green> 0.5 </green>
+ <blue> 1.0 </blue>
+ </emission>
+ </animation>
+
+ <animation>
+ <type>material</type>
+ <object-name>ReheatOuter</object-name>
+ <condition>
+ <greater-than>
+ <property>sim/time/sun-angle-rad</property>
+ <value>1.7</value>
+ </greater-than>
+ </condition>
+ <emission>
+ <red> 0.85 </red>
+ <green> 0.70 </green>
+ <blue> 1.00 </blue>
+ </emission>
+ </animation>
+
+ <animation>
+ <type>select</type>
+ <object-name>flammeNight</object-name>
+ <condition>
+ <greater-than>
+ <property>sim/time/sun-angle-rad</property>
+ <value>1.7</value>
+ </greater-than>
+ </condition>
+ </animation>
+
+ <animation>
+ <type>scale</type>
+ <object-name>flammeNight</object-name>
+ <!-- /controls/engines/engine[0]/throttle -->
+ <property>sim/multiplay/generic/float[12]</property>
+ <x-min> 0 </x-min>
+ <y-min> 0 </y-min>
+ <z-min> 1 </z-min>
+ <x-factor> 0.4 </x-factor>
+ <y-factor> 0.4 </y-factor>
+ <z-factor> 0.4 </z-factor>
+ </animation>
+
+ <!-- ############### DAY FLAMME #################### -->
+ <animation>
+ <type>material</type>
+ <object-name>ReheatInner</object-name>
+ <condition>
+ <less-than>
+ <property>sim/time/sun-angle-rad</property>
+ <value>1.45</value>
+ </less-than>
+ </condition>
+ <emission>
+ <red> 1.0 </red>
+ <green> 0.4 </green>
+ <blue> 0.0 </blue>
+ </emission>
+ </animation>
+
+ <animation>
+ <type>material</type>
+ <object-name>ReheatOuter</object-name>
+ <condition>
+ <less-than>
+ <property>sim/time/sun-angle-rad</property>
+ <value>1.45</value>
+ </less-than>
+ </condition>
+ <emission>
+ <red> 1.0 </red>
+ <green> 0.3 </green>
+ <blue> 0.0 </blue>
+ </emission>
+ </animation>
+
+ <animation>
+ <type>select</type>
+ <object-name>flammeDay</object-name>
+ <condition>
+ <less-than>
+ <property>sim/time/sun-angle-rad</property>
+ <value>1.45</value>
+ </less-than>
+ </condition>
+ </animation>
+
+ <animation>
+ <type>scale</type>
+ <object-name>flammeDay</object-name>
+ <!-- /controls/engines/engine[0]/throttle -->
+ <property>sim/multiplay/generic/float[12]</property>
+ <x-min> 0 </x-min>
+ <y-min> 0 </y-min>
+ <z-min> 1 </z-min>
+ <x-factor> 0.4 </x-factor>
+ <y-factor> 0.4 </y-factor>
+ <z-factor> 0.4 </z-factor>
+ </animation>
+
+ <!-- ############### DUSK FLAMME #################### -->
+ <animation>
+ <type>material</type>
+ <object-name>ReheatInner</object-name>
+ <condition>
+ <and>
+ <less-than>
+ <property>sim/time/sun-angle-rad</property>
+ <value>1.7</value>
+ </less-than>
+ <greater-than>
+ <property>sim/time/sun-angle-rad</property>
+ <value>1.45</value>
+ </greater-than>
+ </and>
+ </condition>
+ <emission>
+ <red> 1.00 </red>
+ <green> 0.20 </green>
+ <blue> 0.05 </blue>
+ </emission>
+ </animation>
+
+ <animation>
+ <type>material</type>
+ <object-name>ReheatOuter</object-name>
+ <condition>
+ <and>
+ <less-than>
+ <property>sim/time/sun-angle-rad</property>
+ <value>1.7</value>
+ </less-than>
+ <greater-than>
+ <property>sim/time/sun-angle-rad</property>
+ <value>1.45</value>
+ </greater-than>
+ </and>
+ </condition>
+ <emission>
+ <red> 0.4 </red>
+ <green> 0.2 </green>
+ <blue> 0.8 </blue>
+ </emission>
+ </animation>
+
+ <animation>
+ <type>select</type>
+ <object-name>flammeDusk</object-name>
+ <condition>
+ <and>
+ <less-than>
+ <property>sim/time/sun-angle-rad</property>
+ <value>1.7</value>
+ </less-than>
+ <greater-than>
+ <property>sim/time/sun-angle-rad</property>
+ <value>1.45</value>
+ </greater-than>
+ </and>
+ </condition>
+ </animation>
+
+ <animation>
+ <type>scale</type>
+ <object-name>flammeDusk</object-name>
+ <!-- /controls/engines/engine[0]/throttle -->
+ <property>sim/multiplay/generic/float[12]</property>
+ <x-min> 0 </x-min>
+ <y-min> 0 </y-min>
+ <z-min> 1 </z-min>
+ <x-factor> 0.4 </x-factor>
+ <y-factor> 0.4 </y-factor>
+ <z-factor> 0.4 </z-factor>
+ </animation>
+
+</PropertyList>
Added: trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion_Day.xml
===================================================================
--- trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion_Day.xml (rev 0)
+++ trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion_Day.xml 2021-11-11 13:56:47 UTC (rev 6160)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<PropertyList>
+
+ <path>thrust_flame.ac</path>
+
+ <nopreview />
+
+ <animation>
+ <type>scale</type>
+ <x-offset> 2.0 </x-offset>
+ <y-offset> 0.8 </y-offset>
+ <z-offset> 0.8 </z-offset>
+ </animation>
+
+ <effect>
+ <inherits-from>flame_Day</inherits-from>
+ <object-name>Bounding_box</object-name>
+ </effect>
+
+</PropertyList>
Added: trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion_Dusk.xml
===================================================================
--- trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion_Dusk.xml (rev 0)
+++ trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion_Dusk.xml 2021-11-11 13:56:47 UTC (rev 6160)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<PropertyList>
+
+ <path>thrust_flame.ac</path>
+
+ <nopreview />
+
+ <animation>
+ <type>scale</type>
+ <x-offset> 2.0 </x-offset>
+ <y-offset> 0.8 </y-offset>
+ <z-offset> 0.8 </z-offset>
+ </animation>
+
+ <effect>
+ <inherits-from>flame_Dusk</inherits-from>
+ <object-name>Bounding_box</object-name>
+ </effect>
+
+</PropertyList>
Added: trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion_Night.xml
===================================================================
--- trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion_Night.xml (rev 0)
+++ trunk/Aircraft/F9F-Panther/Models/Effects/flammes/combustion_Night.xml 2021-11-11 13:56:47 UTC (rev 6160)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<PropertyList>
+
+ <path>thrust_flame.ac</path>
+
+ <nopreview />
+
+ <animation>
+ <type>scale</type>
+ <x-offset> 2.0 </x-offset>
+ <y-offset> 0.8 </y-offset>
+ <z-offset> 0.8 </z-offset>
+ </animation>
+
+ <effect>
+ <inherits-from>flame_Night</inherits-from>
+ <object-name>Bounding_box</object-name>
+ </effect>
+
+</PropertyList>
Added: trunk/Aircraft/F9F-Panther/Models/Effects/flammes/flame_Day.eff
===================================================================
--- trunk/Aircraft/F9F-Panther/Models/Effects/flammes/flame_Day.eff (rev 0)
+++ trunk/Aircraft/F9F-Panther/Models/Effects/flammes/flame_Day.eff 2021-11-11 13:56:47 UTC (rev 6160)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<PropertyList>
+
+ <name>AB-flame</name>
+ <inherits-from>thrust-flame</inherits-from>
+
+ <parameters>
+ <flame_color_low_r type="float">0.9</flame_color_low_r>
+ <flame_color_low_g type="float">0.5</flame_color_low_g>
+ <flame_color_low_b type="float">0.1</flame_color_low_b>
+ <flame_color_high_r type="float">0.9</flame_color_high_r>
+ <flame_color_high_g type="float">0.6</flame_color_high_g>
+ <flame_color_high_b type="float">0.1</flame_color_high_b>
+ <base_flame_r type="float">0.8</base_flame_r>
+ <base_flame_g type="float">0.8</base_flame_g>
+ <base_flame_b type="float">0.8</base_flame_b>
+ <use_shocks type="int">1</use_shocks>
+ <use_noise type="int">1</use_noise>
+ <thrust_collimation type="float">0.1</thrust_collimation>
+ <thrust_density type="float">0.1</thrust_density>
+ <base_flame_density type="float">0.015</base_flame_density>
+ <noise_strength type="float">0.2</noise_strength>
+ <noise_scale type="float">0.3</noise_scale>
+ <deflection_coeff type="float">0.</deflection_coeff>
+ <flame_radius_fraction type="float">0.8</flame_radius...
[truncated message content] |