X-Git-Url: http://git.tdb.fi/?p=libs%2Fvr.git;a=blobdiff_plain;f=source%2Fovr%2Foculusriftcombiner.cpp;h=e0c2c4d0ffc9146106d0d999191973b0daa7d05d;hp=edbe08ae56e4ce9b0dcc833df9109b65d9ce9b85;hb=b6de7d24475dec8f5d6b8148a69cf8b561bc0761;hpb=11d105c5183b401e5f52e9abb16cf659298cf035

diff --git a/source/ovr/oculusriftcombiner.cpp b/source/ovr/oculusriftcombiner.cpp
index edbe08a..e0c2c4d 100644
--- a/source/ovr/oculusriftcombiner.cpp
+++ b/source/ovr/oculusriftcombiner.cpp
@@ -1,9 +1,8 @@
-#include <cmath>
 #include <msp/gl/meshbuilder.h>
 #include <msp/gl/texture2d.h>
 #include "oculusriftcombiner.h"
-#include "oculusriftdevice.h"
-#include "oculusriftdevice_private.h"
+#include "oculusriftsystem.h"
+#include "oculusriftsystem_private.h"
 
 using namespace std;
 
@@ -76,7 +75,13 @@ void create_distortion_mesh(Msp::GL::Mesh &mesh, ovrHmd hmd, ovrEyeType eye, con
 namespace Msp {
 namespace VR {
 
-OculusRiftCombiner::OculusRiftCombiner(OculusRiftDevice &d, GL::View &v):
+struct OculusRiftCombiner::Frustum: StereoCombiner::Frustum
+{
+	Frustum(const ovrFovPort &);
+};
+
+
+OculusRiftCombiner::OculusRiftCombiner(OculusRiftSystem &d, GL::View &v):
 	device(d),
 	view(v),
 	left_mesh((GL::VERTEX2, GL::TEXCOORD2,0, GL::TEXCOORD2,1, GL::TEXCOORD2,2, GL::TEXCOORD2,3)),
@@ -87,17 +92,13 @@ OculusRiftCombiner::OculusRiftCombiner(OculusRiftDevice &d, GL::View &v):
 
 	ovrFovPort left_fov = hmd->DefaultEyeFov[ovrEye_Left];
 	ovrFovPort right_fov = hmd->DefaultEyeFov[ovrEye_Right];
-	float vertical = max(max(left_fov.UpTan, left_fov.DownTan), max(right_fov.UpTan, right_fov.DownTan));
-	fov = Geometry::atan<float>(vertical)*2.0f;
-
-	float inner = max(left_fov.RightTan, right_fov.LeftTan);
-	float outer = max(left_fov.LeftTan, right_fov.RightTan);
-	frustum_skew = (inner-outer)/(inner+outer);
+	configure_eye_frustums(Frustum(left_fov), Frustum(right_fov));
 
-	left_fov.UpTan = right_fov.UpTan = vertical;
-	left_fov.DownTan = right_fov.DownTan = vertical;
-	left_fov.RightTan = right_fov.LeftTan = inner;
-	left_fov.LeftTan = right_fov.RightTan = outer;
+	left_fov.UpTan = left_fov.DownTan = tan(fov/2.0f);
+	left_fov.LeftTan = left_fov.UpTan*render_aspect*(1-frustum_skew);
+	left_fov.RightTan = left_fov.UpTan*render_aspect*(1+frustum_skew);
+	right_fov = left_fov;
+	swap(right_fov.LeftTan, right_fov.RightTan);
 
 	create_distortion_mesh(left_mesh, hmd, ovrEye_Left, left_fov);
 	create_distortion_mesh(right_mesh, hmd, ovrEye_Right, right_fov);
@@ -105,7 +106,6 @@ OculusRiftCombiner::OculusRiftCombiner(OculusRiftDevice &d, GL::View &v):
 	ovrSizei tex_size = ovrHmd_GetFovTextureSize(hmd, ovrEye_Left, left_fov, 1.0);
 	target_width = tex_size.w;
 	target_height = tex_size.h;
-	render_aspect = (inner+outer)/(vertical*2);
 
 	left_shdata.uniform("texture", 0);
 	right_shdata.uniform("texture", 0);
@@ -121,6 +121,8 @@ OculusRiftCombiner::OculusRiftCombiner(OculusRiftDevice &d, GL::View &v):
 	ovrHmd_GetRenderScaleAndOffset(right_fov, tex_size, view_rect, uv_scale_offset);
 	right_shdata.uniform("uv_scale", uv_scale_offset[0].x, -uv_scale_offset[0].y);
 	right_shdata.uniform("uv_offset", uv_scale_offset[1].x, 1-uv_scale_offset[1].y);
+
+	device.configure_window(view.get_window());
 }
 
 void OculusRiftCombiner::prepare() const
@@ -165,5 +167,10 @@ void OculusRiftCombiner::render(const GL::Texture2D &left, const GL::Texture2D &
 	device.end_frame();
 }
 
+
+OculusRiftCombiner::Frustum::Frustum(const ovrFovPort &fov):
+	StereoCombiner::Frustum(-fov.LeftTan, fov.RightTan, -fov.DownTan, fov.UpTan)
+{ }
+
 } // namespace VR
 } // namespace Msp