aboutsummaryrefslogtreecommitdiffstats
path: root/LibOVR/Src/CAPI/CAPI_HMDState.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'LibOVR/Src/CAPI/CAPI_HMDState.cpp')
-rw-r--r--LibOVR/Src/CAPI/CAPI_HMDState.cpp100
1 files changed, 75 insertions, 25 deletions
diff --git a/LibOVR/Src/CAPI/CAPI_HMDState.cpp b/LibOVR/Src/CAPI/CAPI_HMDState.cpp
index 720857d..142c1b6 100644
--- a/LibOVR/Src/CAPI/CAPI_HMDState.cpp
+++ b/LibOVR/Src/CAPI/CAPI_HMDState.cpp
@@ -5,16 +5,16 @@ Content : State associated with a single HMD
Created : January 24, 2014
Authors : Michael Antonov
-Copyright : Copyright 2014 Oculus VR, Inc. All Rights reserved.
+Copyright : Copyright 2014 Oculus VR, LLC All Rights reserved.
-Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License");
+Licensed under the Oculus VR Rift SDK License Version 3.2 (the "License");
you may not use the Oculus VR Rift SDK except in compliance with the License,
which is provided at the time of installation or download, or which
otherwise accompanies this software in either electronic or hard copy form.
You may obtain a copy of the License at
-http://www.oculusvr.com/licenses/LICENSE-3.1
+http://www.oculusvr.com/licenses/LICENSE-3.2
Unless required by applicable law or agreed to in writing, the Oculus VR SDK
distributed under the License is distributed on an "AS IS" BASIS,
@@ -162,11 +162,12 @@ void HMDState::sharedInit(Profile* profile)
BeginFrameThreadId = 0;
BeginFrameTimingCalled = false;
- TheSensorStateReader.LoadProfileCenteredFromWorld(profile);
-
// Construct the HSWDisplay. We will later reconstruct it with a specific ovrRenderAPI type if the application starts using SDK-based rendering.
if(!pHSWDisplay)
+ {
pHSWDisplay = *OVR::CAPI::HSWDisplay::Factory(ovrRenderAPI_None, pHmdDesc, RenderState);
+ pHSWDisplay->Enable(pProfile->GetBoolValue("HSW", true));
+ }
}
static Vector3f GetNeckModelFromProfile(Profile* profile)
@@ -229,7 +230,20 @@ void HMDState::UpdateRenderProfile(Profile* profile)
neckModel.z
};
pClient->SetNumberValues(GetNetId(), "NeckModelVector3f", neckModelArray, 3);
+
+ double camerastate[7];
+ if (profile->GetDoubleValues(OVR_KEY_CAMERA_POSITION, camerastate, 7) == 0)
+ {
+ //there is no value, so we load the default
+ for (int i = 0; i < 7; i++) camerastate[i] = 0;
+ camerastate[3] = 1;//no offset. by default, give the quaternion w component value 1
+ }
+ else
+
+ TheSensorStateReader.setCenteredFromWorld(OVR::Posed::FromArray(camerastate));
}
+
+
}
HMDState* HMDState::CreateHMDState(NetClient* client, const HMDNetworkInfo& netInfo)
@@ -404,7 +418,12 @@ bool HMDState::getBoolValue(const char* propertyName, bool defaultVal)
bool HMDState::setBoolValue(const char* propertyName, bool value)
{
- return NetClient::GetInstance()->SetBoolValue(GetNetId(), propertyName, value);
+ if (NetSessionCommon::IsServiceProperty(NetSessionCommon::ESetBoolValue, propertyName))
+ {
+ return NetClient::GetInstance()->SetBoolValue(GetNetId(), propertyName, value);
+ }
+
+ return false;
}
int HMDState::getIntValue(const char* propertyName, int defaultVal)
@@ -422,7 +441,12 @@ int HMDState::getIntValue(const char* propertyName, int defaultVal)
bool HMDState::setIntValue(const char* propertyName, int value)
{
- return NetClient::GetInstance()->SetIntValue(GetNetId(), propertyName, value);
+ if (NetSessionCommon::IsServiceProperty(NetSessionCommon::ESetIntValue, propertyName))
+ {
+ return NetClient::GetInstance()->SetIntValue(GetNetId(), propertyName, value);
+ }
+
+ return false;
}
float HMDState::getFloatValue(const char* propertyName, float defaultVal)
@@ -453,7 +477,12 @@ float HMDState::getFloatValue(const char* propertyName, float defaultVal)
bool HMDState::setFloatValue(const char* propertyName, float value)
{
- return NetClient::GetInstance()->SetNumberValue(GetNetId(), propertyName, value);
+ if (NetSessionCommon::IsServiceProperty(NetSessionCommon::ESetNumberValue, propertyName))
+ {
+ return NetClient::GetInstance()->SetNumberValue(GetNetId(), propertyName, value);
+ }
+
+ return false;
}
static unsigned CopyFloatArrayWithLimit(float dest[], unsigned destSize,
@@ -486,10 +515,18 @@ unsigned HMDState::getFloatArray(const char* propertyName, float values[], unsig
return 0;
}
- float data[3];
- TimeManager.GetLatencyTimings(data);
-
- return CopyFloatArrayWithLimit(values, arraySize, data, 3);
+ union {
+ struct X {
+ float latencyRender, latencyTimewarp, latencyPostPresent;
+ } x;
+ float data[3];
+ } m;
+
+ static_assert(sizeof(m.x)==sizeof(m.data), "sizeof(struct X) failure");
+
+ TimeManager.GetLatencyTimings(m.x.latencyRender, m.x.latencyTimewarp, m.x.latencyPostPresent);
+
+ return CopyFloatArrayWithLimit(values, arraySize, m.data, 3);
}
else if (NetSessionCommon::IsServiceProperty(NetSessionCommon::EGetNumberValues, propertyName))
{
@@ -517,8 +554,8 @@ unsigned HMDState::getFloatArray(const char* propertyName, float values[], unsig
// we can return 0 in all conditions if property doesn't exist.
return pProfile->GetFloatValues(propertyName, values, arraySize);
- }
}
+ }
return 0;
}
@@ -536,17 +573,22 @@ bool HMDState::setFloatArray(const char* propertyName, float values[], unsigned
return true;
}
- double* da = new double[arraySize];
- for (int i = 0; i < (int)arraySize; ++i)
- {
- da[i] = values[i];
- }
+ if (NetSessionCommon::IsServiceProperty(NetSessionCommon::ESetNumberValues, propertyName))
+ {
+ double* da = new double[arraySize];
+ for (int i = 0; i < (int)arraySize; ++i)
+ {
+ da[i] = values[i];
+ }
+
+ bool result = NetClient::GetInstance()->SetNumberValues(GetNetId(), propertyName, da, arraySize);
- bool result = NetClient::GetInstance()->SetNumberValues(GetNetId(), propertyName, da, arraySize);
+ delete[] da;
- delete[] da;
+ return result;
+ }
- return result;
+ return false;
}
const char* HMDState::getString(const char* propertyName, const char* defaultVal)
@@ -570,7 +612,12 @@ const char* HMDState::getString(const char* propertyName, const char* defaultVal
bool HMDState::setString(const char* propertyName, const char* value)
{
- return NetClient::GetInstance()->SetStringValue(GetNetId(), propertyName, value);
+ if (NetSessionCommon::IsServiceProperty(NetSessionCommon::ESetStringValue, propertyName))
+ {
+ return NetClient::GetInstance()->SetStringValue(GetNetId(), propertyName, value);
+ }
+
+ return false;
}
@@ -647,7 +694,7 @@ bool HMDState::ConfigureRendering(ovrEyeRenderDesc eyeRenderDescOut[2],
}
if (!pRenderer ||
- !pRenderer->Initialize(apiConfig, distortionCaps))
+ !pRenderer->Initialize(apiConfig))
{
RenderingConfigured = false;
return false;
@@ -661,7 +708,10 @@ bool HMDState::ConfigureRendering(ovrEyeRenderDesc eyeRenderDescOut[2],
}
if(!pHSWDisplay) // Use * below because that for of operator= causes it to inherit the refcount the factory gave the object.
+ {
pHSWDisplay = *OVR::CAPI::HSWDisplay::Factory(apiConfig->Header.API, pHmdDesc, RenderState);
+ pHSWDisplay->Enable(pProfile->GetBoolValue("HSW", true));
+ }
if (pHSWDisplay)
pHSWDisplay->Initialize(apiConfig); // This is potentially re-initializing it with a new config.
@@ -700,8 +750,8 @@ ovrBool ovrHmd_CreateDistortionMeshInternal( ovrHmdStruct * hmd,
// Not used now, but Chromatic flag or others could possibly be checked for in the future.
OVR_UNUSED1(distortionCaps);
-#if defined (OVR_OS_WIN32)
- OVR_COMPILER_ASSERT(sizeof(DistortionMeshVertexData) == sizeof(ovrDistortionVertex));
+#if defined (OVR_CC_MSVC)
+ static_assert(sizeof(DistortionMeshVertexData) == sizeof(ovrDistortionVertex), "DistortionMeshVertexData size mismatch");
#endif
// *** Calculate a part of "StereoParams" needed for mesh generation
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 16:52:22 +0000