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

Bugfixes and Improvements.

Browse Source
This commit is contained in:
matzman
2016-12-17 00:39:48 +01:00
parent 129c6e3db1
commit f922b97e5b
5 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/win64/res/qml/ChaperonePage.qml
-3
View File
@@ -275,7 +275,6 @@ MyStackViewPage {
keyBoardUID: 301 keyBoardUID: 301
Layout.preferredWidth: 100 Layout.preferredWidth: 100
Layout.leftMargin: 10 Layout.leftMargin: 10
Layout.rightMargin: 10
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
function onInputEvent(input) { function onInputEvent(input) {
var val = parseFloat(input) var val = parseFloat(input)
@@ -336,7 +335,6 @@ MyStackViewPage {
keyBoardUID: 302 keyBoardUID: 302
Layout.preferredWidth: 100 Layout.preferredWidth: 100
Layout.leftMargin: 10 Layout.leftMargin: 10
Layout.rightMargin: 10
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
function onInputEvent(input) { function onInputEvent(input) {
var val = parseFloat(input) var val = parseFloat(input)
@@ -396,7 +394,6 @@ MyStackViewPage {
keyBoardUID: 303 keyBoardUID: 303
Layout.preferredWidth: 100 Layout.preferredWidth: 100
Layout.leftMargin: 10 Layout.leftMargin: 10
Layout.rightMargin: 10
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
function onInputEvent(input) { function onInputEvent(input) {
var val = parseFloat(input) var val = parseFloat(input)
bin/win64/res/qml/PlayspacePage.qml
+3 -4
View File
@@ -67,7 +67,7 @@ MyStackViewPage {
id: playSpaceMoveXText id: playSpaceMoveXText
text: "0.00" text: "0.00"
keyBoardUID: 101 keyBoardUID: 101
Layout.preferredWidth: 100 Layout.preferredWidth: 140
Layout.leftMargin: 10 Layout.leftMargin: 10
Layout.rightMargin: 10 Layout.rightMargin: 10
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@@ -108,7 +108,7 @@ MyStackViewPage {
id: playSpaceMoveYText id: playSpaceMoveYText
text: "0.00" text: "0.00"
keyBoardUID: 102 keyBoardUID: 102
Layout.preferredWidth: 100 Layout.preferredWidth: 140
Layout.leftMargin: 10 Layout.leftMargin: 10
Layout.rightMargin: 10 Layout.rightMargin: 10
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@@ -148,7 +148,7 @@ MyStackViewPage {
id: playSpaceMoveZText id: playSpaceMoveZText
text: "0.00" text: "0.00"
keyBoardUID: 103 keyBoardUID: 103
Layout.preferredWidth: 100 Layout.preferredWidth: 140
Layout.leftMargin: 10 Layout.leftMargin: 10
Layout.rightMargin: 10 Layout.rightMargin: 10
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@@ -248,7 +248,6 @@ MyStackViewPage {
keyBoardUID: 104 keyBoardUID: 104
Layout.preferredWidth: 100 Layout.preferredWidth: 100
Layout.leftMargin: 10 Layout.leftMargin: 10
Layout.rightMargin: 10
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
function onInputEvent(input) { function onInputEvent(input) {
var val = parseInt(input) var val = parseInt(input)
bin/win64/res/qml/SteamVRPage.qml
-2
View File
@@ -59,7 +59,6 @@ MyStackViewPage {
keyBoardUID: 401 keyBoardUID: 401
Layout.preferredWidth: 100 Layout.preferredWidth: 100
Layout.leftMargin: 10 Layout.leftMargin: 10
Layout.rightMargin: 10
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
function onInputEvent(input) { function onInputEvent(input) {
var val = parseFloat(input) var val = parseFloat(input)
@@ -127,7 +126,6 @@ MyStackViewPage {
keyBoardUID: 402 keyBoardUID: 402
Layout.preferredWidth: 100 Layout.preferredWidth: 100
Layout.leftMargin: 10 Layout.leftMargin: 10
Layout.rightMargin: 10
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
function onInputEvent(input) { function onInputEvent(input) {
var val = parseFloat(input) var val = parseFloat(input)
src/main.cpp
+5 -5
View File
@@ -29,19 +29,19 @@ void myQtMessageHandler(QtMsgType type, const QMessageLogContext &context, const
QByteArray localMsg = msg.toLocal8Bit(); QByteArray localMsg = msg.toLocal8Bit();
switch (type) { switch (type) {
case QtDebugMsg: case QtDebugMsg:
LOG(DEBUG) << localMsg.constData() << "(" << context.file << ":" << context.line << ")"; LOG(DEBUG) << localMsg.constData() << " (" << context.file << ":" << context.line << ")";
break; break;
case QtInfoMsg: case QtInfoMsg:
LOG(INFO) << localMsg.constData() << "(" << context.file << ":" << context.line << ")"; LOG(INFO) << localMsg.constData() << " (" << context.file << ":" << context.line << ")";
break; break;
case QtWarningMsg: case QtWarningMsg:
LOG(WARNING) << localMsg.constData() << "(" << context.file << ":" << context.line << ")"; LOG(WARNING) << localMsg.constData() << " (" << context.file << ":" << context.line << ")";
break; break;
case QtCriticalMsg: case QtCriticalMsg:
LOG(ERROR) << localMsg.constData() << "(" << context.file << ":" << context.line << ")"; LOG(ERROR) << localMsg.constData() << " (" << context.file << ":" << context.line << ")";
break; break;
case QtFatalMsg: case QtFatalMsg:
LOG(FATAL) << localMsg.constData() << "(" << context.file << ":" << context.line << ")"; LOG(FATAL) << localMsg.constData() << " (" << context.file << ":" << context.line << ")";
break; break;
} }
} }
src/tabcontrollers/MoveCenterTabController.cpp
+4 -4
View File
@@ -95,10 +95,10 @@ void MoveCenterTabController::setAdjustChaperone(bool value, bool notify) {
parent->AddOffsetToCollisionBounds(0, -m_offsetX, false); parent->AddOffsetToCollisionBounds(0, -m_offsetX, false);
} }
if (m_offsetY != 0.0f) { if (m_offsetY != 0.0f) {
parent->AddOffsetToCollisionBounds(0, -m_offsetY, false); parent->AddOffsetToCollisionBounds(1, -m_offsetY, false);
} }
if (m_offsetZ != 0.0f) { if (m_offsetZ != 0.0f) {
parent->AddOffsetToCollisionBounds(0, -m_offsetZ, false); parent->AddOffsetToCollisionBounds(2, -m_offsetZ, false);
} }
if (m_rotation != 0) { if (m_rotation != 0) {
parent->RotateCollisionBounds(-m_rotation, false); parent->RotateCollisionBounds(-m_rotation, false);
@@ -108,10 +108,10 @@ void MoveCenterTabController::setAdjustChaperone(bool value, bool notify) {
parent->AddOffsetToCollisionBounds(0, m_offsetX, false); parent->AddOffsetToCollisionBounds(0, m_offsetX, false);
} }
if (m_offsetY != 0.0f) { if (m_offsetY != 0.0f) {
parent->AddOffsetToCollisionBounds(0, m_offsetY, false); parent->AddOffsetToCollisionBounds(1, m_offsetY, false);
} }
if (m_offsetZ != 0.0f) { if (m_offsetZ != 0.0f) {
parent->AddOffsetToCollisionBounds(0, m_offsetZ, false); parent->AddOffsetToCollisionBounds(2, m_offsetZ, false);
} }
if (m_rotation != 0) { if (m_rotation != 0) {
parent->RotateCollisionBounds(m_rotation, false); parent->RotateCollisionBounds(m_rotation, false);