Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Nicer looking particles for Roman Temple. Fixes #1498.

Browse Source 
More shield and helmet stuff.

This was SVN commit r13462.
This commit is contained in:
Michael D. Hafer 2013-06-09 17:28:46 +00:00
parent 80b0106502
commit 356adb1216
24 changed files with 197 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
binaries/data/mods/public/art/actors/particle/flame_firepit_1.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant name="Base">
<particles file="flame_firepit_1.xml"/>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

9
binaries/data/mods/public/art/actors/particle/flame_firepit_2.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant name="Base">
<particles file="flame_firepit_2.xml"/>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

9
binaries/data/mods/public/art/actors/particle/sparks.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant name="Base">
<particles file="sparks.xml"/>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>

7
binaries/data/mods/public/art/actors/props/units/heads/hele_alexander.xml
View File

@ -4,8 +4,11 @@
<group> <group>
<variant name="Base"> <variant name="Base">
<mesh>props/helmet/mace_helmet_alexander.dae</mesh> <mesh>props/helmet/mace_helmet_alexander.dae</mesh>
<textures><texture file="props/helmet/hele_alexander.dds" name="baseTex"/></textures> <textures>
<texture file="props/helmet/hele_alexander.dds" name="baseTex"/>
<texture file="props/helmet/hele_alexander_spec.png" name="specTex"/>
</textures>
</variant> </variant>
</group> </group>
<material>playercolor_spec.xml</material> <material>player_trans_spec_helmet.xml</material>
</actor> </actor>

26
binaries/data/mods/public/art/actors/props/units/shields/mace_argyraspides.xml
View File

@ -10,9 +10,31 @@
</variant> </variant>
</group> </group>
<group> <group>
<variant frequency="3" name="Silver Shield A">
<textures>
<texture file="props/shield/mace_silver_a.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="2" name="Silver Shield B">
<textures>
<texture file="props/shield/mace_silver_b.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="1" name="Silver Shield C"> <variant frequency="1" name="Silver Shield C">
<textures><texture file="props/shield/mace_round_c_silver.png" name="baseTex"/></textures> <textures>
<texture file="props/shield/mace_silver_c.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="2" name="Silver Shield D">
<textures>
<texture file="props/shield/mace_silver_d.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="2" name="Silver Shield E">
<textures>
<texture file="props/shield/mace_round_c_silver.png" name="baseTex"/>
</textures>
</variant> </variant>
</group> </group>
<material>basic_spec.xml</material> <material>playercolor_spec.xml</material>
</actor> </actor>

4
binaries/data/mods/public/art/actors/props/units/shields/mace_aspis_demetrius.xml
View File

@ -7,7 +7,9 @@
<props> <props>
<prop actor="props/units/shields/mace_round_back_purple.xml" attachpoint="root"/> <prop actor="props/units/shields/mace_round_back_purple.xml" attachpoint="root"/>
</props> </props>
<textures><texture file="props/shield/mace_round_c1.png" name="baseTex"/></textures> <textures>
<texture file="props/shield/mace_round_h_silver_player.png" name="baseTex"/>
</textures>
</variant> </variant>
</group> </group>
<material>playercolor_spec.xml</material> <material>playercolor_spec.xml</material>

8
binaries/data/mods/public/art/actors/props/units/shields/mace_hypaspist.xml
View File

@ -11,10 +11,14 @@
</group> </group>
<group> <group>
<variant frequency="1" name="shield mace a"> <variant frequency="1" name="shield mace a">
<textures><texture file="props/shield/mace_round_a1.png" name="baseTex"/></textures> <textures>
<texture file="props/shield/mace_round_c_bronze.png" name="baseTex"/>
</textures>
</variant> </variant>
<variant frequency="1" name="shield mace b"> <variant frequency="1" name="shield mace b">
<textures><texture file="props/shield/mace_round_b1.png" name="baseTex"/></textures> <textures>
<texture file="props/shield/mace_round_b1.png" name="baseTex"/>
</textures>
</variant> </variant>
</group> </group>
<material>playercolor_spec.xml</material> <material>playercolor_spec.xml</material>

16
binaries/data/mods/public/art/actors/props/units/shields/mace_pez_elite.xml
View File

