Merge remote-tracking branch 'origin/developer' into developer

2016-06-22 02:55:46 +02:00
parent 42cffd796d 82acf0d9fc
commit cfb8a7ada8
23 changed files with 7450 additions and 1 deletions
@@ -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();