Merge remote-tracking branch 'origin/heightmapTrees' into heightmapTrees

# Conflicts: # HeightMap.cpp
2016-06-03 11:40:52 +02:00
parent c43718f8fa 23f1ca4f34
commit 87e94056cc
3 changed files with 16 additions and 0 deletions
@@ -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
@@ -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"