aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-12-26 02:20:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust 2D interface shift, re #43

Browse source
This commit is contained in:
kaetemi 2013-06-26 19:58:27 +02:00
parent 06e96929af
commit eb196fd99a
4 changed files with 42 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
code/nel/src/3d/stereo_ovr.cpp
View file

@ -393,17 +393,52 @@ NLMISC::CQuat CStereoOVR::getOrientation() const
/// Get GUI shift /// Get GUI shift
void CStereoOVR::getInterface2DShift(float &x, float &y, float distance) void CStereoOVR::getInterface2DShift(float &x, float &y, float distance)
{ {
#if 0
NLMISC::CVector vector = CVector(0.f, -distance, 0.f); NLMISC::CVector vector = CVector(0.f, -distance, 0.f);
NLMISC::CQuat rot = getOrientation(); NLMISC::CQuat rot = getOrientation();
rot.invert(); rot.invert();
NLMISC::CMatrix mat; NLMISC::CMatrix mat;
mat.rotate(rot); mat.rotate(rot);
if (m_Stage % 2) 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)); //else mat.translate(CVector(m_DevicePtr->HMDInfo.InterpupillaryDistance * 0.5f, 0.f, 0.f));
mat.translate(vector); mat.translate(vector);
CVector proj = CStereoOVR::getCurrentFrustum().project(mat.getPos()); 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) void CStereoOVR::listDevices(std::vector<CStereoDeviceInfo> &devicesOut)

2
code/snowballs2/bin/snowballs_client_default.cfg
View file

@ -52,7 +52,7 @@ ScreenHeight = 800;
ScreenDepth = 32; ScreenDepth = 32;
// If 1, run in fullscreen mode, 0 for windowed // If 1, run in fullscreen mode, 0 for windowed
ScreenFull = 0; ScreenFull = 1;
// Start position of the player (the z is always 0) // Start position of the player (the z is always 0)
StartPoint = { 1840.0, -970.0, 0.0 }; StartPoint = { 1840.0, -970.0, 0.0 };

2
code/snowballs2/client/src/commands.cpp
View file

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

2
code/snowballs2/client/src/compass.cpp
View file

@ -98,7 +98,7 @@ void updateCompass ()
if (StereoHMD) if (StereoHMD)
{ {
float xshift, yshift; float xshift, yshift;
StereoHMD->getInterface2DShift(xshift, yshift, 4.0f); StereoHMD->getInterface2DShift(xshift, yshift, 1.f);
x += xshift; x += xshift;
y += yshift; y += yshift;
} }