From 7a32e9d868676048169b170edf363f6910853cb9 Mon Sep 17 00:00:00 2001
From: danschub <danschub@wildfiregames.com>
Date: Sun, 19 Aug 2012 02:12:46 +0000
Subject: [PATCH] Small Badland rocks committed.

This was SVN commit r12470.
---
 .../actors/geology/decal_stone_desert_a.xml   | 17 +++++++---
 .../stonemine_desert_badlands_small_new.xml   | 33 +++++++++++++++++++
 .../art/meshes/gaia/rock_stone_bl01.dae       |  3 ++
 .../art/meshes/gaia/rock_stone_bl02.dae       |  3 ++
 .../art/meshes/gaia/scandiv_template.png      |  3 ++
 .../art/meshes/gaia/stonequarry_temperate.png |  3 ++
 .../meshes/stonequarry_desert_badlands.png    |  3 ++
 .../gaia/stonequarry_desert_badlands_spec.png |  4 +--
 8 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small_new.xml
 create mode 100644 binaries/data/mods/public/art/meshes/gaia/rock_stone_bl01.dae
 create mode 100644 binaries/data/mods/public/art/meshes/gaia/rock_stone_bl02.dae
 create mode 100644 binaries/data/mods/public/art/meshes/gaia/scandiv_template.png
 create mode 100644 binaries/data/mods/public/art/meshes/gaia/stonequarry_temperate.png
 create mode 100644 binaries/data/mods/public/art/meshes/stonequarry_desert_badlands.png

diff --git a/binaries/data/mods/public/art/actors/geology/decal_stone_desert_a.xml b/binaries/data/mods/public/art/actors/geology/decal_stone_desert_a.xml
index 9b654fecfe..4fbd70de62 100644
--- a/binaries/data/mods/public/art/actors/geology/decal_stone_desert_a.xml
+++ b/binaries/data/mods/public/art/actors/geology/decal_stone_desert_a.xml
@@ -7,15 +7,24 @@
     </variant>
   </group>
 
-  <group>
+ <group>
     <variant frequency="1" name="decal_01">
-      <textures><texture file="gaia/decal_stone_desert_01.dds" name="baseTex"/></textures>
+      <textures>
+	  <texture file="gaia/decal_stone_desert_01.dds" name="baseTex"/>
+	  <texture file="gaia/decal_stone_desert_01_spec.png" name="specTex"/>
+	  <texture file="gaia/decal_stone_desert_01_norm.png" name="normTex"/>
+	  </textures>
     </variant>
     <variant frequency="1" name="decal_02">
-      <textures><texture file="gaia/decal_stone_desert_02.dds" name="baseTex"/></textures>
+      <textures>
+	  <texture file="gaia/decal_stone_desert_02.dds" name="baseTex"/>
+	  	  <texture file="gaia/decal_stone_desert_02_spec.png" name="specTex"/>
+	  <texture file="gaia/decal_stone_desert_02_norm.png" name="normTex"/>
+	  
+	  </textures>
     </variant>
   </group>
 
-  <material>terrain_base.xml</material>
+  <material>terrain_norm_test.xml</material>
 
 </actor>
diff --git a/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small_new.xml b/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small_new.xml
new file mode 100644
index 0000000000..f44a014930
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/geology/stonemine_desert_badlands_small_new.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="formation-01">
+      <mesh>gaia/rock_stone_bl01.dae</mesh>
+	  <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"/>
+	  <texture file="gaia/ao/rock_stone_bl01_ao.png" name="aoTex"/>
+	  </textures>
+    </variant>
+    <variant frequency="1" name="formation-02">
+      <mesh>gaia/rock_stone_bl02.dae</mesh>
+	  <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"/>
+	  <texture file="gaia/ao/rock_stone_bl02_ao.png" name="aoTex"/>
+	  </textures>
+    </variant>
+    
+  </group>
+  <group>
+    <variant frequency="1" name="decal">
+      <props>
+        <prop actor="geology/decal_stone_desert_a.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+    <material>rock_bump_spec_ao_test.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/meshes/gaia/rock_stone_bl01.dae b/binaries/data/mods/public/art/meshes/gaia/rock_stone_bl01.dae
new file mode 100644
index 0000000000..4bdde1eda5
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/gaia/rock_stone_bl01.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48a6203c0be4c98936ae10e53c2d11e297b8f81bbb3c92ed9d1128709d0620e3
+size 48739
diff --git a/binaries/data/mods/public/art/meshes/gaia/rock_stone_bl02.dae b/binaries/data/mods/public/art/meshes/gaia/rock_stone_bl02.dae
new file mode 100644
index 0000000000..dbef6a6ed0
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/gaia/rock_stone_bl02.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0312515095556fb1c41a2093e723fa4adfdf9ff04f22ae0c62c1aa6de7bb426f
+size 86840
diff --git a/binaries/data/mods/public/art/meshes/gaia/scandiv_template.png b/binaries/data/mods/public/art/meshes/gaia/scandiv_template.png
new file mode 100644
index 0000000000..bba5585656
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/gaia/scandiv_template.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc9416c7c0eb48f00e332d63cc2496882f38d16d5dd28b4eb864eb0773a98785
+size 629600
diff --git a/binaries/data/mods/public/art/meshes/gaia/stonequarry_temperate.png b/binaries/data/mods/public/art/meshes/gaia/stonequarry_temperate.png
new file mode 100644
index 0000000000..27f0a6e097
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/gaia/stonequarry_temperate.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5998ba5b891bcd2411034483c6354fdd4f5334c1e2dd3fab9a10c730c3989694
+size 651029
diff --git a/binaries/data/mods/public/art/meshes/stonequarry_desert_badlands.png b/binaries/data/mods/public/art/meshes/stonequarry_desert_badlands.png
new file mode 100644
index 0000000000..a306636761
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/stonequarry_desert_badlands.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4267e6125536a9efea7e06c766a13a4f98754d1d68d62c816a2124b6b95e767e
+size 2338149
diff --git a/binaries/data/mods/public/art/textures/skins/gaia/stonequarry_desert_badlands_spec.png b/binaries/data/mods/public/art/textures/skins/gaia/stonequarry_desert_badlands_spec.png
index 74ff63311c..dc2b25806b 100644
--- a/binaries/data/mods/public/art/textures/skins/gaia/stonequarry_desert_badlands_spec.png
+++ b/binaries/data/mods/public/art/textures/skins/gaia/stonequarry_desert_badlands_spec.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc640d71decad4f98a0d3ed9a91f574f77ab1788abe352285e5dffb139b449b8
-size 810971
+oid sha256:d3de922c6d101d6a5cdc13913ff1801cbaf128cd64fe532a85ab9c110761237f
+size 476605