Merge pull request #1 from swampmo/master

Fire and smoke
This commit is contained in:
Justin Nicholson 2017-05-28 23:34:24 -07:00 committed by GitHub
commit b5de01fce9
4 changed files with 268 additions and 34 deletions

View File

@ -7,9 +7,159 @@
<model>
<path>Aircraft/BUK-M2/Models/smoke.xml</path>
<offsets>
<x-m>1.2</x-m>
<y-m>0.00</y-m>
<z-m>-0.68</z-m>
<x-m> 3.26307</x-m>
<y-m>-0.84611</y-m>
<z-m> 2.85616</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/BUK-M2/Models/fire.xml</path>
<offsets>
<x-m> 3.26307</x-m>
<y-m>-0.84611</y-m>
<z-m> 2.85616</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/BUK-M2/Models/smoke.xml</path>
<offsets>
<x-m> 3.26307</x-m>
<y-m> 0.84611</y-m>
<z-m> 2.85616</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/BUK-M2/Models/fire.xml</path>
<offsets>
<x-m> 3.26307</x-m>
<y-m> 0.84611</y-m>
<z-m> 2.85616</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/BUK-M2/Models/smoke.xml</path>
<offsets>
<x-m> -0.80986</x-m>
<y-m> 0.00064</y-m>
<z-m> 3.24007</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/BUK-M2/Models/fire.xml</path>
<offsets>
<x-m> -0.80986</x-m>
<y-m> 0.00064</y-m>
<z-m> 3.24007</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/BUK-M2/Models/smoke.xml</path>
<offsets>
<x-m> -3.97300</x-m>
<y-m> 0.00023</y-m>
<z-m> 1.83017</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/BUK-M2/Models/fire.xml</path>
<offsets>
<x-m> -3.97300</x-m>
<y-m> 0.00023</y-m>
<z-m> 1.83017</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/BUK-M2/Models/smoke.xml</path>
<offsets>
<x-m> -4.26653</x-m>
<y-m> -1.82402</y-m>
<z-m> 1.44961</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/BUK-M2/Models/fire.xml</path>
<offsets>
<x-m> -4.26653</x-m>
<y-m> -1.82402</y-m>
<z-m> 1.44961</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/BUK-M2/Models/smoke.xml</path>
<offsets>
<x-m> -4.26653</x-m>
<y-m> 1.82402</y-m>
<z-m> 1.44961</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/BUK-M2/Models/fire.xml</path>
<offsets>
<x-m> -4.26653</x-m>
<y-m> 1.82402</y-m>
<z-m> 1.44961</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/BUK-M2/Models/smoke.xml</path>
<offsets>
<x-m> -0.63979</x-m>
<y-m> -2.14385</y-m>
<z-m> 0.05906</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/BUK-M2/Models/fire.xml</path>
<offsets>
<x-m> -0.63979</x-m>
<y-m> -2.14385</y-m>
<z-m> 0.05906</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/BUK-M2/Models/smoke.xml</path>
<offsets>
<x-m> -0.63979</x-m>
<y-m> 2.14385</y-m>
<z-m> 0.05906</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<path>Aircraft/BUK-M2/Models/fire.xml</path>
<offsets>
<x-m> -0.63979</x-m>
<y-m> 2.14385</y-m>
<z-m> 0.05906</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>

BIN
BUK-M2/Models/fire.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

87
BUK-M2/Models/fire.xml Normal file
View File

