Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 08:14:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

get ui working

Browse source
This commit is contained in:
Dante Ruiz 2017-06-06 21:09:09 +01:00
parent 038ffe920a
commit bb7c424d47
7 changed files with 305 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/controls-uit/CheckBox.qml
View file

@ -21,7 +21,7 @@ Original.CheckBox {
readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light
property bool isRedCheck: false
property int boxSize: 14
readonly property int boxRadius: 3
property int boxRadius: 3
readonly property int checkSize: Math.max(boxSize - 8, 10)
readonly property int checkRadius: 2
activeFocusOnPress: true

43
interface/resources/qml/hifi/tablet/InputConfiguration.qml
View file

@ -64,7 +64,7 @@ Rectangle {
Row {
id: configRow
z: 999
anchors.top: configuration.bottom
anchors.topMargin: 20
anchors.left: configuration.left
@ -73,13 +73,14 @@ Rectangle {
HifiControls.ComboBox {
id: box
width: 160
z: 999
editable: true
colorScheme: hifi.colorSchemes.dark
model: inputPlugins()
onCurrentIndexChanged: {
var object = {"Test": "hello"};
InputConfiguration.configurationSettings(object, box.currentText);
loader.source = ""
loader.source = InputConfiguration.configurationLayout(box.currentText);
}
}
@ -95,6 +96,42 @@ Rectangle {
}
Separator {
id: configurationSeperator
z: 0
width: inputConfiguration.width
anchors.top: configRow.bottom
anchors.topMargin: 10
}
Row {
z: 0
id: configurationHeader
anchors.top: configurationSeperator.bottom
anchors.topMargin: 20
anchors.left: inputConfiguration.left
anchors.leftMargin: 40
spacing: 10
RalewayBold {
text: "CONFIGURATION"
size: 18
color: hifi.colors.lightGray
}
}
Loader {
id: loader
asynchronous: false
width: configurationHeader.width
anchors.left: inputConfiguration.left
anchors.right: inputConfiguration.right
anchors.top: configurationHeader.bottom
anchors.topMargin: 10
anchors.bottom: inputConfiguration.bottom
}
function inputPlugins() {
return InputConfiguration.inputPlugins();
}

253
interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml Normal file
View file

@ -0,0 +1,253 @@
//
// Created by Dante Ruiz on 6/5/17.
// Copyright 2017 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
import QtQuick 2.5
import QtGraphicalEffects 1.0
import "../../styles-uit"
import "../../controls"
import "../../controls-uit" as HifiControls
Rectangle {
id: openVrConfiguration
width: parent.width
height: parent.height
anchors.fill: parent
property int leftMargin: 55
HifiConstants { id: hifi }
color: hifi.colors.baseGray
RalewayBold {
id: head
text: "Head:"
size: 15
color: "white"
anchors.left: parent.left
anchors.leftMargin: leftMargin
}
Row {
id: headConfig
anchors.top: head.bottom
anchors.topMargin: 5
anchors.left: openVrConfiguration.left
anchors.leftMargin: leftMargin + 20
spacing: 10
HifiControls.CheckBox {
id: headBox
width: 15
height: 15
boxRadius: 7
}
RalewayBold {
size: 15
text: "Vive HMD"
color: hifi.colors.lightGrayText
}
HifiControls.CheckBox {
id: headPuckBox
width: 15
height: 15
boxRadius: 7
}
RalewayBold {
size: 15
text: "Tracker"
color: hifi.colors.lightGrayText
}
}
RalewayBold {
id: hands
text: "Hands:"
size: 15
color: "white"
anchors.top: headConfig.bottom
anchors.topMargin: 10
anchors.left: parent.left
anchors.leftMargin: leftMargin
}
Row {
id: handConfig
anchors.top: hands.bottom
anchors.topMargin: 5
anchors.left: openVrConfiguration.left
anchors.leftMargin: leftMargin + 20
spacing: 10
HifiControls.CheckBox {
id: handBox
width: 15
height: 15
boxRadius: 7
}
RalewayBold {
size: 15
text: "Controllers"
color: hifi.colors.lightGrayText
}
HifiControls.CheckBox {
id: handPuckBox
width: 15
height: 15
boxRadius: 7
}
RalewayBold {
size: 15
text: "Trackers"
color: hifi.colors.lightGrayText
}
}
RalewayBold {
id: additional
text: "Additional Trackers"
size: 15
color: hifi.colors.white
anchors.top: handConfig.bottom
anchors.topMargin: 10
anchors.left: parent.left
anchors.leftMargin: leftMargin
}
Row {
id: feetConfig
anchors.top: additional.bottom
anchors.topMargin: 15
anchors.left: openVrConfiguration.left
anchors.leftMargin: leftMargin + 20
spacing: 10
HifiControls.CheckBox {
id: feetBox
width: 15
height: 15
boxRadius: 7
}
RalewayBold {
size: 15
text: "Feet"
color: hifi.colors.lightGrayText
}
}
Row {
id: hipConfig
anchors.top: feetConfig.bottom
anchors.topMargin: 15
anchors.left: openVrConfiguration.left
anchors.leftMargin: leftMargin + 20
spacing: 10
HifiControls.CheckBox {
id: hipBox
width: 15
height: 15
boxRadius: 7
}
RalewayBold {
size: 15
text: "Hips"
color: hifi.colors.lightGrayText
}
RalewayBold {
size: 12
text: "requires feet"
color: hifi.colors.lightGray
}
}
Row {
id: chestConfig
anchors.top: hipConfig.bottom
anchors.topMargin: 15
anchors.left: openVrConfiguration.left
anchors.leftMargin: leftMargin + 20
spacing: 10
HifiControls.CheckBox {
id: chestBox
width: 15
height: 15
boxRadius: 7
}
RalewayBold {
size: 15
text: "Chest"
color: hifi.colors.lightGrayText
}
RalewayBold {
size: 12
text: "requires hips"
color: hifi.colors.lightGray
}
}
Row {
id: shoulderConfig
anchors.top: chestConfig.bottom
anchors.topMargin: 15
anchors.left: openVrConfiguration.left
anchors.leftMargin: leftMargin + 20
spacing: 10
HifiControls.CheckBox {
id: shoulderBox
width: 15
height: 15
boxRadius: 7
}
RalewayBold {
size: 15
text: "Shoulders"
color: hifi.colors.lightGrayText
}
RalewayBold {
size: 12
text: "requires hips"
color: hifi.colors.lightGray
}
}
Separator {
id: bottomSeperator
width: parent.width
anchors.top: shoulderConfig.bottom
anchors.topMargin: 10
}
}

2
libraries/plugins/src/plugins/InputConfiguration.cpp
View file

@ -39,7 +39,7 @@ QString InputConfiguration::configurationLayout(QString pluginName) {
for (auto plugin : PluginManager::getInstance()->getInputPlugins()) {
if (plugin->getName() == pluginName) {
qDebug() << "------------> testing <----------";
return plugin->configurationLayout();
}
}
return sourcePath;

3
libraries/plugins/src/plugins/InputPlugin.h
View file

@ -26,5 +26,6 @@ public:
// If an input plugin is only a single device, it will only return it's primary name.
virtual QStringList getSubdeviceNames() { return { getName() }; };
virtual bool isHandController() const = 0;
virtual void inputPluginConfigurationSettings(const QJsonObject configurationSettings) { }
virtual void configurationSettings(const QJsonObject configurationSettings) { }
virtual QString configurationLayout() { return QString(); }
};

8
plugins/openvr/src/ViveControllerManager.cpp
View file

@ -39,7 +39,7 @@ extern PoseData _nextSimPoseData;
vr::IVRSystem* acquireOpenVrSystem();
void releaseOpenVrSystem();
static const QString OPENVR_LAYOUT = QString("OpenVrConfiguration.qml");
static const char* CONTROLLER_MODEL_STRING = "vr_controller_05_wireless_b";
const quint64 CALIBRATION_TIMELAPSE = 1 * USECS_PER_SECOND;
@ -120,7 +120,11 @@ bool ViveControllerManager::isSupported() const {
return openVrSupported();
}
void ViveControllerManager::inputPluginConfigurationSettings(const QJsonObject configurationSettings) {
void ViveControllerManager::configurationSettings(const QJsonObject configurationSettings) {
}
QString ViveControllerManager::configurationLayout() {
return OPENVR_LAYOUT;
}
bool ViveControllerManager::activate() {

3
plugins/openvr/src/ViveControllerManager.h
View file

@ -42,7 +42,8 @@ public:
bool isHandController() const override { return true; }
void inputPluginConfigurationSettings(const QJsonObject configurationSettings) override;
QString configurationLayout() override;
void configurationSettings(const QJsonObject configurationSettings) override;
bool activate() override;
void deactivate() override;