]> git.tdb.fi Git - libs/gl.git/blobdiff - demos/desertpillars/source/desertpillars.cpp
Replace ProgramData copy constructor with a more explicit copy function
[libs/gl.git] / demos / desertpillars / source / desertpillars.cpp
index dd801e29001e117836cc2cf81745392612b39901..62a4455896300b22c9f77a3b8452ac6bf4eb26a6 100644 (file)
@@ -26,7 +26,6 @@ DesertPillars::DesertPillars(int, char **):
        keyboard(window),
        resources(&res_mgr),
        view(window),
-       camera(resources.get<GL::Camera>("Camera.camera")),
        lighting(resources.get<GL::Lighting>("Desert.lightn")),
        sphere(resources.get<GL::Object>("Sphere.object")),
        sphere_morph(0.0f),
@@ -60,6 +59,7 @@ DesertPillars::DesertPillars(int, char **):
        content.add(*env_map);
        content.add(flare);
 
+       camera.copy_parameters(resources.get<GL::Camera>("Camera.camera"));
        camera.set_debug_name("Main camera");
 
        view.set_content(sequence.get());