mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-27 16:49:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect normal maps for stone_furrowed_0* meshes.

Browse Source 
Remove duplication in some actors.
Fix naming conventions for those files.
Use the correct material.

Noticed by: @marder
This was SVN commit r26511.
This commit is contained in:
Stan
2022-03-01 14:17:24 +00:00
parent 552f66e527
commit 8f8752fbe4
21 changed files with 91 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/art/actors/geology/stone_desert_badlands_cubic_weathered.xml
+9 -20
View File
@@ -6,33 +6,22 @@
<textures>
<texture file="gaia/stonequarry_desert_badlands.png" name="baseTex"/>
<texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<group>
<variant name="1">
<mesh>gaia/stone_cubic_weathered_1.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="01" frequency="1">
<mesh>gaia/stone_cubic_weathered_01.dae</mesh>
</variant>
<variant name="2">
<mesh>gaia/stone_cubic_weathered_2.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="02" frequency="1">
<mesh>gaia/stone_cubic_weathered_02.dae</mesh>
</variant>
<variant name="3">
<mesh>gaia/stone_cubic_weathered_3.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="03" frequency="1">
<mesh>gaia/stone_cubic_weathered_03.dae</mesh>
</variant>
<variant name="4">
<mesh>gaia/stone_cubic_weathered_4.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="04" frequency="1">
<mesh>gaia/stone_cubic_weathered_04.dae</mesh>
</variant>
</group>
<material>no_trans_norm_spec.xml</material>
binaries/data/mods/public/art/actors/geology/stone_desert_badlands_furrowed.xml
+10 -21
View File
@@ -2,37 +2,26 @@
<actor version="1">
<castshadow/>
<group>
<variant name="a">
<variant name="Desert Badland Furrowed Stone" frequency="1">
<textures>
<texture file="gaia/stonequarry_desert_badlands.png" name="baseTex"/>
<texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
<texture file="gaia/stonequarry_desert_badlands_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<group>
<variant name="1">
<mesh>gaia/stone_furrowed_1.dae</mesh>
<textures>
<texture file="gaia/stone_furrowed_norm.png" name="normTex"/>
</textures>
<variant name="01" frequency="1">
<mesh>gaia/stone_furrowed_01.dae</mesh>
</variant>
<variant name="2">
<mesh>gaia/stone_furrowed_2.dae</mesh>
<textures>
<texture file="gaia/stone_furrowed_norm.png" name="normTex"/>
</textures>
<variant name="02" frequency="1">
<mesh>gaia/stone_furrowed_02.dae</mesh>
</variant>
<variant name="3">
<mesh>gaia/stone_furrowed_3.dae</mesh>
<textures>
<texture file="gaia/stone_furrowed_norm.png" name="normTex"/>
</textures>
<variant name="03" frequency="1">
<mesh>gaia/stone_furrowed_03.dae</mesh>
</variant>
<variant name="4">
<mesh>gaia/stone_furrowed_4.dae</mesh>
<textures>
<texture file="gaia/stone_furrowed_norm.png" name="normTex"/>
</textures>
<variant name="04" frequency="1">
<mesh>gaia/stone_furrowed_04.dae</mesh>
</variant>
</group>
<material>no_trans_norm_spec.xml</material>
binaries/data/mods/public/art/actors/geology/stone_desert_cubic_weathered.xml
+10 -21
View File
@@ -6,34 +6,23 @@
<textures>
<texture file="gaia/stonequarry_desert.png" name="baseTex"/>
<texture file="gaia/stonequarry_desert_spec.png" name="specTex"/>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<group>
<variant name="1">
<mesh>gaia/stone_cubic_weathered_1.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="01" frequency="1">
<mesh>gaia/stone_cubic_weathered_01.dae</mesh>
</variant>
<variant name="2">
<mesh>gaia/stone_cubic_weathered_2.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="02" frequency="1">
<mesh>gaia/stone_cubic_weathered_02.dae</mesh>
</variant>
<variant name="3">
<mesh>gaia/stone_cubic_weathered_3.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="03" frequency="1">
<mesh>gaia/stone_cubic_weathered_03.dae</mesh>
</variant>
<variant name="4">
<mesh>gaia/stone_cubic_weathered_4.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="04" frequency="1">
<mesh>gaia/stone_cubic_weathered_04.dae</mesh>
</variant>
</group>
<material>player_trans_parallax_spec_helmet.xml</material>
<material>no_trans_norm_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/geology/stone_desert_furrowed.xml
+10 -21
View File
@@ -2,37 +2,26 @@
<actor version="1">
<castshadow/>
<group>
<variant name="a">
<variant name="Desert Furrowed Stone" frequency="1">
<textures>
<texture file="gaia/stonequarry_desert.png" name="baseTex"/>
<texture file="gaia/stonequarry_desert_spec.png" name="specTex"/>
<texture file="gaia/stonequarry_desert_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<group>
<variant name="1">
<mesh>gaia/stone_furrowed_1.dae</mesh>
<textures>
<texture file="gaia/stone_furrowed_norm.png" name="normTex"/>
</textures>
<variant name="01" frequency="1">
<mesh>gaia/stone_furrowed_01.dae</mesh>
</variant>
<variant name="2">
<mesh>gaia/stone_furrowed_2.dae</mesh>
<textures>
<texture file="gaia/stone_furrowed_norm.png" name="normTex"/>
</textures>
<variant name="02" frequency="1">
<mesh>gaia/stone_furrowed_02.dae</mesh>
</variant>
<variant name="3">
<mesh>gaia/stone_furrowed_3.dae</mesh>
<textures>
<texture file="gaia/stone_furrowed_norm.png" name="normTex"/>
</textures>
<variant name="03" frequency="1">
<mesh>gaia/stone_furrowed_03.dae</mesh>
</variant>
<variant name="4">
<mesh>gaia/stone_furrowed_4.dae</mesh>
<textures>
<texture file="gaia/stone_furrowed_norm.png" name="normTex"/>
</textures>
<variant name="04" frequency="1">
<mesh>gaia/stone_furrowed_04.dae</mesh>
</variant>
</group>
<material>no_trans_norm_spec.xml</material>
binaries/data/mods/public/art/actors/geology/stone_savanna_cubic_weathered.xml
+9 -20
View File
@@ -6,33 +6,22 @@
<textures>
<texture file="gaia/stonequarry_savanna.png" name="baseTex"/>
<texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<group>
<variant name="1">
<mesh>gaia/stone_cubic_weathered_1.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="01" frequency="1">
<mesh>gaia/stone_cubic_weathered_01.dae</mesh>
</variant>
<variant name="2">
<mesh>gaia/stone_cubic_weathered_2.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="02" frequency="1">
<mesh>gaia/stone_cubic_weathered_02.dae</mesh>
</variant>
<variant name="3">
<mesh>gaia/stone_cubic_weathered_3.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="03" frequency="1">
<mesh>gaia/stone_cubic_weathered_03.dae</mesh>
</variant>
<variant name="4">
<mesh>gaia/stone_cubic_weathered_4.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="04" frequency="1">
<mesh>gaia/stone_cubic_weathered_04.dae</mesh>
</variant>
</group>
<material>no_trans_norm_spec.xml</material>
binaries/data/mods/public/art/actors/geology/stone_savanna_furrowed.xml
+11 -22
View File
@@ -2,38 +2,27 @@
<actor version="1">
<castshadow/>
<group>
<variant name="a">
<variant name="Savanna Badland Furrowed Stone" frequency="1">
<textures>
<texture file="gaia/stonequarry_savanna.png" name="baseTex"/>
<texture file="gaia/stonequarry_desert_badlands_spec.png" name="specTex"/>
<texture file="gaia/stonequarry_desert_badlands_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<group>
<variant name="1">
<mesh>gaia/stone_furrowed_1.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="01" frequency="1">
<mesh>gaia/stone_furrowed_01.dae</mesh>
</variant>
<variant name="2">
<mesh>gaia/stone_furrowed_2.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="02" frequency="1">
<mesh>gaia/stone_furrowed_02.dae</mesh>
</variant>
<variant name="3">
<mesh>gaia/stone_furrowed_3.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="03" frequency="1">
<mesh>gaia/stone_furrowed_03.dae</mesh>
</variant>
<variant name="4">
<mesh>gaia/stone_furrowed_4.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="04" frequency="1">
<mesh>gaia/stone_furrowed_04.dae</mesh>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
<material>no_trans_norm_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/geology/stone_temperate_cubic_weathered.xml
+9 -20
View File
@@ -6,33 +6,22 @@
<textures>
<texture file="gaia/stonequarry_temperate.png" name="baseTex"/>
<texture file="gaia/stonequarry_temperate_spec.png" name="specTex"/>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<group>
<variant name="1">
<mesh>gaia/stone_cubic_weathered_1.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="01" frequency="1">
<mesh>gaia/stone_cubic_weathered_01.dae</mesh>
</variant>
<variant name="2">
<mesh>gaia/stone_cubic_weathered_2.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="02" frequency="1">
<mesh>gaia/stone_cubic_weathered_02.dae</mesh>
</variant>
<variant name="3">
<mesh>gaia/stone_cubic_weathered_3.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="03" frequency="1">
<mesh>gaia/stone_cubic_weathered_03.dae</mesh>
</variant>
<variant name="4">
<mesh>gaia/stone_cubic_weathered_4.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="04" frequency="1">
<mesh>gaia/stone_cubic_weathered_04.dae</mesh>
</variant>
</group>
<material>no_trans_norm_spec.xml</material>
binaries/data/mods/public/art/actors/geology/stone_tropic_cubic_weathered.xml
+9 -20
View File
@@ -6,33 +6,22 @@
<textures>
<texture file="gaia/stonequarry_tropic.png" name="baseTex"/>
<texture file="gaia/stonequarry_tropic_spec.png" name="specTex"/>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<group>
<variant name="1">
<mesh>gaia/stone_cubic_weathered_1.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="01" frequency="1">
<mesh>gaia/stone_cubic_weathered_01.dae</mesh>
</variant>
<variant name="2">
<mesh>gaia/stone_cubic_weathered_2.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="02" frequency="1">
<mesh>gaia/stone_cubic_weathered_02.dae</mesh>
</variant>
<variant name="3">
<mesh>gaia/stone_cubic_weathered_3.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="03" frequency="1">
<mesh>gaia/stone_cubic_weathered_03.dae</mesh>
</variant>
<variant name="4">
<mesh>gaia/stone_cubic_weathered_4.dae</mesh>
<textures>
<texture file="gaia/stone_weathered_cubic_norm.png" name="normTex"/>
</textures>
<variant name="04" frequency="1">
<mesh>gaia/stone_cubic_weathered_04.dae</mesh>
</variant>
</group>
<material>no_trans_norm_spec.xml</material>
binaries/data/mods/public/art/meshes/gaia/stone_cubic_weathered_1.dae → binaries/data/mods/public/art/meshes/gaia/stone_cubic_weathered_01.dae
View File
binaries/data/mods/public/art/meshes/gaia/stone_cubic_weathered_2.dae → binaries/data/mods/public/art/meshes/gaia/stone_cubic_weathered_02.dae
View File
binaries/data/mods/public/art/meshes/gaia/stone_cubic_weathered_3.dae → binaries/data/mods/public/art/meshes/gaia/stone_cubic_weathered_03.dae
View File
binaries/data/mods/public/art/meshes/gaia/stone_cubic_weathered_4.dae → binaries/data/mods/public/art/meshes/gaia/stone_cubic_weathered_04.dae
View File
binaries/data/mods/public/art/meshes/gaia/stone_furrowed_01.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/stone_furrowed_02.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/stone_furrowed_03.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/stone_furrowed_04.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/stone_furrowed_1.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/stone_furrowed_2.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/stone_furrowed_3.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/stone_furrowed_4.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/textures/skins/gaia/stone_weathered_cubic_norm.png
LFS
BIN
View File
Binary file not shown.