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

Changed a couple of misnamed materials, which were breaking some decals

Browse Source 
This was SVN commit r12599.
This commit is contained in:
myconid 2012-09-02 09:00:27 +00:00
parent 766823f293
commit 8a61f207f2
9 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binaries/data/mods/public/art/actors/geology/decal_stone_medit_a.xml
View File

@ -22,6 +22,6 @@
</variant>
</group>
<material>terrain_norm_test.xml</material>
<material>terrain_norm_spec.xml</material>
</actor>

2
binaries/data/mods/public/art/actors/geology/decal_stone_medit_b.xml
View File

@ -25,6 +25,6 @@
</variant>
</group>
<material>terrain_norm_test.xml</material>
<material>terrain_norm_spec.xml</material>
</actor>

1
binaries/data/mods/public/art/materials/terrain_norm.xml
View File

@ -2,7 +2,6 @@
<material>
<shader effect="terrain_base"/>
<define name="USE_NORMAL_MAP" value="1"/>
<define name="USE_SPECULAR_MAP" value="1"/>
<uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
</material>

8
binaries/data/mods/public/art/materials/terrain_norm_spec.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<material>
<shader effect="terrain_base"/>
<define name="USE_NORMAL_MAP" value="1"/>
<define name="USE_SPECULAR_MAP" value="1"/>
<uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
</material>

11
binaries/data/mods/public/art/materials/terrain_norm_test.xml
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<material>
<shader effect="terrain_base"/>
<conditional_define name="USE_PARALLAX_MAP" value="1" type="draw_range" conf="PARALLAX_DIST"/>
<conditional_define name="USE_HQ_PARALLAX" value="1" type="draw_range" conf="PARALLAX_HQ_DIST"/>
<conditional_define name="USE_VHQ_PARALLAX" value="1" type="draw_range" conf="PARALLAX_VHQ_DIST"/>
<define name="USE_NORMAL_MAP" value="1"/>
<define name="USE_SPECULAR_MAP" value="1"/>
<uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
</material>

2
binaries/data/mods/public/art/terrains/biome-desert/desert_city_tile_pers.xml
View File

@ -5,5 +5,5 @@
<texture name="normTex" file="types/desert_city_tile_pers_norm.png"/>
<texture name="specTex" file="types/desert_city_tile_pers_spec.png"/>
</textures>
<material>terrain_norm.xml</material>
<material>terrain_norm_spec.xml</material>
</terrain>

2
binaries/data/mods/public/art/terrains/biome-mediterranean/medit_city_pavement.xml
View File

@ -5,5 +5,5 @@
<texture name="normTex" file="types/medit_city_pavement_norm.png"/>
<texture name="specTex" file="types/medit_city_pavement_spec.png"/>
</textures>
<material>terrain_norm.xml</material>
<material>terrain_norm_spec.xml</material>
</terrain>

2
binaries/data/mods/public/art/terrains/grass/grass1_spring.xml
View File

@ -5,5 +5,5 @@
<texture name="normTex" file="types/grass1_spring_norm.png"/>
<texture name="specTex" file="types/grass1_spring_spec.png"/>
</textures>
<material>terrain_norm.xml</material>
<material>terrain_norm_spec.xml</material>
</terrain>

2
binaries/data/mods/public/art/terrains/snow/snow grass 2.xml
View File

@ -5,5 +5,5 @@
<texture name="normTex" file="types/snow grass 2_norm.png"/>
<texture name="specTex" file="types/snow grass 2_spec.png"/>
</textures>
<material>terrain_norm.xml</material>
<material>terrain_norm_spec.xml</material>
</terrain>