Add eye distance in 2D interface shift, re #43

--HG--
branch : multipass-stereo

code/nel/include/nel/3d/stereo_ovr.h

@@ -121,8 +121,8 @@ public:
 
 	/// Get the HMD orientation
 	virtual NLMISC::CQuat getOrientation() const;
-	/// Get GUI center (1 = width, 1 = height, 0 = center) (todo: move to CStereoHMD)
+	/// Get GUI center (1 = width, 1 = height, 0 = center)
-	void getInterface2DShift(float &x, float &y, float distance);
+	virtual void getInterface2DShift(float &x, float &y, float distance);
 
 
 	static void listDevices(std::vector<CStereoDeviceInfo> &devicesOut);

code/nel/src/3d/stereo_ovr.cpp

@@ -390,7 +390,7 @@ NLMISC::CQuat CStereoOVR::getOrientation() const
 	return finalquat;
 }
 
-/// Get GUI shift (todo: move to CStereoHMD)
+/// Get GUI shift
 void CStereoOVR::getInterface2DShift(float &x, float &y, float distance)
 {
 	NLMISC::CVector vector = CVector(0.f, -distance, 0.f);
@@ -398,8 +398,10 @@ void CStereoOVR::getInterface2DShift(float &x, float &y, float distance)
 	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));
 	mat.translate(vector);
-	CVector proj = getCurrentFrustum().project(mat.getPos());
+	CVector proj = CStereoOVR::getCurrentFrustum().project(mat.getPos());
 	x = proj.x - 0.5f;
 	y = proj.y - 0.5f;
 }

code/snowballs2/client/src/commands.cpp

@@ -388,7 +388,7 @@ void	updateCommands()
 	if (StereoHMD)
 	{
 		float xshift, yshift;
-		StereoHMD->getInterface2DShift(xshift, yshift, 1.0f);
+		StereoHMD->getInterface2DShift(xshift, yshift, 4.0f);
 		// snap to pixels
 		xshift = ((float)(sint32)(xshift * width)) / width;
 		yshift = ((float)(sint32)(yshift * height)) / height;