@ -10,8 +10,20 @@
</variant> </variant>
</group> </group>
<group> <group>
<variant frequency="1" name="shield d"> <variant frequency="1" name="Shield Bronze B">
<textures><texture file="props/shield/mace_round_d.png" name="baseTex"/></textures> <textures>
<texture file="props/shield/mace_bronze_b_player.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="1" name="Shield Bronze C">
<textures>
<texture file="props/shield/mace_bronze_c_player.png" name="baseTex"/>
</textures>
</variant>
<variant frequency="1" name="Shield Bronze D">
<textures>
<texture file="props/shield/mace_bronze_d_player.png" name="baseTex"/>
</textures>
</variant> </variant>
</group> </group>
<material>playercolor_spec.xml</material> <material>playercolor_spec.xml</material>

19
binaries/data/mods/public/art/actors/structures/romans/temple.xml
View File

@ -5,19 +5,24 @@
<variant> <variant>
<mesh>structural/rome_hc1.dae</mesh> <mesh>structural/rome_hc1.dae</mesh>
<props> <props>
<prop actor="particle/flame_jav.xml" attachpoint="flame01"/> <prop actor="particle/sparks.xml" attachpoint="flame01"/>
<prop actor="particle/flame_firepit_1.xml" attachpoint="flame01"/>
<prop actor="particle/flame_firepit_2.xml" attachpoint="flame01"/>
<prop actor="particle/smoke_small_light.xml" attachpoint="flame01"/> <prop actor="particle/smoke_small_light.xml" attachpoint="flame01"/>
<prop actor="particle/flame_jav.xml" attachpoint="flame02"/> <prop actor="particle/sparks.xml" attachpoint="flame02"/>
<prop actor="particle/flame_firepit_1.xml" attachpoint="flame02"/>
<prop actor="particle/flame_firepit_2.xml" attachpoint="flame02"/>
<prop actor="particle/smoke_small_light.xml" attachpoint="flame02"/> <prop actor="particle/smoke_small_light.xml" attachpoint="flame02"/>
<prop actor="props/structures/romans/rome_temple_ashes.xml" attachpoint="flame01"/> <prop actor="props/structures/romans/rome_temple_ashes.xml" attachpoint="flame01"/>
<prop actor="props/structures/romans/rome_temple_ashes.xml" attachpoint="flame02"/> <prop actor="props/structures/romans/rome_temple_ashes.xml" attachpoint="flame02"/>
</props> </props>
<texture>structural/rome_struct.png</texture>
<textures> <textures>
<texture file="structural/rome_struct.png" name="baseTex"/> <texture file="structural/rome_struct.png" name="baseTex"/>
<texture file="structural/rome_struct_norm.png" name="normTex"/> <texture file="structural/ao/rome_temple.png" name="aoTex"/>
<texture file="structural/rome_struct_spec.png" name="specTex"/> <texture file="structural/rome_struct_norm.png" name="normTex"/>
<texture file="structural/ao/rome_temple.png" name="aoTex"/> <texture file="structural/rome_struct_spec.png" name="specTex"/>
</textures> </textures>
</variant> </variant>
</group> </group>
<group> <group>

4
binaries/data/mods/public/art/actors/units/macedonians/alexander_r.xml
View File

@ -18,7 +18,9 @@
<prop actor="props/units/weapons/falcata.xml" attachpoint="r_hand"/> <prop actor="props/units/weapons/falcata.xml" attachpoint="r_hand"/>
<prop actor="props/units/cape_hd_cav_white.xml" attachpoint="shoulders"/> <prop actor="props/units/cape_hd_cav_white.xml" attachpoint="shoulders"/>
</props> </props>
<textures><texture file="skeletal/hele_alexander.dds" name="baseTex"/></textures> <textures>
<texture file="skeletal/hele_alexander.dds" name="baseTex"/>
</textures>
</variant> </variant>
</group> </group>
<material>player_trans.xml</material> <material>player_trans.xml</material>

23
binaries/data/mods/public/art/particles/flame_firepit_1.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<particles>
<texture>art/textures/particles/flame.png</texture>
<blend mode="add"/>
<constant name="emissionrate" value="20.0"/>
<uniform name="lifetime" min="1.2" max="1.7"/>
<uniform name="angle" min="-0.5" max="0.5"/>
<uniform name="velocity.x" min="-0.1" max="0.1"/>
<uniform name="velocity.y" min="1.5" max="2.0"/>
<uniform name="velocity.z" min="-0.1" max="0.1"/>
<uniform name="velocity.angle" min="-0.5" max="0.5"/>
<uniform name="size" min="0.25" max="0.4"/>
<uniform name="color.r" min="0.2" max="0.8"/>
<copy name="color.g" from="color.r"/>
<copy name="color.b" from="color.r"/>
</particles>

