Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

OVR: Translate camera

Browse source 
--HG--
branch : multipass-stereo
This commit is contained in:
kaetemi 2014-08-05 00:51:53 +02:00
parent 9b79a44f8a
commit 2e6893fd48
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/include/nel/3d/stereo_ovr_04.h
View file

@ -168,6 +168,7 @@ private:
uint m_RenderTargetWidth; uint m_RenderTargetWidth;
uint m_RenderTargetHeight; uint m_RenderTargetHeight;
NLMISC::CVector2f m_EyeUVScaleOffset[NL_OVR_EYE_COUNT][2]; NLMISC::CVector2f m_EyeUVScaleOffset[NL_OVR_EYE_COUNT][2];
float m_EyeViewAdjustX[NL_OVR_EYE_COUNT];
CVertexBuffer m_VB; CVertexBuffer m_VB;
CIndexBuffer m_IB; CIndexBuffer m_IB;

11
code/nel/src/3d/stereo_ovr_04.cpp
View file

@ -221,6 +221,9 @@ CStereoOVR::CStereoOVR(const CStereoOVRDeviceFactory *factory) : m_DevicePtr(NUL
{ {
ovrFovPort &fov = eyeRenderDesc[eye].Fov; ovrFovPort &fov = eyeRenderDesc[eye].Fov;
// store data
m_EyeViewAdjustX[eye] = -eyeRenderDesc[eye].ViewAdjust.x;
// setup viewport // setup viewport
m_EyeViewport[eye].init( m_EyeViewport[eye].init(
(float)eyeRenderDesc[eye].DistortedViewport.Pos.x / nativeWidth, (float)eyeRenderDesc[eye].DistortedViewport.Pos.x / nativeWidth,
@ -653,11 +656,11 @@ void CStereoOVR::getCurrentFrustum(uint cid, NL3D::UCamera *camera) const
} }
void CStereoOVR::getCurrentMatrix(uint cid, NL3D::UCamera *camera) const void CStereoOVR::getCurrentMatrix(uint cid, NL3D::UCamera *camera) const
{/* {
CMatrix translate; CMatrix translate;
if (m_Stage == 2) { } if (m_Stage == 2) { }
else if (m_Stage % 2) translate.translate(CVector((m_DevicePtr->HMDInfo.InterpupillaryDistance * m_Scale) * -0.5f, 0.f, 0.f)); else if (m_Stage % 2) translate.translate(CVector(m_EyeViewAdjustX[ovrEye_Left] * m_Scale, 0.f, 0.f));
else translate.translate(CVector((m_DevicePtr->HMDInfo.InterpupillaryDistance * m_Scale) * 0.5f, 0.f, 0.f)); else translate.translate(CVector(m_EyeViewAdjustX[ovrEye_Right] * m_Scale, 0.f, 0.f));
CMatrix mat = m_CameraMatrix[cid] * translate; CMatrix mat = m_CameraMatrix[cid] * translate;
if (camera->getTransformMode() == NL3D::UTransformable::RotQuat) if (camera->getTransformMode() == NL3D::UTransformable::RotQuat)
{ {
@ -668,7 +671,7 @@ void CStereoOVR::getCurrentMatrix(uint cid, NL3D::UCamera *camera) const
{ {
// camera->setTransformMode(NL3D::UTransformable::DirectMatrix); // camera->setTransformMode(NL3D::UTransformable::DirectMatrix);
camera->setMatrix(mat); camera->setMatrix(mat);
}*/ }
} }
bool CStereoOVR::wantClear() bool CStereoOVR::wantClear()