diff --git a/HeightMap.cpp b/HeightMap.cpp index fa25d13..83c6374 100644 --- a/HeightMap.cpp +++ b/HeightMap.cpp @@ -40,11 +40,11 @@ HeightMap::HeightMap(const std::string &file, float scale, World* world) Vec3f ba(1, heightAt(x + 1, y) - heightAt(x, y), 0); - //if (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)); - //} - if (valueAt(x, y, GREEN) == 180 || valueAt(x, y, GREEN) == 190 || valueAt(x, y, GREEN) == 170) + if ((valueAt(x, y, GREEN) >= 10) && (valueAt(x,y,GREEN) <= 100)) + { + 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) { world->addLevelObject(new LevelObject(world->getObjectFromValue(valueAt(x, y, GREEN)), Vec3f(x*scale, heightAt(x, y), y*scale), Vec3f(0, 0, 0), 1, true)); } diff --git a/models/Crystal/Crystal.mtl b/models/Crystal/Crystal.mtl new file mode 100644 index 0000000..77dc950 --- /dev/null +++ b/models/Crystal/Crystal.mtl @@ -0,0 +1,100 @@ +newmtl SpringIsComing:Material_007 +illum 4 +Kd 0.75 0.80 0.80 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.01 0.00 0.00 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.60 0.20 0.30 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.01 0.00 0.00 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.60 0.20 0.30 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.01 0.00 0.00 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.60 0.20 0.30 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.01 0.00 0.00 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.60 0.20 0.30 +Ka 1.00 1.00 1.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +Ks 0.50 0.50 0.50 +Ns 96.08 +newmtl initialShadingGroup +illum 4 +Kd 0.34 0.34 0.34 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert2SG +illum 4 +Kd 0.00 1.00 1.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl rock1:Material_001 +illum 4 +Kd 0.64 0.64 0.64 +Ka 1.00 1.00 1.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +Ks 0.50 0.50 0.50 +Ns 96.08 +newmtl rock3:Material_016 +illum 4 +Kd 0.64 0.64 0.64 +Ka 1.00 1.00 1.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +Ks 0.50 0.50 0.50 +Ns 96.08 diff --git a/models/Rocks/Rock1.mtl b/models/Rocks/Rock1.mtl new file mode 100644 index 0000000..9e73746 --- /dev/null +++ b/models/Rocks/Rock1.mtl @@ -0,0 +1,43 @@ +newmtl initialShadingGroup +illum 4 +Kd 0.50 0.50 0.50 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert2SG +illum 4 +Kd 0.11 0.07 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert3SG +illum 4 +Kd 0.50 0.35 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl 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 lambert5SG +illum 4 +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 +newmtl 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 pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 diff --git a/models/Rocks/Rock10.mtl b/models/Rocks/Rock10.mtl new file mode 100644 index 0000000..e7c796b --- /dev/null +++ b/models/Rocks/Rock10.mtl @@ -0,0 +1,73 @@ +newmtl Rock1:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl Rock2:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl Rock3:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl Rock4:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl initialShadingGroup +illum 4 +Kd 0.50 0.50 0.50 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert2SG +illum 4 +Kd 0.11 0.07 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert3SG +illum 4 +Kd 0.50 0.35 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl 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 lambert5SG +illum 4 +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 +newmtl lambert6SG +illum 4 +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 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 pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 diff --git a/models/Rocks/Rock2.mtl b/models/Rocks/Rock2.mtl new file mode 100644 index 0000000..9e73746 --- /dev/null +++ b/models/Rocks/Rock2.mtl @@ -0,0 +1,43 @@ +newmtl initialShadingGroup +illum 4 +Kd 0.50 0.50 0.50 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert2SG +illum 4 +Kd 0.11 0.07 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert3SG +illum 4 +Kd 0.50 0.35 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl 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 lambert5SG +illum 4 +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 +newmtl 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 pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 diff --git a/models/Rocks/Rock3.mtl b/models/Rocks/Rock3.mtl new file mode 100644 index 0000000..9e73746 --- /dev/null +++ b/models/Rocks/Rock3.mtl @@ -0,0 +1,43 @@ +newmtl initialShadingGroup +illum 4 +Kd 0.50 0.50 0.50 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert2SG +illum 4 +Kd 0.11 0.07 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert3SG +illum 4 +Kd 0.50 0.35 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl 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 lambert5SG +illum 4 +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 +newmtl 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 pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 diff --git a/models/Rocks/Rock4.mtl b/models/Rocks/Rock4.mtl new file mode 100644 index 0000000..9e73746 --- /dev/null +++ b/models/Rocks/Rock4.mtl @@ -0,0 +1,43 @@ +newmtl initialShadingGroup +illum 4 +Kd 0.50 0.50 0.50 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert2SG +illum 4 +Kd 0.11 0.07 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert3SG +illum 4 +Kd 0.50 0.35 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl 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 lambert5SG +illum 4 +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 +newmtl 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 pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 diff --git a/models/Rocks/Rock5.mtl b/models/Rocks/Rock5.mtl new file mode 100644 index 0000000..7e359c2 --- /dev/null +++ b/models/Rocks/Rock5.mtl @@ -0,0 +1,67 @@ +newmtl Rock1:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl Rock2:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl Rock3:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl Rock4:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl initialShadingGroup +illum 4 +Kd 0.50 0.50 0.50 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert2SG +illum 4 +Kd 0.11 0.07 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert3SG +illum 4 +Kd 0.50 0.35 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl 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 lambert5SG +illum 4 +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 +newmtl 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 pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 diff --git a/models/Rocks/Rock6.mtl b/models/Rocks/Rock6.mtl new file mode 100644 index 0000000..7e359c2 --- /dev/null +++ b/models/Rocks/Rock6.mtl @@ -0,0 +1,67 @@ +newmtl Rock1:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl Rock2:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl Rock3:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl Rock4:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl initialShadingGroup +illum 4 +Kd 0.50 0.50 0.50 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert2SG +illum 4 +Kd 0.11 0.07 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert3SG +illum 4 +Kd 0.50 0.35 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl 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 lambert5SG +illum 4 +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 +newmtl 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 pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 diff --git a/models/Rocks/Rock7.mtl b/models/Rocks/Rock7.mtl new file mode 100644 index 0000000..7e359c2 --- /dev/null +++ b/models/Rocks/Rock7.mtl @@ -0,0 +1,67 @@ +newmtl Rock1:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl Rock2:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl Rock3:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl Rock4:pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl initialShadingGroup +illum 4 +Kd 0.50 0.50 0.50 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert2SG +illum 4 +Kd 0.11 0.07 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert3SG +illum 4 +Kd 0.50 0.35 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl 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 lambert5SG +illum 4 +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 +newmtl 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 pasted__pasted__lambert3SG1 +illum 4 +Kd 0.45 0.45 0.45 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 diff --git a/models/Rocks/Rock8.mtl b/models/Rocks/Rock8.mtl new file mode 100644 index 0000000..caf8f92 --- /dev/null +++ b/models/Rocks/Rock8.mtl @@ -0,0 +1,92 @@ +newmtl SpringIsComing:Material_007 +illum 4 +Kd 0.75 0.80 0.80 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.01 0.00 0.00 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.60 0.20 0.30 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.01 0.00 0.00 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.60 0.20 0.30 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.01 0.00 0.00 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.60 0.20 0.30 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.01 0.00 0.00 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.60 0.20 0.30 +Ka 1.00 1.00 1.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +Ks 0.50 0.50 0.50 +Ns 96.08 +newmtl initialShadingGroup +illum 4 +Kd 0.34 0.34 0.34 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert2SG +illum 4 +Kd 0.00 1.00 1.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl rock3:Material_016 +illum 4 +Kd 0.64 0.64 0.64 +Ka 1.00 1.00 1.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +Ks 0.50 0.50 0.50 +Ns 96.08 diff --git a/models/Rocks/Rock9.mtl b/models/Rocks/Rock9.mtl new file mode 100644 index 0000000..caf8f92 --- /dev/null +++ b/models/Rocks/Rock9.mtl @@ -0,0 +1,92 @@ +newmtl SpringIsComing:Material_007 +illum 4 +Kd 0.75 0.80 0.80 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.01 0.00 0.00 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.60 0.20 0.30 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.01 0.00 0.00 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.60 0.20 0.30 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.01 0.00 0.00 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.60 0.20 0.30 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.01 0.00 0.00 +Ka 1.00 1.00 1.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 +illum 4 +Kd 0.60 0.20 0.30 +Ka 1.00 1.00 1.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +Ks 0.50 0.50 0.50 +Ns 96.08 +newmtl initialShadingGroup +illum 4 +Kd 0.34 0.34 0.34 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert2SG +illum 4 +Kd 0.00 1.00 1.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl rock3:Material_016 +illum 4 +Kd 0.64 0.64 0.64 +Ka 1.00 1.00 1.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +Ks 0.50 0.50 0.50 +Ns 96.08 diff --git a/worlds/rock.json b/worlds/rock.json index 61e44a6..e96959e 100644 --- a/worlds/rock.json +++ b/worlds/rock.json @@ -4,6 +4,46 @@ "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" + }, + { + "color": 60, + "file": "models/Rocks/Rock6.obj" + }, + { + "color": 70, + "file": "models/Rocks/Rock7.obj" + }, + { + "color": 80, + "file": "models/Rocks/Rock8.obj" + }, + { + "color": 90, + "file": "models/Rocks/Rock9.obj" + }, + { + "color": 100, + "file": "models/Rocks/Rock10.obj" + }, { "color": 170, "file": "models/Rocks/DraakHoofd.obj" @@ -35,6 +75,10 @@ { "color": 240, "file": "models/Rocks/SpikeRock5.obj" + }, + { + "color": 250, + "file": "models/Crystal/Crystal.obj" } ] diff --git a/worlds/rockHeightmap.pdn b/worlds/rockHeightmap.pdn index 740e685..7de74e5 100644 Binary files a/worlds/rockHeightmap.pdn and b/worlds/rockHeightmap.pdn differ diff --git a/worlds/rockHeightmap.png b/worlds/rockHeightmap.png index 50fbcef..6d4aa1e 100644 Binary files a/worlds/rockHeightmap.png and b/worlds/rockHeightmap.png differ