X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Fstereoview.cpp;h=868447435c213551f55c412e41ae0450aa88d3e5;hp=73be19c4527a420aacad992148a56ac25573c2cf;hb=HEAD;hpb=23a6e642715fab2f275a2015ea079137cb31036d

diff --git a/source/stereoview.cpp b/source/stereoview.cpp
index 73be19c..8684474 100644
--- a/source/stereoview.cpp
+++ b/source/stereoview.cpp
@@ -1,5 +1,6 @@
 #include <msp/gl/renderer.h>
 #include "headtrackingcamera.h"
+#include "motioncontroller.h"
 #include "stereocombiner.h"
 #include "stereoview.h"
 
@@ -59,11 +60,27 @@ void StereoView::set_strabismus(const Geometry::Angle<float> &s)
 	strabismus = s;
 }
 
+void StereoView::add_controller(MotionController &controller)
+{
+	if(find(controllers.begin(), controllers.end(), &controller)==controllers.end())
+		controllers.push_back(&controller);
+}
+
+void StereoView::remove_controller(MotionController &controller)
+{
+	vector<MotionController *>::iterator i = find(controllers.begin(), controllers.end(), &controller);
+	if(i!=controllers.end())
+		controllers.erase(i);
+}
+
 void StereoView::setup_frame() const
 {
 	if(head_camera)
 		head_camera->update();
 
+	for(vector<MotionController *>::const_iterator i=controllers.begin(); i!=controllers.end(); ++i)
+		(*i)->update();
+
 	EyeParams params;
 	params.fov = combiner.get_field_of_view();
 	if(params.fov==Geometry::Angle<float>::zero())
@@ -112,6 +129,11 @@ StereoView::Eye::Eye():
 	target(0)
 { }
 
+StereoView::Eye::~Eye()
+{
+	delete target;
+}
+
 void StereoView::Eye::create_target(unsigned w, unsigned h)
 {
 	delete target;