Merge CameraControl functionality into other classes

[libs/demoscene.git] / source / stage.h

diff --git a/source/stage.h b/source/stage.h
index 1ab32d83d27d07fa50be5510c5b7bf8216ab43db..daf4f4b982c72ab52fa07008c79a10d2d2b1ba69 100644 (file)
--- a/source/stage.h
+++ b/source/stage.h
@@ -1,8 +1,8 @@
 #ifndef MSP_DEMOSCENE_STAGE_H_
 #define MSP_DEMOSCENE_STAGE_H_
 
+#include <msp/gl/camera.h>
 #include <msp/gl/pipeline.h>
-#include "cameracontrol.h"
 #include "action.h"
 
 struct Stage
@@ -33,11 +33,39 @@ struct Stage
                virtual void start(float, float);
        };
 
+       class SetCamera: public Action
+       {
+       public:
+               class Loader: public Msp::DataFile::DerivedObjectLoader<SetCamera, Action::Loader>
+               {
+               public:
+                       Loader(SetCamera &, Demo &);
+
+               private:
+                       void camera(const std::string &);
+                       void stage(const std::string &);
+               };
+
+       private:
+               Stage *stage;
+               const Msp::GL::Camera *camera;
+
+       public:
+               SetCamera();
+               SetCamera(Stage &, const Msp::GL::Camera &);
+
+               virtual void validate() const;
+
+               virtual void start(float, float);
+       };
+
        Msp::GL::Pipeline *pipeline;
-       CameraControl camera_control;
+       Msp::GL::Camera camera;
 
        Stage();
        ~Stage();
+
+       void set_camera(const Msp::GL::Camera &);
 };
 
 #endif