TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 08:15:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2074 from OTHGMars/ovr_srgb_no_dx9

Browse source 
from @Azaezel: fixes flaws found with openvr in production
This commit is contained in:
Areloch 2017-08-24 00:02:36 -05:00 • committed by GitHub
commit 09fe097258
3 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/platform/input/openVR/openVROverlay.cpp
View file

@ -29,7 +29,7 @@ OpenVROverlay::OpenVROverlay()
mOverlayWidth = 1.5f; mOverlayWidth = 1.5f;
mOverlayFlags = 0; mOverlayFlags = 0;
mOverlayColor = ColorF(1, 1, 1, 1); mOverlayColor = LinearColorF(1, 1, 1, 1);
mTrackingOrigin = vr::TrackingUniverseSeated; mTrackingOrigin = vr::TrackingUniverseSeated;
mTargetFormat = GFXFormatR8G8B8A8_LINEAR_FORCE; // needed for openvr! mTargetFormat = GFXFormatR8G8B8A8_LINEAR_FORCE; // needed for openvr!

2
Engine/source/platform/input/openVR/openVROverlay.h
View file

@ -53,7 +53,7 @@ public:
GFXTexHandle mStagingTexture; ///< Texture used by openvr GFXTexHandle mStagingTexture; ///< Texture used by openvr
ColorF mOverlayColor; LinearColorF mOverlayColor;
bool mOverlayTypeDirty; ///< Overlay type is dirty bool mOverlayTypeDirty; ///< Overlay type is dirty
bool mOverlayDirty; ///< Overlay properties are dirty bool mOverlayDirty; ///< Overlay properties are dirty

12
Engine/source/platform/input/openVR/openVRProvider.cpp
View file

@ -18,11 +18,6 @@
#include "gfx/D3D11/gfxD3D11EnumTranslate.h" #include "gfx/D3D11/gfxD3D11EnumTranslate.h"
#include "gfx/gfxStringEnumTranslate.h" #include "gfx/gfxStringEnumTranslate.h"
#include "gfx/D3D9/gfxD3D9Device.h"
#include "gfx/D3D9/gfxD3D9TextureObject.h"
#include "gfx/D3D9/gfxD3D9EnumTranslate.h"
#include "materials/matTextureTarget.h" #include "materials/matTextureTarget.h"
#ifdef TORQUE_OPENGL #ifdef TORQUE_OPENGL
@ -976,11 +971,6 @@ void OpenVRProvider::onEyeRendered(U32 index)
err = vr::VRCompositor()->Submit((vr::EVREye)(vr::Eye_Right), &eyeTexture, &bounds); err = vr::VRCompositor()->Submit((vr::EVREye)(vr::Eye_Right), &eyeTexture, &bounds);
} }
} }
else if (GFX->getAdapterType() == Direct3D9)
{
//vr::Texture_t eyeTexture = { (void*)static_cast<GFXD3D9TextureObject*>(mHMDRenderState.mStereoRenderTextures[index].getPointer())->get2DTex(), vr::API_DirectX, vr::ColorSpace_Gamma };
//err = vr::VRCompositor()->Submit((vr::EVREye)(vr::Eye_Left + index), &eyeTexture);
}
#ifdef TORQUE_OPENGL #ifdef TORQUE_OPENGL
else if (GFX->getAdapterType() == OpenGL) else if (GFX->getAdapterType() == OpenGL)
{ {
@ -1496,7 +1486,7 @@ bool OpenVRProvider::getRenderModelTexture(S32 idx, GFXTextureObject **outTex, b
bmp->writeBitmap("PNG", fs); bmp->writeBitmap("PNG", fs);
fs.close(); fs.close();
tex.set(bmp, &GFXDefaultStaticDiffuseProfile, true, "OpenVR Texture"); tex.set(bmp, &GFXStaticTextureSRGBProfile, true, "OpenVR Texture");
//tex.set(loadedTexture.vrTexture->unWidth, loadedTexture.vrTexture->unHeight, 1, (void*)pixels, GFXFormatR8G8B8A8, &GFXDefaultStaticDiffuseProfile, "OpenVR Texture", 1); //tex.set(loadedTexture.vrTexture->unWidth, loadedTexture.vrTexture->unHeight, 1, (void*)pixels, GFXFormatR8G8B8A8, &GFXDefaultStaticDiffuseProfile, "OpenVR Texture", 1);