Merge branch 'developer' into FireWorld

# Conflicts:
#	worlds/worlds.json

Enemy.cpp

@@ -43,20 +43,6 @@ Enemy::~Enemy()
 void Enemy::draw()
 {
 	Entity::draw();
-	glPushMatrix();
-	
-	glTranslatef(position.x, position.y, position.z);
-
-	glBegin(GL_LINE_LOOP);
-	for (int i = 0; i < 360; i++)
-	{
-		//convert degrees into radians
-		float degInRad = i*(M_PI / 180.0);
-		glVertex3f(cos(degInRad)*radius, 1*scale,sin(degInRad)*radius);
-	}
-	glEnd();
-
-	glPopMatrix();
 }
 
 void Enemy::inEyeSight(Vec3f & TargetPosition)

World.cpp

@@ -278,9 +278,13 @@ void World::draw()
 	glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse);
 	glLightfv(GL_LIGHT0, GL_AMBIENT, lightAmbient);
 
-	skybox->draw();
+	GLfloat mat_specular[] = { 0.15, 0.15, 0.15, 0 };
+	glMaterialfv(GL_FRONT, GL_SPECULAR, mat_specular);
+
+
 
 	player->setCamera();
+	skybox->draw();
 	player->draw();
 
 	heightmap->Draw();

models/grass/grass.mtl

@@ -0,0 +1,9 @@
+# WaveFront *.mtl file (generated by CINEMA 4D)
+
+newmtl Mat
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Blauw.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+

models/islands/isle.mtl

@@ -0,0 +1,28 @@
+# WaveFront *.mtl file (generated by CINEMA 4D)
+
+newmtl Mat
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Groen.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+
+newmtl Mat.3
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Bruin.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+
+newmtl Mat.2
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Blauw.png
+illum 7
+
+newmtl Mat.1
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Wit.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+

models/islands/isle2.mtl

@@ -0,0 +1,28 @@
+# WaveFront *.mtl file (generated by CINEMA 4D)
+
+newmtl Mat
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Groen.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+
+newmtl Mat.3
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Bruin.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+
+newmtl Mat.2
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Blauw.png
+illum 7
+
+newmtl Mat.1
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Wit.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+

models/puddle/Puddle.mtl

@@ -0,0 +1,21 @@
+# WaveFront *.mtl file (generated by CINEMA 4D)
+
+newmtl Mat.2
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd congruent_pentagon2.png
+illum 7
+
+newmtl Mat
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd Blauw.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+
+newmtl Mat.1
+Kd 0.80000001192093 0.80000001192093 0.80000001192093
+map_Kd congruent_pentagon_blue.png
+Ks 1.00000000000000 1.00000000000000 1.00000000000000
+Ns 100
+illum 7
+

worlds/ice.json

@@ -0,0 +1,92 @@
+{
+  "world": {
+    "heightmap": "worlds/watermap.png",
+    "texture": "worlds/watertexture.png",
+	"skybox": "skyboxes/water/",
+	"music":  "WAVE/test2.wav",
+    "object-templates": [
+      {
+        "color": 205,
+        "file": "models/puddle/Puddle.obj",
+        "collision": true
+      },
+      {
+        "color": 220,
+        "file": "models/islands/isle.obj",
+        "collision": false
+      },
+      {
+        "color": 223,
+        "file": "models/islands/isle2.obj",
+        "collision": false
+      },
+      {
+        "color": 210,
+        "file": "models/trees/tree1.obj",
+        "collision": true
+      },
+      {
+        "color": 211,
+        "file": "models/trees/tree2.obj",
+        "collision": true
+      },
+      {
+        "color": 212,
+        "file": "models/trees/tree3.obj",
+        "collision": true
+      },
+      {
+        "color": 213,
+        "file": "models/trees/tree4.obj",
+        "collision": true
+      },
+      {
+        "color": 215,
+        "file": "models/grass/grass.obj",
+        "collision": false
+      },
+      {
+        "color": 214,
+        "file": "models/trees/tree5.obj",
+        "collision": true
+      }
+    ]
+  },
+  "player": {
+    "startposition": [ 385, 20, 375]
+  },
+  "objects": [ ],
+  "portal": {     
+    "file": "models/Teleporter/Teleporter.obj",
+    "pos": [ 380, 5, 385 ]    
+  },
+  "enemies": [
+  {
+      "file": "models/squid/Blooper.obj",
+      "pos": [ 350, 5, 350 ],
+      "scale": 0.01,
+      "music": "WAVE/enemy.wav"
+  }],
+  "crystal": {
+    "full texture": "models/crystal/Crystal.obj",
+    "empty texture": "models/crystal/PickedUpCrystal.obj",
+    "instances": [
+      {
+        "pos": [ 255, 5, 225 ],
+        "rot": [ 0, 0, 0 ]
+      },
+      {
+        "pos": [ 250, 5, 540 ],
+        "rot": [ 0, 0, 0 ]
+      },
+      {
+        "pos": [ 250, 5, 490 ],
+        "rot": [ 0, 0, 0 ]
+      },
+      {
+        "pos": [ 480, 5, 500 ],
+        "rot": [ 0, 0, 0 ]
+      }
+    ]
+  }
+}

worlds/worlds.json

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