Merge CameraControl functionality into other classes

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

diff --git a/source/stage.cpp b/source/stage.cpp
index 94782add256f16ddc7cd2ed5c06905ae3dd4fd54..dfb668852760d3526f20c2939c2f8d2b7889e88b 100644 (file)
--- a/source/stage.cpp
+++ b/source/stage.cpp
@@ -14,6 +14,14 @@ Stage::~Stage()
        delete pipeline;
 }
 
+void Stage::set_camera(const GL::Camera &c)
+{
+       camera.set_object_matrix(c.get_object_matrix());
+       camera.set_up_direction(c.get_up_direction());
+       camera.set_field_of_view(c.get_field_of_view());
+       camera.set_depth_clip(c.get_near_clip(), c.get_far_clip());
+}
+
 
 Stage::UseInView::UseInView():
        view(0),
@@ -35,11 +43,35 @@ void Stage::UseInView::validate() const
 
 void Stage::UseInView::start(float, float)
 {
-       view->set_camera(&stage->camera_control.get_camera());
+       view->set_camera(&stage->camera);
        view->set_content(stage->pipeline);
 }
 
 
+Stage::SetCamera::SetCamera():
+       stage(0),
+       camera(0)
+{ }
+
+Stage::SetCamera::SetCamera(Stage &s, const GL::Camera &c):
+       stage(&s),
+       camera(&c)
+{ }
+
+void Stage::SetCamera::validate() const
+{
+       if(!stage)
+               throw logic_error("null stage");
+       if(!camera)
+               throw logic_error("null camera");
+}
+
+void Stage::SetCamera::start(float, float)
+{
+       stage->set_camera(*camera);
+}
+
+
 Stage::UseInView::Loader::Loader(UseInView &u, Demo &d):
        DataFile::DerivedObjectLoader<UseInView, Action::Loader>(u, d)
 {
@@ -56,3 +88,21 @@ void Stage::UseInView::Loader::view(const string &n)
 {
        obj.view = &demo.get_thing<GL::View>(n);
 }
+
+
+Stage::SetCamera::Loader::Loader(SetCamera &s, Demo &d):
+       DataFile::DerivedObjectLoader<SetCamera, Action::Loader>(s, d)
+{
+       add("camera", &Loader::camera);
+       add("stage", &Loader::stage);
+}
+
+void Stage::SetCamera::Loader::stage(const string &n)
+{
+       obj.stage = &demo.get_thing<Stage>(n);
+}
+
+void Stage::SetCamera::Loader::camera(const string &n)
+{
+       obj.camera = &demo.get_resources().get<GL::Camera>(n);
+}