diff --git a/HeightMap.cpp b/HeightMap.cpp index 83c6374..9be0922 100644 --- a/HeightMap.cpp +++ b/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(); diff --git a/models/Rocks/Rock8.mtl b/models/Rocks/Rock8.mtl index caf8f92..e7c796b 100644 --- a/models/Rocks/Rock8.mtl +++ b/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 -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 +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.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 -newmtl rock3:Material_016 +newmtl lambert3SG illum 4 -Kd 0.64 0.64 0.64 -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 +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 -Ks 0.50 0.50 0.50 -Ns 96.08 diff --git a/models/Rocks/Rock9.mtl b/models/Rocks/Rock9.mtl index caf8f92..e7c796b 100644 --- a/models/Rocks/Rock9.mtl +++ b/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 -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 +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.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 -newmtl rock3:Material_016 +newmtl lambert3SG illum 4 -Kd 0.64 0.64 0.64 -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 +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 -Ks 0.50 0.50 0.50 -Ns 96.08 diff --git a/worlds/rock.json b/worlds/rock.json index e96959e..54a0d3f 100644 --- a/worlds/rock.json +++ b/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" } ] diff --git a/worlds/rockHeightmap.pdn b/worlds/rockHeightmap.pdn index 7de74e5..3f42fdd 100644 Binary files a/worlds/rockHeightmap.pdn and b/worlds/rockHeightmap.pdn differ diff --git a/worlds/rockHeightmap.png b/worlds/rockHeightmap.png index 6d4aa1e..346a87a 100644 Binary files a/worlds/rockHeightmap.png and b/worlds/rockHeightmap.png differ