Rocky places

HeightMap.cpp

@@ -52,6 +52,10 @@ 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, 0, 0), 1, false));
 			}
+			if (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, false));
+			}
 
 			Vec3f normal = ca.cross(ba);
 			normal.Normalize();

models/Rocks/Rock8.mtl

@@ -1,92 +1,73 @@
-newmtl SpringIsComing:Material_007
+newmtl Rock1:pasted__pasted__lambert3SG1
 illum 4
-Kd 0.75 0.80 0.80
-Ka 1.00 1.00 1.00
+Kd 0.45 0.45 0.45
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree01:Material_001
+newmtl Rock2:pasted__pasted__lambert3SG1
 illum 4
-Kd 0.01 0.00 0.00
-Ka 1.00 1.00 1.00
+Kd 0.45 0.45 0.45
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree01:Material_004
+newmtl Rock3:pasted__pasted__lambert3SG1
 illum 4
-Kd 0.60 0.20 0.30
-Ka 1.00 1.00 1.00
+Kd 0.45 0.45 0.45
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree02:Material_001
+newmtl Rock4:pasted__pasted__lambert3SG1
 illum 4
-Kd 0.01 0.00 0.00
-Ka 1.00 1.00 1.00
+Kd 0.45 0.45 0.45
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree02:Material_004
+newmtl initialShadingGroup
 illum 4
-Kd 0.60 0.20 0.30
-Ka 1.00 1.00 1.00
+Kd 0.50 0.50 0.50
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree03:Material_001
+newmtl lambert2SG
 illum 4
-Kd 0.01 0.00 0.00
-Ka 1.00 1.00 1.00
+Kd 0.11 0.07 0.00
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree03:Material_004
+newmtl lambert3SG
 illum 4
-Kd 0.60 0.20 0.30
-Ka 1.00 1.00 1.00
+Kd 0.50 0.35 0.00
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree04:Material_001
+newmtl lambert4SG
 illum 4
-Kd 0.01 0.00 0.00
-Ka 1.00 1.00 1.00
+Kd 0.13 0.14 0.16
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree04:Material_004
+newmtl lambert5SG
 illum 4
-Kd 0.60 0.20 0.30
-Ka 1.00 1.00 1.00
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
+map_Kd Naamloos.png
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl initialShadingGroup
+newmtl lambert6SG
 illum 4
-Kd 0.34 0.34 0.34
+Kd 0.89 0.89 0.89
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-newmtl lambert2SG
+newmtl pasted__lambert4SG
 illum 4
-Kd 0.00 1.00 1.00
+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 rock3:Material_016
+newmtl pasted__pasted__lambert3SG1
 illum 4
-Kd 0.64 0.64 0.64
-Ka 1.00 1.00 1.00
+Kd 0.45 0.45 0.45
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08

models/Rocks/Rock9.mtl

@@ -1,92 +1,73 @@
-newmtl SpringIsComing:Material_007
+newmtl Rock1:pasted__pasted__lambert3SG1
 illum 4
-Kd 0.75 0.80 0.80
-Ka 1.00 1.00 1.00
+Kd 0.45 0.45 0.45
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree01:Material_001
+newmtl Rock2:pasted__pasted__lambert3SG1
 illum 4
-Kd 0.01 0.00 0.00
-Ka 1.00 1.00 1.00
+Kd 0.45 0.45 0.45
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree01:Material_004
+newmtl Rock3:pasted__pasted__lambert3SG1
 illum 4
-Kd 0.60 0.20 0.30
-Ka 1.00 1.00 1.00
+Kd 0.45 0.45 0.45
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree02:Material_001
+newmtl Rock4:pasted__pasted__lambert3SG1
 illum 4
-Kd 0.01 0.00 0.00
-Ka 1.00 1.00 1.00
+Kd 0.45 0.45 0.45
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree02:Material_004
+newmtl initialShadingGroup
 illum 4
-Kd 0.60 0.20 0.30
-Ka 1.00 1.00 1.00
+Kd 0.50 0.50 0.50
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree03:Material_001
+newmtl lambert2SG
 illum 4
-Kd 0.01 0.00 0.00
-Ka 1.00 1.00 1.00
+Kd 0.11 0.07 0.00
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree03:Material_004
+newmtl lambert3SG
 illum 4
-Kd 0.60 0.20 0.30
-Ka 1.00 1.00 1.00
+Kd 0.50 0.35 0.00
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree04:Material_001
+newmtl lambert4SG
 illum 4
-Kd 0.01 0.00 0.00
-Ka 1.00 1.00 1.00
+Kd 0.13 0.14 0.16
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl Tree04:Material_004
+newmtl lambert5SG
 illum 4
-Kd 0.60 0.20 0.30
-Ka 1.00 1.00 1.00
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
+map_Kd Naamloos.png
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08
-newmtl initialShadingGroup
+newmtl lambert6SG
 illum 4
-Kd 0.34 0.34 0.34
+Kd 0.89 0.89 0.89
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-newmtl lambert2SG
+newmtl pasted__lambert4SG
 illum 4
-Kd 0.00 1.00 1.00
+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 rock3:Material_016
+newmtl pasted__pasted__lambert3SG1
 illum 4
-Kd 0.64 0.64 0.64
-Ka 1.00 1.00 1.00
+Kd 0.45 0.45 0.45
+Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-Ks 0.50 0.50 0.50
-Ns 96.08

worlds/rock.json

@@ -40,7 +40,7 @@
         "color": 90,
         "file": "models/Rocks/Rock9.obj"
       },
-            {
+      {
         "color": 100,
         "file": "models/Rocks/Rock10.obj"
       },
@@ -78,7 +78,7 @@
       },
       {
         "color": 250,
-        "file": "models/Crystal/Crystal.obj"
+        "file": "models/Teleporter/Teleporter.obj"
       }
 
     ]