Update the windsock to a better animation and a lightmapped model for ALS
This commit is contained in:
Erik Hofman
parent
c6644c7cbc
commit
99819bcd4e
9 changed files with 1900 additions and 416 deletions
150
Models/Airport/windsock-ALS.xml
Normal file
150
Models/Airport/windsock-ALS.xml
Normal file
|
|
@ -0,0 +1,150 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<PropertyList>
|
||||
|
||||
<path>windsock.ac</path>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>windsock</object-name>
|
||||
<object-name>pivot_pole</object-name>
|
||||
<object-name>frame</object-name>
|
||||
<property>/environment/wind-from-heading-deg</property>
|
||||
<offset-deg>-90</offset-deg>
|
||||
<factor>-1</factor>
|
||||
<axis>
|
||||
<x>0.0</x>
|
||||
<y>0.0</y>
|
||||
<z>1.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>0.0</y-m>
|
||||
<z-m>0.0</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
<effect>
|
||||
<inherits-from>Models/Airport/windsock</inherits-from>
|
||||
<object-name>pivot_pole</object-name>
|
||||
<object-name>frame</object-name>
|
||||
<object-name>2.5kt</object-name>
|
||||
<object-name>5kt</object-name>
|
||||
<object-name>7.5kt</object-name>
|
||||
<object-name>10kt</object-name>
|
||||
<object-name>12.5kt</object-name>
|
||||
<object-name>15kt</object-name>
|
||||
</effect>
|
||||
|
||||
<!-- TODO: Make the organix wing-flex shader work for the windsock -->
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>5kt</object-name>
|
||||
<object-name>7.5kt</object-name>
|
||||
<object-name>10kt</object-name>
|
||||
<object-name>12.5kt</object-name>
|
||||
<object-name>15kt</object-name>
|
||||
<property>/environment/wind-speed-kt</property>
|
||||
<factor>-6</factor>
|
||||
<offset-deg>30.0</offset-deg>
|
||||
<min-deg>0</min-deg>
|
||||
<max-deg>32</max-deg>
|
||||
<axis>
|
||||
<x>-1.0</x>
|
||||
<y>0.0</y>
|
||||
<z>0.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>1.17</y-m>
|
||||
<z-m>6.07</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>7.5kt</object-name>
|
||||
<object-name>10kt</object-name>
|
||||
<object-name>12.5kt</object-name>
|
||||
<object-name>15kt</object-name>
|
||||
<property>/environment/wind-speed-kt</property>
|
||||
<factor>-6</factor>
|
||||
<offset-deg>45.0</offset-deg>
|
||||
<min-deg>0</min-deg>
|
||||
<max-deg>28</max-deg>
|
||||
<axis>
|
||||
<x>-1.0</x>
|
||||
<y>0.0</y>
|
||||
<z>0.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>1.70</y-m>
|
||||
<z-m>6.02</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>10kt</object-name>
|
||||
<object-name>12.5kt</object-name>
|
||||
<object-name>15kt</object-name>
|
||||
<property>/environment/wind-speed-kt</property>
|
||||
<factor>-6</factor>
|
||||
<offset-deg>60.0</offset-deg>
|
||||
<min-deg>0</min-deg>
|
||||
<max-deg>25</max-deg>
|
||||
<axis>
|
||||
<x>-1.0</x>
|
||||
<y>0.0</y>
|
||||
<z>0.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>2.22</y-m>
|
||||
<z-m>5.97</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>12.5kt</object-name>
|
||||
<object-name>15kt</object-name>
|
||||
<property>/environment/wind-speed-kt</property>
|
||||
<factor>-6</factor>
|
||||
<offset-deg>75.0</offset-deg>
|
||||
<min-deg>0</min-deg>
|
||||
<max-deg>10</max-deg>
|
||||
<axis>
|
||||
<x>-1.0</x>
|
||||
<y>0.0</y>
|
||||
<z>0.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>2.75</y-m>
|
||||
<z-m>5.92</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>15kt</object-name>
|
||||
<property>/environment/wind-speed-kt</property>
|
||||
<factor>-6</factor>
|
||||
<offset-deg>90.0</offset-deg>
|
||||
<min-deg>0</min-deg>
|
||||
<max-deg>5</max-deg>
|
||||
<axis>
|
||||
<x>-1.0</x>
|
||||
<y>0.0</y>
|
||||
<z>0.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>3.28</y-m>
|
||||
<z-m>5.87</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
</PropertyList>
|
||||
232
Models/Airport/windsock-default-lit.xml
Normal file
232
Models/Airport/windsock-default-lit.xml
Normal file
|
|
@ -0,0 +1,232 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<PropertyList>
|
||||
|
||||
<path>windsock.ac</path>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>windsock</object-name>
|
||||
<object-name>frame</object-name>
|
||||
<property>/environment/wind-from-heading-deg</property>
|
||||
<offset-deg>-90</offset-deg>
|
||||
<factor>-1</factor>
|
||||
<axis>
|
||||
<x>0.0</x>
|
||||
<y>0.0</y>
|
||||
<z>1.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>0.0</y-m>
|
||||
<z-m>0.0</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>5kt</object-name>
|
||||
<object-name>7.5kt</object-name>
|
||||
<object-name>10kt</object-name>
|
||||
<object-name>12.5kt</object-name>
|
||||
<object-name>15kt</object-name>
|
||||
<property>/environment/wind-speed-kt</property>
|
||||
<factor>-6</factor>
|
||||
<offset-deg>30.0</offset-deg>
|
||||
<min-deg>0</min-deg>
|
||||
<max-deg>32</max-deg>
|
||||
<axis>
|
||||
<x>-1.0</x>
|
||||
<y>0.0</y>
|
||||
<z>0.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>1.17</y-m>
|
||||
<z-m>6.07</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>7.5kt</object-name>
|
||||
<object-name>10kt</object-name>
|
||||
<object-name>12.5kt</object-name>
|
||||
<object-name>15kt</object-name>
|
||||
<property>/environment/wind-speed-kt</property>
|
||||
<factor>-6</factor>
|
||||
<offset-deg>45.0</offset-deg>
|
||||
<min-deg>0</min-deg>
|
||||
<max-deg>28</max-deg>
|
||||
<axis>
|
||||
<x>-1.0</x>
|
||||
<y>0.0</y>
|
||||
<z>0.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>1.70</y-m>
|
||||
<z-m>6.02</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>10kt</object-name>
|
||||
<object-name>12.5kt</object-name>
|
||||
<object-name>15kt</object-name>
|
||||
<property>/environment/wind-speed-kt</property>
|
||||
<factor>-6</factor>
|
||||
<offset-deg>60.0</offset-deg>
|
||||
<min-deg>0</min-deg>
|
||||
<max-deg>25</max-deg>
|
||||
<axis>
|
||||
<x>-1.0</x>
|
||||
<y>0.0</y>
|
||||
<z>0.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>2.22</y-m>
|
||||
<z-m>5.97</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>12.5kt</object-name>
|
||||
<object-name>15kt</object-name>
|
||||
<property>/environment/wind-speed-kt</property>
|
||||
<factor>-6</factor>
|
||||
<offset-deg>75.0</offset-deg>
|
||||
<min-deg>0</min-deg>
|
||||
<max-deg>10</max-deg>
|
||||
<axis>
|
||||
<x>-1.0</x>
|
||||
<y>0.0</y>
|
||||
<z>0.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>2.75</y-m>
|
||||
<z-m>5.92</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>15kt</object-name>
|
||||
<property>/environment/wind-speed-kt</property>
|
||||
<factor>-6</factor>
|
||||
<offset-deg>90.0</offset-deg>
|
||||
<min-deg>0</min-deg>
|
||||
<max-deg>5</max-deg>
|
||||
<axis>
|
||||
<x>-1.0</x>
|
||||
<y>0.0</y>
|
||||
<z>0.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>3.28</y-m>
|
||||
<z-m>5.87</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>material</type>
|
||||
<object-name>2.5kt</object-name>
|
||||
<object-name>frame</object-name>
|
||||
<condition>
|
||||
<greater-than>
|
||||
<property>/sim/time/sun-angle-rad</property>
|
||||
<value>1.57</value>
|
||||
</greater-than>
|
||||
</condition>
|
||||
<emission>
|
||||
<red>0.565</red>
|
||||
<green>0.334</green>
|
||||
<blue>0.110</blue>
|
||||
</emission>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>material</type>
|
||||
<object-name>5kt</object-name>
|
||||
<condition>
|
||||
<greater-than>
|
||||
<property>/sim/time/sun-angle-rad</property>
|
||||
<value>1.57</value>
|
||||
</greater-than>
|
||||
</condition>
|
||||
<emission>
|
||||
<red>0.529</red>
|
||||
<green>0.388</green>
|
||||
<blue>0.184</blue>
|
||||
</emission>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>material</type>
|
||||
<object-name>7.5kt</object-name>
|
||||
<condition>
|
||||
<greater-than>
|
||||
<property>/sim/time/sun-angle-rad</property>
|
||||
<value>1.57</value>
|
||||
</greater-than>
|
||||
</condition>
|
||||
<emission>
|
||||
<red>0.461</red>
|
||||
<green>0.355</green>
|
||||
<blue>0.166</blue>
|
||||
</emission>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>material</type>
|
||||
<object-name>10kt</object-name>
|
||||
<condition>
|
||||
<greater-than>
|
||||
<property>/sim/time/sun-angle-rad</property>
|
||||
<value>1.57</value>
|
||||
</greater-than>
|
||||
</condition>
|
||||
<emission>
|
||||
<red>0.427</red>
|
||||
<green>0.306</green>
|
||||
<blue>0.141</blue>
|
||||
</emission>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>material</type>
|
||||
<object-name>12.5kt</object-name>
|
||||
<condition>
|
||||
<greater-than>
|
||||
<property>/sim/time/sun-angle-rad</property>
|
||||
<value>1.57</value>
|
||||
</greater-than>
|
||||
</condition>
|
||||
<emission>
|
||||
<red>0.398</red>
|
||||
<green>0.278</green>
|
||||
<blue>0.137</blue>
|
||||
</emission>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>material</type>
|
||||
<object-name>15kt</object-name>
|
||||
<condition>
|
||||
<greater-than>
|
||||
<property>/sim/time/sun-angle-rad</property>
|
||||
<value>1.57</value>
|
||||
</greater-than>
|
||||
</condition>
|
||||
<emission>
|
||||
<red>0.369</red>
|
||||
<green>0.255</green>
|
||||
<blue>0.133</blue>
|
||||
</emission>
|
||||
</animation>
|
||||
</PropertyList>
|
||||
BIN
Models/Airport/windsock-lightmap.png
Normal file
BIN
Models/Airport/windsock-lightmap.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
File diff suppressed because it is too large
Load diff
51
Models/Airport/windsock.eff
Normal file
51
Models/Airport/windsock.eff
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<PropertyList>
|
||||
<name>windsock</name>
|
||||
<inherits-from>Effects/model-wingflex-organic</inherits-from>
|
||||
<parameters>
|
||||
<!--
|
||||
<wingflex-alpha><use>/environment/windsock-pos</use></wingflex-alpha>
|
||||
<wingflex-trailing-alpha><use>/environment/windsock-pos</use></wingflex-trailing-alpha>
|
||||
<wingsweep-factor><use>/environment/windsock-pos</use></wingsweep-factor>
|
||||
-->
|
||||
|
||||
<lightmap-enabled type="int">1</lightmap-enabled>
|
||||
<texture n="3">
|
||||
<image>Models/Airport/windsock-lightmap.png</image>
|
||||
</texture>
|
||||
</parameters>
|
||||
|
||||
<technique n="5">
|
||||
<pass>
|
||||
<lighting>true</lighting>
|
||||
<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>
|
||||
<texture-unit>
|
||||
<unit>0</unit>
|
||||
<type>2d</type>
|
||||
<image>
|
||||
<use>texture[0]/image</use>
|
||||
</image>
|
||||
<wrap-s>clamp</wrap-s>
|
||||
<wrap-t>clamp</wrap-t>
|
||||
</texture-unit>
|
||||
<alpha-to-coverage>true</alpha-to-coverage>
|
||||
</pass>
|
||||
</technique>
|
||||
|
||||
</PropertyList>
|
||||
BIN
Models/Airport/windsock.png
Normal file
BIN
Models/Airport/windsock.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 248 B |
Binary file not shown.
|
|
@ -4,18 +4,10 @@
|
|||
|
||||
<path>windsock.ac</path>
|
||||
|
||||
<animation>
|
||||
<type>range</type>
|
||||
<min-m>0</min-m>
|
||||
<max-m>2000</max-m>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>wf4</object-name>
|
||||
<object-name>wf8</object-name>
|
||||
<object-name>wf12</object-name>
|
||||
<object-name>wf16</object-name>
|
||||
<object-name>windsock</object-name>
|
||||
<object-name>frame</object-name>
|
||||
<property>/environment/wind-from-heading-deg</property>
|
||||
<offset-deg>-90</offset-deg>
|
||||
<factor>-1</factor>
|
||||
|
|
@ -33,82 +25,111 @@
|
|||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>wf4</object-name>
|
||||
<object-name>wf8</object-name>
|
||||
<object-name>wf12</object-name>
|
||||
<object-name>wf16</object-name>
|
||||
<object-name>5kt</object-name>
|
||||
<object-name>7.5kt</object-name>
|
||||
<object-name>10kt</object-name>
|
||||
<object-name>12.5kt</object-name>
|
||||
<object-name>15kt</object-name>
|
||||
<property>/environment/wind-speed-kt</property>
|
||||
<factor>1.67</factor>
|
||||
<factor>-6</factor>
|
||||
<offset-deg>30.0</offset-deg>
|
||||
<min-deg>0</min-deg>
|
||||
<max-deg>25</max-deg>
|
||||
<max-deg>32</max-deg>
|
||||
<axis>
|
||||
<x>1.0</x>
|
||||
<x>-1.0</x>
|
||||
<y>0.0</y>
|
||||
<z>0.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>0.42</y-m>
|
||||
<z-m>8.0</z-m>
|
||||
<y-m>1.17</y-m>
|
||||
<z-m>6.07</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>wf8</object-name>
|
||||
<object-name>wf12</object-name>
|
||||
<object-name>wf16</object-name>
|
||||
<object-name>7.5kt</object-name>
|
||||
<object-name>10kt</object-name>
|
||||
<object-name>12.5kt</object-name>
|
||||
<object-name>15kt</object-name>
|
||||
<property>/environment/wind-speed-kt</property>
|
||||
<factor>1.67</factor>
|
||||
<factor>-6</factor>
|
||||
<offset-deg>45.0</offset-deg>
|
||||
<min-deg>0</min-deg>
|
||||
<max-deg>25</max-deg>
|
||||
<max-deg>28</max-deg>
|
||||
<axis>
|
||||
<x>1.0</x>
|
||||
<x>-1.0</x>
|
||||
<y>0.0</y>
|
||||
<z>0.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>1.92</y-m>
|
||||
<z-m>8.61</z-m>
|
||||
<y-m>1.70</y-m>
|
||||
<z-m>6.02</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>wf12</object-name>
|
||||
<object-name>wf16</object-name>
|
||||
<object-name>10kt</object-name>
|
||||
<object-name>12.5kt</object-name>
|
||||
<object-name>15kt</object-name>
|
||||
<property>/environment/wind-speed-kt</property>
|
||||
<factor>1.67</factor>
|
||||
<factor>-6</factor>
|
||||
<offset-deg>60.0</offset-deg>
|
||||
<min-deg>0</min-deg>
|
||||
<max-deg>25</max-deg>
|
||||
<axis>
|
||||
<x>1.0</x>
|
||||
<x>-1.0</x>
|
||||
<y>0.0</y>
|
||||
<z>0.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>2.5</y-m>
|
||||
<z-m>7.68</z-m>
|
||||
<y-m>2.22</y-m>
|
||||
<z-m>5.97</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>wf16</object-name>
|
||||
<object-name>12.5kt</object-name>
|
||||
<object-name>15kt</object-name>
|
||||
<property>/environment/wind-speed-kt</property>
|
||||
<factor>-6</factor>
|
||||
<offset-deg>75.0</offset-deg>
|
||||
<min-deg>0</min-deg>
|
||||
<max-deg>15</max-deg>
|
||||
<max-deg>10</max-deg>
|
||||
<axis>
|
||||
<x>1.0</x>
|
||||
<x>-1.0</x>
|
||||
<y>0.0</y>
|
||||
<z>0.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>2.64</y-m>
|
||||
<z-m>6.59</z-m>
|
||||
<y-m>2.75</y-m>
|
||||
<z-m>5.92</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
<animation>
|
||||
<type>rotate</type>
|
||||
<object-name>15kt</object-name>
|
||||
<property>/environment/wind-speed-kt</property>
|
||||
<factor>-6</factor>
|
||||
<offset-deg>90.0</offset-deg>
|
||||
<min-deg>0</min-deg>
|
||||
<max-deg>5</max-deg>
|
||||
<axis>
|
||||
<x>-1.0</x>
|
||||
<y>0.0</y>
|
||||
<z>0.0</z>
|
||||
</axis>
|
||||
<center>
|
||||
<x-m>0.0</x-m>
|
||||
<y-m>3.28</y-m>
|
||||
<z-m>5.87</z-m>
|
||||
</center>
|
||||
</animation>
|
||||
|
||||
|
|
|
|||
20
Models/Airport/windsock_lit.xml
Normal file
20
Models/Airport/windsock_lit.xml
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<PropertyList>
|
||||
|
||||
<model>
|
||||
<path>windsock-default-lit.xml</path>
|
||||
<condition>
|
||||
<not>
|
||||
<property>/sim/rendering/shaders/skydome</property>
|
||||
</not>
|
||||
</condition>
|
||||
</model>
|
||||
<model>
|
||||
<path>windsock-ALS.xml</path>
|
||||
<condition>
|
||||
<property>/sim/rendering/shaders/skydome</property>
|
||||
</condition>
|
||||
</model>
|
||||
|
||||
</PropertyList>
|
||||
Loading…
Add table
Reference in a new issue