TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More progress

Browse source 
- Fixed normal stereo rendering
- Beginnings of vr overlay code
This commit is contained in:
James Urquhart 2016-05-07 22:33:54 +01:00
parent b15be28f38
commit 9e5eda9a08
6 changed files with 693 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Engine/source/gui/3d/guiTSControl.cpp
View file

@ -538,6 +538,47 @@ void GuiTSCtrl::onRender(Point2I offset, const RectI &updateRect)
return;
}
// jamesu - currently a little bit of a hack. Ideally we need to ditch the viewports in the query data and just rely on the display device
if (mLastCameraQuery.displayDevice)
{
if (mRenderStyle == RenderStyleStereoSideBySide)
{
mLastCameraQuery.displayDevice->setDrawMode(GFXDevice::RS_StereoSideBySide);
}
else if (mRenderStyle == RenderStyleStereoSeparate)
{
mLastCameraQuery.displayDevice->setDrawMode(GFXDevice::RS_StereoSeparate);
}
else
{
mLastCameraQuery.displayDevice->setDrawMode(GFXDevice::RS_Standard);
}
// The connection's display device may want to set the projection offset
if (mLastCameraQuery.displayDevice->providesProjectionOffset())
{
mLastCameraQuery.projectionOffset = mLastCameraQuery.displayDevice->getProjectionOffset();
}
// The connection's display device may want to set the eye offset
if (mLastCameraQuery.displayDevice->providesEyeOffsets())
{
mLastCameraQuery.displayDevice->getEyeOffsets(mLastCameraQuery.eyeOffset);
}
// Grab field of view for both eyes
if (mLastCameraQuery.displayDevice->providesFovPorts())
{
mLastCameraQuery.displayDevice->getFovPorts(mLastCameraQuery.fovPort);
mLastCameraQuery.hasFovPort = true;
}
mLastCameraQuery.displayDevice->getStereoViewports(mLastCameraQuery.stereoViewports);
mLastCameraQuery.displayDevice->getStereoTargets(mLastCameraQuery.stereoTargets);
mLastCameraQuery.hasStereoTargets = mLastCameraQuery.stereoTargets[0];
}
GFXTargetRef origTarget = GFX->getActiveRenderTarget();
U32 origStyle = GFX->getCurrentRenderStyle();
@ -612,6 +653,9 @@ void GuiTSCtrl::onRender(Point2I offset, const RectI &updateRect)
GFX->activateStereoTarget(-1);
_internalRender(RectI(updateRect.point, updateRect.extent), frustum);
// Notify device we've rendered the right, thus the last stereo frame.
GFX->getDeviceEventSignal().trigger(GFXDevice::deRightStereoFrameRendered);
// Render preview
if (mLastCameraQuery.displayDevice)
@ -626,7 +670,7 @@ void GuiTSCtrl::onRender(Point2I offset, const RectI &updateRect)
}
}
}
else if (mRenderStyle == RenderStyleStereoSeparate && mLastCameraQuery.stereoTargets[0])
else if (mRenderStyle == RenderStyleStereoSeparate && mLastCameraQuery.displayDevice)
{
// In this case we render the scene twice to different render targets, then
// render the final composite view
@ -699,7 +743,6 @@ void GuiTSCtrl::onRender(Point2I offset, const RectI &updateRect)
Point2I screensize = getRoot()->getWindowSize();
tempRect.point.y = screensize.y - (tempRect.point.y + tempRect.extent.y);
#endif
GFX->setCurrentRenderStyle(GFXDevice::RS_Standard);
// set up the camera and viewport stuff:
F32 wwidth;