From 23f1ca4f34badb13d2200b8f7e3786d9fe187020 Mon Sep 17 00:00:00 2001
From: Dofensmirtsz <dofensmirtsz@gmail.com>
Date: Fri, 3 Jun 2016 11:34:19 +0200
Subject: [PATCH] fix

---
 HeightMap.cpp              |   8 ++------
 models/Rocks/InvisBall.mtl |  12 ++++++++++++
 worlds/rock.json           |   4 ++++
 worlds/rockHeightmap.pdn   | Bin 191894 -> 191894 bytes
 4 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 models/Rocks/InvisBall.mtl

diff --git a/HeightMap.cpp b/HeightMap.cpp
index 9be0922..56bd7f5 100644
--- a/HeightMap.cpp
+++ b/HeightMap.cpp
@@ -44,15 +44,11 @@ HeightMap::HeightMap(const std::string &file, float scale, World* world)
 			{
 				world->addLevelObject(new LevelObject(world->getObjectFromValue(valueAt(x, y, GREEN)), Vec3f(x*scale, heightAt(x, y), y*scale), Vec3f(0, rand() % 360, 0), 1, true));
 			}
-			if (valueAt(x, y, GREEN) == 180 || valueAt(x, y, GREEN) == 190 || valueAt(x, y, GREEN) == 170 || valueAt(x, y, GREEN) == 250)
+			if (valueAt(x, y, GREEN) == 180 || valueAt(x, y, GREEN) == 160)
 			{
 				world->addLevelObject(new LevelObject(world->getObjectFromValue(valueAt(x, y, GREEN)), Vec3f(x*scale, heightAt(x, y), y*scale), Vec3f(0, 0, 0), 1, true));
 			}
-			if ((valueAt(x, y, GREEN) >= 200) && (valueAt(x, y, GREEN) <= 240))
-			{
-				world->addLevelObject(new LevelObject(world->getObjectFromValue(valueAt(x, y, GREEN)), Vec3f(x*scale, heightAt(x, y), y*scale), Vec3f(0, 0, 0), 1, false));
-			}
-			if (valueAt(x, y, GREEN) == 160)
+			if ((valueAt(x, y, GREEN) >= 200) && (valueAt(x, y, GREEN) <= 250) || valueAt(x, y, GREEN) == 190)
 			{
 				world->addLevelObject(new LevelObject(world->getObjectFromValue(valueAt(x, y, GREEN)), Vec3f(x*scale, heightAt(x, y), y*scale), Vec3f(0, 0, 0), 1, false));
 			}
diff --git a/models/Rocks/InvisBall.mtl b/models/Rocks/InvisBall.mtl
new file mode 100644
index 0000000..402ee80
--- /dev/null
+++ b/models/Rocks/InvisBall.mtl
@@ -0,0 +1,12 @@
+newmtl Cave1:pasted__lambert4SG
+illum 4
+Kd 0.13 0.14 0.16
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert2SG
+illum 4
+Kd 0.50 0.50 0.50
+Ka 0.00 0.00 0.00
+Tf 0.00 0.00 0.00
+Ni 1.00
diff --git a/worlds/rock.json b/worlds/rock.json
index 54a0d3f..ba3e037 100644
--- a/worlds/rock.json
+++ b/worlds/rock.json
@@ -44,6 +44,10 @@
         "color": 100,
         "file": "models/Rocks/Rock10.obj"
       },
+      {
+        "color": 160,
+        "file": "models/Rocks/InvisBall.obj"
+      },
       {
         "color": 170,
         "file": "models/Rocks/DraakHoofd.obj"
diff --git a/worlds/rockHeightmap.pdn b/worlds/rockHeightmap.pdn
index 3f42fdd54accc5477dbcda09ad1be864ad6a9c84..24dfcba67c9526aa131615ddd4c78d972736c8dd 100644
GIT binary patch
delta 143
zcmV;A0C4}7+Y6T43$UEO0eiEZzXJpTHj|;lP60QQ@WWOCII~B@SuL|Y`JM!|#sOml
zv!C&v2eaG#>H@bZ1p!dMx9B4RbuqUOs{(sAw{ZRecqO-a!~ys@w_Q~Nu~h;D0Jmu5
x0%QWW0_Xxg0k@Fh0^9<(FYE$m0k_oZ0$TwA1(%WG0vEUB<^mo8w?F9ul>yB6JhuP<

delta 144
zcmV;B0B`@6+Y6T43$UEO0dKRNzXJpTFq5IfP608K@WWOCGP6g-SuL}o`ke=}pz)pr
zw?6^_>H@Pp_GARNDFp#gzqjF00{A(%YAgbGCAWFR0d+CA*^2_PRk!W+0em(B1OT@w
y<pSUWw~*liU;+UJmoDW37q{c;0v-Xk@Z$nK0k;9{0+j)`aOnbD0k;Y00%rl^zdVKj