1
0
forked from mirrors/0ad

Remove transparency in fauna actors that do not need it. Add a no_trans_spec.xml material. + Native eol and some ident fix.

Noticed by: @vladislavbelov
This was SVN commit r23253.
This commit is contained in:
Stan
2019-12-17 12:02:23 +00:00
parent 8959ba2110
commit 400c90c67d
21 changed files with 74 additions and 63 deletions
@@ -32,5 +32,5 @@
</props>
</variant>
</group>
<material>basic_trans.xml</material>
<material>default.xml</material>
</actor>
@@ -63,5 +63,5 @@
</props>
</variant>
</group>
<material>basic_trans.xml</material>
<material>default.xml</material>
</actor>
@@ -29,5 +29,5 @@
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>default.xml</material>
</actor>
@@ -23,5 +23,5 @@
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>default.xml</material>
</actor>
@@ -23,5 +23,5 @@
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>default.xml</material>
</actor>
@@ -22,5 +22,5 @@
</props>
</variant>
</group>
<material>basic_trans.xml</material>
<material>default.xml</material>
</actor>
@@ -18,5 +18,5 @@
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>default.xml</material>
</actor>
@@ -14,5 +14,5 @@
<variant file="quadraped/base_elephant_death.xml"/>
<variant file="quadraped/base_elephant_run.xml"/>
</group>
<material>basic_trans.xml</material>
<material>default.xml</material>
</actor>
@@ -15,5 +15,5 @@
<variant file="quadraped/base_elephant_death.xml"/>
<variant file="quadraped/base_elephant_run.xml"/>
</group>
<material>basic_trans_spec.xml</material>
<material>no_trans_spec.xml</material>
</actor>
@@ -15,5 +15,5 @@
<variant file="quadraped/base_elephant_death.xml"/>
<variant file="quadraped/base_elephant_run.xml"/>
</group>
<material>basic_trans_spec.xml</material>
<material>no_trans_spec.xml</material>
</actor>
@@ -16,5 +16,5 @@
<variant file="quadraped/base_elephant_death.xml"/>
<variant file="quadraped/base_elephant_run.xml"/>
</group>
<material>basic_trans_parallax_spec.xml</material>
<material>no_trans_parallax_spec.xml</material>
</actor>
@@ -49,5 +49,5 @@
</props>
</variant>
</group>
<material>basic_trans.xml</material>
<material>default.xml</material>
</actor>
@@ -4,24 +4,24 @@
<float/>
<group>
<variant>
<animations>
<animation file="other/hawk_flight.dae" name="Walk" speed="10"/>
<animation file="other/hawk_glide.dae" name="Walk" speed="3"/>
<animation file="other/hawk_flight.dae" name="Idle" speed="40"/>
<animation file="other/hawk_glide.dae" name="Idle" speed="3"/>
</animations>
<animations>
<animation file="other/hawk_flight.dae" name="Walk" speed="10"/>
<animation file="other/hawk_glide.dae" name="Walk" speed="3"/>
<animation file="other/hawk_flight.dae" name="Idle" speed="40"/>
<animation file="other/hawk_glide.dae" name="Idle" speed="3"/>
</animations>
<mesh>skeletal/hawk.dae</mesh>
</variant>
</group>
<group>
<variant name="hawk a">
<textures>
<texture file="skeletal/animal_hawk.png" name="baseTex"/>
<texture file="skeletal/animal_hawk.png" name="baseTex"/>
</textures>
</variant>
<variant name="hawk b">
<textures>
<texture file="skeletal/animal_hawk2.png" name="baseTex"/>
<texture file="skeletal/animal_hawk2.png" name="baseTex"/>
</textures>
</variant>
</group>
@@ -51,5 +51,5 @@
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>default.xml</material>
</actor>
@@ -45,5 +45,5 @@
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>default.xml</material>
</actor>
@@ -51,5 +51,5 @@
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>default.xml</material>
</actor>
@@ -56,5 +56,5 @@
</props>
</variant>
</group>
<material>basic_trans.xml</material>
<material>default.xml</material>
</actor>
@@ -3,35 +3,32 @@
<castshadow/>
<group>
<variant frequency="100" name="Mesh">
<animations>
<animations>
<animation file="quadraped/feline_idle_01.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_01.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_01.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_02.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_02.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_02.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_03.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_03.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_03.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_04.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_attack.dae" name="attack_melee" speed="100"/>
<animation file="quadraped/feline_attack_02.dae" name="attack_melee" speed="100"/>
<animation file="quadraped/feline_walk.dae" name="walk" speed="40"/>
<animation file="quadraped/feline_run.dae" name="run" speed="20"/>
<animation file="quadraped/feline_death.dae" name="Death" speed="100"/>
<animation file="quadraped/feline_idle_01.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_01.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_02.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_02.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_02.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_03.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_03.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_03.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_idle_04.dae" name="Idle" speed="100"/>
<animation file="quadraped/feline_attack.dae" name="attack_melee" speed="100"/>
<animation file="quadraped/feline_attack_02.dae" name="attack_melee" speed="100"/>
<animation file="quadraped/feline_walk.dae" name="walk" speed="40"/>
<animation file="quadraped/feline_run.dae" name="run" speed="20"/>
<animation file="quadraped/feline_death.dae" name="Death" speed="100"/>
</animations>
<mesh>skeletal/tiger.dae</mesh>
<textures>
<texture file="skeletal/animal_tiger.png" name="baseTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="100" name="texture">
<textures><texture file="skeletal/animal_tiger.png" name="baseTex"/></textures>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="Run">
<variant name="Run">
<props>
<prop actor="particle/dust_cav.xml" attachpoint="root"/>
</props>
@@ -4,25 +4,29 @@
<group>
<variant frequency="100" name="Mesh">
<mesh>skeletal/wolf.dae</mesh>
<animations>
<animation file="quadraped/wolf_walk.dae" name="Walk" speed="75"/>
<animation file="quadraped/wolf_run.dae" name="Run" speed="10"/>
<animation file="quadraped/wolf_attack_01.dae" name="attack_melee" speed="165"/>
<animation file="quadraped/wolf_attack_02.dae" name="attack_melee" speed="165"/>
<animation file="quadraped/wolf_idle_01.dae" name="Idle" speed="100"/>
<animation file="quadraped/wolf_idle_02.dae" name="Idle" speed="100"/>
<animation file="quadraped/wolf_idle_03.dae" name="Idle" speed="100"/>
<animation file="quadraped/wolf_death_01.dae" name="death" speed="100"/>
<animation file="quadraped/wolf_death_02.dae" name="death" speed="100"/>
</animations>
<animations>
<animation file="quadraped/wolf_walk.dae" name="Walk" speed="75"/>
<animation file="quadraped/wolf_run.dae" name="Run" speed="10"/>
<animation file="quadraped/wolf_attack_01.dae" name="attack_melee" speed="165"/>
<animation file="quadraped/wolf_attack_02.dae" name="attack_melee" speed="165"/>
<animation file="quadraped/wolf_idle_01.dae" name="Idle" speed="100"/>
<animation file="quadraped/wolf_idle_02.dae" name="Idle" speed="100"/>
<animation file="quadraped/wolf_idle_03.dae" name="Idle" speed="100"/>
<animation file="quadraped/wolf_death_01.dae" name="death" speed="100"/>
<animation file="quadraped/wolf_death_02.dae" name="death" speed="100"/>
</animations>
</variant>
</group>
<group>
<variant frequency="1" name="fur-brown">
<textures><texture file="skeletal/animal_wolf.png" name="baseTex"/></textures>
<textures>
<texture file="skeletal/animal_wolf.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="4" name="fur-grey">
<textures><texture file="skeletal/animal_wolf_grey.png" name="baseTex"/></textures>
<variant frequency="4" name="fur-grey">
<textures>
<texture file="skeletal/animal_wolf_grey.png" name="baseTex"/>
</textures>
</variant>
</group>
<group>
@@ -33,5 +37,5 @@
</props>
</variant>
</group>
<material>basic_trans.xml</material>
<material>default.xml</material>
</actor>
@@ -11,7 +11,9 @@
<animation file="quadraped/zebra_death.dae" name="death" speed="100"/>
</animations>
<mesh>skeletal/zebra.dae</mesh>
<textures><texture file="skeletal/animal_zebra.dds" name="baseTex"/></textures>
<textures>
<texture file="skeletal/animal_zebra.dds" name="baseTex"/>
</textures>
</variant>
</group>
<group>
@@ -27,5 +29,5 @@
</props>
</variant>
</group>
<material>basic_trans.xml</material>
<material>default.xml</material>
</actor>
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<material>
<alternative material="default.xml" quality="2"/>
<required_texture name="baseTex"/>
<required_texture name="specTex" define="USE_SPECULAR_MAP"/>
<shader effect="model"/>
<uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
</material>