From 087d36aa1589c8ebd76b063ca13ad646a988ca2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20F=C3=BCndgens?= <steffen.fuendgens@rwth-aachen.de>
Date: Fri, 20 Feb 2015 13:56:40 +0100
Subject: [PATCH] Unified object and texture filenames.

---
 .../{ruins_block.obj => ruinsBlock.obj}       |   0
 .../{ruins_column.obj => ruinsColumn.obj}     |   0
 .../{switch_inner.obj => switchInner.obj}     |   0
 .../{switch_outer.obj => switchOuter.obj}     |   0
 data/levels/Compositions.xml                  |  26 +++++++++---------
 .../{Marbletexture.png => marbleTexture.png}  | Bin
 ...extureInner.png => switchInnerTexture.png} | Bin
 ...extureOuter.png => switchOuterTexture.png} | Bin
 8 files changed, 13 insertions(+), 13 deletions(-)
 rename data/geometry/{ruins_block.obj => ruinsBlock.obj} (100%)
 rename data/geometry/{ruins_column.obj => ruinsColumn.obj} (100%)
 rename data/geometry/{switch_inner.obj => switchInner.obj} (100%)
 rename data/geometry/{switch_outer.obj => switchOuter.obj} (100%)
 rename data/textures/{Marbletexture.png => marbleTexture.png} (100%)
 rename data/textures/{switchTextureInner.png => switchInnerTexture.png} (100%)
 rename data/textures/{switchTextureOuter.png => switchOuterTexture.png} (100%)

diff --git a/data/geometry/ruins_block.obj b/data/geometry/ruinsBlock.obj
similarity index 100%
rename from data/geometry/ruins_block.obj
rename to data/geometry/ruinsBlock.obj
diff --git a/data/geometry/ruins_column.obj b/data/geometry/ruinsColumn.obj
similarity index 100%
rename from data/geometry/ruins_column.obj
rename to data/geometry/ruinsColumn.obj
diff --git a/data/geometry/switch_inner.obj b/data/geometry/switchInner.obj
similarity index 100%
rename from data/geometry/switch_inner.obj
rename to data/geometry/switchInner.obj
diff --git a/data/geometry/switch_outer.obj b/data/geometry/switchOuter.obj
similarity index 100%
rename from data/geometry/switch_outer.obj
rename to data/geometry/switchOuter.obj
diff --git a/data/levels/Compositions.xml b/data/levels/Compositions.xml
index 9203b8f..b377569 100644
--- a/data/levels/Compositions.xml
+++ b/data/levels/Compositions.xml
@@ -138,7 +138,7 @@
     <typeID>120</typeID>
     <ignoreHeightmap>false</ignoreHeightmap>
     <object>
-        <modelPath>switch_inner.obj</modelPath>
+        <modelPath>switchInner.obj</modelPath>
         <xOffset>0.0</xOffset>
         <yOffset>0.5</yOffset>
         <zOffset>0.0</zOffset>
@@ -149,7 +149,7 @@
         <mass>0.5</mass>
     </object>
     <object>
-        <modelPath>switch_outer.obj</modelPath>
+        <modelPath>switchOuter.obj</modelPath>
         <xOffset>0.0</xOffset>
         <yOffset>-1</yOffset>
         <zOffset>0.0</zOffset>
@@ -160,7 +160,7 @@
         <mass>1.0</mass>
     </object>
     <object>
-        <modelPath>switch_outerBox</modelPath>
+        <modelPath>switchOuterBox</modelPath>
         <xOffset>0.0</xOffset>
         <yOffset>-1</yOffset>
         <zOffset>1.105</zOffset>
@@ -171,7 +171,7 @@
         <mass>0.0</mass>
     </object>
     <object>
-        <modelPath>switch_outerBox</modelPath>
+        <modelPath>switchOuterBox</modelPath>
         <xOffset>0.0</xOffset>
         <yOffset>-1</yOffset>
         <zOffset>-1.105</zOffset>
@@ -182,7 +182,7 @@
         <mass>0.0</mass>
     </object>
     <object>
-        <modelPath>switch_outerBox</modelPath>
+        <modelPath>switchOuterBox</modelPath>
         <xOffset>1.105</xOffset>
         <yOffset>-1</yOffset>
         <zOffset>0.0</zOffset>
@@ -193,7 +193,7 @@
         <mass>0.0</mass>
     </object>
     <object>
-        <modelPath>switch_outerBox</modelPath>
+        <modelPath>switchOuterBox</modelPath>
         <xOffset>-1.105</xOffset>
         <yOffset>-1</yOffset>
         <zOffset>0.0</zOffset>
@@ -204,7 +204,7 @@
         <mass>0.0</mass>
     </object>
     <object>
-        <modelPath>switch_outerBox</modelPath>
+        <modelPath>switchOuterBox</modelPath>
         <xOffset>0.0</xOffset>
         <yOffset>-2.105</yOffset>
         <zOffset>0.0</zOffset>
@@ -463,7 +463,7 @@
 <!-- Do not change the radius, it has to match the .obj -->
 <objectData>
     <modelPath>marbleSmooth.obj</modelPath>
-    <texturePath>Marbletexture.png</texturePath>
+    <texturePath>marbleTexture.png</texturePath>
     <ambientFactor>0.1</ambientFactor>
     <diffuseFactor>0.5</diffuseFactor>
     <specularFactor>0.5</specularFactor>
@@ -520,8 +520,8 @@
 
 <!-- Do not change width height or length, they have to match the .obj -->
 <objectData>
-    <modelPath>switch_inner.obj</modelPath>
-    <texturePath>switchTextureInner.png</texturePath>
+    <modelPath>switchInner.obj</modelPath>
+    <texturePath>switchInnerTexture.png</texturePath>
     <ambientFactor>0.1</ambientFactor>
     <diffuseFactor>0.6</diffuseFactor>
     <specularFactor>0.4</specularFactor>        
@@ -537,7 +537,7 @@
 
 <!-- Do not change width height or length, they have to match the .obj -->
 <objectData>
-    <modelPath>switch_outerBox</modelPath>
+    <modelPath>switchOuterBox</modelPath>
     <physicType>Box</physicType>
     <width>2.54</width>
     <height>2.54</height>
@@ -548,8 +548,8 @@
 </objectData>
 
 <objectData>
-    <modelPath>switch_outer.obj</modelPath>
-    <texturePath>switchTextureOuter.png</texturePath>
+    <modelPath>switchOuter.obj</modelPath>
+    <texturePath>switchOuterTexture.png</texturePath>
     <ambientFactor>0.1</ambientFactor>
     <diffuseFactor>0.6</diffuseFactor>
     <specularFactor>0.4</specularFactor>
diff --git a/data/textures/Marbletexture.png b/data/textures/marbleTexture.png
similarity index 100%
rename from data/textures/Marbletexture.png
rename to data/textures/marbleTexture.png
diff --git a/data/textures/switchTextureInner.png b/data/textures/switchInnerTexture.png
similarity index 100%
rename from data/textures/switchTextureInner.png
rename to data/textures/switchInnerTexture.png
diff --git a/data/textures/switchTextureOuter.png b/data/textures/switchOuterTexture.png
similarity index 100%
rename from data/textures/switchTextureOuter.png
rename to data/textures/switchOuterTexture.png