Fire en Earth werkend

World.cpp

@@ -219,7 +219,7 @@ World::World(const std::string &fileName)
 		if (!v["portal"]["pos"].isNull())
 			pos = Vec3f(v["portal"]["pos"][0].asFloat(),
 				v["portal"]["pos"][1].asFloat(),
-				v["portal"]["pos"][0].asFloat());
+				v["portal"]["pos"][2].asFloat());
 
 		pos.y = getHeight(pos.x, pos.z);
 
@@ -227,7 +227,7 @@ World::World(const std::string &fileName)
 		if (!v["portal"]["rot"].isNull())
 			pos = Vec3f(v["portal"]["rot"][0].asFloat(),
 				v["portal"]["rot"][1].asFloat(),
-				v["portal"]["rot"][0].asFloat());
+				v["portal"]["rot"][2].asFloat());
 
 		float scale = 1.0f;
 		if (!v["portal"]["scale"].isNull())
@@ -339,7 +339,7 @@ void World::update(float elapsedTime)
 			remove = true;
 			continue;
 		}
-		enemy->position.y = getHeight(enemy->position.x, enemy->position.z) + 2.0f;
+		enemy->position.y = getHeight(enemy->position.x, enemy->position.z);
 		
 		if(!remove)
 			count++;

models/Bob/BobFire.mtl

@@ -0,0 +1,9 @@
+newmtl BobRock: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
+Ns 0.06

models/Enemies/SquidFire.mtl

@@ -0,0 +1,7 @@
+newmtl SquidRock: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 InktvisTextureFire.png
+Ni 1.00

models/Enemies/VincentFire.mtl

@@ -0,0 +1,7 @@
+newmtl VincentRock: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 VincentTextureFire.png
+Ni 1.00

worlds/fire.json

@@ -0,0 +1,199 @@
+{
+  "world": {
+    "heightmap": "worlds/FireHeightmap.png",
+    "texture": "worlds/FireTexture.png",
+	"skybox": "skyboxes/water/",
+	"music": "WAVE/world1.wav",
+    "object-templates": []
+  },
+  "player": {
+    "startposition": [ 350, 0,  130 ]
+  },
+  "objects": [ ],
+  "portal": {     
+    "file": "models/Teleporter/Teleporter.obj",
+    "pos": [ 245, 0, 326 ]    
+  },
+  "enemies": [
+    {
+      "file": "models/Enemies/Monkey.obj",
+      "pos": [ 520, 0, 123 ],
+      "scale": 1.25,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+    {
+      "file": "models/Bob/BobFire.obj",
+      "pos": [530,0,501],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+    {
+      "file": "models/Bob/BobFire.obj",
+      "pos": [582,0,576],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+    {
+      "file": "models/Bob/BobFire.obj",
+      "pos": [ 500, 0, 641 ],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+
+    {
+      "file": "models/Enemies/VincentFire.obj",
+      "pos": [295,0,541],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+    {
+      "file": "models/Enemies/VincentFire.obj",
+      "pos": [390,0,542],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+    {
+      "file": "models/Enemies/VincentFire.obj",
+      "pos": [510,0,130],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+    {
+      "file": "models/Enemies/VincentFire.obj",
+      "pos": [440,0,260],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+    {
+      "file": "models/Enemies/VincentFire.obj",
+      "pos": [555,0,275],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+    {
+      "file": "models/Enemies/VincentFire.obj",
+      "pos": [390,0,357],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+    {
+      "file": "models/Enemies/VincentFire.obj",
+      "pos": [370,0,412],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+    {
+      "file": "models/Enemies/VincentFire.obj",
+      "pos": [230,0,474],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+    {
+      "file": "models/Enemies/VincentFire.obj",
+      "pos": [ 450, 0, 551 ],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+    {
+      "file": "models/Enemies/SquidFire.obj",
+      "pos": [383,0,666],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+    {
+      "file": "models/Enemies/SquidFire.obj",
+      "pos": [251,0,690],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+    {
+      "file": "models/Enemies/SquidFire.obj",
+      "pos": [178,0,561],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+    {
+      "file": "models/Enemies/SquidFire.obj",
+      "pos": [147,0,392],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    },
+                {
+      "file": "models/Enemies/SquidFire.obj",
+      "pos": [209,0,333],
+      "scale": 0.75,
+      "music": "WAVE/ghostEnemy.wav",
+      "health": 10,
+      "damage": 1
+    }
+
+  ],
+  "crystal": {
+    "full texture": "models/crystal/Crystal.obj",
+    "empty texture": "models/crystal/PickedUpCrystal.obj",
+    "instances": [
+      {
+        "pos": [ 560, 0, 150 ],
+        "rot": [ 0, 0, 0 ]
+      },
+      {
+        "pos": [ 610, 0, 260 ],
+        "rot": [ 0, 0, 0 ]
+      },
+      {
+        "pos": [ 580, 0, 460 ],
+        "rot": [ 0, 0, 0 ]
+      },
+      {
+        "pos": [ 210, 0, 450 ],
+        "rot": [ 0, 0, 0 ]
+      },
+      {
+        "pos": [ 510, 0, 680 ],
+        "rot": [ 0, 0, 0 ]
+      },
+      {
+        "pos": [ 560, 0, 150 ],
+        "rot": [ 0, 0, 0 ]
+      },
+      {
+        "pos": [ 180, 0, 310 ],
+        "rot": [ 0, 0, 0 ]
+      }
+    ]
+  }
+}

worlds/worlds.json

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