SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Format every single file using .clang-format

Browse Source
This commit is contained in:
Vasily
2018-12-28 03:06:42 +01:00
parent 89c02642fc
commit 51057c1d79
40 changed files with 10302 additions and 6950 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/ChaperoneUtils.cpp
+93 -72
View File
@@ -2,80 +2,101 @@
#include <iostream>
#include <cmath>
namespace utils {
float ChaperoneUtils::_getDistanceToChaperone(const vr::HmdVector3_t & x, vr::HmdVector3_t * projectedPoint) {
float distance = NAN;
vr::HmdVector3_t* _cornersPtr = _corners.get();
for (uint32_t i = 0; i < _quadsCount; i++) {
uint32_t i2 = (i + 1) % _quadsCount;
vr::HmdVector3_t& r0 = _cornersPtr[i];
vr::HmdVector3_t& r1 = _cornersPtr[i2];
float u_x = r1.v[0] - r0.v[0];
float u_z = r1.v[2] - r0.v[2];
float r = ((x.v[0] - r0.v[0]) * u_x + (x.v[2] - r0.v[2]) * u_z) / (u_x*u_x + u_z*u_z);
//int mode = 0; // 0 .. projected point on segment, 1 .. projected point outside of segment (r0 closer than r1), 2 .. projected point outside of segment (r1 closer than r0)
float d;
float x1_x;
float x1_z;
if (r < 0.0f || r > 1.0f) { // projected point outside of segment
float d_x = r0.v[0] - x.v[0];
float d_z = r0.v[2] - x.v[2];
float d1 = sqrt(d_x*d_x + d_z*d_z);
d_x = r1.v[0] - x.v[0];
d_z = r1.v[2] - x.v[2];
float d2 = sqrt(d_x*d_x + d_z*d_z);
if (d1 < d2) {
d = d1;
x1_x = r0.v[0];
x1_z = r0.v[2];
} else {
d = d2;
x1_x = r1.v[0];
x1_z = r1.v[2];
}
} else { // projected point on segment
x1_x = r0.v[0] + r * u_x;
x1_z = r0.v[2] + r * u_z;
float d_x = x1_x - x.v[0];
float d_z = x1_z - x.v[2];
d = sqrt(d_x*d_x + d_z*d_z);
}
if (std::isnan(distance) || d < distance) {
distance = d;
if (projectedPoint) {
projectedPoint->v[0] = x1_x;
projectedPoint->v[1] = x.v[1];
projectedPoint->v[2] = x1_z;
}
}
}
return distance;
namespace utils
{
float ChaperoneUtils::_getDistanceToChaperone(
const vr::HmdVector3_t& x,
vr::HmdVector3_t* projectedPoint )
{
float distance = NAN;
vr::HmdVector3_t* _cornersPtr = _corners.get();
for ( uint32_t i = 0; i < _quadsCount; i++ )
{
uint32_t i2 = ( i + 1 ) % _quadsCount;
vr::HmdVector3_t& r0 = _cornersPtr[i];
vr::HmdVector3_t& r1 = _cornersPtr[i2];
float u_x = r1.v[0] - r0.v[0];
float u_z = r1.v[2] - r0.v[2];
float r = ( ( x.v[0] - r0.v[0] ) * u_x + ( x.v[2] - r0.v[2] ) * u_z )
/ ( u_x * u_x + u_z * u_z );
// int mode = 0; // 0 .. projected point on segment, 1 .. projected
// point outside of segment (r0 closer than r1), 2 .. projected point
// outside of segment (r1 closer than r0)
float d;
float x1_x;
float x1_z;
if ( r < 0.0f || r > 1.0f )
{ // projected point outside of segment
float d_x = r0.v[0] - x.v[0];
float d_z = r0.v[2] - x.v[2];
float d1 = sqrt( d_x * d_x + d_z * d_z );
d_x = r1.v[0] - x.v[0];
d_z = r1.v[2] - x.v[2];
float d2 = sqrt( d_x * d_x + d_z * d_z );
if ( d1 < d2 )
{
d = d1;
x1_x = r0.v[0];
x1_z = r0.v[2];
}
else
{
d = d2;
x1_x = r1.v[0];
x1_z = r1.v[2];
}
}
else
{ // projected point on segment
x1_x = r0.v[0] + r * u_x;
x1_z = r0.v[2] + r * u_z;
float d_x = x1_x - x.v[0];
float d_z = x1_z - x.v[2];
d = sqrt( d_x * d_x + d_z * d_z );
}
if ( std::isnan( distance ) || d < distance )
{
distance = d;
if ( projectedPoint )
{
projectedPoint->v[0] = x1_x;
projectedPoint->v[1] = x.v[1];
projectedPoint->v[2] = x1_z;
}
}
}
return distance;
}
void ChaperoneUtils::loadChaperoneData() {
std::lock_guard<std::recursive_mutex> lock(_mutex);
vr::VRChaperoneSetup()->GetLiveCollisionBoundsInfo(nullptr, &_quadsCount);
if (_quadsCount > 0) {
std::unique_ptr<vr::HmdQuad_t> quadsBuffer(new vr::HmdQuad_t[_quadsCount]);
vr::HmdQuad_t* quadsBufferPtr = quadsBuffer.get();
_corners.reset((vr::HmdVector3_t*)new vr::HmdQuad_t[_quadsCount]);
vr::HmdVector3_t* _cornersPtr = _corners.get();
vr::VRChaperoneSetup()->GetLiveCollisionBoundsInfo(quadsBufferPtr, &_quadsCount);
for (uint32_t i = 0; i < _quadsCount; i++) {
_cornersPtr[i] = quadsBufferPtr[i].vCorners[0];
uint32_t i2 = (i + 1) % _quadsCount;
if (quadsBufferPtr[i].vCorners[3].v[0] != quadsBufferPtr[i2].vCorners[0].v[0]
|| quadsBufferPtr[i].vCorners[3].v[1] != quadsBufferPtr[i2].vCorners[0].v[1]
|| quadsBufferPtr[i].vCorners[3].v[2] != quadsBufferPtr[i2].vCorners[0].v[2]
|| quadsBufferPtr[i].vCorners[0].v[1] != 0.0f) {
_chaperoneWellFormed = false;
}
}
}
void ChaperoneUtils::loadChaperoneData()
{
std::lock_guard<std::recursive_mutex> lock( _mutex );
vr::VRChaperoneSetup()->GetLiveCollisionBoundsInfo( nullptr, &_quadsCount );
if ( _quadsCount > 0 )
{
std::unique_ptr<vr::HmdQuad_t> quadsBuffer(
new vr::HmdQuad_t[_quadsCount] );
vr::HmdQuad_t* quadsBufferPtr = quadsBuffer.get();
_corners.reset( ( vr::HmdVector3_t* ) new vr::HmdQuad_t[_quadsCount] );
vr::HmdVector3_t* _cornersPtr = _corners.get();
vr::VRChaperoneSetup()->GetLiveCollisionBoundsInfo( quadsBufferPtr,
&_quadsCount );
for ( uint32_t i = 0; i < _quadsCount; i++ )
{
_cornersPtr[i] = quadsBufferPtr[i].vCorners[0];
uint32_t i2 = ( i + 1 ) % _quadsCount;
if ( quadsBufferPtr[i].vCorners[3].v[0]
!= quadsBufferPtr[i2].vCorners[0].v[0]
|| quadsBufferPtr[i].vCorners[3].v[1]
!= quadsBufferPtr[i2].vCorners[0].v[1]
|| quadsBufferPtr[i].vCorners[3].v[2]
!= quadsBufferPtr[i2].vCorners[0].v[2]
|| quadsBufferPtr[i].vCorners[0].v[1] != 0.0f )
{
_chaperoneWellFormed = false;
}
}
}
}
} // end namespace utils
src/utils/ChaperoneUtils.h
+37 -22
View File
@@ -4,35 +4,50 @@
#include <mutex>
#include <openvr.h>
namespace utils {
class ChaperoneUtils {
namespace utils
{
class ChaperoneUtils
{
private:
std::recursive_mutex _mutex;
uint32_t _quadsCount = 0;
std::unique_ptr<vr::HmdVector3_t> _corners;
bool _chaperoneWellFormed = true;
std::recursive_mutex _mutex;
uint32_t _quadsCount = 0;
std::unique_ptr<vr::HmdVector3_t> _corners;
bool _chaperoneWellFormed = true;
float _getDistanceToChaperone(const vr::HmdVector3_t& point, vr::HmdVector3_t* projectedPoint);
float _getDistanceToChaperone( const vr::HmdVector3_t& point,
vr::HmdVector3_t* projectedPoint );
public:
uint32_t quadsCount() const noexcept { return _quadsCount; }
bool isChaperoneWellFormed() const noexcept { return _chaperoneWellFormed; }
uint32_t quadsCount() const noexcept
{
return _quadsCount;
}
bool isChaperoneWellFormed() const noexcept
{
return _chaperoneWellFormed;
}
std::recursive_mutex& mutex() noexcept { return _mutex; }
std::recursive_mutex& mutex() noexcept
{
return _mutex;
}
void loadChaperoneData();
void loadChaperoneData();
float getDistanceToChaperone(const vr::HmdVector3_t& point, vr::HmdVector3_t* projectedPoint = nullptr, bool doLock = false) {
if (doLock) {
std::lock_guard<std::recursive_mutex> lock(_mutex);
return _getDistanceToChaperone(point, projectedPoint);
} else {
return _getDistanceToChaperone(point, projectedPoint);
}
}
float getDistanceToChaperone( const vr::HmdVector3_t& point,
vr::HmdVector3_t* projectedPoint = nullptr,
bool doLock = false )
{
if ( doLock )
{
std::lock_guard<std::recursive_mutex> lock( _mutex );
return _getDistanceToChaperone( point, projectedPoint );
}
else
{
return _getDistanceToChaperone( point, projectedPoint );
}
}
};
} // end namespace utils
src/utils/Matrix.h
+96 -83
View File
@@ -3,95 +3,108 @@
#include <openvr.h>
#include <cmath>
namespace utils {
inline vr::HmdMatrix34_t& initRotationMatrix(vr::HmdMatrix34_t& matrix, unsigned axisId, float angle) {
switch (axisId) {
case 0: // x-axis
matrix.m[0][0] = 1.0f;
matrix.m[0][1] = 0.0f;
matrix.m[0][2] = 0.0f;
matrix.m[0][3] = 0.0f;
matrix.m[1][0] = 0.0f;
matrix.m[1][1] = std::cos(angle);
matrix.m[1][2] = -std::sin(angle);
matrix.m[1][3] = 0.0f;
matrix.m[2][0] = 0.0f;
matrix.m[2][1] = std::sin(angle);
matrix.m[2][2] = std::cos(angle);
matrix.m[2][3] = 0.0f;
break;
case 1: // y-axis
matrix.m[0][0] = std::cos(angle);
matrix.m[0][1] = 0.0f;
matrix.m[0][2] = std::sin(angle);
matrix.m[0][3] = 0.0f;
matrix.m[1][0] = 0.0f;
matrix.m[1][1] = 1.0f;
matrix.m[1][2] = 0.0f;
matrix.m[1][3] = 0.0f;
matrix.m[2][0] = -std::sin(angle);
matrix.m[2][1] = 0.0f;
matrix.m[2][2] = std::cos(angle);
matrix.m[2][3] = 0.0f;
break;
case 2: // z-axis
matrix.m[0][0] = std::cos(angle);
matrix.m[0][1] = -std::sin(angle);
matrix.m[0][2] = 0.0f;
matrix.m[0][3] = 0.0f;
matrix.m[1][0] = std::sin(angle);
matrix.m[1][1] = std::cos(angle);
matrix.m[1][2] = 0.0f;
matrix.m[1][3] = 0.0f;
matrix.m[2][0] = 0.0f;
matrix.m[2][1] = 0.0f;
matrix.m[2][2] = 1.0f;
matrix.m[2][3] = 0.0f;
break;
default:
break;
}
return matrix;
namespace utils
{
inline vr::HmdMatrix34_t& initRotationMatrix( vr::HmdMatrix34_t& matrix,
unsigned axisId,
float angle )
{
switch ( axisId )
{
case 0: // x-axis
matrix.m[0][0] = 1.0f;
matrix.m[0][1] = 0.0f;
matrix.m[0][2] = 0.0f;
matrix.m[0][3] = 0.0f;
matrix.m[1][0] = 0.0f;
matrix.m[1][1] = std::cos( angle );
matrix.m[1][2] = -std::sin( angle );
matrix.m[1][3] = 0.0f;
matrix.m[2][0] = 0.0f;
matrix.m[2][1] = std::sin( angle );
matrix.m[2][2] = std::cos( angle );
matrix.m[2][3] = 0.0f;
break;
case 1: // y-axis
matrix.m[0][0] = std::cos( angle );
matrix.m[0][1] = 0.0f;
matrix.m[0][2] = std::sin( angle );
matrix.m[0][3] = 0.0f;
matrix.m[1][0] = 0.0f;
matrix.m[1][1] = 1.0f;
matrix.m[1][2] = 0.0f;
matrix.m[1][3] = 0.0f;
matrix.m[2][0] = -std::sin( angle );
matrix.m[2][1] = 0.0f;
matrix.m[2][2] = std::cos( angle );
matrix.m[2][3] = 0.0f;
break;
case 2: // z-axis
matrix.m[0][0] = std::cos( angle );
matrix.m[0][1] = -std::sin( angle );
matrix.m[0][2] = 0.0f;
matrix.m[0][3] = 0.0f;
matrix.m[1][0] = std::sin( angle );
matrix.m[1][1] = std::cos( angle );
matrix.m[1][2] = 0.0f;
matrix.m[1][3] = 0.0f;
matrix.m[2][0] = 0.0f;
matrix.m[2][1] = 0.0f;
matrix.m[2][2] = 1.0f;
matrix.m[2][3] = 0.0f;
break;
default:
break;
}
return matrix;
}
inline vr::HmdMatrix34_t& matMul33(vr::HmdMatrix34_t& result, const vr::HmdMatrix34_t& a, const vr::HmdMatrix34_t& b) {
for (unsigned i = 0; i < 3; i++) {
for (unsigned j = 0; j < 3; j++) {
result.m[i][j] = 0.0f;
for (unsigned k = 0; k < 3; k++) {
result.m[i][j] += a.m[i][k] * b.m[k][j];
}
}
}
return result;
inline vr::HmdMatrix34_t& matMul33( vr::HmdMatrix34_t& result,
const vr::HmdMatrix34_t& a,
const vr::HmdMatrix34_t& b )
{
for ( unsigned i = 0; i < 3; i++ )
{
for ( unsigned j = 0; j < 3; j++ )
{
result.m[i][j] = 0.0f;
for ( unsigned k = 0; k < 3; k++ )
{
result.m[i][j] += a.m[i][k] * b.m[k][j];
}
}
}
return result;
}
inline vr::HmdVector3_t& matMul33(vr::HmdVector3_t& result, const vr::HmdMatrix34_t& a, const vr::HmdVector3_t& b) {
for (unsigned i = 0; i < 3; i++) {
result.v[i] = 0.0f;
for (unsigned k = 0; k < 3; k++) {
result.v[i] += a.m[i][k] * b.v[k];
};
}
return result;
inline vr::HmdVector3_t& matMul33( vr::HmdVector3_t& result,
const vr::HmdMatrix34_t& a,
const vr::HmdVector3_t& b )
{
for ( unsigned i = 0; i < 3; i++ )
{
result.v[i] = 0.0f;
for ( unsigned k = 0; k < 3; k++ )
{
result.v[i] += a.m[i][k] * b.v[k];
};
}
return result;
}
inline vr::HmdVector3_t& matMul33(vr::HmdVector3_t& result, const vr::HmdVector3_t& a, const vr::HmdMatrix34_t& b) {
for (unsigned i = 0; i < 3; i++) {
result.v[i] = 0.0f;
for (unsigned k = 0; k < 3; k++) {
result.v[i] += a.v[k] * b.m[k][i];
};
}
return result;
inline vr::HmdVector3_t& matMul33( vr::HmdVector3_t& result,
const vr::HmdVector3_t& a,
const vr::HmdMatrix34_t& b )
{
for ( unsigned i = 0; i < 3; i++ )
{
result.v[i] = 0.0f;
for ( unsigned k = 0; k < 3; k++ )
{
result.v[i] += a.v[k] * b.m[k][i];
};
}
return result;
}
} // end namespace utils