From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 27 Sep 2014 15:43:02 +0000 (+0300)
Subject: Adjust the desert pillars demo to recent changes
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=c44e9005200af76266ef44c158688e112ad4bb32;p=libs%2Fgl.git

Adjust the desert pillars demo to recent changes

Also decrease the cube's shininess from 150 to 120 for compatibility with
older OpenGL versions.
---

diff --git a/demos/desertpillars.cpp b/demos/desertpillars.cpp
index c0ba0c6c..b5cdde06 100644
--- a/demos/desertpillars.cpp
+++ b/demos/desertpillars.cpp
@@ -746,7 +746,8 @@ void DesertPillars::create_cube()
 	cube_material.set_diffuse(GL::Color(0.5, 0.5, 0.55));
 	cube_material.set_ambient(GL::Color(0.5, 0.5, 0.55));
 	cube_material.set_specular(GL::Color(1.0));
-	cube_material.set_shininess(150);
+	cube_material.set_shininess(120);
+	cube_material.set_reflectivity(0.5);
 
 	// First create a simplified shader for rendering the shadow map
 	GL::ProgramBuilder::StandardFeatures features;
@@ -919,9 +920,7 @@ DesertPillars::ObjectData::~ObjectData()
 
 DesertPillars::Cube::Cube(const GL::Object &obj):
 	GL::AnimatedObject(obj)
-{
-	shdata.uniform("reflectivity", 0.5f);
-}
+{ }
 
 void DesertPillars::Cube::set_spherify(float s)
 {