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

Qt6 (#669)

Browse Source 
* update qt6 upgrade progress

* add flawed addition for QRenderTarget and link needed libs

* update to better logging format

* move many assets and qml files into qrc

* get rid of deprecation messages

* remove additional deprecation notices

* make Qt6 finally render on desktop with some progress on vr

* initialize QRhi with QQuickRenderControl

* use default values to stop SegFaults

* fix compilation on windows

* add windows files for aiding in running exe

* fix formatting of testing qt.conf

* first attempt on using textures instead of files in AudioTabController

* Fix public/private access issue

---------

Co-authored-by: RTUnreal <unreal@rtinf.net>
This commit is contained in:
ykeara
2024-04-03 22:49:24 -05:00
committed by GitHub
co-authored by RTUnreal
parent 72e91e9116
commit ca0ec3e07d
109 changed files with 1558 additions and 9421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/FixFloorTabController.cpp
+12 -11
View File
@@ -1,5 +1,7 @@
#include "FixFloorTabController.h"
#include <QQuickWindow>
#include <QtLogging>
#include <QtDebug>
#include "../overlaycontroller.h"
// application namespace
@@ -153,7 +155,7 @@ void FixFloorTabController::dashboardLoopTick(
/*
floorOffsetY = static_cast<float>(tempOffsetY);
LOG(INFO) << "Offset For Knuckles up is: " <<
qInfo() << "Offset For Knuckles up is: " <<
floorOffsetY;
*/
}
@@ -183,7 +185,7 @@ void FixFloorTabController::dashboardLoopTick(
/*
floorOffsetY = static_cast<float>(tempOffsetY);
LOG(INFO) << "Offset For Knuckles up is: " <<
qInfo() << "Offset For Knuckles up is: " <<
floorOffsetY;
*/
}
@@ -196,10 +198,9 @@ void FixFloorTabController::dashboardLoopTick(
floorOffsetX = static_cast<float>( tempOffsetX );
floorOffsetZ = static_cast<float>( tempOffsetZ );
LOG( INFO )
<< "Fix Floor and adjust space center: Floor Offset = ["
<< floorOffsetX << ", " << floorOffsetY << ", "
<< floorOffsetZ << "]";
qInfo() << "Fix Floor and adjust space center: Floor Offset = ["
<< floorOffsetX << ", " << floorOffsetY << ", "
<< floorOffsetZ << "]";
float offset[3] = { 0, 0, 0 };
offset[1] = floorOffsetY;
if ( state == 2 )
@@ -243,12 +244,12 @@ int FixFloorTabController::getControllerType(
&error );
if ( error != vr::TrackedProp_Success )
{
LOG( ERROR ) << "Error With Controller Type: "
<< vr::VRSystem()->GetPropErrorNameFromEnum( error );
qCritical() << "Error With Controller Type: "
<< vr::VRSystem()->GetPropErrorNameFromEnum( error );
}
else if ( stringLength == 0 )
{
LOG( ERROR ) << "Device Index not valid";
qCritical() << "Device Index not valid";
}
else if ( strcmp( controllerTypeString, "knuckles" ) == 0 )
{
@@ -308,8 +309,8 @@ void FixFloorTabController::undoFixFloorClicked()
{
float off[3] = { -floorOffsetX, -floorOffsetY, -floorOffsetZ };
parent->m_moveCenterTabController.addOffset( off );
LOG( INFO ) << "Fix Floor: Undo Floor Offset = [" << -floorOffsetX << ", "
<< -floorOffsetY << ", " << -floorOffsetZ << "]";
qInfo() << "Fix Floor: Undo Floor Offset = [" << -floorOffsetX << ", "
<< -floorOffsetY << ", " << -floorOffsetZ << "]";
floorOffsetY = 0.0f;
statusMessage = "Undo ... OK";
statusMessageTimeout = 1.0;