Merge branch 'developer' into feature/loadingscreen

# Conflicts:
#	worlds/rock.json

Crystal.cpp

@@ -18,6 +18,8 @@ Crystal::Crystal(const std::string & filled, const std::string & empty, const Ve
 	sound_id = CrystalPoint::GetSoundSystem().LoadSound("WAVE/Crystal.wav", false);
 	music = CrystalPoint::GetSoundSystem().GetSound(sound_id);
 	music->SetPos(position, Vec3f());
+
+	crystalRot = 0;
 }
 
 Crystal::~Crystal()
@@ -38,6 +40,8 @@ Crystal::~Crystal()
 
 void Crystal::draw()
 {	
+	crystalRot -= 3.0f;
+	rotation = Vec3f(0, crystalRot, 0);
 	Entity::draw();	
 }
 

Crystal.h

@@ -10,7 +10,7 @@ public:
 	Crystal(const std::string &filled, const std::string &empty,
 		const Vec3f &position, Vec3f &rotation, const float &scale);
 	~Crystal();
-
+	float crystalRot;
 	bool isFilled;
 	void draw();
 	void collide();

HeightMap.cpp

@@ -49,7 +49,7 @@ HeightMap::HeightMap(const std::string &file, World* world)
 		{
 			int offsets[4][2] = { { 0, 0 },{ 1, 0 },{ 1, 1 },{ 0, 1 } };
 
-			if (valueAt(x, y, GREEN) > 0)
+			if (valueAt(x, y, GREEN) > 5)
 			{
 				world->addLevelObject(new LevelObject(world->getObjectFromValue(valueAt(x, y, GREEN)).first, Vec3f(x, heightAt(x, y), y), Vec3f(0, 0, 0), 1, world->getObjectFromValue(valueAt(x, y, GREEN)).second));
 			}

Player.cpp

@@ -16,7 +16,7 @@ Player::Player()
 	health = maxHp;
 	xp = 0;
 	maxXp = 100;
-	level = 5;
+	level = 1;
 	crystals = 0;
 
 	loadWeapons();

World.cpp

@@ -40,7 +40,7 @@ World::World(const std::string &fileName)
 		std::cout << "Invalid world file: objects - " << fileName << "\n";
 	if (v["enemies"].isNull())
 		std::cout << "Invalid world file: enemies - " << fileName << "\n";
-	if (v["crystals"].isNull())
+	if (v["crystal"].isNull())
 		std::cout << "Invalid world file: crystals - " << fileName << "\n";
 	
 

models/Bob/Bob.mtl

@@ -0,0 +1,113 @@
+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.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
+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
+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
+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 BobStoneTexture.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
+Ni 1.00
+newmtl pasted__lambert4SG
+illum 4
+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__lambert5SG
+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

models/Bob/BobRock.mtl

@@ -0,0 +1,113 @@
+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.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert2SG
+illum 4
+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
+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
+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
+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 BobStoneTexture.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
+Ni 1.00
+newmtl pasted__lambert4SG
+illum 4
+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__lambert5SG
+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

models/Enemies/Cube.mtl

@@ -0,0 +1,6 @@
+newmtl initialShadingGroup
+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

models/Enemies/Monkey.mtl

@@ -0,0 +1,7 @@
+newmtl Monkey1:initialShadingGroup
+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 tex_wendy.jpg
+Ni 1.00

models/Enemies/Squid.mtl

@@ -0,0 +1,99 @@
+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 lambert3SG
+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 InktvisTextureRock.png
+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

models/Enemies/SquidRock.mtl

@@ -0,0 +1,7 @@
+newmtl Squid:lambert3SG
+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 InktvisTextureRock.png
+Ni 1.00

models/Enemies/VincentRock.mtl

@@ -0,0 +1,147 @@
+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.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert2SG
+illum 4
+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
+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 BobStoneTexture.png
+Ni 1.00
+Ks 0.50 0.50 0.50
+newmtl lambert19SG
+illum 4
+Kd 0.85 0.85 0.85
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert20SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 0.64 0.64 0.64
+Ni 1.00
+newmtl lambert21SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl lambert22SG
+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 lambert23SG
+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 VincentTexture.png
+Ni 1.00
+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.50 1.00 1.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl pasted__lambert5SG
+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

models/Rocks/Rock10.mtl

@@ -1,73 +1,7 @@
-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
+newmtl Rock14: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 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
+map_Kd Stones.png
 Ni 1.00

models/Rocks/Rock10.obj

@@ -1,17 +1,17 @@
 # This file uses centimeters as units for non-parametric coordinates.
 
 mtllib Rock10.mtl
-g default
-v 4.941558 -0.000000 -3.356660
-v 2.216577 -0.000000 -5.336667
-v -1.151898 -0.000000 -6.543634
-v -4.489141 -0.000000 -4.563631
-v -5.530008 -0.000000 -0.153030
-v -4.965517 -0.000000 3.266693
-v -2.240540 -0.000000 5.819403
-v 2.216577 -0.000000 5.603078
-v 5.729727 -0.000000 4.689539
-v 6.770609 -0.000000 1.485886
+g Rock14:default1
+v 4.941558 0.000000 -3.356660
+v 2.216577 0.000000 -5.336667
+v -1.151898 0.000000 -6.543634
+v -4.489141 0.000000 -4.563631
+v -5.530008 0.000000 -0.153030
+v -4.965517 0.000000 3.266693
+v -2.240540 0.000000 5.819403
+v 2.216577 0.000000 5.603078
+v 5.729727 0.000000 4.689539
+v 6.770609 0.000000 1.485886
 v 4.725860 1.551832 -3.199978
 v 2.134023 1.551832 -5.082932
 v -1.069599 1.551832 -6.289903
@@ -40,15 +40,15 @@ v 2.430769 12.995994 0.244891
 v 3.408291 12.995994 2.984904
 v 5.654229 12.995994 4.427516
 v 7.268513 12.995994 4.606150
-v 9.888848 16.207620 4.064604
-v 11.050520 16.207620 1.225952
+v 9.888848 16.207621 4.064604
+v 11.050520 16.207621 1.225952
 v 11.146457 20.527525 -0.466318
 v 6.799099 16.705383 -1.078148
 v 5.113851 16.705383 -1.356947
-v 6.527206 18.970071 -0.745113
+v 6.527206 18.970072 -0.745113
 v 3.950029 16.705383 0.244891
 v 4.271805 16.705383 1.234890
-v 8.013615 18.970071 2.125519
+v 8.013615 18.970072 2.125519
 v 10.304179 20.527525 2.125519
 v 11.146457 20.527525 1.513685
 v 11.467955 20.527525 0.523689
@@ -97,109 +97,203 @@ v 3.411045 12.993238 2.980508
 v 5.651475 12.998750 4.431911
 v 8.016369 18.967314 2.121123
 v 4.269051 16.708139 1.239282
-vt 0.000000 0.500000
-vt 0.100000 0.500000
-vt 0.200000 0.500000
-vt 0.300000 0.500000
-vt 0.400000 0.500000
-vt 0.500000 0.500000
-vt 0.600000 0.500000
-vt 0.700000 0.500000
-vt 0.800000 0.500000
-vt 0.900000 0.500000
-vt 1.000000 0.500000
-vt 0.000000 0.600000
-vt 0.100000 0.600000
-vt 0.200000 0.600000
-vt 0.300000 0.600000
-vt 0.400000 0.600000
-vt 0.500000 0.600000
-vt 0.600000 0.600000
-vt 0.700000 0.600000
-vt 0.800000 0.600000
-vt 0.900000 0.600000
-vt 1.000000 0.600000
-vt 0.000000 0.700000
-vt 0.100000 0.700000
-vt 0.200000 0.700000
-vt 0.300000 0.700000
-vt 0.400000 0.700000
-vt 0.500000 0.700000
-vt 0.600000 0.700000
-vt 0.700000 0.700000
-vt 0.800000 0.700000
-vt 0.900000 0.700000
-vt 1.000000 0.700000
-vt 0.000000 0.800000
-vt 0.100000 0.800000
-vt 0.200000 0.800000
-vt 0.300000 0.800000
-vt 0.400000 0.800000
-vt 0.500000 0.800000
-vt 0.600000 0.800000
-vt 0.700000 0.800000
-vt 0.800000 0.800000
-vt 0.900000 0.800000
-vt 1.000000 0.800000
-vt 0.000000 0.900000
-vt 0.100000 0.900000
-vt 0.200000 0.900000
-vt 0.300000 0.900000
-vt 0.400000 0.900000
-vt 0.500000 0.900000
-vt 0.600000 0.900000
-vt 0.700000 0.900000
-vt 0.800000 0.900000
-vt 0.900000 0.900000
-vt 1.000000 0.900000
-vt 1.000000 0.776546
-vt 0.000000 0.776546
-vt 0.100000 0.776546
-vt 0.200000 0.776546
-vt 0.300000 0.776546
-vt 0.400000 0.776546
-vt 0.500000 0.776546
-vt 0.600000 0.776546
-vt 0.700000 0.776546
-vt 0.800000 0.776546
-vt 0.900000 0.776546
-vt 1.000000 0.745849
-vt 0.000000 0.745849
-vt 0.100000 0.745849
-vt 0.200000 0.745849
-vt 0.500000 0.745849
-vt 0.600000 0.745849
-vt 0.700000 0.745849
-vt 0.800000 0.745849
-vt 0.900000 0.745849
-vt 1.000000 0.715546
-vt 0.000000 0.715546
-vt 0.100000 0.715546
-vt 0.200000 0.715546
-vt 0.300000 0.715546
-vt 0.500000 0.715546
-vt 0.600000 0.715546
-vt 0.700000 0.715546
-vt 0.800000 0.715546
-vt 0.900000 0.715546
-vt 0.300000 0.715546
-vt 0.400000 0.715546
-vt 0.400000 0.745849
-vt 0.300000 0.745849
-vt 0.300000 0.715546
-vt 0.400000 0.715546
-vt 0.400000 0.745849
-vt 0.300000 0.745849
-vt 0.400000 0.745691
-vt 0.300000 0.730697
-vt 0.400000 0.730697
-vt 0.400000 0.745849
-vt 0.300000 0.745849
-vt 0.395018 0.745849
-vt 0.500000 0.800000
-vt 0.600000 0.800000
-vt 0.600000 0.900000
-vt 0.500000 0.900000
+vt 0.747022 0.464579
+vt 0.853638 0.464579
+vt 0.853638 0.502091
+vt 0.750810 0.502091
+vt 0.936302 0.464579
+vt 0.932515 0.502091
+vt 0.853638 0.535931
+vt 0.790988 0.535931
+vt 0.699160 0.464579
+vt 0.705294 0.502091
+vt 0.998008 0.464579
+vt 0.991875 0.502091
+vt 0.937002 0.535931
+vt 0.854875 0.641299
+vt 0.794890 0.635607
+vt 0.795144 0.640797
+vt 0.861003 0.721782
+vt 0.935832 0.573675
+vt 0.923036 0.647250
+vt 0.931253 0.721782
+vt 0.833441 0.748612
+vt 0.773456 0.742920
+vt 0.975723 0.535931
+vt 0.973957 0.573675
+vt 0.970514 0.647250
+vt 0.967024 0.721782
+vt 0.929491 0.778727
+vt 0.863257 0.778727
+vt 0.834901 0.772846
+vt 0.777509 0.770000
+vt 0.964362 0.778727
+vt 0.887188 0.868393
+vt 0.863257 0.868393
+vt 0.851626 0.850914
+vt 0.775674 0.846534
+vt 0.908717 0.923136
+vt 0.839326 0.923136
+vt 0.001992 0.001895
+vt 0.079433 0.001895
+vt 0.079433 0.039407
+vt 0.005786 0.039407
+vt 0.196490 0.001895
+vt 0.192703 0.039407
+vt 0.102073 0.078457
+vt 0.016326 0.078457
+vt 0.244352 0.001895
+vt 0.238219 0.039407
+vt 0.200623 0.073247
+vt 0.099532 0.116201
+vt 0.016445 0.116201
+vt 0.195415 0.110991
+vt 0.094575 0.189775
+vt 0.016680 0.189775
+vt 0.185265 0.184565
+vt 0.089551 0.264307
+vt 0.016916 0.264307
+vt 0.174988 0.259097
+vt 0.085716 0.393676
+vt 0.017098 0.393676
+vt 0.167129 0.316043
+vt 0.102692 0.498100
+vt 0.078761 0.498100
+vt 0.126623 0.498100
+vt 0.063393 0.559036
+vt 0.108908 0.559036
+vt 0.108908 0.648702
+vt 0.084977 0.703446
+vt 0.057115 0.502091
+vt 0.106654 0.502091
+vt 0.035261 0.559036
+vt 0.070187 0.648702
+vt 0.026503 0.502091
+vt 0.163636 0.610527
+vt 0.207905 0.649700
+vt 0.229774 0.713018
+vt 0.153822 0.717397
+vt 0.167712 0.610430
+vt 0.202447 0.612058
+vt 0.210558 0.502091
+vt 0.231991 0.609403
+vt 0.227939 0.636484
+vt 0.144445 0.588265
+vt 0.193984 0.588265
+vt 0.270374 0.804930
+vt 0.214729 0.949340
+vt 0.214623 0.949273
+vt 0.270481 0.804997
+vt 0.424535 0.894663
+vt 0.382233 0.804997
+vt 0.382339 0.804930
+vt 0.424429 0.894729
+vt 0.087686 0.784877
+vt 0.042170 0.862323
+vt 0.001992 0.832383
+vt 0.040713 0.779090
+vt 0.058510 0.707437
+vt 0.040713 0.713219
+vt 0.486186 0.806273
+vt 0.487074 0.809006
+vt 0.483578 0.804930
+vt 0.339641 0.812702
+vt 0.276989 0.833062
+vt 0.291779 0.812702
+vt 0.315710 0.804930
+vt 0.346380 0.924361
+vt 0.276989 0.888431
+vt 0.263287 0.549953
+vt 0.343957 0.502091
+vt 0.425382 0.531267
+vt 0.491252 0.579129
+vt 0.535465 0.696186
+vt 0.510305 0.773627
+vt 0.425382 0.795709
+vt 0.317642 0.800939
+vt 0.251772 0.739233
+vt 0.238127 0.656569
+vt 0.468468 0.804930
+vt 0.468468 0.886355
+vt 0.430956 0.884366
+vt 0.430956 0.806926
+vt 0.312308 0.001895
+vt 0.420049 0.001895
+vt 0.418053 0.039407
+vt 0.314304 0.039407
+vt 0.504971 0.001895
+vt 0.514707 0.039407
+vt 0.412271 0.073247
+vt 0.355235 0.073247
+vt 0.505141 0.078457
+vt 0.432467 0.110991
+vt 0.378233 0.110991
+vt 0.251653 0.039407
+vt 0.301942 0.073247
+vt 0.520740 0.116201
+vt 0.471829 0.184565
+vt 0.423055 0.184565
+vt 0.551157 0.189775
+vt 0.511701 0.259097
+vt 0.468456 0.259097
+vt 0.581965 0.264307
+vt 0.542167 0.316043
+vt 0.503146 0.316043
+vt 0.605508 0.393676
+vt 0.615548 0.498100
+vt 0.560179 0.460452
+vt 0.635908 0.498100
+vt 0.830989 0.460588
+vt 0.768338 0.460588
+vt 0.762555 0.426748
+vt 0.828179 0.426748
+vt 0.782751 0.389004
+vt 0.846103 0.389004
+vt 0.696685 0.426748
+vt 0.717257 0.389004
+vt 0.822114 0.315429
+vt 0.881052 0.315429
+vt 0.739241 0.217105
+vt 0.755845 0.240897
+vt 0.797981 0.240897
+vt 0.757358 0.315429
+vt 0.643392 0.426748
+vt 0.666225 0.321882
+vt 0.665446 0.327072
+vt 0.861985 0.240897
+vt 0.916451 0.240897
+vt 0.892452 0.183952
+vt 0.943497 0.183952
+vt 0.829020 0.183952
+vt 0.881105 0.094286
+vt 0.986192 0.001895
+vt 0.840368 0.094286
+vt 0.874533 0.039543
+vt 0.095737 0.721389
+vt 0.149894 0.721522
+vt 0.207060 0.865798
+vt 0.116477 0.811188
+vt 0.564521 0.607459
+vt 0.663878 0.709773
+vt 0.664117 0.710123
+vt 0.661509 0.710203
+vt 0.693025 0.817074
+vt 0.629799 0.739006
+vt 0.606700 0.714772
+vt 0.541601 0.502091
+vt 0.475849 0.859220
+vt 0.475849 0.804930
+vt 0.475916 0.804997
+vt 0.475782 0.859154
+vt 0.117761 0.709773
+vt 0.130946 0.502091
+vt 0.138310 0.687942
+vt 0.115043 0.710107
+vt 0.117776 0.710123
+vt 0.374527 0.804997
+vt 0.352998 0.895446
+vt 0.353105 0.895513
+vt 0.374421 0.804930
 vn 0.580093 0.161325 -0.798415
 vn 0.580093 0.161325 -0.798415
 vn 0.580093 0.161325 -0.798415
@@ -300,10 +394,10 @@ vn -0.513202 0.342157 0.787116
 vn -0.513202 0.342157 0.787116
 vn -0.513202 0.342157 0.787116
 vn -0.513202 0.342158 0.787116
-vn -0.103818 0.105609 0.988974
-vn -0.103818 0.105609 0.988974
-vn -0.103818 0.105609 0.988974
-vn -0.103818 0.105609 0.988974
+vn -0.103818 0.105609 0.988973
+vn -0.103818 0.105609 0.988973
+vn -0.103818 0.105609 0.988973
+vn -0.103818 0.105609 0.988973
 vn 0.242147 -0.055410 0.968656
 vn 0.242147 -0.055411 0.968656
 vn 0.242147 -0.055411 0.968656
@@ -312,8 +406,8 @@ vn 0.913291 -0.166829 0.371576
 vn 0.913291 -0.166829 0.371576
 vn 0.913291 -0.166829 0.371575
 vn 0.913291 -0.166829 0.371576
-vn 0.908138 -0.217763 -0.357580
-vn 0.908138 -0.217763 -0.357580
+vn 0.908139 -0.217763 -0.357580
+vn 0.908139 -0.217763 -0.357580
 vn 0.908139 -0.217763 -0.357580
 vn 0.908139 -0.217763 -0.357580
 vn -0.010919 0.268649 -0.963176
@@ -434,10 +528,10 @@ vn 0.282260 0.010754 -0.959278
 vn 0.282260 0.010754 -0.959278
 vn 0.282260 0.010754 -0.959278
 vn 0.282260 0.010754 -0.959278
-vn 0.007899 0.161210 -0.986888
-vn 0.007899 0.161210 -0.986888
-vn 0.007899 0.161210 -0.986888
-vn 0.007899 0.161210 -0.986888
+vn 0.007899 0.161210 -0.986889
+vn 0.007899 0.161210 -0.986889
+vn 0.007899 0.161210 -0.986889
+vn 0.007899 0.161210 -0.986889
 vn -0.544997 0.360368 0.757042
 vn -0.544997 0.360368 0.757042
 vn -0.544997 0.360368 0.757042
@@ -450,18 +544,18 @@ vn 0.248662 -0.093840 0.964034
 vn 0.248662 -0.093840 0.964034
 vn 0.248662 -0.093840 0.964034
 vn 0.248662 -0.093840 0.964034
-vn 0.868209 -0.359881 0.341614
-vn 0.868209 -0.359881 0.341614
 vn 0.868208 -0.359881 0.341614
-vn 0.868209 -0.359881 0.341614
+vn 0.868208 -0.359881 0.341614
+vn 0.868208 -0.359881 0.341614
+vn 0.868208 -0.359881 0.341614
 vn 0.820167 -0.305191 -0.483927
 vn 0.820167 -0.305191 -0.483927
 vn 0.820167 -0.305191 -0.483927
 vn 0.820167 -0.305191 -0.483927
-vn -0.901648 0.290351 -0.320509
-vn -0.901648 0.290351 -0.320509
-vn -0.901648 0.290351 -0.320509
-vn -0.901648 0.290351 -0.320509
+vn -0.901649 0.290351 -0.320509
+vn -0.901649 0.290351 -0.320509
+vn -0.901649 0.290351 -0.320509
+vn -0.901649 0.290351 -0.320509
 vn -0.153020 0.117402 0.981225
 vn -0.153020 0.117402 0.981225
 vn -0.153020 0.117402 0.981225
@@ -470,9 +564,9 @@ vn -0.153020 0.117402 0.981225
 vn -0.153020 0.117402 0.981225
 vn -0.153020 0.117402 0.981225
 vn 0.944190 -0.256454 0.206730
-vn 0.944189 -0.256454 0.206730
 vn 0.944190 -0.256454 0.206730
-vn 0.944189 -0.256454 0.206730
+vn 0.944190 -0.256454 0.206730
+vn 0.944190 -0.256454 0.206730
 vn 0.599743 -0.413652 -0.684982
 vn 0.599743 -0.413652 -0.684982
 vn 0.599743 -0.413652 -0.684982
@@ -510,7 +604,7 @@ vn 0.954339 0.279212 0.106194
 vn 0.954339 0.279212 0.106194
 vn 0.033520 0.999426 0.005000
 vn 0.033520 0.999426 0.005000
-vn 0.033520 0.999425 0.005000
+vn 0.033520 0.999426 0.005000
 vn -0.805391 0.501883 0.315372
 vn -0.805390 0.501883 0.315372
 vn -0.805390 0.501883 0.315372
@@ -528,14 +622,16 @@ vn -0.412111 0.909837 0.048596
 vn -0.412111 0.909837 0.048596
 vn -0.412111 0.909837 0.048596
 vn -0.412111 0.909837 0.048596
-vn 0.130679 0.969155 0.208951
-vn 0.130679 0.969155 0.208951
-vn 0.130679 0.969155 0.208951
-vn 0.130679 0.969155 0.208951
+vn 0.130679 0.969156 0.208951
+vn 0.130679 0.969156 0.208951
+vn 0.130679 0.969156 0.208951
+vn 0.130679 0.969156 0.208951
 vn 0.898657 -0.437843 0.026635
 vn 0.898657 -0.437843 0.026635
 vn 0.898657 -0.437843 0.026635
 vn 0.898657 -0.437843 0.026635
+vn -0.559499 0.786314 0.262050
+vn -0.559500 0.786314 0.262050
 vn 0.901532 -0.413238 -0.128352
 vn 0.901532 -0.413238 -0.128352
 vn 0.391848 0.919311 -0.036369
@@ -553,93 +649,89 @@ vn 0.000000 -1.000000 0.000000
 vn 0.000000 -1.000000 0.000000
 vn 0.000000 -1.000000 0.000000
 s off
-g pasted__pasted__pSphere1 pasted__pasted__pSphere1SmoothProxyGroup pasted__group group1
-usemtl lambert6SG
-f 1/1/1 2/2/2 12/13/3 11/12/4
-f 2/2/5 3/3/6 13/14/7 12/13/8
-f 3/3/9 4/4/10 14/15/11 13/14/12
-f 4/4/13 5/5/14 15/16/15 14/15/16
-f 5/5/17 6/6/18 16/17/19 15/16/20
-f 6/6/21 7/7/22 17/18/23 16/17/24
-f 7/7/25 8/8/26 18/19/27 17/18/28
-f 8/8/29 9/9/30 19/20/31 18/19/32
-f 9/9/33 10/10/34 20/21/35 19/20/36
-f 10/10/37 1/11/38 11/22/39 20/21/40
-f 11/12/41 12/13/42 22/24/43 21/23/44
-f 12/13/45 13/14/46 23/25/47 22/24/48
-f 13/14/49 14/15/50 24/26/51 23/25/52
-f 14/15/53 15/16/54 25/27/55 24/26/56
-f 15/16/57 16/17/58 26/28/59 25/27/60
-f 16/17/61 17/18/62 27/29/63 26/28/64
-f 17/18/65 18/19/66 28/30/67 27/29/68
-f 18/19/69 19/20/70 29/31/71 28/30/72
-f 19/20/73 20/21/74 30/32/75 29/31/76
-f 20/21/77 11/22/78 21/33/79 30/32/80
-f 51/57/81 52/58/82 32/35/83 31/34/84
-f 52/58/85 53/59/86 33/36/87 32/35/88
-f 54/60/89 55/61/90 35/38/91 34/37/92
-f 55/61/93 56/62/94 36/39/95 35/38/96
-f 56/62/97 57/63/98 37/40/99 36/39/100
-f 57/63/101 58/64/102 38/41/103 37/40/104
-f 58/64/105 59/65/106 39/42/107 38/41/108
-f 59/65/109 60/66/110 40/43/111 39/42/112
-f 60/66/113 51/56/114 31/44/115 40/43/116
-f 31/34/117 32/35/118 42/46/119 41/45/120
-f 32/35/121 33/36/122 43/47/123 42/46/124
-f 33/36/125 34/37/126 44/48/127 43/47/128
-f 34/37/129 35/38/130 45/49/131 44/48/132
-f 35/38/133 36/39/134 46/50/135 45/49/136
-f 92/100/137 93/101/138 94/102/139 95/103/140
-f 37/40/141 38/41/142 48/52/143 47/51/144
-f 38/41/145 39/42/146 49/53/147 48/52/148
-f 39/42/149 40/43/150 50/54/151 49/53/152
-f 40/43/153 31/44/154 41/55/155 50/54/156
-f 34/37/157 33/36/158 53/59/159 54/60/160
-s 1
-f 47/51/161 44/48/162 45/49/163 46/50/164
-s off
-f 61/68/165 62/69/166 52/58/167 51/57/168
-f 62/69/169 63/70/170 53/59/171 52/58/172
-f 55/61/173 25/27/174 26/28/175 73/81/176 64/71/177 56/62/178
-f 64/71/179 65/72/180 57/63/181 56/62/182
-f 65/72/183 66/73/184 58/64/185 57/63/186
-f 66/73/187 67/74/188 59/65/189 58/64/190
-f 67/74/191 68/75/192 60/66/193 59/65/194
-f 68/75/195 61/67/196 51/56/197 60/66/198
-f 69/77/199 70/78/200 62/69/201 61/68/202
-f 70/78/203 71/79/204 63/70/205 62/69/206
-f 87/95/207 88/96/208 84/92/209 85/93/210
-f 73/81/211 74/82/212 65/72/213 64/71/214
-f 74/82/215 75/83/216 66/73/217 65/72/218
-f 75/83/219 76/84/220 67/74/221 66/73/222
-f 76/84/223 77/85/224 68/75/225 67/74/226
-f 77/85/227 69/76/228 61/67/229 68/75/230
-f 21/23/231 22/24/232 70/78/233 69/77/234
-f 22/24/235 23/25/236 71/79/237 70/78/238
-f 26/28/239 27/29/240 74/82/241 73/81/242
-f 27/29/243 28/30/244 75/83/245 74/82/246
-f 28/30/247 29/31/248 76/84/249 75/83/250
-f 29/31/251 30/32/252 77/85/253 76/84/254
-f 30/32/255 21/33/256 69/76/257 77/85/258
-f 78/86/259 79/87/260 83/91/261 82/90/262
-f 79/87/263 86/94/264 80/88/265 89/97/266 84/92/267 88/96/268 83/91/269
-f 89/97/270 90/98/271 85/93/272 84/92/273
-f 81/89/274 78/86/275 82/90/276 87/95/277 85/93/278 90/98/279
-f 25/27/280 79/87/281 78/86/282 72/80/283 24/26/284
-f 25/27/285 86/94/286 79/87/287
-f 82/90/288 83/91/289 88/96/290 87/95/291
-f 89/97/292 91/99/293 81/89/294 90/98/295
-f 81/89/296 54/60/297 53/59/298 63/70/299 71/79/300 23/25/301 24/26/302 72/80/303 78/86/304
-f 91/99/305 55/61/306 54/60/307 81/89/308
-f 80/88/309 91/99/310 89/97/311
-f 86/94/312 25/27/313 55/61/314 91/99/315 80/88/316
-f 42/46/317 43/47/318 44/48/319 41/45/320
-f 41/45/321 48/52/322 49/53/323 50/54/324
-f 41/45/325 44/48/326 47/51/327 48/52/328
-f 36/39/329 37/40/330 93/101/331 92/100/332
-f 37/40/333 47/51/334 94/102/335 93/101/336
-s 1
-f 47/51/161 46/50/164 95/103/337 94/102/338
-s off
-f 46/50/339 36/39/340 92/100/341 95/103/342
-f 4/4/343 3/3/344 2/2/345 1/11/346 10/10/347 9/9/348 8/8/349 7/7/350 6/6/351 5/5/352
+g Rock14:group1 Rock14:pasted__group Rock14:pasted__pasted__pSphere1 Rock14:pasted__pasted__pSphere1SmoothProxyGroup Rock14:polySurface1
+usemtl Rock14:lambert6SG
+f 1/42/1 2/46/2 12/47/3 11/43/4
+f 2/117/5 3/118/6 13/119/7 12/120/8
+f 3/9/9 4/1/10 14/4/11 13/10/12
+f 4/1/13 5/2/14 15/3/15 14/4/16
+f 5/2/17 6/5/18 16/6/19 15/3/20
+f 6/5/21 7/11/22 17/12/23 16/6/24
+f 7/121/25 8/122/26 18/123/27 17/124/28
+f 8/122/29 9/125/30 19/126/31 18/123/32
+f 9/38/33 10/39/34 20/40/35 19/41/36
+f 10/39/37 1/42/38 11/43/39 20/40/40
+f 11/147/41 12/148/42 22/149/43 21/150/44
+f 12/96/45 13/92/46 23/95/47 22/97/48
+f 13/92/49 14/93/50 24/94/51 23/95/52
+f 14/4/53 15/3/54 25/7/55 24/8/56
+f 15/3/57 16/6/58 26/13/59 25/7/60
+f 16/132/61 17/124/62 27/128/63 26/133/64
+f 17/124/65 18/123/66 28/127/67 27/128/68
+f 18/123/69 19/126/70 29/129/71 28/127/72
+f 19/41/73 20/40/74 30/44/75 29/45/76
+f 20/40/77 11/43/78 21/48/79 30/44/80
+f 51/165/81 52/164/82 32/166/83 31/167/84
+f 52/164/85 53/159/86 33/168/87 32/166/88
+f 54/68/89 55/69/90 35/65/91 34/64/92
+f 55/17/93 56/20/94 36/27/95 35/28/96
+f 56/20/97 57/26/98 37/31/99 36/27/100
+f 57/139/101 58/138/102 38/141/103 37/142/104
+f 58/138/105 59/140/106 39/143/107 38/141/108
+f 59/56/109 60/55/110 40/58/111 39/59/112
+f 60/55/113 51/57/114 31/60/115 40/58/116
+f 31/167/117 32/166/118 42/169/119 41/170/120
+f 32/166/121 33/168/122 43/171/123 42/169/124
+f 33/70/125 34/64/126 44/67/127 43/71/128
+f 34/64/129 35/65/130 45/66/131 44/67/132
+f 35/28/133 36/27/134 46/32/135 45/33/136
+f 92/173/137 93/174/138 94/175/139 95/176/140
+f 37/142/141 38/141/142 48/144/143 47/145/144
+f 38/141/145 39/143/146 49/146/147 48/144/148
+f 39/59/149 40/58/150 50/61/151 49/62/152
+f 40/58/153 31/60/154 41/63/155 50/61/156
+f 34/64/157 33/70/158 53/72/159 54/68/160
+f 47/36/161 44/37/162 45/33/163 46/32/164
+f 61/156/165 62/155/166 52/164/167 51/165/168
+f 62/155/169 63/160/170 53/159/171 52/164/172
+f 55/17/173 25/7/174 26/13/175 73/18/176 64/19/177 56/20/178
+f 64/19/179 65/25/180 57/26/181 56/20/182
+f 65/136/183 66/135/184 58/138/185 57/139/186
+f 66/135/187 67/137/188 59/140/189 58/138/190
+f 67/53/191 68/52/192 60/55/193 59/56/194
+f 68/52/195 61/54/196 51/57/197 60/55/198
+f 69/152/199 70/151/200 62/155/201 61/156/202
+f 70/151/203 71/154/204 63/160/205 62/155/206
+f 87/30/207 88/29/208 84/34/209 85/35/210
+f 73/18/211 74/24/212 65/25/213 64/19/214
+f 74/131/215 75/130/216 66/135/217 65/136/218
+f 75/130/219 76/134/220 67/137/221 66/135/222
+f 76/50/223 77/49/224 68/52/225 67/53/226
+f 77/49/227 69/51/228 61/54/229 68/52/230
+f 21/150/231 22/149/232 70/151/233 69/152/234
+f 22/149/235 23/153/236 71/154/237 70/151/238
+f 26/13/239 27/23/240 74/24/241 73/18/242
+f 27/128/243 28/127/244 75/130/245 74/131/246
+f 28/127/247 29/129/248 76/134/249 75/130/250
+f 29/45/251 30/44/252 77/49/253 76/50/254
+f 30/44/255 21/48/256 69/51/257 77/49/258
+f 78/15/259 79/14/260 83/21/261 82/22/262
+f 79/177/263 86/178/264 80/179/265 89/180/266 84/181/267 88/182/268 83/183/269
+f 89/73/270 90/74/271 85/75/272 84/76/273
+f 81/78/274 78/79/275 82/80/276 87/81/277 85/75/278 90/74/279
+f 25/7/280 79/14/281 78/15/282 72/16/283 24/8/284
+f 25/184/285 86/178/286 79/177/287
+f 82/22/288 83/21/289 88/29/290 87/30/291
+f 89/73/292 91/77/293 81/78/294 90/74/295
+f 81/157/296 54/158/297 53/159/298 63/160/299 71/154/300 23/153/301 24/161/302 72/162/303 78/163/304
+f 91/77/305 55/82/306 54/83/307 81/78/308
+f 80/98/309 91/99/310 89/100/311
+f 86/189/312 25/190/313 55/191/314 91/192/315 80/193/316
+f 42/169/317 43/171/318 44/172/319 41/170/320
+f 41/101/321 48/102/322 49/103/323 50/104/324
+f 41/101/325 44/105/326 47/106/327 48/102/328
+f 36/185/329 37/186/330 93/187/331 92/188/332
+f 37/84/333 47/85/334 94/86/335 93/87/336
+f 47/194/337 46/195/338 95/196/339 94/197/340
+f 46/88/341 36/89/342 92/90/343 95/91/344
+f 4/107/345 3/108/346 2/109/347 1/110/348 10/111/349 9/112/350 8/113/351 7/114/352 6/115/353 5/116/354

models/Rocks/Rock5.mtl

@@ -1,67 +1,26 @@
-newmtl Rock1:pasted__pasted__lambert3SG1
+newmtl Rock5: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
+Kd 0.00 0.00 0.00
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
+map_Kd Stones.png
 Ni 1.00
-newmtl Rock3:pasted__pasted__lambert3SG1
+newmtl Rock5:pasted__pasted__lambert3SG3
 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
+newmtl Rock5:pasted__pasted__lambert3SG7
 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
+map_Kd Stones.png
 Ni 1.00

models/Rocks/Rock6.mtl

@@ -1,67 +1,32 @@
-newmtl Rock1:pasted__pasted__lambert3SG1
+newmtl Rock6: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
+newmtl Rock6:pasted__pasted__lambert3SG3
 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
+newmtl Rock6:pasted__pasted__lambert3SG7
 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
+Kd 0.00 0.00 0.00
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
+map_Kd Stones.png
 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
+map_Kd Stones.png
 Ni 1.00

models/Rocks/Rock7.mtl

@@ -1,67 +1,135 @@
-newmtl Rock1:pasted__pasted__lambert3SG1
+newmtl initialShadingGroup
 illum 4
-Kd 0.45 0.45 0.45
+Kd 0.22 0.22 0.22
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-newmtl Rock2:pasted__pasted__lambert3SG1
+newmtl lambert2SG
 illum 4
-Kd 0.45 0.45 0.45
+Kd 0.50 0.32 0.25
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-newmtl Rock3:pasted__pasted__lambert3SG1
+newmtl lambert3SG
 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
+newmtl lambert4SG
 illum 4
-Kd 0.45 0.45 0.45
+Kd 0.12 0.12 0.12
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-newmtl initialShadingGroup
+newmtl lambert5SG
 illum 4
-Kd 0.50 0.50 0.50
+Kd 0.10 0.05 0.02
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-newmtl lambert2SG
+newmtl lambert7SG
 illum 4
-Kd 0.11 0.07 0.00
+Kd 0.00 0.00 0.00
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
+map_Kd Stones.png
 Ni 1.00
-newmtl lambert3SG
+newmtl pasted__lambert4SG
 illum 4
-Kd 0.50 0.35 0.00
+Kd 0.12 0.12 0.12
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-newmtl lambert4SG
+newmtl pasted__lambert4SG1
 illum 4
-Kd 0.13 0.14 0.16
+Kd 0.12 0.12 0.12
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-newmtl lambert5SG
+newmtl pasted__lambert4SG2
 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
+map_Kd DH4m07o.gif
 Ni 1.00
-newmtl pasted__lambert4SG
+newmtl pasted__lambert5SG
 illum 4
-Kd 0.13 0.14 0.16
+Kd 0.10 0.05 0.02
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00
-newmtl pasted__pasted__lambert3SG1
+newmtl pasted__lambert5SG1
 illum 4
-Kd 0.45 0.45 0.45
+Kd 0.10 0.05 0.02
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl pasted__lambert5SG2
+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 kappa.jpg
+Ni 1.00
+newmtl pasted__pasted__lambert4SG
+illum 4
+Kd 0.12 0.12 0.12
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl pasted__pasted__lambert4SG1
+illum 4
+Kd 0.12 0.12 0.12
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl pasted__pasted__lambert4SG2
+illum 4
+Kd 0.12 0.12 0.12
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl pasted__pasted__lambert4SG3
+illum 4
+Kd 0.12 0.12 0.12
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl pasted__pasted__lambert5SG
+illum 4
+Kd 0.10 0.05 0.02
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl pasted__pasted__lambert5SG1
+illum 4
+Kd 0.10 0.05 0.02
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl pasted__pasted__lambert5SG2
+illum 4
+Kd 0.10 0.05 0.02
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl pasted__pasted__lambert5SG3
+illum 4
+Kd 0.10 0.05 0.02
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl pasted__pasted__pasted__lambert4SG
+illum 4
+Kd 0.12 0.12 0.12
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+Ni 1.00
+newmtl pasted__pasted__pasted__lambert5SG
+illum 4
+Kd 0.10 0.05 0.02
 Ka 0.00 0.00 0.00
 Tf 1.00 1.00 1.00
 Ni 1.00

models/Rocks/Rock8.mtl

@@ -1,73 +1,7 @@
-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
+newmtl Rock16: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 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
+map_Kd Stones.png
 Ni 1.00

models/Rocks/Rock8.obj

@@ -10,9 +10,9 @@ v 0.000000 2.695647 2.606701
 v 2.606701 2.695647 2.606701
 v -2.606701 5.302348 2.606701
 v 0.000000 16.108469 2.606700
-v 5.170563 20.254806 4.702277
-v -2.606701 5.302348 -0.000000
-v 0.000000 13.687572 -0.000000
+v 5.170563 20.254807 4.702277
+v -2.606701 5.302348 0.000000
+v 0.000000 13.687572 0.000000
 v 2.606701 16.108469 -0.000001
 v 0.000000 5.302348 -2.606701
 v 2.606701 5.302348 -2.606701
@@ -22,58 +22,77 @@ v 2.606701 2.695647 -2.606701
 v -2.606701 0.088946 -2.606701
 v 0.000000 0.088946 -2.606701
 v 2.606701 0.088946 -2.606701
-v -2.606701 0.088946 -0.000000
-v 0.000000 0.088946 -0.000000
-v 2.606701 0.088946 -0.000000
-v 2.606701 2.695647 -0.000000
-v -2.606701 2.695647 -0.000000
+v -2.606701 0.088946 0.000000
+v 0.000000 0.088946 0.000000
+v 2.606701 0.088946 0.000000
+v 2.606701 2.695647 0.000000
+v -2.606701 2.695647 0.000000
 v 2.606701 13.749858 2.606700
 v 2.049037 5.150423 2.093857
 v 1.372906 9.543440 1.526483
-v 2.606701 9.394895 -0.000000
+v 2.606701 9.394895 0.000000
 v 0.000000 9.264000 2.606700
-vt 0.375000 0.000000
-vt 0.500000 0.000000
-vt 0.625000 0.000000
-vt 0.375000 0.125000
-vt 0.500000 0.125000
-vt 0.625000 0.125000
-vt 0.375000 0.250000
-vt 0.500000 0.250000
-vt 0.625000 0.250000
-vt 0.375000 0.375000
-vt 0.500000 0.375000
-vt 0.625000 0.375000
-vt 0.500000 0.500000
-vt 0.625000 0.500000
-vt 0.375000 0.625000
-vt 0.500000 0.625000
-vt 0.625000 0.625000
-vt 0.375000 0.750000
-vt 0.500000 0.750000
-vt 0.625000 0.750000
-vt 0.375000 0.875000
-vt 0.500000 0.875000
-vt 0.625000 0.875000
-vt 0.375000 1.000000
-vt 0.500000 1.000000
-vt 0.625000 1.000000
-vt 0.875000 0.000000
-vt 0.750000 0.000000
-vt 0.875000 0.125000
-vt 0.750000 0.125000
-vt 0.875000 0.250000
-vt 0.750000 0.250000
-vt 0.125000 0.000000
-vt 0.250000 0.000000
-vt 0.125000 0.125000
-vt 0.250000 0.125000
-vt 0.250000 0.250000
-vt 0.625000 0.229861
-vt 0.625000 0.185525
-vt 0.625000 0.189959
-vt 0.750000 0.187433
-vt 0.500000 0.186213
+vt 0.762946 0.193234
+vt 0.762946 0.590509
+vt 0.667113 0.501507
+vt 0.667113 0.193234
+vt 0.571281 0.097402
+vt 0.667113 0.097402
+vt 0.571281 0.193234
+vt 0.571281 0.097402
+vt 0.762946 0.097402
+vt 0.571281 0.001569
+vt 0.667113 0.001569
+vt 0.762946 0.001569
+vt 0.467404 0.001569
+vt 0.563236 0.001569
+vt 0.563236 0.097402
+vt 0.467404 0.097402
+vt 0.563236 0.193234
+vt 0.467404 0.590509
+vt 0.467404 0.343692
+vt 0.371571 0.001569
+vt 0.371571 0.097402
+vt 0.411284 0.349153
+vt 0.371571 0.503797
+vt 0.390425 0.187649
+vt 0.294530 0.742944
+vt 0.704376 0.784590
+vt 0.627334 0.594500
+vt 0.800208 0.688758
+vt 0.800208 0.784590
+vt 0.806343 0.594500
+vt 0.902176 0.594500
+vt 0.902176 0.690333
+vt 0.806343 0.690333
+vt 0.998008 0.594500
+vt 0.998008 0.690333
+vt 0.902176 0.786165
+vt 0.806343 0.786165
+vt 0.998008 0.786165
+vt 0.001992 0.001569
+vt 0.097824 0.001569
+vt 0.097824 0.097402
+vt 0.001992 0.097402
+vt 0.193657 0.001569
+vt 0.193657 0.097402
+vt 0.097824 0.338880
+vt 0.097824 0.590509
+vt 0.001992 0.193234
+vt 0.173155 0.187649
+vt 0.148298 0.349153
+vt 0.193657 0.503797
+vt 0.287914 0.742944
+vt 0.865906 0.090571
+vt 0.961739 0.001569
+vt 0.961739 0.398844
+vt 0.865906 0.398844
+vt 0.961739 0.494677
+vt 0.865906 0.494677
+vt 0.961739 0.590509
+vt 0.865906 0.590509
+vt 0.770074 0.494677
+vt 0.770074 0.590509
 vn 0.000000 0.000000 1.000000
 vn 0.000000 0.000000 1.000000
 vn 0.000000 0.000000 1.000000
@@ -175,38 +194,39 @@ vn 0.966982 -0.130885 0.218667
 vn 0.966982 -0.130885 0.218667
 vn 0.943057 0.110389 0.313780
 vn 0.943057 0.110389 0.313780
+vn 0.961544 0.005218 0.274603
+vn 0.962837 -0.006538 0.270005
 vn 0.943057 0.110389 0.313780
+vn 0.255456 0.011727 0.966749
+vn 0.246580 -0.010791 0.969062
 vn 0.202435 -0.117634 0.972205
 vn 0.202435 -0.117634 0.972205
 s off
-g pCube3
-usemtl lambert6SG
-f 1/1/1 2/2/2 5/5/3 4/4/4
-f 2/2/5 3/3/6 6/6/7 5/5/8
-f 4/4/9 5/5/10 30/42/11 8/8/12 7/7/13
-f 8/8/14 26/38/15 9/9/16
-f 7/7/17 8/8/18 11/11/19 10/10/20
-f 8/8/21 9/9/22 12/12/23 11/11/24
-f 11/11/25 12/12/26 14/14/27 13/13/28
-f 13/13/29 14/14/30 17/17/31 16/16/32
-f 15/15/33 16/16/34 19/19/35 18/18/36
-f 16/16/37 17/17/38 20/20/39 19/19/40
-f 18/18/41 19/19/42 22/22/43 21/21/44
-f 19/19/45 20/20/46 23/23/47 22/22/48
-f 21/21/49 22/22/50 2/25/51 1/24/52
-f 22/22/53 23/23/54 3/26/55 2/25/56
-f 23/28/57 20/27/58 17/29/59 24/30/60
-f 3/3/61 23/28/62 24/30/63 6/6/64
-f 24/30/65 17/29/66 14/31/67 12/32/68 29/41/69
-f 26/38/70 12/32/71 9/9/72
-f 18/33/73 21/34/74 25/36/75 15/35/76
-f 21/34/77 1/1/78 4/4/79 25/36/80
-f 15/35/81 25/36/82 10/10/83 11/11/84 13/13/85 16/16/86
-f 25/36/87 4/4/88 7/7/89 10/37/90
-s 1
-f 5/5/91 6/6/92 27/39/93 28/40/94 30/42/95
-s 2
-f 28/40/96 29/41/97 12/32/98 26/38/99
-f 6/6/100 24/30/101 29/41/97 28/40/96 27/39/102
-s 1
-f 30/42/95 28/40/94 26/38/103 8/8/104
+g Rock16:pCube3
+usemtl Rock16:lambert6SG
+f 1/39/1 2/40/2 5/41/3 4/42/4
+f 2/40/5 3/43/6 6/44/7 5/41/8
+f 4/42/9 5/41/10 30/45/11 8/46/12 7/47/13
+f 8/46/14 26/50/15 9/51/16
+f 7/1/17 8/2/18 11/3/19 10/4/20
+f 8/26/21 9/27/22 12/28/23 11/29/24
+f 11/52/25 12/53/26 14/54/27 13/55/28
+f 13/55/29 14/54/30 17/56/31 16/57/32
+f 15/60/33 16/57/34 19/59/35 18/61/36
+f 16/57/37 17/56/38 20/58/39 19/59/40
+f 18/30/41 19/31/42 22/32/43 21/33/44
+f 19/31/45 20/34/46 23/35/47 22/32/48
+f 21/33/49 22/32/50 2/36/51 1/37/52
+f 22/32/53 23/35/54 3/38/55 2/36/56
+f 23/13/57 20/14/58 17/15/59 24/16/60
+f 3/20/61 23/13/62 24/16/63 6/21/64
+f 24/16/65 17/15/66 14/17/67 12/18/68 29/19/69
+f 26/23/70 12/18/71 9/25/72
+f 18/10/73 21/11/74 25/6/75 15/5/76
+f 21/11/77 1/12/78 4/9/79 25/6/80
+f 15/5/81 25/6/82 10/4/83 11/3/84 13/7/85 16/8/86
+f 25/6/87 4/9/88 7/1/89 10/4/90
+f 5/41/91 6/44/92 27/48/93 28/49/94 30/45/95
+f 28/22/96 29/19/97 12/18/98 26/23/99
+f 6/21/100 24/16/101 29/19/102 28/22/103 27/24/104
+f 30/45/105 28/49/106 26/50/107 8/46/108

models/Rocks/Rock9.mtl

@@ -1,73 +1,7 @@
-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
+newmtl Rock15: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 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
+map_Kd Stones.png
 Ni 1.00

models/Rocks/Rock9.obj

@@ -1,7 +1,7 @@
 # This file uses centimeters as units for non-parametric coordinates.
 
 mtllib Rock9.mtl
-g default
+g Rock15:default1
 v 4.190732 0.000000 -3.044746
 v 1.600717 0.000000 -4.926502
 v -1.600718 0.000000 -6.073623
@@ -31,7 +31,7 @@ v -3.620442 5.705560 3.773085
 v -0.856116 7.070742 5.339645
 v 1.295008 5.972178 3.985623
 v 4.445651 7.153885 2.463250
-v 5.246009 6.351979 -0.000000
+v 5.246009 6.351979 0.000000
 v 2.463251 11.268532 -1.789657
 v 0.940878 11.268532 -2.895725
 v -1.553225 11.268532 -3.160698
@@ -43,74 +43,108 @@ v 1.494638 14.960294 2.536589
 v 2.930491 11.473380 1.789656
 v 3.511985 11.473380 0.000000
 v 1.295008 20.837601 -0.940878
-v 0.494649 20.837598 -1.522373
-v -1.106995 20.837598 -1.787346
-v -1.907354 20.837598 -1.205851
-v -2.213063 20.837598 -0.264973
-v -1.907354 20.837598 0.675905
-v -0.494649 20.837598 1.522372
-v -0.089389 25.104711 1.006061
-v 0.710969 25.104711 0.424566
-v 1.016679 25.104711 -0.516312
-v -0.045158 22.971154 -1.151829
-v -1.151226 22.971154 0.370544
-vt 0.000000 0.500000
-vt 0.100000 0.500000
-vt 0.200000 0.500000
-vt 0.300000 0.500000
-vt 0.400000 0.500000
-vt 0.500000 0.500000
-vt 0.600000 0.500000
-vt 0.700000 0.500000
-vt 0.800000 0.500000
-vt 0.900000 0.500000
-vt 1.000000 0.500000
-vt 0.000000 0.600000
-vt 0.100000 0.600000
-vt 0.200000 0.600000
-vt 0.300000 0.600000
-vt 0.400000 0.600000
-vt 0.500000 0.600000
-vt 0.600000 0.600000
-vt 0.700000 0.600000
-vt 0.800000 0.600000
-vt 0.900000 0.600000
-vt 1.000000 0.600000
-vt 0.000000 0.700000
-vt 0.100000 0.700000
-vt 0.200000 0.700000
-vt 0.300000 0.700000
-vt 0.400000 0.700000
-vt 0.500000 0.700000
-vt 0.600000 0.700000
-vt 0.700000 0.700000
-vt 0.800000 0.700000
-vt 0.900000 0.700000
-vt 1.000000 0.700000
-vt 0.000000 0.800000
-vt 0.100000 0.800000
-vt 0.200000 0.800000
-vt 0.300000 0.800000
-vt 0.400000 0.800000
-vt 0.500000 0.800000
-vt 0.600000 0.800000
-vt 0.700000 0.800000
-vt 0.800000 0.800000
-vt 0.900000 0.800000
-vt 1.000000 0.800000
-vt 0.000000 0.900000
-vt 0.100000 0.900000
-vt 0.200000 0.900000
-vt 0.300000 0.900000
-vt 0.400000 0.900000
-vt 0.500000 0.900000
-vt 0.600000 0.900000
-vt 0.700000 0.900000
-vt 0.800000 0.900000
-vt 0.900000 0.900000
-vt 1.000000 0.900000
-vt 0.550000 0.900000
-vt 0.550000 0.900000
+v 0.494649 20.837599 -1.522373
+v -1.106995 20.837599 -1.787346
+v -1.907354 20.837599 -1.205851
+v -2.213063 20.837599 -0.264973
+v -1.907354 20.837599 0.675905
+v -0.494649 20.837599 1.522372
+v -0.089389 25.104712 1.006061
+v 0.710969 25.104712 0.424566
+v 1.016679 25.104712 -0.516312
+v -0.045158 22.971153 -1.151829
+v -1.151226 22.971153 0.370544
+vt 0.452321 0.001837
+vt 0.556355 0.001837
+vt 0.556355 0.038441
+vt 0.456020 0.038441
+vt 0.637022 0.001837
+vt 0.633323 0.038441
+vt 0.563305 0.141790
+vt 0.458756 0.187575
+vt 0.405620 0.001837
+vt 0.411604 0.038441
+vt 0.697230 0.001837
+vt 0.691246 0.038441
+vt 0.649995 0.143437
+vt 0.549779 0.281499
+vt 0.505363 0.281499
+vt 0.688874 0.177318
+vt 0.614408 0.281499
+vt 0.549779 0.518983
+vt 0.526428 0.518983
+vt 0.648435 0.281499
+vt 0.573129 0.518983
+vt 0.565551 0.571934
+vt 0.527769 0.571934
+vt 0.511997 0.518983
+vt 0.477913 0.281499
+vt 0.594137 0.518983
+vt 0.543541 0.624884
+vt 0.581323 0.624884
+vt 0.566892 0.624884
+vt 0.001992 0.001837
+vt 0.077556 0.001837
+vt 0.077556 0.038441
+vt 0.005690 0.038441
+vt 0.191780 0.001837
+vt 0.188082 0.038441
+vt 0.116216 0.159480
+vt 0.055083 0.179382
+vt 0.238481 0.001837
+vt 0.232497 0.038441
+vt 0.177349 0.163396
+vt 0.116216 0.286583
+vt 0.071800 0.286583
+vt 0.215131 0.170720
+vt 0.160631 0.281499
+vt 0.129030 0.624884
+vt 0.105679 0.624884
+vt 0.017301 0.150054
+vt 0.053263 0.373121
+vt 0.188082 0.281499
+vt 0.139566 0.518983
+vt 0.091248 0.624884
+vt 0.153998 0.518983
+vt 0.707867 0.779610
+vt 0.732420 0.675577
+vt 0.811136 0.628875
+vt 0.890589 0.657345
+vt 0.954868 0.704046
+vt 0.998008 0.818270
+vt 0.973456 0.893834
+vt 0.890589 0.915382
+vt 0.785461 0.920485
+vt 0.721182 0.860277
+vt 0.398885 0.624884
+vt 0.319432 0.624884
+vt 0.321377 0.588280
+vt 0.396941 0.588280
+vt 0.327019 0.467452
+vt 0.391298 0.456002
+vt 0.245806 0.588280
+vt 0.277857 0.439147
+vt 0.320611 0.345223
+vt 0.382509 0.345223
+vt 0.282829 0.345223
+vt 0.331685 0.107738
+vt 0.371435 0.107738
+vt 0.358038 0.054788
+vt 0.384391 0.001837
+vt 0.391298 0.107738
+vt 0.703810 0.001837
+vt 0.808938 0.001837
+vt 0.806994 0.038441
+vt 0.705754 0.038441
+vt 0.891805 0.001837
+vt 0.901308 0.038441
+vt 0.801351 0.150054
+vt 0.747965 0.177318
+vt 0.879544 0.179382
+vt 0.806306 0.373121
+vt 0.754487 0.281499
+vt 0.766993 0.624884
+vt 0.756936 0.518983
 vn 0.580084 0.161341 -0.798418
 vn 0.580084 0.161341 -0.798418
 vn 0.580084 0.161341 -0.798418
@@ -148,9 +182,9 @@ vn 0.929675 -0.210852 0.302070
 vn 0.929675 -0.210852 0.302070
 vn 0.929675 -0.210852 0.302070
 vn 0.913963 -0.019617 -0.405324
-vn 0.913962 -0.019617 -0.405324
-vn 0.913962 -0.019617 -0.405324
-vn 0.913962 -0.019617 -0.405324
+vn 0.913963 -0.019617 -0.405324
+vn 0.913963 -0.019617 -0.405324
+vn 0.913963 -0.019617 -0.405324
 vn 0.588154 0.133808 -0.797603
 vn 0.588154 0.133808 -0.797603
 vn 0.588154 0.133808 -0.797603
@@ -175,10 +209,10 @@ vn -0.616041 0.149026 0.773489
 vn -0.616041 0.149026 0.773489
 vn -0.616041 0.149026 0.773489
 vn -0.616041 0.149027 0.773489
-vn 0.256783 0.090224 0.962248
-vn 0.256783 0.090224 0.962248
-vn 0.256783 0.090224 0.962248
-vn 0.256783 0.090224 0.962248
+vn 0.256783 0.090224 0.962249
+vn 0.256783 0.090224 0.962249
+vn 0.256783 0.090224 0.962249
+vn 0.256783 0.090224 0.962249
 vn 0.248552 0.317778 0.915008
 vn 0.248552 0.317778 0.915008
 vn 0.248552 0.317778 0.915008
@@ -204,8 +238,8 @@ vn -0.954536 0.152238 -0.256292
 vn -0.954536 0.152238 -0.256292
 vn -0.954536 0.152238 -0.256292
 vn -0.934758 0.204653 0.290420
-vn -0.934758 0.204652 0.290420
-vn -0.934758 0.204652 0.290420
+vn -0.934759 0.204652 0.290420
+vn -0.934759 0.204652 0.290420
 vn -0.934758 0.204653 0.290420
 vn -0.550940 0.308557 0.775408
 vn -0.550940 0.308557 0.775408
@@ -259,10 +293,10 @@ vn 0.708333 0.195907 0.678148
 vn 0.708333 0.195907 0.678148
 vn 0.708333 0.195907 0.678148
 vn 0.708333 0.195907 0.678148
-vn 0.935053 0.182675 0.303817
-vn 0.935053 0.182675 0.303817
-vn 0.935053 0.182675 0.303817
-vn 0.935053 0.182675 0.303817
+vn 0.935054 0.182675 0.303817
+vn 0.935054 0.182675 0.303817
+vn 0.935054 0.182675 0.303817
+vn 0.935054 0.182675 0.303817
 vn 0.816567 0.136979 -0.560762
 vn 0.816568 0.136979 -0.560762
 vn 0.816568 0.136979 -0.560762
@@ -306,52 +340,52 @@ vn 0.000000 -1.000000 0.000000
 vn 0.000000 -1.000000 0.000000
 vn 0.000000 -1.000000 0.000000
 s off
-g pasted__pasted__pSphere1 pasted__pasted__pSphere1SmoothProxyGroup pasted__group group3
-usemtl lambert6SG
-f 1/1/1 2/2/2 12/13/3 11/12/4
-f 2/2/5 3/3/6 13/14/7 12/13/8
-f 3/3/9 4/4/10 14/15/11 13/14/12
-f 4/4/13 5/5/14 15/16/15 14/15/16
-f 5/5/17 6/6/18 16/17/19 15/16/20
-f 6/6/21 7/7/22 17/18/23 16/17/24
-f 7/7/25 8/8/26 18/19/27 17/18/28
-f 8/8/29 9/9/30 19/20/31 18/19/32
-f 9/9/33 10/10/34 20/21/35 19/20/36
-f 10/10/37 1/11/38 11/22/39 20/21/40
-f 11/12/41 12/13/42 22/24/43 21/23/44
-f 12/13/45 13/14/46 23/25/47 22/24/48
-f 13/14/49 14/15/50 24/26/51 23/25/52
-f 14/15/53 15/16/54 25/27/55 24/26/56
-f 15/16/57 16/17/58 26/28/59 25/27/60
-f 16/17/61 17/18/62 27/29/63 26/28/64
-f 17/18/65 18/19/66 28/30/67 27/29/68
-f 18/19/69 19/20/70 29/31/71 28/30/72
-f 19/20/73 20/21/74 30/32/75 29/31/76
-f 20/21/77 11/22/78 21/33/79 30/32/80
-f 21/23/81 22/24/82 32/35/83 31/34/84
-f 22/24/85 23/25/86 33/36/87 32/35/88
-f 24/26/89 25/27/90 35/38/91 34/37/92
-f 25/27/93 26/28/94 36/39/95 35/38/96
-f 26/28/97 27/29/98 37/40/99 36/39/100
-f 27/29/101 28/30/102 38/41/103 37/40/104
-f 28/30/105 29/31/106 39/42/107 38/41/108
-f 29/31/109 30/32/110 40/43/111 39/42/112
-f 30/32/113 21/33/114 31/44/115 40/43/116
-f 31/34/117 32/35/118 42/46/119 41/45/120
-f 32/35/121 33/36/122 43/47/123 42/46/124
-f 33/36/125 34/37/126 44/48/127 43/47/128
-f 34/37/129 35/38/130 45/49/131 44/48/132
-f 35/38/133 36/39/134 46/50/135 45/49/136
-f 36/39/137 37/40/138 47/51/139 46/50/140
-f 37/40/141 38/41/142 48/52/143 47/51/144
-f 38/41/145 39/42/146 49/53/147 48/52/148
-f 39/42/149 40/43/150 50/54/151 49/53/152
-f 40/43/153 31/44/154 41/55/155 50/54/156
-f 34/37/157 33/36/158 23/25/159 24/26/160
-f 46/50/161 52/57/162 45/49/163
-f 42/46/164 51/56/165 50/54/166 41/45/167
-f 50/54/168 51/56/169 52/57/170 48/52/171 49/53/172
-f 42/46/173 43/47/174 51/56/175
-f 48/52/176 52/57/177 46/50/178 47/51/179
-f 52/57/180 51/56/181 43/47/182 44/48/183 45/49/184
-f 5/5/185 4/4/186 3/3/187 2/2/188 1/11/189 10/10/190 9/9/191 8/8/192 7/7/193 6/6/194
+g Rock15:group3 Rock15:pasted__group Rock15:pasted__pasted__pSphere1 Rock15:pasted__pasted__pSphere1SmoothProxyGroup Rock15:polySurface1
+usemtl Rock15:lambert6SG
+f 1/34/1 2/38/2 12/39/3 11/35/4
+f 2/63/5 3/64/6 13/65/7 12/66/8
+f 3/9/9 4/1/10 14/4/11 13/10/12
+f 4/1/13 5/2/14 15/3/15 14/4/16
+f 5/2/17 6/5/18 16/6/19 15/3/20
+f 6/5/21 7/11/22 17/12/23 16/6/24
+f 7/79/25 8/80/26 18/81/27 17/82/28
+f 8/80/29 9/83/30 19/84/31 18/81/32
+f 9/30/33 10/31/34 20/32/35 19/33/36
+f 10/31/37 1/34/38 11/35/39 20/32/40
+f 11/35/41 12/39/42 22/43/43 21/40/44
+f 12/66/45 13/65/46 23/67/47 22/68/48
+f 13/65/49 14/69/50 24/70/51 23/67/52
+f 14/4/53 15/3/54 25/7/55 24/8/56
+f 15/3/57 16/6/58 26/13/59 25/7/60
+f 16/6/61 17/12/62 27/16/63 26/13/64
+f 17/82/65 18/81/66 28/85/67 27/86/68
+f 18/81/69 19/84/70 29/87/71 28/85/72
+f 19/33/73 20/32/74 30/36/75 29/37/76
+f 20/32/77 11/35/78 21/40/79 30/36/80
+f 21/40/81 22/43/82 32/49/83 31/44/84
+f 22/68/85 23/67/86 33/71/87 32/72/88
+f 24/8/89 25/7/90 35/14/91 34/15/92
+f 25/7/93 26/13/94 36/17/95 35/14/96
+f 26/13/97 27/16/98 37/20/99 36/17/100
+f 27/86/101 28/85/102 38/88/103 37/89/104
+f 28/47/105 29/37/106 39/42/107 38/48/108
+f 29/37/109 30/36/110 40/41/111 39/42/112
+f 30/36/113 21/40/114 31/44/115 40/41/116
+f 31/44/117 32/49/118 42/52/119 41/50/120
+f 32/72/121 33/71/122 43/74/123 42/75/124
+f 33/25/125 34/15/126 44/19/127 43/24/128
+f 34/15/129 35/14/130 45/18/131 44/19/132
+f 35/14/133 36/17/134 46/21/135 45/18/136
+f 36/17/137 37/20/138 47/26/139 46/21/140
+f 37/89/141 38/88/142 48/90/143 47/91/144
+f 38/48/145 39/42/146 49/46/147 48/51/148
+f 39/42/149 40/41/150 50/45/151 49/46/152
+f 40/41/153 31/44/154 41/50/155 50/45/156
+f 34/73/157 33/71/158 23/67/159 24/70/160
+f 46/21/161 52/22/162 45/18/163
+f 42/75/164 51/76/165 50/77/166 41/78/167
+f 50/27/168 51/23/169 52/22/170 48/28/171 49/29/172
+f 42/75/173 43/74/174 51/76/175
+f 48/28/176 52/22/177 46/21/178 47/26/179
+f 52/22/180 51/23/181 43/24/182 44/19/183 45/18/184
+f 5/53/185 4/54/186 3/55/187 2/56/188 1/57/189 10/58/190 9/59/191 8/60/192 7/61/193 6/62/194

models/island/Island.mtl

@@ -0,0 +1,99 @@
+newmtl FlyingIslands: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 FlyingIslands:Material_002
+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 FlyingIslands:Material_003
+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 FlyingIslands:Material_004
+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 FlyingIslands:Material_005
+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 FlyingIslands:Material_006
+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 FlyingIslands:Material_008
+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 FlyingIslands:Material_0010
+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 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 Blauw.png
+Ni 1.00
+newmtl lambert3SG
+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 Wit.png
+Ni 1.00
+newmtl lambert4SG
+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 Groen.png
+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 Bruin.png
+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 island.png
+Ni 1.00

worlds/fire.json

@@ -1,43 +0,0 @@
-{
-  "world": {
-    "heightmap": "worlds/hell.png",
-    "texture":  "worlds/helltexture.png",
-    "skybox": "skyboxes/peaceful/",
-    "object-templates": [
-      {
-        "color": 100,
-        "file": "models/boom/Boom.obj",
-        "collision": true
-      }
-    ],
-	"music": "WAVE/bond.wav"
-  },
-  "player": {
-    "startposition": [ 1, 5, 20 ]
-  },
-  "objects": [ ],
-  "portal": {     
-    "file": "models/Teleporter/Teleporter.obj",
-    "pos": [ 10, 5, 10 ]    
-  },
-  "enemies": [
-  {
-      "file": "models/squid/Blooper.obj",
-      "pos": [ 20, 5, 10 ],
-      "scale": 0.01
-  }],
-  "crystal": {
-    "full texture": "models/crystal/Crystal.obj",
-    "empty texture": "models/crystal/PickedUpCrystal.obj",
-    "instances": [
-      {
-        "pos": [ 31, 5, 33 ],
-        "rot": [ 0, 0, 0 ]
-      },
-      {
-        "pos": [ 40, 5, 40 ],
-        "rot": [ 0, 0, 0 ]
-      }
-    ]
-  }
-}

worlds/ice.json

@@ -1,43 +0,0 @@
-{
-  "world": {
-    "heightmap": "worlds/hmcs.png",
-    "texture":  "worlds/hmcstexture.png",
-    "skybox": "skyboxes/peaceful/",
-    "object-templates": [
-      {
-        "color": 100,
-        "file": "models/boom/Boom.obj",
-        "collision": true
-      }
-    ],
-	"music": "WAVE/bond.wav"
-  },
-  "player": {
-    "startposition": [ 1, 5, 20 ]
-  },
-  "objects": [ ],
-  "portal": {     
-    "file": "models/Teleporter/Teleporter.obj",
-    "pos": [ 10, 5, 10 ]    
-  },
-  "enemies": [
-  {
-      "file": "models/squid/Blooper.obj",
-      "pos": [ 20, 5, 10 ],
-      "scale": 0.01
-  }],
-  "crystal": {
-    "full texture": "models/crystal/Crystal.obj",
-    "empty texture": "models/crystal/PickedUpCrystal.obj",
-    "instances": [
-      {
-        "pos": [ 31, 5, 33 ],
-        "rot": [ 0, 0, 0 ]
-      },
-      {
-        "pos": [ 40, 5, 40 ],
-        "rot": [ 0, 0, 0 ]
-      }
-    ]
-  }
-}

worlds/rock.json

@@ -86,56 +86,56 @@
       "file": "models/Enemies/Monkey.obj",
       "pos": [ 80, 0, 670 ],
       "scale": 1,
-      "music": "WAVE/ghostEnemy.wav",
+      "music": "WAVE/ape.wav",
       "health": 10,
-      "damage": 1
+      "damage": 2
     },
     {
       "file": "models/Enemies/Monkey.obj",
       "pos": [ 213, 0, 348 ],
       "scale": 1.25,
-      "music": "WAVE/ghostEnemy.wav",
+      "music": "WAVE/ape.wav",
       "health": 10,
-      "damage": 1
+      "damage": 2
     },
     {
       "file": "models/Bob/BobRock.obj",
       "pos": [437,0,600],
       "scale": 0.75,
-      "music": "WAVE/ghostEnemy.wav",
-      "health": 10,
+      "music": "WAVE/letsRock.wav",
+      "health": 5,
       "damage": 1
     },
     {
       "file": "models/Bob/BobRock.obj",
       "pos": [540,0,681],
       "scale": 0.75,
-      "music": "WAVE/ghostEnemy.wav",
-      "health": 10,
+      "music": "WAVE/letsRock.wav",
+      "health": 5,
       "damage": 1
     },
     {
       "file": "models/Bob/BobRock.obj",
       "pos": [594,0,575],
       "scale": 0.75,
-      "music": "WAVE/ghostEnemy.wav",
-      "health": 10,
+      "music": "WAVE/letsRock.wav",
+      "health": 5,
       "damage": 1
     },
     {
       "file": "models/Bob/BobRock.obj",
       "pos": [666,0,631],
       "scale": 0.75,
-      "music": "WAVE/ghostEnemy.wav",
-      "health": 10,
+      "music": "WAVE/letsRock.wav",
+      "health": 5,
       "damage": 1
     },
     {
       "file": "models/Bob/BobRock.obj",
       "pos": [ 603, 0, 562 ],
       "scale": 0.75,
-      "music": "WAVE/ghostEnemy.wav",
-      "health": 10,
+      "music": "WAVE/letsRock.wav",
+      "health": 5,
       "damage": 1
     },
     {
@@ -190,72 +190,72 @@
       "file": "models/Enemies/VincentRock.obj",
       "pos": [363,0,343],
       "scale": 1,
-      "music": "WAVE/ghostEnemy.wav",
-      "health": 10,
+      "music": "WAVE/hedge.wav",
+      "health": 3,
       "damage": 1
     },
     {
       "file": "models/Enemies/VincentRock.obj",
       "pos": [333,0,263],
       "scale": 1,
-      "music": "WAVE/ghostEnemy.wav",
-      "health": 10,
+      "music": "WAVE/hedge.wav",
+      "health": 3,
       "damage": 1
     },
     {
       "file": "models/Enemies/VincentRock.obj",
       "pos": [243,0,218],
       "scale": 1,
-      "music": "WAVE/ghostEnemy.wav",
-      "health": 10,
+      "music": "WAVE/hedge.wav",
+      "health": 3,
       "damage": 1
     },
     {
       "file": "models/Enemies/VincentRock.obj",
       "pos": [289,0,123],
       "scale": 1,
-      "music": "WAVE/ghostEnemy.wav",
-      "health": 10,
+      "music": "WAVE/hedge.wav",
+      "health": 3,
       "damage": 1
     },
     {
       "file": "models/Enemies/VincentRock.obj",
       "pos": [628,0,397],
       "scale": 1,
-      "music": "WAVE/ghostEnemy.wav",
-      "health": 10,
+      "music": "WAVE/hedge.wav",
+      "health": 3,
       "damage": 1
     },
     {
       "file": "models/Enemies/VincentRock.obj",
       "pos": [618,0,416],
       "scale": 1,
-      "music": "WAVE/ghostEnemy.wav",
-      "health": 10,
+      "music": "WAVE/hedge.wav",
+      "health": 3,
       "damage": 1
     },
     {
       "file": "models/Enemies/VincentRock.obj",
       "pos": [660,0,432],
       "scale": 1,
-      "music": "WAVE/ghostEnemy.wav",
-      "health": 10,
+      "music": "WAVE/hedge.wav",
+      "health": 3,
       "damage": 1
     },
     {
       "file": "models/Enemies/VincentRock.obj",
       "pos": [639,0,442],
       "scale": 1,
-      "music": "WAVE/ghostEnemy.wav",
-      "health": 10,
+      "music": "WAVE/hedge.wav",
+      "health": 3,
       "damage": 1
     },
         {
       "file": "models/Enemies/VincentRock.obj",
       "pos": [613,0,447],
       "scale": 1,
-      "music": "WAVE/ghostEnemy.wav",
-      "health": 10,
+      "music": "WAVE/hedge.wav",
+      "health": 3,
       "damage": 1
     }
     

worlds/small.json

@@ -1,6 +1,7 @@
 {
   "world": {
     "heightmap": "worlds/small.png",
+    "loadingscreen": "worlds/loadingScreen_picture.png",
     "skybox": "skyboxes/water/",
     "object-templates": [
       {

worlds/worlds.json

@@ -1,8 +1,6 @@
 {
   "worlds": [
-    "worlds/small.json",
-	  "worlds/rock.json",
-    "worlds/ice.json",
-    "worlds/fire.json"
+      "worlds/rock.json",
+	    "worlds/small.json"
   ]
 }