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

Add nop rendering technique to water and waterfall to stop crashes in fixed and arb mode when those are used.

Browse Source 
This was SVN commit r12882.
This commit is contained in:
leper 2012-11-25 15:26:09 +00:00
parent cdcd3e504b
commit a6f1620621
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
binaries/data/mods/public/art/actors/structures/persians/gardens_struct.xml
View File

@ -4,7 +4,7 @@
<group>
<variant>
<mesh>structural/pers_gardens_struct.dae</mesh>
<props>
<props>
<prop actor="props/structures/persians/gardens_bush_dese_a.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_bush_desert_c.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_bush_lush_a.xml" attachpoint="root"/>
@ -13,29 +13,27 @@
<prop actor="props/structures/persians/gardens_bush_tempe_la_b2.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_grass_field.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_log_b.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_struct_nature.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_struct_transp.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_tree_apple_bloom.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_tree_baobab_a.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_tree_baobab_b.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_tree_euro_beech_a_aut.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_tree_euro_beech_c.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_tree_lumbardypoplar_a.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_tree_palmdate_b.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_trunk_baobab.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_trunk_deciduous_b.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_turf.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_water.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_water_lillies.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_wrld_bush_b_2.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_struct_nature.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_struct_transp.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_tree_apple_bloom.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_tree_baobab_a.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_tree_baobab_b.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_tree_euro_beech_a_aut.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_tree_euro_beech_c.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_tree_lumbardypoplar_a.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_tree_palmdate_b.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_trunk_baobab.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_trunk_deciduous_b.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_turf.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_water.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_water_lillies.xml" attachpoint="root"/>
<prop actor="props/structures/persians/gardens_wrld_bush_b_2.xml" attachpoint="root"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
<textures>
<texture file="structural/pers_struct.dds" name="baseTex"/>
<texture file="structural/ao/pers_gardens_ao.png" name="aoTex" />
<texture file="structural/ao/pers_gardens_ao.png" name="aoTex"/>
</textures>
</variant>
</group>

17
binaries/data/mods/public/shaders/effects/model_water.xml
View File

@ -1,21 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<effect>
<technique>
<require shaders="glsl"/>
<sort_by_distance/>
<pass shader="glsl/model_water">
<define name="USE_TRANSPARENT" value="1"/>
<define name="USE_SPECULAR" value="1"/>
<define name="USE_NORMAL_MAP" value="1"/>
<define name="USE_INSTANCING" value="1"/>
<define name="USE_SPECULAR" value="1"/>
<define name="USE_NORMAL_MAP" value="1"/>
<define name="USE_INSTANCING" value="1"/>
<define name="REQUIRE_ALPHA_GEQUAL" value="0.05"/>
<blend src="src_alpha" dst="one_minus_src_alpha"/>
<depth func="less" mask="true"/>
</pass>
</technique>
<technique>
<require shaders="arb"/>
</technique>
<technique>
<require shaders="fixed"/>
</technique>
</effect>

15
binaries/data/mods/public/shaders/effects/model_waterfall.xml
View File

@ -1,18 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<effect>
<technique>
<require shaders="glsl"/>
<sort_by_distance/>
<pass shader="glsl/model_waterfall">
<define name="USE_TRANSPARENT" value="1"/>
<define name="USE_INSTANCING" value="1"/>
<define name="USE_INSTANCING" value="1"/>
<blend src="src_alpha" dst="one_minus_src_alpha"/>
<depth func="lequal" mask="true"/>
<depth func="lequal" mask="true"/>
</pass>
</technique>
<technique>
<require shaders="arb"/>
</technique>
<technique>
<require shaders="fixed"/>
</technique>
</effect>