diff --git a/CrystalPoint.cpp b/CrystalPoint.cpp index 826ad4a..765659b 100644 --- a/CrystalPoint.cpp +++ b/CrystalPoint.cpp @@ -91,7 +91,7 @@ void CrystalPoint::update() if (!worldhandler->isPlayerPositionValid()) player->position = oldPosition; - player->position.y = worldhandler->getHeight(player->position.x, player->position.z) + 1.7f; + player->position.y = worldhandler->getHeight(player->position.x, player->position.z) + 2.5f; worldhandler->update(deltaTime); diff --git a/HeightMap.cpp b/HeightMap.cpp index aa79d4d..fa25d13 100644 --- a/HeightMap.cpp +++ b/HeightMap.cpp @@ -39,11 +39,16 @@ HeightMap::HeightMap(const std::string &file, float scale, World* world) Vec3f ca(0, heightAt(x, y + 1) - heightAt(x, y), 1); Vec3f ba(1, heightAt(x + 1, y) - heightAt(x, y), 0); - if ((valueAt(x, y, GREEN) >= 200) && (valueAt(x, y, GREEN) <= 240)) + + //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) { - world->addLevelObject(new LevelObject(world->getObjectFromValue(valueAt(x, y, GREEN)), Vec3f(x*scale, heightAt(x, y), y*scale), Vec3f(0, 0, 0), 1, false)); + 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) == 190) + 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)); } diff --git a/models/Rocks/DraakHoofd.mtl b/models/Rocks/DraakHoofd.mtl new file mode 100644 index 0000000..aec0a4c --- /dev/null +++ b/models/Rocks/DraakHoofd.mtl @@ -0,0 +1,6 @@ +newmtl lambert2SG +illum 4 +Kd 1.00 1.00 1.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 diff --git a/models/Rocks/DragonWall1.mtl b/models/Rocks/DragonWall1.mtl new file mode 100644 index 0000000..25727c4 --- /dev/null +++ b/models/Rocks/DragonWall1.mtl @@ -0,0 +1,13 @@ +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.00 0.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +map_Kd DragonWallAwesome.png +Ni 1.00 diff --git a/models/Rocks/DragonWallAwesome.png b/models/Rocks/DragonWallAwesome.png new file mode 100644 index 0000000..b6e9b25 Binary files /dev/null and b/models/Rocks/DragonWallAwesome.png differ diff --git a/models/Rocks/SpikeRock1.mtl b/models/Rocks/SpikeRock1.mtl index cb388d7..90abd7d 100644 --- a/models/Rocks/SpikeRock1.mtl +++ b/models/Rocks/SpikeRock1.mtl @@ -1,49 +1,122 @@ newmtl SpikeRock1:lambert4SG illum 4 -Kd 0.13 0.14 0.16 +Kd 1.00 1.00 1.00 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 -newmtl initialShadingGroup +newmtl bob1: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 initialShadingGroup +illum 4 +Kd 0.67 0.67 0.67 +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 +Kd 0.20 0.32 0.50 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 newmtl lambert5SG illum 4 +Kd 1.00 0.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert6SG +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 lambert7SG +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 Screenshot_1.png +Ni 1.00 +newmtl lambert8SG +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 Screenshot_1.png +Ni 1.00 +newmtl lambert10SG +illum 4 +Kd 1.00 1.00 1.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert12SG +illum 4 +Kd 0.58 0.00 1.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert13SG +illum 4 +Kd 0.00 1.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert14SG +illum 4 +Kd 1.00 1.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert15SG +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 TheThing2.png +Ni 1.00 +newmtl lambert16SG +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 SkateboardwielThing.png +Ni 1.00 +newmtl lambert17SG +illum 4 +Kd 0.25 0.25 0.25 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +Ks 0.50 0.50 0.50 +newmtl lambert18SG +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 Bobhelemaal2.png +Ni 1.00 +Ks 0.50 0.50 0.50 +newmtl pasted__lambert2SG +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 Screenshot_1.png Ni 1.00 newmtl pasted__lambert4SG illum 4 -Kd 0.13 0.14 0.16 +Kd 0.50 1.00 1.00 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 -newmtl pasted__pasted__lambert3SG1 +newmtl pasted__lambert5SG illum 4 -Kd 0.45 0.45 0.45 +Kd 0.00 1.00 1.00 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 diff --git a/models/Rocks/SpikeRock2.mtl b/models/Rocks/SpikeRock2.mtl index d9e8e23..af267cf 100644 --- a/models/Rocks/SpikeRock2.mtl +++ b/models/Rocks/SpikeRock2.mtl @@ -1,49 +1,122 @@ newmtl SpikeRock2:lambert4SG illum 4 -Kd 0.13 0.14 0.16 +Kd 1.00 1.00 1.00 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 -newmtl initialShadingGroup +newmtl bob1: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 initialShadingGroup +illum 4 +Kd 0.67 0.67 0.67 +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 +Kd 0.20 0.32 0.50 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 newmtl lambert5SG illum 4 +Kd 1.00 0.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert6SG +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 lambert7SG +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 Screenshot_1.png +Ni 1.00 +newmtl lambert8SG +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 Screenshot_1.png +Ni 1.00 +newmtl lambert10SG +illum 4 +Kd 1.00 1.00 1.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert12SG +illum 4 +Kd 0.58 0.00 1.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert13SG +illum 4 +Kd 0.00 1.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert14SG +illum 4 +Kd 1.00 1.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert15SG +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 TheThing2.png +Ni 1.00 +newmtl lambert16SG +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 SkateboardwielThing.png +Ni 1.00 +newmtl lambert17SG +illum 4 +Kd 0.25 0.25 0.25 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +Ks 0.50 0.50 0.50 +newmtl lambert18SG +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 Bobhelemaal2.png +Ni 1.00 +Ks 0.50 0.50 0.50 +newmtl pasted__lambert2SG +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 Screenshot_1.png Ni 1.00 newmtl pasted__lambert4SG illum 4 -Kd 0.13 0.14 0.16 +Kd 0.50 1.00 1.00 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 -newmtl pasted__pasted__lambert3SG1 +newmtl pasted__lambert5SG illum 4 -Kd 0.45 0.45 0.45 +Kd 0.00 1.00 1.00 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 diff --git a/models/Rocks/SpikeRock3.mtl b/models/Rocks/SpikeRock3.mtl index 9e73746..c2181a3 100644 --- a/models/Rocks/SpikeRock3.mtl +++ b/models/Rocks/SpikeRock3.mtl @@ -1,43 +1,122 @@ -newmtl initialShadingGroup +newmtl SpikeRock3:lambert4SG +illum 4 +Kd 1.00 1.00 1.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl bob1: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 initialShadingGroup +illum 4 +Kd 0.67 0.67 0.67 +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 +Kd 0.20 0.32 0.50 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 newmtl lambert5SG illum 4 +Kd 1.00 0.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert6SG +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 lambert7SG +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 Screenshot_1.png +Ni 1.00 +newmtl lambert8SG +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 Screenshot_1.png +Ni 1.00 +newmtl lambert10SG +illum 4 +Kd 1.00 1.00 1.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert12SG +illum 4 +Kd 0.58 0.00 1.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert13SG +illum 4 +Kd 0.00 1.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert14SG +illum 4 +Kd 1.00 1.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert15SG +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 TheThing2.png +Ni 1.00 +newmtl lambert16SG +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 SkateboardwielThing.png +Ni 1.00 +newmtl lambert17SG +illum 4 +Kd 0.25 0.25 0.25 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +Ks 0.50 0.50 0.50 +newmtl lambert18SG +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 Bobhelemaal2.png +Ni 1.00 +Ks 0.50 0.50 0.50 +newmtl pasted__lambert2SG +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 Screenshot_1.png Ni 1.00 newmtl pasted__lambert4SG illum 4 -Kd 0.13 0.14 0.16 +Kd 0.50 1.00 1.00 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 -newmtl pasted__pasted__lambert3SG1 +newmtl pasted__lambert5SG illum 4 -Kd 0.45 0.45 0.45 +Kd 0.00 1.00 1.00 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 diff --git a/models/Rocks/SpikeRock4.mtl b/models/Rocks/SpikeRock4.mtl index 03958a1..24aaced 100644 --- a/models/Rocks/SpikeRock4.mtl +++ b/models/Rocks/SpikeRock4.mtl @@ -1,49 +1,122 @@ -newmtl SpikeRock3:lambert4SG +newmtl SpikeRock4:lambert4SG illum 4 -Kd 0.13 0.14 0.16 +Kd 1.00 1.00 1.00 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 -newmtl initialShadingGroup +newmtl bob1: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 initialShadingGroup +illum 4 +Kd 0.67 0.67 0.67 +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 +Kd 0.20 0.32 0.50 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 newmtl lambert5SG illum 4 +Kd 1.00 0.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert6SG +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 lambert7SG +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 Screenshot_1.png +Ni 1.00 +newmtl lambert8SG +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 Screenshot_1.png +Ni 1.00 +newmtl lambert10SG +illum 4 +Kd 1.00 1.00 1.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert12SG +illum 4 +Kd 0.58 0.00 1.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert13SG +illum 4 +Kd 0.00 1.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert14SG +illum 4 +Kd 1.00 1.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert15SG +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 TheThing2.png +Ni 1.00 +newmtl lambert16SG +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 SkateboardwielThing.png +Ni 1.00 +newmtl lambert17SG +illum 4 +Kd 0.25 0.25 0.25 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +Ks 0.50 0.50 0.50 +newmtl lambert18SG +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 Bobhelemaal2.png +Ni 1.00 +Ks 0.50 0.50 0.50 +newmtl pasted__lambert2SG +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 Screenshot_1.png Ni 1.00 newmtl pasted__lambert4SG illum 4 -Kd 0.13 0.14 0.16 +Kd 0.50 1.00 1.00 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 -newmtl pasted__pasted__lambert3SG1 +newmtl pasted__lambert5SG illum 4 -Kd 0.45 0.45 0.45 +Kd 0.00 1.00 1.00 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 diff --git a/models/Rocks/SpikeRock5.mtl b/models/Rocks/SpikeRock5.mtl index d9e8e23..55c5eca 100644 --- a/models/Rocks/SpikeRock5.mtl +++ b/models/Rocks/SpikeRock5.mtl @@ -1,49 +1,122 @@ -newmtl SpikeRock2:lambert4SG +newmtl SpikeRock5:lambert4SG illum 4 -Kd 0.13 0.14 0.16 +Kd 1.00 1.00 1.00 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 -newmtl initialShadingGroup +newmtl bob1: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 initialShadingGroup +illum 4 +Kd 0.67 0.67 0.67 +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 +Kd 0.20 0.32 0.50 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 newmtl lambert5SG illum 4 +Kd 1.00 0.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert6SG +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 lambert7SG +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 Screenshot_1.png +Ni 1.00 +newmtl lambert8SG +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 Screenshot_1.png +Ni 1.00 +newmtl lambert10SG +illum 4 +Kd 1.00 1.00 1.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert12SG +illum 4 +Kd 0.58 0.00 1.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert13SG +illum 4 +Kd 0.00 1.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert14SG +illum 4 +Kd 1.00 1.00 0.00 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +newmtl lambert15SG +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 TheThing2.png +Ni 1.00 +newmtl lambert16SG +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 SkateboardwielThing.png +Ni 1.00 +newmtl lambert17SG +illum 4 +Kd 0.25 0.25 0.25 +Ka 0.00 0.00 0.00 +Tf 1.00 1.00 1.00 +Ni 1.00 +Ks 0.50 0.50 0.50 +newmtl lambert18SG +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 Bobhelemaal2.png +Ni 1.00 +Ks 0.50 0.50 0.50 +newmtl pasted__lambert2SG +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 Screenshot_1.png Ni 1.00 newmtl pasted__lambert4SG illum 4 -Kd 0.13 0.14 0.16 +Kd 0.50 1.00 1.00 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 -newmtl pasted__pasted__lambert3SG1 +newmtl pasted__lambert5SG illum 4 -Kd 0.45 0.45 0.45 +Kd 0.00 1.00 1.00 Ka 0.00 0.00 0.00 Tf 1.00 1.00 1.00 Ni 1.00 diff --git a/worlds/rock.json b/worlds/rock.json index b24eee8..61e44a6 100644 --- a/worlds/rock.json +++ b/worlds/rock.json @@ -4,6 +4,14 @@ "texture": "worlds/rockStone2.png", "scale": 1, "object-templates": [ + { + "color": 170, + "file": "models/Rocks/DraakHoofd.obj" + }, + { + "color": 180, + "file": "models/Rocks/DragonWall1.obj" + }, { "color": 190, "file": "models/Rocks/Cave1.obj" @@ -36,41 +44,7 @@ }, "objects": [ ], "enemies": [ - { - "file": "models/squid/Blooper.obj", - "pos": [ 300, 2, 500 ], - "scale": 0.01 - }, - { - "file": "models/Enemies/Bob.obj", - "pos": [ 300, 0, 490 ], - "scale": 0.5 - }, - { - "file": "models/Enemies/Skateboard.obj", - "pos": [ 300, 4, 510 ], - "scale": 1 - }, - { - "file": "models/Enemies/Monkey.obj", - "pos": [ 60, 0, 675 ], - "scale": 2 - }, - { - "file": "models/Enemies/Vincent.obj", - "pos": [ 300, 0, 520 ], - "scale": 0.2 - }, - { - "file": "models/Enemies/Vincent.obj", - "pos": [ 300, 0, 521 ], - "scale": 0.2 - }, - { - "file": "models/Enemies/Vincent.obj", - "pos": [ 300, 0, 522 ], - "scale": 0.2 - } + ] diff --git a/worlds/rockHeightmap.pdn b/worlds/rockHeightmap.pdn index 425c158..740e685 100644 Binary files a/worlds/rockHeightmap.pdn and b/worlds/rockHeightmap.pdn differ diff --git a/worlds/rockHeightmap.png b/worlds/rockHeightmap.png index e7eee97..50fbcef 100644 Binary files a/worlds/rockHeightmap.png and b/worlds/rockHeightmap.png differ diff --git a/worlds/rockStone2.png b/worlds/rockStone2.png index 52d87ea..6d1dc66 100644 Binary files a/worlds/rockStone2.png and b/worlds/rockStone2.png differ