From 5966a54a1cfba398cec67a17eb5da9fdc786a0b6 Mon Sep 17 00:00:00 2001
From: Faerbit <faerbit@gmail.com>
Date: Wed, 11 Mar 2015 11:16:17 +0100
Subject: [PATCH] Moving textures from cgtextures into their own folder.

---
 data/levels/Compositions.xml                  |  22 +++++++++---------
 data/levels/Level1.xml                        |   2 +-
 .../{ => cgtextures}/blockTexture_small.png   | Bin
 .../{ => cgtextures}/brazierTexture.png       | Bin
 .../{ => cgtextures}/columnTexture2.png       | Bin
 .../textures/{ => cgtextures}/exitTexture.png | Bin
 .../textures/{ => cgtextures}/gateTexture.png | Bin
 .../{ => cgtextures}/marbleTexture.png        | Bin
 .../{ => cgtextures}/movableBlockTexture.png  | Bin
 .../{ => cgtextures}/simpleWallTexture.png    | Bin
 .../{ => cgtextures}/switchInnerTexture.png   | Bin
 .../{ => cgtextures}/switchOuterTexture.png   | Bin
 .../{ => cgtextures}/torchTexture2.png        | Bin
 .../{ => cgtextures}/waterTexture.png         | Bin
 14 files changed, 12 insertions(+), 12 deletions(-)
 rename data/textures/{ => cgtextures}/blockTexture_small.png (100%)
 rename data/textures/{ => cgtextures}/brazierTexture.png (100%)
 rename data/textures/{ => cgtextures}/columnTexture2.png (100%)
 rename data/textures/{ => cgtextures}/exitTexture.png (100%)
 rename data/textures/{ => cgtextures}/gateTexture.png (100%)
 rename data/textures/{ => cgtextures}/marbleTexture.png (100%)
 rename data/textures/{ => cgtextures}/movableBlockTexture.png (100%)
 rename data/textures/{ => cgtextures}/simpleWallTexture.png (100%)
 rename data/textures/{ => cgtextures}/switchInnerTexture.png (100%)
 rename data/textures/{ => cgtextures}/switchOuterTexture.png (100%)
 rename data/textures/{ => cgtextures}/torchTexture2.png (100%)
 rename data/textures/{ => cgtextures}/waterTexture.png (100%)

diff --git a/data/levels/Compositions.xml b/data/levels/Compositions.xml
index 882cde3..52dc7c7 100644
--- a/data/levels/Compositions.xml
+++ b/data/levels/Compositions.xml
@@ -551,7 +551,7 @@
 <!-- Do not change the radius, it has to match the .obj -->
 <objectData>
     <modelPath>marbleSmooth.obj</modelPath>
-    <texturePath>marbleTexture.png</texturePath>
+    <texturePath>cgtextures/marbleTexture.png</texturePath>
     <ambientFactor>0.13</ambientFactor>
     <diffuseFactor>0.5</diffuseFactor>
     <specularFactor>0.5</specularFactor>
@@ -566,7 +566,7 @@
 <!-- Do not change width height or length, they have to match the .obj -->
 <objectData>
     <modelPath>block.obj</modelPath>
-    <texturePath>blockTexture_small.png</texturePath>
+    <texturePath>cgtextures/blockTexture_small.png</texturePath>
     <ambientFactor>0.13</ambientFactor>
     <diffuseFactor>0.6</diffuseFactor>
     <specularFactor>0.4</specularFactor>
@@ -582,7 +582,7 @@
 
 <objectData>
     <modelPath>column.obj</modelPath>
-    <texturePath>columnTexture2.png</texturePath>
+    <texturePath>cgtextures/columnTexture2.png</texturePath>
     <ambientFactor>0.13</ambientFactor>
     <diffuseFactor>0.6</diffuseFactor>
     <specularFactor>0.4</specularFactor>
@@ -595,7 +595,7 @@
 
 <objectData>
     <modelPath>torch.obj</modelPath>    
-    <texturePath>torchTexture2.png</texturePath>
+    <texturePath>cgtextures/torchTexture2.png</texturePath>
     <ambientFactor>0.13</ambientFactor>
     <diffuseFactor>0.3</diffuseFactor>
     <specularFactor>0.7</specularFactor>
@@ -609,7 +609,7 @@
 <!-- Do not change width height or length, they have to match the .obj -->
 <objectData>
     <modelPath>switchInner.obj</modelPath>
-    <texturePath>switchInnerTexture.png</texturePath>
+    <texturePath>cgtextures/switchInnerTexture.png</texturePath>
     <ambientFactor>0.13</ambientFactor>
     <diffuseFactor>0.6</diffuseFactor>
     <specularFactor>0.4</specularFactor>        
@@ -637,7 +637,7 @@
 
 <objectData>
     <modelPath>switchOuter.obj</modelPath>
-    <texturePath>switchOuterTexture.png</texturePath>
+    <texturePath>cgtextures/switchOuterTexture.png</texturePath>
     <ambientFactor>0.13</ambientFactor>
     <diffuseFactor>0.6</diffuseFactor>
     <specularFactor>0.4</specularFactor>
