From c3b9e23f3dd112c1d118eee36ace7dc9e090c644 Mon Sep 17 00:00:00 2001
From: Dofensmirtsz <dofensmirtsz@gmail.com>
Date: Thu, 9 Jun 2016 12:43:17 +0200
Subject: [PATCH] last stuff

---
 HeightMap.cpp            |   2 +-
 worlds/rock.json         |  64 +++++++++++++++++++--------------------
 worlds/rockHeightmap.pdn | Bin 191894 -> 191894 bytes
 worlds/rockHeightmap.png | Bin 173157 -> 173157 bytes
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/HeightMap.cpp b/HeightMap.cpp
index 8a0cad9..1ef9e80 100644
--- a/HeightMap.cpp
+++ b/HeightMap.cpp
@@ -40,7 +40,7 @@ HeightMap::HeightMap(const std::string &file, World* world)
 
 			if (valueAt(x, y, GREEN) > 0)
 			{
-				world->addLevelObject(new LevelObject(world->getObjectFromValue(valueAt(x, y, GREEN)).first, Vec3f(x, heightAt(x, y), y), Vec3f(0, rand()%360, 0), 1, world->getObjectFromValue(valueAt(x, y, GREEN)).second));
+				world->addLevelObject(new LevelObject(world->getObjectFromValue(valueAt(x, y, GREEN)).first, Vec3f(x, heightAt(x, y), y), Vec3f(0, 0, 0), 1, world->getObjectFromValue(valueAt(x, y, GREEN)).second));
 			}
 
 			Vec3f normal = ca.cross(ba);
diff --git a/worlds/rock.json b/worlds/rock.json
index ba3e037..728a898 100644
--- a/worlds/rock.json
+++ b/worlds/rock.json
@@ -4,85 +4,85 @@
     "texture": "worlds/rockStone2.png",
     "scale": 1,
     "object-templates": [
-      {
-        "color": 10,
-        "file": "models/Rocks/Rock1.obj"
-      },
-      {
-        "color": 20,
-        "file": "models/Rocks/Rock2.obj"
-      },
-      {
-        "color": 30,
-        "file": "models/Rocks/Rock3.obj"
-      },
-      {
-        "color": 40,
-        "file": "models/Rocks/Rock4.obj"
-      },
       {
         "color": 50,
-        "file": "models/Rocks/Rock5.obj"
+        "file": "models/Rocks/Rock5.obj",
+        "collision":  true
       },
       {
         "color": 60,
-        "file": "models/Rocks/Rock6.obj"
+        "file": "models/Rocks/Rock6.obj",
+        "collision":  true
       },
       {
         "color": 70,
-        "file": "models/Rocks/Rock7.obj"
+        "file": "models/Rocks/Rock7.obj",
+        "collision":  true
       },
       {
         "color": 80,
-        "file": "models/Rocks/Rock8.obj"
+        "file": "models/Rocks/Rock8.obj",
+        "collision":  true
       },
       {
         "color": 90,
-        "file": "models/Rocks/Rock9.obj"
+        "file": "models/Rocks/Rock9.obj",
+        "collision":  true
       },
       {
         "color": 100,
-        "file": "models/Rocks/Rock10.obj"
+        "file": "models/Rocks/Rock10.obj",
+        "collision":  true
       },
       {
         "color": 160,
-        "file": "models/Rocks/InvisBall.obj"
+        "file": "models/Rocks/InvisBall.obj",
+        "collision":  true
       },
       {
         "color": 170,
-        "file": "models/Rocks/DraakHoofd.obj"
+        "file": "models/Rocks/DraakHoofd.obj",
+        "collision":  true
       },
       {
         "color": 180,
-        "file": "models/Rocks/DragonWall1.obj"
+        "file": "models/Rocks/DragonWall1.obj",
+        "collision":  true
       },
       {
         "color": 190,
-        "file": "models/Rocks/Cave1.obj"
+        "file": "models/Rocks/Cave1.obj",
+        "collision":  false
       },
       {
         "color": 200,
-        "file": "models/Rocks/SpikeRock2.obj"
+        "file": "models/Rocks/SpikeRock2.obj",
+        "collision":  false
       },
       {
         "color": 210,
-        "file": "models/Rocks/SpikeRock1.obj"
+        "file": "models/Rocks/SpikeRock1.obj",
+        "collision":  false
       },
       {
         "color": 220,
-        "file": "models/Rocks/SpikeRock3.obj"
+        "file": "models/Rocks/SpikeRock3.obj",
+        "collision":  false
       },
       {
         "color": 230,
-        "file": "models/Rocks/SpikeRock4.obj"
+        "file": "models/Rocks/SpikeRock4.obj",
+        "collision":  false
       },
       {
         "color": 240,
-        "file": "models/Rocks/SpikeRock5.obj"
+        "file": "models/Rocks/SpikeRock5.obj",
+        "collision":  false
       },
       {
         "color": 250,
-        "file": "models/Teleporter/Teleporter.obj"
+        "file": "models/Teleporter/Teleporter.obj",
+        "collision":  false
       }
 
     ]
diff --git a/worlds/rockHeightmap.pdn b/worlds/rockHeightmap.pdn
index 24dfcba67c9526aa131615ddd4c78d972736c8dd..ea67e7538bea2354d8c5d91b586263499eec76cb 100644
GIT binary patch
delta 154
zcmV;L0A>G{+Y6T43$UEO0f)1lzXAjTG&qx?!%YG-Ig{|iRRT3Ivq!}DF|(rjod>f%
z_GARNKLP<1HMj2d0em*MQ#S#GN4IJ$0&icpdBg#AF}K-^0<l%M)_wt^MYoFK0x<!%
zW99;;0k^y20yP1*E#(3>0k`nu0zCn@0qg>m0R#X500oyW<pLMC<LUw)0k?DM0$2gJ
I3Frc60TCiT+5i9m

delta 144
zcmV;B0B`@6+Y6T43$UEO0eiEZzXAjTGd7c<!%YG+H<R$gRRS|Ovq!}DF|*tKWCXK5
z_MHc}KLP<1HMh@g0fa}l>6-$fMYq8e0(LRCQ#S#8Hn&r?0dHToH%0=nRkw=a0x<!%
yVdMfe0k_QN0zCn@mgNFA0k^y20;U1CFYE$m0k_oZ0$TyMq3HrP0k;Y00+j)onmm^P

diff --git a/worlds/rockHeightmap.png b/worlds/rockHeightmap.png
index 346a87acf086cbadc17da97c7e820efcacec3b04..48236999f6495e573eb62f36e3b8b807ec60f20d 100644
GIT binary patch
delta 29
lcmaEQg6ruCt_e0=I~W-Fb}(i+evNK)YjtDX>c%9$1OT=i3labT

delta 29
lcmaEQg6ruCt_e0=I~f@Gb~5f@6W`zH*6PN%)s0Dh2>`Ka3atPD