Adjust the desert pillars demo to recent changes

[libs/gl.git] / demos / cubemap.cpp

diff --git a/demos/cubemap.cpp b/demos/cubemap.cpp
index 4f663055b8fc4ff68dce2c11b5c00bff484154cf..4679590d3e65057076e5d8d7b0e749611c2f40ee 100644 (file)
--- a/demos/cubemap.cpp
+++ b/demos/cubemap.cpp
@@ -84,15 +84,17 @@ int main()
        material.set_specular(GL::Color(1.0));
        material.set_shininess(100);
 
-       GL::Program::StandardFeatures features;
+       GL::ProgramBuilder::StandardFeatures features;
        features.lighting = true;
        features.specular = true;
        features.material = true;
        features.reflection = true;
        GL::Program shprog(features);
-       GL::ProgramData shdata(shprog);
+       GL::ProgramData shdata;
        shdata.uniform("environment", 0);
        shdata.uniform("reflectivity", 0.5f);
+       float env_mat[9] = { 1, 0, 0, 0, 1, 0, 0, 0, 1 };
+       shdata.uniform_matrix3("env_eye_matrix", env_mat);
 
        GL::MatrixStack::projection() = GL::Matrix::frustum_centered(0.15, 0.1, 0.1, 10);
 
@@ -112,7 +114,7 @@ int main()
                        GL::Bind bind_depth(GL::DepthTest::lequal());
                        GL::Renderer renderer(0);
                        renderer.set_material(&material);
-                       renderer.set_shader(&shprog, &shdata);
+                       renderer.set_shader_program(&shprog, &shdata);
                        renderer.set_texture(&texture);
                        renderer.matrix_stack() *= GL::Matrix::translation(0, 0, -7);
                        {