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

wip on disabling pointers

Browse source
This commit is contained in:
Wayne Chen 2018-11-05 17:41:42 -08:00
parent 77b47d4b32
commit 235df365aa
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
interface/src/LoginPointerManager.cpp
View file

@ -44,12 +44,14 @@ static const QVariantMap COLORS_GRAB_DISTANCE_HOLD = {{"red", 238},
LoginPointerManager::~LoginPointerManager() { LoginPointerManager::~LoginPointerManager() {
auto pointers = DependencyManager::get<PointerManager>(); auto pointers = DependencyManager::get<PointerManager>().data();
if (pointers) { if (pointers) {
if (leftLoginPointerID() != PointerEvent::INVALID_POINTER_ID) { if (leftLoginPointerID() != PointerEvent::INVALID_POINTER_ID) {
pointers->disablePointer(leftLoginPointerID());
pointers->removePointer(leftLoginPointerID()); pointers->removePointer(leftLoginPointerID());
} }
if (rightLoginPointerID() != PointerEvent::INVALID_POINTER_ID) { if (rightLoginPointerID() != PointerEvent::INVALID_POINTER_ID) {
pointers->disablePointer(rightLoginPointerID());
pointers->removePointer(rightLoginPointerID()); pointers->removePointer(rightLoginPointerID());
} }
} }
@ -153,12 +155,10 @@ void LoginPointerManager::init() {
QList<QVariant> leftPointerTriggerProperties; QList<QVariant> leftPointerTriggerProperties;
QVariantMap ltClick1 { QVariantMap ltClick1 {
//{ "action", controller::StandardButtonChannel::LT_CLICK },
{ "action", controller->getStandard()["LTClick"] }, { "action", controller->getStandard()["LTClick"] },
{ "button", "Focus" } { "button", "Focus" }
}; };
QVariantMap ltClick2 { QVariantMap ltClick2 {
//{ "action", controller::StandardButtonChannel::LT_CLICK },
{ "action", controller->getStandard()["LTClick"] }, { "action", controller->getStandard()["LTClick"] },
{ "button", "Primary" } { "button", "Primary" }
}; };
@ -168,7 +168,6 @@ void LoginPointerManager::init() {
const unsigned int leftHand = 0; const unsigned int leftHand = 0;
QVariantMap leftPointerProperties { QVariantMap leftPointerProperties {
{ "joint", "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND" }, { "joint", "_CAMERA_RELATIVE_CONTROLLER_LEFTHAND" },
// { "filter", PickFilter::PICK_OVERLAYS },
{ "filter", PickScriptingInterface::PICK_OVERLAYS() }, { "filter", PickScriptingInterface::PICK_OVERLAYS() },
{ "triggers", leftPointerTriggerProperties }, { "triggers", leftPointerTriggerProperties },
{ "posOffset", vec3toVariant(grabPointSphereOffsetLeft) }, { "posOffset", vec3toVariant(grabPointSphereOffsetLeft) },
@ -186,12 +185,10 @@ void LoginPointerManager::init() {
QList<QVariant> rightPointerTriggerProperties; QList<QVariant> rightPointerTriggerProperties;
QVariantMap rtClick1 { QVariantMap rtClick1 {
//{ "action", controller::StandardButtonChannel::RT_CLICK },
{ "action", controller->getStandard()["RTClick"] }, { "action", controller->getStandard()["RTClick"] },
{ "button", "Focus" } { "button", "Focus" }
}; };
QVariantMap rtClick2 { QVariantMap rtClick2 {
//{ "action", controller::StandardButtonChannel::RT_CLICK },
{ "action", controller->getStandard()["RTClick"] }, { "action", controller->getStandard()["RTClick"] },
{ "button", "Primary" } { "button", "Primary" }
}; };
@ -199,7 +196,6 @@ void LoginPointerManager::init() {
rightPointerTriggerProperties.append(rtClick2); rightPointerTriggerProperties.append(rtClick2);
QVariantMap rightPointerProperties{ QVariantMap rightPointerProperties{
{ "joint", "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" }, { "joint", "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND" },
// { "filter", PickFilter::PICK_OVERLAYS },
{ "filter", PickScriptingInterface::PICK_OVERLAYS() }, { "filter", PickScriptingInterface::PICK_OVERLAYS() },
{ "triggers", rightPointerTriggerProperties }, { "triggers", rightPointerTriggerProperties },
{ "posOffset", vec3toVariant(grabPointSphereOffsetRight) }, { "posOffset", vec3toVariant(grabPointSphereOffsetRight) },
@ -220,16 +216,8 @@ void LoginPointerManager::init() {
void LoginPointerManager::update() { void LoginPointerManager::update() {
auto pointers = DependencyManager::get<PointerScriptingInterface>(); auto pointers = DependencyManager::get<PointerScriptingInterface>();
if (pointers) { if (pointers) {
QString mode = ""; QString mode = "full";
// if (this.visible) {
// if (this.locked) {
// mode = "hold";
// if (triggerClicks[this.hand]) {
mode = "full";
// } else if (triggerValues[this.hand] > TRIGGER_ON_VALUE || this.allwaysOn) {
// mode = "half";
// }
// }
if (leftLoginPointerID() > PointerEvent::INVALID_POINTER_ID) { if (leftLoginPointerID() > PointerEvent::INVALID_POINTER_ID) {
pointers->setRenderState(leftLoginPointerID(), mode); pointers->setRenderState(leftLoginPointerID(), mode);
} }