Dofensmirtsz 9 жил өмнө
parent
commit
23f1ca4f34

+ 2 - 6
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));
 			}

+ 12 - 0
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

+ 4 - 0
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"

BIN
worlds/rockHeightmap.pdn