@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8" ?>
<PropertyList>
<particlesystem>
<texture>fire.png</texture>
<condition>
<equals>
<property>sim/multiplay/generic/int[0]</property>
<value>1</value>
</equals>
</condition>
<emissive>true</emissive>
<lighting>false</lighting>
<offsets>
<roll-deg>0</roll-deg>
</offsets>
<attach>world</attach>
<placer>
<type>point</type>
</placer>
<shooter>
<theta-min-deg>80</theta-min-deg>
<theta-max-deg>30</theta-max-deg>
<phi-min-deg>-180</phi-min-deg>
<phi-max-deg> 180</phi-max-deg>
<speed>
<value>20</value>
<spread>40</spread>
</speed>
</shooter>
<counter>
<particles-per-sec>
<value>40</value>
<spread>60</spread>
</particles-per-sec>
</counter>
<align>billboard</align>
<particle>
<start>
<color>
<red>
<value>0.6</value>
</red>
<green>
<value>0.6</value>
</green>
<blue>
<value>0.6</value>
</blue>
<alpha>
<value>0.4</value>
</alpha>
</color>
<size>
<value>1.2</value>
</size>
</start>
<end>
<color>
<red>
<value>0</value>
</red>
<green>
<value>0</value>
</green>
<blue>
<value>0</value>
</blue>
<alpha>
<value>0</value>
</alpha>
</color>
<size>
<value>4.0</value>
</size>
</end>
<life-sec>
<value>3</value>
</life-sec>
<mass-kg>1.3</mass-kg>
<radius-m>0.03</radius-m>
</particle>
</particlesystem>
</PropertyList>

View File

@ -1,33 +1,31 @@
<?xml version="1.0" encoding="UTF-8" ?>
<PropertyList>
<particlesystem>
<name>smoke</name>
<texture>smoke.png</texture>
<condition>
<equals>
<property>sim/multiplay/generic/int[0]</property>
<value>1</value>
</equals>
</condition>
<particlesystem>
<texture>smoke.png</texture>
<condition>
<equals>
<property>sim/multiplay/generic/int[0]</property>
<value>1</value>
</equals>
</condition>
<emissive>false</emissive>
<lighting>false</lighting>
<align>billboard</align> <!-- billboard / fixed -->
<attach>world</attach> <!-- world / local-->
<placer>
<type>point</type>
<type>point</type>damage.fail_systems(10000);
</placer>
<shooter>
<theta-min-deg>20</theta-min-deg>
<theta-min-deg>65</theta-min-deg>
<theta-max-deg>35</theta-max-deg>
<phi-min-deg>-15</phi-min-deg>
<phi-max-deg> 15</phi-max-deg>
<phi-min-deg>-20</phi-min-deg>
<phi-max-deg> 20</phi-max-deg>
<speed-mps>
<value>0</value>
<spread>0</spread>
<value>500</value>
<spread>10</spread>
</speed-mps>
<rotation-speed>
<x-min-deg-sec>0</x-min-deg-sec>
@ -35,13 +33,13 @@
<z-min-deg-sec>-180</z-min-deg-sec>
<x-max-deg-sec>0</x-max-deg-sec>
<y-max-deg-sec>0</y-max-deg-sec>
<z-max-deg-sec>180</z-max-deg-sec>
<z-max-deg-sec>360</z-max-deg-sec>
</rotation-speed>
</shooter>
<counter>
<particles-per-sec>
<value>1</value>
<spread>20</spread>
<value>50</value>
<spread>1</spread>
</particles-per-sec>
</counter>
<particle>
@ -50,10 +48,10 @@
<red><value>0.0</value></red>
<green><value>0.0</value></green>
<blue><value>0.0</value></blue>
<alpha><value>1</value></alpha>
<alpha><value>0.08</value></alpha>
</color>
<size>
<value>3.0</value>
<value>5</value>
</size>
</start>
<end>
@ -64,21 +62,20 @@
<alpha><value>0.0</value></alpha>
</color>
<size>
<value>20.0</value>
<value>15.0</value>
</size>
</end>
<life-sec>
<value>30</value>
<value>4</value>
</life-sec>
<mass-kg>0.025</mass-kg>
<radius-m>0.40</radius-m>
<mass-kg>0.0085</mass-kg>
<radius-m>0.50</radius-m>
</particle>
<program>
<fluid>air</fluid>
<gravity>true</gravity>
<wind>true</wind>
<gravity type="bool">true</gravity>
<wind type="bool">true</wind>
</program>
</particlesystem>
</PropertyList>
</PropertyList>