24
binaries/data/mods/public/art/particles/flame_firepit_2.xml Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<particles>
<texture>art/textures/particles/flame.png</texture>
<blend mode="add"/>
<constant name="emissionrate" value="7.0"/>
<uniform name="lifetime" min="0.5" max="0.8"/>
<uniform name="angle" min="-0.5" max="0.5"/>
<constant name="position.y" value="0.2"/>
<uniform name="velocity.x" min="-0.2" max="0.2"/>
<uniform name="velocity.y" min="0.5" max="1.0"/>
<uniform name="velocity.z" min="-0.2" max="0.2"/>
<uniform name="velocity.angle" min="-0.2" max="0.2"/>
<uniform name="size" min="1.0" max="1.3"/>
<uniform name="color.r" min="0.4" max="0.7"/>
<copy name="color.g" from="color.r"/>
<copy name="color.b" from="color.r"/>
</particles>

24
binaries/data/mods/public/art/particles/smoke_small_light.xml
View File

@ -1,25 +1,27 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<particles> <particles>
<texture>art/textures/particles/smoke_128b.png</texture> <texture>art/textures/particles/smoke_128d_light.png</texture>
<blend mode="over"/> <blend mode="over"/>
<constant name="emissionrate" value="9.0"/> <constant name="emissionrate" value="5.0"/>
<uniform name="lifetime" min="7.0" max="8.0"/> <uniform name="lifetime" min="10.0" max="12.0"/>
<constant name="position.y" value="1.0"/> <constant name="position.y" value="1.5"/>
<uniform name="angle" min="-3.14" max="3.14"/> <uniform name="angle" min="0.0" max="3.26"/>
<uniform name="velocity.x" min="-0.3" max="0.3"/> <uniform name="velocity.x" min="0.1" max="0.2"/>
<uniform name="velocity.y" min="2.0" max="2.5"/> <uniform name="velocity.y" min="0.5" max="1.0"/>
<uniform name="velocity.z" min="-0.5" max="0.5"/> <uniform name="velocity.z" min="-0.05" max="0.1"/>
<uniform name="velocity.angle" min="-2.0" max="2.0"/> <uniform name="velocity.angle" min="-0.5" max="0.5"/>
<uniform name="size" min="0.75" max="1.75"/> <uniform name="size" min="1.5" max="2.0"/>
<uniform name="color.r" min="0.4" max="0.8"/> <uniform name="color.r" min="0.5" max="1.0"/>
<copy name="color.g" from="color.r"/> <copy name="color.g" from="color.r"/>
<copy name="color.b" from="color.r"/> <copy name="color.b" from="color.r"/>
<force y="-0.03"/>
</particles> </particles>

24
binaries/data/mods/public/art/particles/sparks.xml Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<particles>
<texture>art/textures/particles/sparks.png</texture>
<blend mode="add"/>
<constant name="emissionrate" value="5.0"/>
<uniform name="lifetime" min="2.0" max="4.0"/>
<uniform name="angle" min="-0.5" max="0.5"/>
<uniform name="velocity.x" min="0.1" max="0.5"/>
<uniform name="velocity.y" min="1.5" max="2.0"/>
<uniform name="velocity.z" min="-0.3" max="0.3"/>
<uniform name="velocity.angle" min="-0.5" max="0.5"/>
<uniform name="size" min="0.1" max="0.2"/>
<constant name="color.r" value="1.0"/>
<constant name="color.g" value="1.0"/>
<constant name="color.b" value="1.0"/>
</particles>

BIN
binaries/data/mods/public/art/textures/particles/smoke_128d_light.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/particles/sparks.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/helmet/hele_alexander_spec.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/shield/aspis_bronze.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/shield/aspis_copper.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/shield/mace_silver_a.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/shield/mace_silver_b.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/shield/mace_silver_c.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/props/shield/ptol_round_e_bronze_face_player.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/ui/session/portraits/emblems/emblem_macedonians2.png (Stored with Git LFS)
View File

Binary file not shown.