From 202413ab52a1c81945c73e72be7d9ad748ed43cb Mon Sep 17 00:00:00 2001
From: kaetemi <none@none>
Date: Wed, 26 Jun 2013 19:58:27 +0200
Subject: [PATCH] Adjust 2D interface shift, re #43

--HG--
branch : multipass-stereo
---
 code/nel/src/3d/stereo_ovr.cpp                | 43 +++++++++++++++++--
 .../bin/snowballs_client_default.cfg          |  2 +-
 code/snowballs2/client/src/commands.cpp       |  2 +-
 code/snowballs2/client/src/compass.cpp        |  2 +-
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/code/nel/src/3d/stereo_ovr.cpp b/code/nel/src/3d/stereo_ovr.cpp
index cba1c004f..1f62213eb 100644
--- a/code/nel/src/3d/stereo_ovr.cpp
+++ b/code/nel/src/3d/stereo_ovr.cpp
@@ -393,17 +393,52 @@ NLMISC::CQuat CStereoOVR::getOrientation() const
 /// Get GUI shift
 void CStereoOVR::getInterface2DShift(float &x, float &y, float distance)
 {
+#if 0
+
 	NLMISC::CVector vector = CVector(0.f, -distance, 0.f);
 	NLMISC::CQuat rot = getOrientation();
 	rot.invert();
 	NLMISC::CMatrix mat;
 	mat.rotate(rot);
-	if (m_Stage % 2) mat.translate(CVector(m_DevicePtr->HMDInfo.InterpupillaryDistance * -0.5f, 0.f, 0.f));
-	else mat.translate(CVector(m_DevicePtr->HMDInfo.InterpupillaryDistance * 0.5f, 0.f, 0.f));
+	//if (m_Stage % 2) mat.translate(CVector(m_DevicePtr->HMDInfo.InterpupillaryDistance * -0.5f, 0.f, 0.f));
+	//else mat.translate(CVector(m_DevicePtr->HMDInfo.InterpupillaryDistance * 0.5f, 0.f, 0.f));
 	mat.translate(vector);
 	CVector proj = CStereoOVR::getCurrentFrustum().project(mat.getPos());
-	x = proj.x - 0.5f;
-	y = proj.y - 0.5f;
+
+	NLMISC::CVector ipd;
+	if (m_Stage % 2) ipd = CVector(m_DevicePtr->HMDInfo.InterpupillaryDistance * -0.5f, 0.f, 0.f);
+	else ipd = CVector(m_DevicePtr->HMDInfo.InterpupillaryDistance * 0.5f, 0.f, 0.f);
+	CVector projipd = CStereoOVR::getCurrentFrustum().project(vector + ipd);
+	CVector projvec = CStereoOVR::getCurrentFrustum().project(vector);
+
+	x = (proj.x + projipd.x - projvec.x - 0.5f);
+	y = (proj.y + projipd.y - projvec.y - 0.5f);
+
+#elif 1
+
+	// Alternative method
+
+	NLMISC::CVector vec = CVector(0.f, -distance, 0.f);
+	NLMISC::CVector ipd;
+	if (m_Stage % 2) ipd = CVector(m_DevicePtr->HMDInfo.InterpupillaryDistance * -0.5f, 0.f, 0.f);
+	else ipd = CVector(m_DevicePtr->HMDInfo.InterpupillaryDistance * 0.5f, 0.f, 0.f);
+	
+
+	NLMISC::CQuat rot = getOrientation();
+	NLMISC::CQuat modrot = NLMISC::CQuat(CVector(0.f, 1.f, 0.f), NLMISC::Pi);
+	rot = rot * modrot;
+	float p = NLMISC::Pi + atan2f(2.0f * ((rot.x * rot.y) + (rot.z * rot.w)), 1.0f - 2.0f * ((rot.y * rot.y) + (rot.w * rot.w)));
+	if (p > NLMISC::Pi) p -= NLMISC::Pi * 2.0f;	
+	float t = -atan2f(2.0f * ((rot.x * rot.w) + (rot.y * rot.z)), 1.0f - 2.0f * ((rot.z * rot.z) + (rot.w * rot.w)));// // asinf(2.0f * ((rot.x * rot.z) - (rot.w * rot.y)));
+	
+	CVector rotshift = CVector(p, 0.f, t) * -distance;
+	
+	CVector proj = CStereoOVR::getCurrentFrustum().project(vec + ipd + rotshift);
+
+	x = (proj.x - 0.5f);
+	y = (proj.y - 0.5f);
+
+#endif
 }
 
 void CStereoOVR::listDevices(std::vector<CStereoDeviceInfo> &devicesOut)
diff --git a/code/snowballs2/bin/snowballs_client_default.cfg b/code/snowballs2/bin/snowballs_client_default.cfg
index 758bd8483..9d1429f83 100755
--- a/code/snowballs2/bin/snowballs_client_default.cfg
+++ b/code/snowballs2/bin/snowballs_client_default.cfg
@@ -52,7 +52,7 @@ ScreenHeight = 800;
 ScreenDepth = 32;
 
 // If 1, run in fullscreen mode, 0 for windowed
-ScreenFull = 0;
+ScreenFull = 1;
 
 // Start position of the player (the z is always 0)
 StartPoint = { 1840.0, -970.0, 0.0 };
diff --git a/code/snowballs2/client/src/commands.cpp b/code/snowballs2/client/src/commands.cpp
index 4a36db8bb..bd44411e1 100644
--- a/code/snowballs2/client/src/commands.cpp
+++ b/code/snowballs2/client/src/commands.cpp
@@ -388,7 +388,7 @@ void	updateCommands()
 	if (StereoHMD)
 	{
 		float xshift, yshift;
-		StereoHMD->getInterface2DShift(xshift, yshift, 4.0f);
+		StereoHMD->getInterface2DShift(xshift, yshift, 1.f);
 		// snap to pixels
 		xshift = ((float)(sint32)(xshift * width)) / width;
 		yshift = ((float)(sint32)(yshift * height)) / height;
diff --git a/code/snowballs2/client/src/compass.cpp b/code/snowballs2/client/src/compass.cpp
index b915cdb52..285ba3bdc 100644
--- a/code/snowballs2/client/src/compass.cpp
+++ b/code/snowballs2/client/src/compass.cpp
@@ -98,7 +98,7 @@ void updateCompass ()
 	if (StereoHMD)
 	{
 		float xshift, yshift;
-		StereoHMD->getInterface2DShift(xshift, yshift, 4.0f);
+		StereoHMD->getInterface2DShift(xshift, yshift, 1.f);
 		x += xshift;
 		y += yshift;
 	}