Make offset_axis a local variable of StereoView::setup_frame

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

diff --git a/source/stereoview.h b/source/stereoview.h
index b1e0473029fec0e05ceb848f1aefd5c9f0fbe700..f9e9a560ea7eefc21b8f4081cf627267e4e601db 100644 (file)
--- a/source/stereoview.h
+++ b/source/stereoview.h
@@ -13,7 +13,7 @@ namespace VR {
 
 class StereoCombiner;
 
 
 class StereoCombiner;
 

-class StereoView: public GL::Renderable
+class StereoView

 {
 private:
        struct RenderTarget
 {
 private:
        struct RenderTarget


@@ -42,7 +42,7 @@ private:
 
                void create_target(unsigned, unsigned);
                void setup_frame(const GL::Camera &, const GL::Vector3 &, float, const EyeParams &) const;
 
                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 render(const GL::Renderable &) const;

        };
 
        unsigned width;
        };
 
        unsigned width;


@@ -54,7 +54,6 @@ private:
        Eye right;
        float eye_spacing;
        Geometry::Angle<float> strabismus;
        Eye right;
        float eye_spacing;
        Geometry::Angle<float> strabismus;

-       mutable GL::Vector3 offset_axis;

 
 public:
        StereoView(unsigned, unsigned, const GL::Camera &, const GL::Renderable &, const StereoCombiner &);
 
 public:
        StereoView(unsigned, unsigned, const GL::Camera &, const GL::Renderable &, const StereoCombiner &);


@@ -63,11 +62,10 @@ public:
        void set_eye_spacing(float);
        void set_strabismus(const Geometry::Angle<float> &);
 
        void set_eye_spacing(float);
        void set_strabismus(const Geometry::Angle<float> &);
 

-       virtual void setup_frame() const;
-       virtual void finish_frame() const;
-
-       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
 };
 
 } // namespace VR