Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 13:20:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding check in isReady for grabbing non-web entitys

Browse source
This commit is contained in:
Wayne Chen 2018-07-20 15:26:55 -07:00
parent 4e3a6cb320
commit be5fdef974
2 changed files with 57 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
scripts/system/controllers/controllerDispatcher.js
View file

@ -31,6 +31,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
var PROFILE = false;
var DEBUG = false;
var DEBUG_OVERLAY = true;
if (typeof Test !== "undefined") {
PROFILE = true;
@ -48,6 +49,7 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
this.tabletID = null;
this.blacklist = [];
this.pointerManager = new PointerManager();
this.debugOverlayID = null;
// a module can occupy one or more "activity" slots while it's running. If all the required slots for a module are
// not set to false (not in use), a module cannot start. When a module is using a slot, that module's name
@ -298,7 +300,6 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
triggerValues: [_this.leftTriggerValue, _this.rightTriggerValue],
triggerClicks: [_this.leftTriggerClicked, _this.rightTriggerClicked],
secondaryValues: [_this.leftSecondaryValue, _this.rightSecondaryValue],
pointers: [_this.leftPointer, _this.rightPointer ],
controllerLocations: controllerLocations,
nearbyEntityProperties: nearbyEntityProperties,
nearbyEntityPropertiesByID: nearbyEntityPropertiesByID,
@ -378,6 +379,48 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
}
}
_this.pointerManager.updatePointersRenderState(controllerData.triggerClicks, controllerData.triggerValues);
if (DEBUG_OVERLAY) {
if (!_this.debugOverlayID) {
var textWidth = 0.4;
var textHeight = 0.3;
var numberOfLines = 15;
var textMargin = 0.02;
var lineHeight = (textHeight - (2 * textMargin)) / numberOfLines;
_this.debugOverlayID = Overlays.addOverlay("text3d", {
localPosition: { x: 0.3, y: 0.2, z: 1.1 },
localRotation: { x: 0.0, y: 0.0, z: 0.0, w: 1.0 },
parentID: MyAvatar.sessionUUID,
parentJointIndex: MyAvatar.getJointIndex("Head"),
dimensions: { x: textWidth, y: textHeight },
backgroundColor: { red: 0, green: 0, blue: 0 },
color: { red: 255, green: 255, blue: 255 },
topMargin: textMargin,
leftMargin: textMargin,
bottomMargin: textMargin,
rightMargin: textMargin,
text: "",
lineHeight: lineHeight,
alpha: 0.9,
backgroundAlpha: 0.9,
ignoreRayIntersection: true,
visible: true,
isFacingAvatar: true
});
}
var debugText = "";
Object.keys(_this.runningPluginNames).forEach(function (pluginName) {
if (_this.runningPluginNames[pluginName]) {
var plugin = controllerDispatcherPlugins[pluginName];
debugText += pluginName + ": " + plugin.parameters.priority + "\n";
}
});
Overlays.editOverlay(_this.debugOverlayID, { text: debugText });
}
if (PROFILE) {
Script.endProfileRange("dispatch.run");
}
@ -481,6 +524,9 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
this.cleanup = function () {
Controller.disableMapping(MAPPING_NAME);
_this.pointerManager.removePointers();
if (_this.debugOverlayID) {
Overlays.deleteOverlay(_this.debugOverlayID);
}
Pointers.removePointer(this.mouseRayPick);
Selection.disableListHighlight(DISPATCHER_HOVERING_LIST);
};

19
scripts/system/controllers/controllerModules/webSurfaceLaserInput.js
View file

@ -5,12 +5,11 @@
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
/* global Script, Entities, Controller, RIGHT_HAND, LEFT_HAND, getControllerWorldLocation,
enableDispatcherModule, disableDispatcherModule, makeRunningValues, Messages, Quat, Vec3,
makeDispatcherModuleParameters, Overlays, ZERO_VEC, HMD, INCHES_TO_METERS, DEFAULT_REGISTRATION_POINT,
getGrabPointSphereOffset, COLORS_GRAB_SEARCHING_HALF_SQUEEZE, COLORS_GRAB_SEARCHING_FULL_SQUEEZE,
COLORS_GRAB_DISTANCE_HOLD, DEFAULT_SEARCH_SPHERE_DISTANCE, TRIGGER_ON_VALUE, TRIGGER_OFF_VALUE,
getEnabledModuleByName, PICK_MAX_DISTANCE, ContextOverlay, Picks, makeLaserParams
/* global Script, Entities, Controller, RIGHT_HAND, LEFT_HAND, enableDispatcherModule, disableDispatcherModule,
makeRunningValues, Messages, Quat, Vec3, makeDispatcherModuleParameters, Overlays, ZERO_VEC, HMD,
INCHES_TO_METERS, DEFAULT_REGISTRATION_POINT, getGrabPointSphereOffset, COLORS_GRAB_SEARCHING_HALF_SQUEEZE,
COLORS_GRAB_SEARCHING_FULL_SQUEEZE, COLORS_GRAB_DISTANCE_HOLD, DEFAULT_SEARCH_SPHERE_DISTANCE, TRIGGER_ON_VALUE,
TRIGGER_OFF_VALUE, getEnabledModuleByName, PICK_MAX_DISTANCE, ContextOverlay, Picks, makeLaserParams
*/
Script.include("/~/system/libraries/controllerDispatcherUtils.js");
@ -76,7 +75,7 @@ Script.include("/~/system/libraries/controllers.js");
return triggerPressed;
} else {
// far-grabbable, but still return it as true anyway
return false;
return true;
}
}
}
@ -99,8 +98,9 @@ Script.include("/~/system/libraries/controllers.js");
}
} else if (intersection.type === Picks.INTERSECTED_ENTITY) {
var entityProperty = Entities.getEntityProperties(objectID);
var entityType = entityProperty.type;
var isLocked = entityProperty.locked;
return (!isLocked || triggerPressed || entityProperty.type === "Web");
return (!isLocked || triggerPressed || entityType === "Web");
}
return false;
};
@ -135,7 +135,8 @@ Script.include("/~/system/libraries/controllers.js");
var isTriggerPressed = controllerData.triggerValues[this.hand] > TRIGGER_OFF_VALUE &&
controllerData.triggerValues[this.otherHand] <= TRIGGER_OFF_VALUE;
var allowThisModule = !otherModuleRunning || isTriggerPressed;
if (allowThisModule && this.isPointingAtTriggerable(controllerData, isTriggerPressed)) {
if (allowThisModule && this.isPointingAtTriggerable(controllerData, isTriggerPressed) &&
!this.isPointingAtNearGrabbableEntity(controllerData, isTriggerPressed)) {
this.updateAllwaysOn();
if (isTriggerPressed) {
this.dominantHandOverride = true; // Override dominant hand.