From 28333ba92ef3f8fc6034f66141341ee3f898180e Mon Sep 17 00:00:00 2001
From: danschub <danschub@wildfiregames.com>
Date: Wed, 8 Aug 2012 00:26:08 +0000
Subject: [PATCH] Committed fixed Normal Maps and materials for the Rock
 ScandivFormation. Now the bump is much more noticeable, yet realistic.

This was SVN commit r12314.
---
 .../geology/stone_scandiv_formation.xml       |  2 +-
 .../art/materials/rock_bump_spec_test.xml     | 49 +++++++++++++++++++
 .../gaia/stone_scandiv_template_norm.png      |  4 +-
 3 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 binaries/data/mods/public/art/materials/rock_bump_spec_test.xml

diff --git a/binaries/data/mods/public/art/actors/geology/stone_scandiv_formation.xml b/binaries/data/mods/public/art/actors/geology/stone_scandiv_formation.xml
index 985060c942..57d6320e19 100644
--- a/binaries/data/mods/public/art/actors/geology/stone_scandiv_formation.xml
+++ b/binaries/data/mods/public/art/actors/geology/stone_scandiv_formation.xml
@@ -19,5 +19,5 @@
 	  </textures>
     </variant>
   </group>
-  <material>player_trans_ao_parallax_spec.xml</material>
+  <material>rock_bump_spec_test.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/materials/rock_bump_spec_test.xml b/binaries/data/mods/public/art/materials/rock_bump_spec_test.xml
new file mode 100644
index 0000000000..2fd8914546
--- /dev/null
+++ b/binaries/data/mods/public/art/materials/rock_bump_spec_test.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<material>
+    <shader effect="model"/>
+    <alternative material="player_trans_ao_spec.xml" quality="8"/>
+    
+    <define name="USE_PLAYERCOLOR" value="0"/>
+    
+    <!-- REQUIRES: Actor must provide a texture named "normTex", where the Alpha channel
+                   is the heightmap (white = high). 
+         COMMENT: Pixels that are exactly white are calculated more efficiently (on average) 
+		  if dynamic branching is supported by the player's GPU.
+	 EFFICIENCY: This is a moderately expensive effect, so use with care. -->
+    <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"/>
+    
+    <!-- REQUIRES: Actor must provide a texture named "normTex", where the RGB channels
+		   are a normal map corresponding to XYZ normals.
+	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
+    <define name="USE_NORMAL_MAP" value="1"/>
+    
+    <!-- REQUIRES: Actor must provide a texture named "specTex", where the RGB channels
+		   provide a specular colour multiplier. 
+		   Material must provide a uniform definition for "specularPower" that controls
+		   the glossiness of the effect.
+	 COMMENT: The intensity of the colour controls the specular amount, so black pixels have
+		  no specularity. 
+	 COMPATIBILITY: This effect is incompatible with the old "USE_SPECULAR" effect.
+	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
+    <define name="USE_SPECULAR_MAP" value="1"/>
+    
+    <!-- REQUIRES: That "USE_SPECULAR_MAP" is enabled and a texture named "specTex" is provided by the Actor.
+		   The Alpha channel of the texture defines the amount of self-illumination, with 
+		   transparency being no self-illumination.
+	 COMMENT: Full self-illumination means the screen colour of a pixel is equal to its baseTex value.
+	 EFFICIENCY: This is a very cheap effect, however it also requires the calculation of specular. -->
+    <define name="USE_SELF_LIGHT" value="0"/>
+    
+    <!-- REQUIRES: Actor must provide a texture named "aoTex", where the R channel is the Ambient Occlusion.
+                   The model must provide a second, non-overlapping set of UV coordinates.
+	 COMMENT: The texture is combined using a multiply blend of (2 * ao * baseTex). -->
+    <define name="USE_AO" value="0"/>
+    
+    <!-- Settings for effects above:
+         First value: Normal mapping intensity.
+	 Second value: Specular power.
+	 Third value: Parallax scale.
+	 Fourth value: AO amount. -->
+    <uniform name="effectSettings" value="5.0 50.0 0.0075 0.85"/>
+</material>
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/stone_scandiv_template_norm.png b/binaries/data/mods/public/art/textures/skins/gaia/stone_scandiv_template_norm.png
index 88ba8f0b60..ffe017ffd5 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/stone_scandiv_template_norm.png
+++ b/binaries/data/mods/public/art/textures/skins/gaia/stone_scandiv_template_norm.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e6f36d8fe888f5c113ded18286a582f7caf5d691ca4f4ea79e13656d624720bc
-size 363187
+oid sha256:5921c6cd9f6225a66deacfef1f9c1836c2a421359cc482e19277df2d73b6468d
+size 431794