mirror of
https://github.com/overte-org/overte.git
synced 2025-08-06 19:59:28 +02:00
added homebutton message and scripts cleanup
This commit is contained in:
parent
cde5208151
commit
abb6f786fa
8 changed files with 25 additions and 18 deletions
|
@ -168,7 +168,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
|
||||||
var pointer = (hand === RIGHT_HAND) ? _this.rightControllerPointer : _this.leftControllerPointer;
|
var pointer = (hand === RIGHT_HAND) ? _this.rightControllerPointer : _this.leftControllerPointer;
|
||||||
var targetID = laserLockInfo.targetID;
|
var targetID = laserLockInfo.targetID;
|
||||||
var targetIsOverlay = laserLockInfo.isOverlay;
|
var targetIsOverlay = laserLockInfo.isOverlay;
|
||||||
Pointers.setLockEndUUID(pointer, targetID, targetIsOverlay);
|
Pointers.setLockEndUid(pointer, targetID, targetIsOverlay);
|
||||||
_this.laserLockStatus[hand] = targetID;
|
_this.laserLockStatus[hand] = targetID;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -634,7 +634,14 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
|
||||||
Pointers.removePointer(_this.leftControllerHudRayPick);
|
Pointers.removePointer(_this.leftControllerHudRayPick);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
function mouseReleaseOnOverlay(overlayID, event) {
|
||||||
|
if (overlayID === HMD.homeButtonID) {
|
||||||
|
print(JSON.stringify(event));
|
||||||
|
print("---------> go home <--------");
|
||||||
|
Messages.sendLocalMessage("home", overlayID);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Overlays.mouseReleaseOnOverlay.connect(mouseReleaseOnOverlay);
|
||||||
var controllerDispatcher = new ControllerDispatcher();
|
var controllerDispatcher = new ControllerDispatcher();
|
||||||
Messages.subscribe('Hifi-Hand-RayPick-Blacklist');
|
Messages.subscribe('Hifi-Hand-RayPick-Blacklist');
|
||||||
Messages.messageReceived.connect(controllerDispatcher.handleHandMessage);
|
Messages.messageReceived.connect(controllerDispatcher.handleHandMessage);
|
||||||
|
|
|
@ -53,7 +53,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
|
||||||
|
|
||||||
enableDispatcherModule("LeftDisableModules", leftDisableModules);
|
enableDispatcherModule("LeftDisableModules", leftDisableModules);
|
||||||
enableDispatcherModule("RightDisableModules", rightDisableModules);
|
enableDispatcherModule("RightDisableModules", rightDisableModules);
|
||||||
this.handleMessage = function(channel, message, sender) {
|
function handleMessage(channel, message, sender) {
|
||||||
if (sender === MyAvatar.sessionUUID) {
|
if (sender === MyAvatar.sessionUUID) {
|
||||||
if (channel === 'Hifi-Hand-Disabler') {
|
if (channel === 'Hifi-Hand-Disabler') {
|
||||||
if (message === 'left') {
|
if (message === 'left') {
|
||||||
|
@ -76,10 +76,10 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
|
||||||
};
|
};
|
||||||
|
|
||||||
Messages.subscribe('Hifi-Hand-Disabler');
|
Messages.subscribe('Hifi-Hand-Disabler');
|
||||||
this.cleanup = function() {
|
function cleanup() {
|
||||||
disableDispatcherModule("LeftDisableModules");
|
disableDispatcherModule("LeftDisableModules");
|
||||||
disableDispatcherModule("RightDisableModules");
|
disableDispatcherModule("RightDisableModules");
|
||||||
};
|
};
|
||||||
Messages.messageReceived.connect(this.handleMessage);
|
Messages.messageReceived.connect(handleMessage);
|
||||||
Script.scriptEnding.connect(this.cleanup);
|
Script.scriptEnding.connect(cleanup);
|
||||||
}());
|
}());
|
||||||
|
|
|
@ -475,11 +475,11 @@ Script.include("/~/system/libraries/controllers.js");
|
||||||
enableDispatcherModule("LeftFarActionGrabEntity", leftFarActionGrabEntity);
|
enableDispatcherModule("LeftFarActionGrabEntity", leftFarActionGrabEntity);
|
||||||
enableDispatcherModule("RightFarActionGrabEntity", rightFarActionGrabEntity);
|
enableDispatcherModule("RightFarActionGrabEntity", rightFarActionGrabEntity);
|
||||||
|
|
||||||
this.cleanup = function () {
|
function cleanup() {
|
||||||
leftFarActionGrabEntity.cleanup();
|
leftFarActionGrabEntity.cleanup();
|
||||||
rightFarActionGrabEntity.cleanup();
|
rightFarActionGrabEntity.cleanup();
|
||||||
disableDispatcherModule("LeftFarActionGrabEntity");
|
disableDispatcherModule("LeftFarActionGrabEntity");
|
||||||
disableDispatcherModule("RightFarActionGrabEntity");
|
disableDispatcherModule("RightFarActionGrabEntity");
|
||||||
};
|
};
|
||||||
Script.scriptEnding.connect(this.cleanup);
|
Script.scriptEnding.connect(cleanup);
|
||||||
}());
|
}());
|
||||||
|
|
|
@ -256,11 +256,11 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
|
||||||
enableDispatcherModule("LeftNearActionGrabEntity", leftNearActionGrabEntity);
|
enableDispatcherModule("LeftNearActionGrabEntity", leftNearActionGrabEntity);
|
||||||
enableDispatcherModule("RightNearActionGrabEntity", rightNearActionGrabEntity);
|
enableDispatcherModule("RightNearActionGrabEntity", rightNearActionGrabEntity);
|
||||||
|
|
||||||
this.cleanup = function () {
|
function cleanup() {
|
||||||
leftNearActionGrabEntity.cleanup();
|
leftNearActionGrabEntity.cleanup();
|
||||||
rightNearActionGrabEntity.cleanup();
|
rightNearActionGrabEntity.cleanup();
|
||||||
disableDispatcherModule("LeftNearActionGrabEntity");
|
disableDispatcherModule("LeftNearActionGrabEntity");
|
||||||
disableDispatcherModule("RightNearActionGrabEntity");
|
disableDispatcherModule("RightNearActionGrabEntity");
|
||||||
};
|
};
|
||||||
Script.scriptEnding.connect(this.cleanup);
|
Script.scriptEnding.connect(cleanup);
|
||||||
}());
|
}());
|
||||||
|
|
|
@ -338,11 +338,11 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
|
||||||
enableDispatcherModule("LeftNearParentingGrabEntity", leftNearParentingGrabEntity);
|
enableDispatcherModule("LeftNearParentingGrabEntity", leftNearParentingGrabEntity);
|
||||||
enableDispatcherModule("RightNearParentingGrabEntity", rightNearParentingGrabEntity);
|
enableDispatcherModule("RightNearParentingGrabEntity", rightNearParentingGrabEntity);
|
||||||
|
|
||||||
this.cleanup = function () {
|
function cleanup() {
|
||||||
leftNearParentingGrabEntity.cleanup();
|
leftNearParentingGrabEntity.cleanup();
|
||||||
rightNearParentingGrabEntity.cleanup();
|
rightNearParentingGrabEntity.cleanup();
|
||||||
disableDispatcherModule("LeftNearParentingGrabEntity");
|
disableDispatcherModule("LeftNearParentingGrabEntity");
|
||||||
disableDispatcherModule("RightNearParentingGrabEntity");
|
disableDispatcherModule("RightNearParentingGrabEntity");
|
||||||
};
|
};
|
||||||
Script.scriptEnding.connect(this.cleanup);
|
Script.scriptEnding.connect(cleanup);
|
||||||
}());
|
}());
|
||||||
|
|
|
@ -224,11 +224,11 @@ Script.include("/~/system/libraries/utils.js");
|
||||||
enableDispatcherModule("LeftNearParentingGrabOverlay", leftNearParentingGrabOverlay);
|
enableDispatcherModule("LeftNearParentingGrabOverlay", leftNearParentingGrabOverlay);
|
||||||
enableDispatcherModule("RightNearParentingGrabOverlay", rightNearParentingGrabOverlay);
|
enableDispatcherModule("RightNearParentingGrabOverlay", rightNearParentingGrabOverlay);
|
||||||
|
|
||||||
this.cleanup = function () {
|
function cleanup() {
|
||||||
leftNearParentingGrabOverlay.cleanup();
|
leftNearParentingGrabOverlay.cleanup();
|
||||||
rightNearParentingGrabOverlay.cleanup();
|
rightNearParentingGrabOverlay.cleanup();
|
||||||
disableDispatcherModule("LeftNearParentingGrabOverlay");
|
disableDispatcherModule("LeftNearParentingGrabOverlay");
|
||||||
disableDispatcherModule("RightNearParentingGrabOverlay");
|
disableDispatcherModule("RightNearParentingGrabOverlay");
|
||||||
};
|
};
|
||||||
Script.scriptEnding.connect(this.cleanup);
|
Script.scriptEnding.connect(cleanup);
|
||||||
}());
|
}());
|
||||||
|
|
|
@ -110,11 +110,11 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
|
||||||
enableDispatcherModule("LeftNearTriggerEntity", leftNearTriggerEntity);
|
enableDispatcherModule("LeftNearTriggerEntity", leftNearTriggerEntity);
|
||||||
enableDispatcherModule("RightNearTriggerEntity", rightNearTriggerEntity);
|
enableDispatcherModule("RightNearTriggerEntity", rightNearTriggerEntity);
|
||||||
|
|
||||||
this.cleanup = function () {
|
function cleanup() {
|
||||||
leftNearTriggerEntity.cleanup();
|
leftNearTriggerEntity.cleanup();
|
||||||
rightNearTriggerEntity.cleanup();
|
rightNearTriggerEntity.cleanup();
|
||||||
disableDispatcherModule("LeftNearTriggerEntity");
|
disableDispatcherModule("LeftNearTriggerEntity");
|
||||||
disableDispatcherModule("RightNearTriggerEntity");
|
disableDispatcherModule("RightNearTriggerEntity");
|
||||||
};
|
};
|
||||||
Script.scriptEnding.connect(this.cleanup);
|
Script.scriptEnding.connect(cleanup);
|
||||||
}());
|
}());
|
||||||
|
|
|
@ -98,9 +98,9 @@
|
||||||
dispatcherUtils.enableDispatcherModule("LeftScaleEntity", leftScaleEntity);
|
dispatcherUtils.enableDispatcherModule("LeftScaleEntity", leftScaleEntity);
|
||||||
dispatcherUtils.enableDispatcherModule("RightScaleEntity", rightScaleEntity);
|
dispatcherUtils.enableDispatcherModule("RightScaleEntity", rightScaleEntity);
|
||||||
|
|
||||||
this.cleanup = function() {
|
function cleanup() {
|
||||||
dispatcherUtils.disableDispatcherModule("LeftScaleEntity");
|
dispatcherUtils.disableDispatcherModule("LeftScaleEntity");
|
||||||
dispatcherUtils.disableDispatcherModule("RightScaleEntity");
|
dispatcherUtils.disableDispatcherModule("RightScaleEntity");
|
||||||
};
|
};
|
||||||
Script.scriptEnding.connect(this.cleanup);
|
Script.scriptEnding.connect(cleanup);
|
||||||
})();
|
})();
|
||||||
|
|
Loading…
Reference in a new issue