Fix memory leaks

[libs/vr.git] / source / stereoview.h

diff --git a/source/stereoview.h b/source/stereoview.h
index b1e0473029fec0e05ceb848f1aefd5c9f0fbe700..75361ba13abd56acf8cc50feb0585e75daa41f24 100644 (file)
--- a/source/stereoview.h
+++ b/source/stereoview.h
@@ -11,9 +11,11 @@
 namespace Msp {
 namespace VR {
 
+class HeadTrackingCamera;
+class MotionController;
 class StereoCombiner;
 
-class StereoView: public GL::Renderable
+class StereoView
 {
 private:
        struct RenderTarget
@@ -36,38 +38,47 @@ private:
        struct Eye
        {
                mutable GL::Camera camera;
+               GL::Matrix offset_matrix;
                RenderTarget *target;
 
                Eye();
+               ~Eye();
 
                void create_target(unsigned, unsigned);
-               void setup_frame(const GL::Camera &, const GL::Vector3 &, float, const EyeParams &) const;
-               void render(const GL::Renderable &, const GL::Tag &) const;
+               void setup_frame(const GL::Camera &, float, const EyeParams &) const;
+               void render(const GL::Renderable &) const;
        };
 
-       unsigned width;
-       unsigned height;
+       const StereoCombiner &combiner;
        const GL::Camera &base_camera;
-       const GL::Renderable &renderable;
-       const StereoCombiner *combiner;
+       HeadTrackingCamera *head_camera;
+       const GL::Renderable *content;
        Eye left;
        Eye right;
-       float eye_spacing;
        Geometry::Angle<float> strabismus;
-       mutable GL::Vector3 offset_axis;
+       std::vector<MotionController *> controllers;
 
 public:
-       StereoView(unsigned, unsigned, const GL::Camera &, const GL::Renderable &, const StereoCombiner &);
+       StereoView(const StereoCombiner &, const GL::Camera &);
+       StereoView(const StereoCombiner &, HeadTrackingCamera &);
+private:
+       void init();
 
-       void set_combiner(const StereoCombiner &);
+public:
+       const GL::Camera &get_base_camera() const { return base_camera; }
+       const HeadTrackingCamera *get_head_camera() const { return head_camera; }
+       void set_content(const GL::Renderable *);
        void set_eye_spacing(float);
+       void set_eye_matrices(const GL::Matrix &, const GL::Matrix &);
        void set_strabismus(const Geometry::Angle<float> &);
 
-       virtual void setup_frame() const;
-       virtual void finish_frame() const;
+       void add_controller(MotionController &);
+       void remove_controller(MotionController &);
 
-       virtual void render(const GL::Tag & = GL::Tag()) const;
-       virtual void render(GL::Renderer &, const GL::Tag & = GL::Tag()) const;
+private:
+       void setup_frame() const;
+public:
+       void render() const;
 };
 
 } // namespace VR