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

Add offset profiles

Browse Source 
Addresses #149
This commit is contained in:
Kung-vr
2019-10-02 15:25:03 +09:00
parent d3b4d30807
commit 6dc7bc6837
6 changed files with 292 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/res/qml/PlayspacePage.qml
+144 -1
View File
@@ -8,6 +8,69 @@ import "common"
MyStackViewPage {
headerText: "Space Offsets"
MyDialogOkPopup {
id: offsetMessageDialog
function showMessage(title, text) {
dialogTitle = title
dialogText = text
open()
}
}
MyDialogOkCancelPopup {
id: offsetDeleteProfileDialog
property int profileIndex: -1
dialogTitle: "Delete Profile"
dialogText: "Do you really want to delete this profile?"
onClosed: {
if (okClicked) {
MoveCenterTabController.deleteOffsetProfile(profileIndex)
}
}
}
MyDialogOkCancelPopup {
id: offsetNewProfileDialog
dialogTitle: "Create New Profile"
dialogWidth: 800
dialogHeight: 400
dialogContentItem: ColumnLayout {
RowLayout {
Layout.topMargin: 16
Layout.leftMargin: 16
Layout.rightMargin: 16
MyText {
text: "Name: "
}
MyTextField {
id: offsetNewProfileName
keyBoardUID: 105
color: "#cccccc"
text: ""
Layout.fillWidth: true
font.pointSize: 20
function onInputEvent(input) {
offsetNewProfileName.text = input
}
}
}
}
onClosed: {
if (okClicked) {
if (offsetNewProfileName.text == "") {
offsetMessageDialog.showMessage("Create New Profile", "ERROR: Empty profile name.")
} else {
MoveCenterTabController.addOffsetProfile(offsetNewProfileName.text)
}
}
}
function openPopup() {
offsetNewProfileName.text = ""
open()
}
}
content: ColumnLayout {
spacing: 18
@@ -29,6 +92,74 @@ MyStackViewPage {
text: "Settings Tab: 'Disable Motion in Seated Mode' checked"
}
ColumnLayout {
Layout.bottomMargin: 32
spacing: 18
RowLayout {
spacing: 18
MyText {
text: "Profile:"
}
MyComboBox {
id: offsetProfileComboBox
Layout.maximumWidth: 799
Layout.minimumWidth: 799
Layout.preferredWidth: 799
Layout.fillWidth: true
model: [""]
onCurrentIndexChanged: {
if (currentIndex > 0) {
offsetApplyProfileButton.enabled = true
offsetDeleteProfileButton.enabled = true
} else {
offsetApplyProfileButton.enabled = false
offsetDeleteProfileButton.enabled = false
}
}
}
MyPushButton {
id: offsetApplyProfileButton
enabled: false
Layout.preferredWidth: 200
text: "Apply"
onClicked: {
if (offsetProfileComboBox.currentIndex > 0) {
MoveCenterTabController.applyOffsetProfile(offsetProfileComboBox.currentIndex - 1)
offsetProfileComboBox.currentIndex = 0
}
}
}
}
RowLayout {
spacing: 18
Item {
Layout.fillWidth: true
}
MyPushButton {
id: offsetDeleteProfileButton
enabled: false
Layout.preferredWidth: 200
text: "Delete Profile"
onClicked: {
if (offsetProfileComboBox.currentIndex > 0) {
offsetDeleteProfileDialog.profileIndex = offsetProfileComboBox.currentIndex - 1
offsetDeleteProfileDialog.open()
}
}
}
MyPushButton {
Layout.preferredWidth: 200
text: "New Profile"
onClicked: {
offsetNewProfileDialog.openPopup()
}
}
}
}
GroupBox {
Layout.fillWidth: true
id: offsetsGroupBox
@@ -416,6 +547,7 @@ MyStackViewPage {
resetButtonRow.visible = false
seatedDisableWarningText.visible = false
}
reloadOffsetProfiles()
}
Connections {
@@ -481,8 +613,19 @@ MyStackViewPage {
seatedDisableWarningText.visible = false
}
}
onOffsetProfilesUpdated: {
reloadOffsetProfiles()
}
}
}
function reloadOffsetProfiles() {
var profiles = [""]
var profileCount = MoveCenterTabController.getOffsetProfileCount()
for (var i = 0; i < profileCount; i++) {
profiles.push(MoveCenterTabController.getOffsetProfileName(i))
}
offsetProfileComboBox.currentIndex = 0
offsetProfileComboBox.model = profiles
}
}
src/tabcontrollers/MoveCenterTabController.cpp
+121
View File
@@ -165,6 +165,7 @@ void MoveCenterTabController::initStage1()
m_disableSeatedMotion = value.toBool();
}
settings->endGroup();
reloadOffsetProfiles();
m_lastDragUpdateTimePoint = std::chrono::steady_clock::now();
m_lastGravityUpdateTimePoint = std::chrono::steady_clock::now();
}
@@ -176,6 +177,126 @@ void MoveCenterTabController::initStage2( OverlayController* var_parent )
outputLogSettings();
}
void MoveCenterTabController::reloadOffsetProfiles()
{
m_offsetProfiles.clear();
auto settings = OverlayController::appSettings();
settings->beginGroup( "playspaceSettings" );
auto profileCount = settings->beginReadArray( "offsetProfiles" );
for ( int i = 0; i < profileCount; i++ )
{
settings->setArrayIndex( i );
m_offsetProfiles.emplace_back();
auto& entry = m_offsetProfiles[static_cast<size_t>( i )];
entry.profileName
= settings->value( "profileName" ).toString().toStdString();
entry.offsetX = settings->value( "offsetX", 0.0f ).toFloat();
entry.offsetY = settings->value( "offsetY", 0.0f ).toFloat();
entry.offsetZ = settings->value( "offsetZ", 0.0f ).toFloat();
entry.rotation = settings->value( "rotation", 0 ).toInt();
}
settings->endArray();
settings->endGroup();
}
void MoveCenterTabController::saveOffsetProfiles()
{
auto settings = OverlayController::appSettings();
settings->beginGroup( "playspaceSettings" );
settings->beginWriteArray( "offsetProfiles" );
unsigned i = 0;
for ( auto& p : m_offsetProfiles )
{
settings->setArrayIndex( static_cast<int>( i ) );
settings->setValue( "profileName",
QString::fromStdString( p.profileName ) );
settings->setValue( "offsetX", p.offsetX );
settings->setValue( "offsetY", p.offsetY );
settings->setValue( "offsetZ", p.offsetZ );
settings->setValue( "rotation", p.rotation );
i++;
}
settings->endArray();
settings->endGroup();
}
Q_INVOKABLE unsigned MoveCenterTabController::getOffsetProfileCount()
{
return static_cast<unsigned int>( m_offsetProfiles.size() );
}
Q_INVOKABLE QString
MoveCenterTabController::getOffsetProfileName( unsigned index )
{
if ( index >= m_offsetProfiles.size() )
{
return QString();
}
else
{
return QString::fromStdString( m_offsetProfiles[index].profileName );
}
}
void MoveCenterTabController::addOffsetProfile( QString name )
{
OffsetProfile* profile = nullptr;
for ( auto& p : m_offsetProfiles )
{
if ( p.profileName.compare( name.toStdString() ) == 0 )
{
profile = &p;
break;
}
}
if ( !profile )
{
auto i = m_offsetProfiles.size();
m_offsetProfiles.emplace_back();
profile = &m_offsetProfiles[i];
}
profile->profileName = name.toStdString();
profile->offsetX = m_offsetX;
profile->offsetY = m_offsetY;
profile->offsetZ = m_offsetZ;
profile->rotation = m_rotation;
saveOffsetProfiles();
OverlayController::appSettings()->sync();
emit offsetProfilesUpdated();
}
void MoveCenterTabController::applyOffsetProfile( unsigned index )
{
if ( index < m_offsetProfiles.size() )
{
auto& profile = m_offsetProfiles[index];
m_rotation = profile.rotation;
m_offsetX = profile.offsetX;
m_offsetY = profile.offsetY;
m_offsetZ = profile.offsetZ;
emit rotationChanged( m_rotation );
emit offsetXChanged( m_offsetX );
emit offsetYChanged( m_offsetY );
emit offsetZChanged( m_offsetZ );
LOG( INFO ) << "Applying Offset Profile:" << profile.profileName
<< " X:" << m_offsetX << " Y:" << m_offsetY
<< " Z:" << m_offsetZ << " Rotation:"
<< ( static_cast<float>( m_rotation ) / 100 );
}
}
void MoveCenterTabController::deleteOffsetProfile( unsigned index )
{
if ( index < m_offsetProfiles.size() )
{
auto pos = m_offsetProfiles.begin() + index;
m_offsetProfiles.erase( pos );
saveOffsetProfiles();
OverlayController::appSettings()->sync();
emit offsetProfilesUpdated();
}
}
void MoveCenterTabController::outputLogSettings()
{
if ( !m_adjustChaperone )
src/tabcontrollers/MoveCenterTabController.h
+22
View File
@@ -24,6 +24,15 @@ constexpr double k_maxOvrasUniverseCenteredTurningOffset = 25000.0;
class OverlayController;
struct OffsetProfile
{
std::string profileName;
float offsetX = 0.0f;
float offsetY = 0.0f;
float offsetZ = 0.0f;
int rotation = 0;
};
class MoveCenterTabController : public QObject
{
Q_OBJECT
@@ -210,6 +219,8 @@ private:
void outputLogHmdMatrix( vr::HmdMatrix34_t hmdMatrix );
void outputLogSettings();
std::vector<OffsetProfile> m_offsetProfiles;
public:
void initStage1();
void initStage2( OverlayController* parent );
@@ -252,6 +263,11 @@ public:
void resetHmdYawTotal();
void incomingSeatedReset();
void reloadOffsetProfiles();
void saveOffsetProfiles();
Q_INVOKABLE unsigned getOffsetProfileCount();
Q_INVOKABLE QString getOffsetProfileName( unsigned index );
// actions:
void leftHandSpaceDrag( bool leftHandDragActive );
void rightHandSpaceDrag( bool rightHandDragActive );
@@ -324,6 +340,10 @@ public slots:
void outputLogPoses();
void zeroOffsets();
void addOffsetProfile( QString name );
void applyOffsetProfile( unsigned index );
void deleteOffsetProfile( unsigned index );
signals:
void trackingUniverseChanged( int value );
void offsetXChanged( float value );
@@ -357,6 +377,8 @@ signals:
void universeCenteredRotationChanged( bool value );
void enableSeatedOffsetsRecenterChanged( bool value );
void disableSeatedMotionChanged( bool value );
void offsetProfilesUpdated();
};
} // namespace advsettings