X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=demos%2Fdesertpillars%2Fsource%2Fdesertpillars.cpp;h=62a4455896300b22c9f77a3b8452ac6bf4eb26a6;hb=3b98e13c823d4cb7e4d2d4d14e8440b44bc71f91;hp=532a94990120d98f4eb3fc55edfca8eb899de5d6;hpb=f0414f06fc2463e9765c9492dce60e0468dceb3c;p=libs%2Fgl.git diff --git a/demos/desertpillars/source/desertpillars.cpp b/demos/desertpillars/source/desertpillars.cpp index 532a9499..62a44558 100644 --- a/demos/desertpillars/source/desertpillars.cpp +++ b/demos/desertpillars/source/desertpillars.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include "desertpillars.h" @@ -27,7 +26,6 @@ DesertPillars::DesertPillars(int, char **): keyboard(window), resources(&res_mgr), view(window), - camera(resources.get("Camera.camera")), lighting(resources.get("Desert.lightn")), sphere(resources.get("Sphere.object")), sphere_morph(0.0f), @@ -61,6 +59,7 @@ DesertPillars::DesertPillars(int, char **): content.add(*env_map); content.add(flare); + camera.copy_parameters(resources.get("Camera.camera")); camera.set_debug_name("Main camera"); view.set_content(sequence.get());