@@ -649,7 +649,7 @@
 <!-- lengh may not be exact -->
 <objectData>
     <modelPath>simpleWall.obj</modelPath>
-    <texturePath>simpleWallTexture.png</texturePath>
+    <texturePath>cgtextures/simpleWallTexture.png</texturePath>
     <ambientFactor>0.13</ambientFactor>
     <diffuseFactor>0.6</diffuseFactor>
     <specularFactor>0.4</specularFactor>
@@ -665,7 +665,7 @@
 
 <objectData>
     <modelPath>gate.obj</modelPath>
-    <texturePath>gateTexture.png</texturePath> 
+    <texturePath>cgtextures/gateTexture.png</texturePath> 
     <ambientFactor>0.13</ambientFactor>
     <diffuseFactor>0.6</diffuseFactor>
     <specularFactor>0.4</specularFactor>
@@ -681,7 +681,7 @@
 
 <objectData>
     <modelPath>movableBlock.obj</modelPath>
-    <texturePath>movableBlockTexture.png</texturePath>
+    <texturePath>cgtextures/movableBlockTexture.png</texturePath>
     <ambientFactor>0.13</ambientFactor>
     <diffuseFactor>0.6</diffuseFactor>
     <specularFactor>0.4</specularFactor>
@@ -697,7 +697,7 @@
 
 <objectData>
     <modelPath>brazier.obj</modelPath>
-    <texturePath>brazierTexture.png</texturePath>
+    <texturePath>cgtextures/brazierTexture.png</texturePath>
     <ambientFactor>0.13</ambientFactor>
     <diffuseFactor>0.6</diffuseFactor>
     <specularFactor>0.4</specularFactor>
@@ -723,7 +723,7 @@
 
 <objectData>
     <modelPath>exit.obj</modelPath>
-    <texturePath>exitTexture.png</texturePath>
+    <texturePath>cgtextures/exitTexture.png</texturePath>
     <ambientFactor>0.13</ambientFactor>
     <diffuseFactor>0.6</diffuseFactor>
     <specularFactor>0.4</specularFactor>
diff --git a/data/levels/Level1.xml b/data/levels/Level1.xml
index eb8d87c..c80c163 100644
--- a/data/levels/Level1.xml
+++ b/data/levels/Level1.xml
@@ -13223,7 +13223,7 @@
 
 <waterPlane>
     <yPosition>14.5</yPosition>
-    <texture>waterTexture.png</texture>
+    <texture>cgtextures/waterTexture.png</texture>
 </waterPlane>
 
 <physics>
diff --git a/data/textures/blockTexture_small.png b/data/textures/cgtextures/blockTexture_small.png
similarity index 100%
rename from data/textures/blockTexture_small.png
rename to data/textures/cgtextures/blockTexture_small.png
diff --git a/data/textures/brazierTexture.png b/data/textures/cgtextures/brazierTexture.png
similarity index 100%
rename from data/textures/brazierTexture.png
rename to data/textures/cgtextures/brazierTexture.png
diff --git a/data/textures/columnTexture2.png b/data/textures/cgtextures/columnTexture2.png
similarity index 100%
rename from data/textures/columnTexture2.png
rename to data/textures/cgtextures/columnTexture2.png
diff --git a/data/textures/exitTexture.png b/data/textures/cgtextures/exitTexture.png
similarity index 100%
rename from data/textures/exitTexture.png
rename to data/textures/cgtextures/exitTexture.png
diff --git a/data/textures/gateTexture.png b/data/textures/cgtextures/gateTexture.png
similarity index 100%
rename from data/textures/gateTexture.png
rename to data/textures/cgtextures/gateTexture.png
diff --git a/data/textures/marbleTexture.png b/data/textures/cgtextures/marbleTexture.png
similarity index 100%
rename from data/textures/marbleTexture.png
rename to data/textures/cgtextures/marbleTexture.png
diff --git a/data/textures/movableBlockTexture.png b/data/textures/cgtextures/movableBlockTexture.png
similarity index 100%
rename from data/textures/movableBlockTexture.png
rename to data/textures/cgtextures/movableBlockTexture.png
diff --git a/data/textures/simpleWallTexture.png b/data/textures/cgtextures/simpleWallTexture.png
similarity index 100%
rename from data/textures/simpleWallTexture.png
rename to data/textures/cgtextures/simpleWallTexture.png
diff --git a/data/textures/switchInnerTexture.png b/data/textures/cgtextures/switchInnerTexture.png
similarity index 100%
rename from data/textures/switchInnerTexture.png
rename to data/textures/cgtextures/switchInnerTexture.png
diff --git a/data/textures/switchOuterTexture.png b/data/textures/cgtextures/switchOuterTexture.png
similarity index 100%
rename from data/textures/switchOuterTexture.png
rename to data/textures/cgtextures/switchOuterTexture.png
diff --git a/data/textures/torchTexture2.png b/data/textures/cgtextures/torchTexture2.png
similarity index 100%
rename from data/textures/torchTexture2.png
rename to data/textures/cgtextures/torchTexture2.png
diff --git a/data/textures/waterTexture.png b/data/textures/cgtextures/waterTexture.png
similarity index 100%
rename from data/textures/waterTexture.png
rename to data/textures/cgtextures/waterTexture.png