From a18dd1a36d6d762c3b82b08b01604b0ca74643ae Mon Sep 17 00:00:00 2001
From: danschub <danschub@wildfiregames.com>
Date: Thu, 16 Aug 2012 23:18:21 +0000
Subject: [PATCH] Fixed Spec for the Temperate Rock Formation. Added parallax
 mapping for terrain's decals. Added missing AO for scandiv rock.

This was SVN commit r12451.
---
 .../data/mods/public/art/materials/terrain_norm_test.xml     | 5 ++++-
 .../art/textures/skins/gaia/ao/stone_scandiv_template_ao.png | 3 +++
 .../art/textures/skins/gaia/decal_stone_desert_01_norm.png   | 4 ++--
 .../art/textures/skins/gaia/decal_stone_desert_02_norm.png   | 4 ++--
 .../art/textures/skins/gaia/decal_stone_medit_03_norm.png    | 4 ++--
 .../art/textures/skins/gaia/decal_stone_medit_04_norm.png    | 4 ++--
 .../art/textures/skins/gaia/stonequarry_temperate_spec.png   | 4 ++--
 7 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 binaries/data/mods/public/art/textures/skins/gaia/ao/stone_scandiv_template_ao.png

diff --git a/binaries/data/mods/public/art/materials/terrain_norm_test.xml b/binaries/data/mods/public/art/materials/terrain_norm_test.xml
index 9b37fddc2e..22ba982cf9 100644
--- a/binaries/data/mods/public/art/materials/terrain_norm_test.xml
+++ b/binaries/data/mods/public/art/materials/terrain_norm_test.xml
@@ -1,8 +1,11 @@
 <?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="2.5 15.0 0.0 0.0"/>
+    <uniform name="effectSettings" value="1.0 15.0 0.0 0.0"/>
 </material>
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/ao/stone_scandiv_template_ao.png b/binaries/data/mods/public/art/textures/skins/gaia/ao/stone_scandiv_template_ao.png
new file mode 100644
index 0000000000..c0c585dc40
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/gaia/ao/stone_scandiv_template_ao.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa82c2b3c98847f61476b4a50a8acaa5a2fffaa20a814da9d172887b61f32af1
+size 190367
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_01_norm.png b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_01_norm.png
index 2232ed5ea3..136da16b61 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_01_norm.png
+++ b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_01_norm.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e32968c2f8458f261e9199cb8585284ac1b40538cc396bbb2855695f40f9e3f
-size 131042
+oid sha256:7b98196f130515e5f69e6e83937c18bf93a11d4fd47598427302cd04ef2f57ae
+size 178450
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_02_norm.png b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_02_norm.png
index 587ebbef06..c4254725a4 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_02_norm.png
+++ b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_desert_02_norm.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19e0324e2c940bd9bf597af12c78fc78e90edc1a5755d1d35dc20785497daaf9
-size 134675
+oid sha256:894e3053aa87f2bbae41aa050761a07b39a8063015abaad5161ceb5e2e70df1c
+size 177918
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_03_norm.png b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_03_norm.png
index f7bf421dd1..42dc837bda 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_03_norm.png
+++ b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_03_norm.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74360c310cb8788a18002bb48eb5bbf367e9c3c91c9347576e19ade433b4e1ca
-size 538474
+oid sha256:841d247fa6d7a55a264e77459520bb2f98b9695a8e3d929eaaff3bd97408bdbf
+size 723048
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_04_norm.png b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_04_norm.png
index a1e4fe4a3c..5629a2434b 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_04_norm.png
+++ b/binaries/data/mods/public/art/textures/skins/gaia/decal_stone_medit_04_norm.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc9702069578c0028cfa9a18fc1b0cc7c9a9a0ac1414bcaddfa17ea1bd494202
-size 578672
+oid sha256:c9787a7257a8d8bbe3b25b9455b55496d5725adbef9f6d2b3ae477142aca1c1e
+size 782098
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/stonequarry_temperate_spec.png b/binaries/data/mods/public/art/textures/skins/gaia/stonequarry_temperate_spec.png
index caa09ed878..ba7ebc7f95 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/stonequarry_temperate_spec.png
+++ b/binaries/data/mods/public/art/textures/skins/gaia/stonequarry_temperate_spec.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1444b651ddde4b741ede9e7421f9bc505fb8afc1c7a672ddfe0c2b664cdadb7
-size 384838
+oid sha256:f4289ee511daf19fdd2133fd89c0defa7e5f4172c7bd19ee9099a4221699c493
+size 220125