Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 19:42:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove dead code and eslint files

Browse source
This commit is contained in:
Dante Ruiz 2018-03-02 14:23:35 -08:00
parent 05fb3cfd9a
commit 5dc336bfae
3 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/system/controllers/controllerModules/farActionGrabEntity.js
View file

@ -14,7 +14,7 @@
PICK_MAX_DISTANCE, COLORS_GRAB_SEARCHING_HALF_SQUEEZE, COLORS_GRAB_SEARCHING_FULL_SQUEEZE, COLORS_GRAB_DISTANCE_HOLD, PICK_MAX_DISTANCE, COLORS_GRAB_SEARCHING_HALF_SQUEEZE, COLORS_GRAB_SEARCHING_FULL_SQUEEZE, COLORS_GRAB_DISTANCE_HOLD,
DEFAULT_SEARCH_SPHERE_DISTANCE, TRIGGER_OFF_VALUE, TRIGGER_ON_VALUE, ZERO_VEC, ensureDynamic, DEFAULT_SEARCH_SPHERE_DISTANCE, TRIGGER_OFF_VALUE, TRIGGER_ON_VALUE, ZERO_VEC, ensureDynamic,
getControllerWorldLocation, projectOntoEntityXYPlane, ContextOverlay, HMD, Reticle, Overlays, isPointingAtUI getControllerWorldLocation, projectOntoEntityXYPlane, ContextOverlay, HMD, Reticle, Overlays, isPointingAtUI
Picks, makeLaserLockInfo Xform, makeLaserParams Picks, makeLaserLockInfo Xform, makeLaserParams, AddressManager, getEntityParents
*/ */
Script.include("/~/system/libraries/controllerDispatcherUtils.js"); Script.include("/~/system/libraries/controllerDispatcherUtils.js");
@ -375,7 +375,7 @@ Script.include("/~/system/libraries/Xform.js");
return true; return true;
} }
return false; return false;
} };
this.isReady = function (controllerData) { this.isReady = function (controllerData) {
if (HMD.active) { if (HMD.active) {
@ -485,7 +485,8 @@ Script.include("/~/system/libraries/Xform.js");
this.grabbedDistance = rayPickInfo.distance; this.grabbedDistance = rayPickInfo.distance;
} }
if (otherFarGrabModule.grabbedThingID === this.grabbedThingID && otherFarGrabModule.distanceHolding) { if (otherFarGrabModule.grabbedThingID === this.grabbedThingID &&
otherFarGrabModule.distanceHolding) {
this.prepareDistanceRotatingData(controllerData); this.prepareDistanceRotatingData(controllerData);
this.distanceRotate(otherFarGrabModule); this.distanceRotate(otherFarGrabModule);
} else { } else {

4
scripts/system/controllers/controllerModules/nearGrabHyperLinkEntity.js
View file

@ -10,7 +10,7 @@
propsArePhysical, Messages, HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, entityIsGrabbable, propsArePhysical, Messages, HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, entityIsGrabbable,
Quat, Vec3, MSECS_PER_SEC, getControllerWorldLocation, makeDispatcherModuleParameters, makeRunningValues, Quat, Vec3, MSECS_PER_SEC, getControllerWorldLocation, makeDispatcherModuleParameters, makeRunningValues,
TRIGGER_OFF_VALUE, NEAR_GRAB_RADIUS, findGroupParent, entityIsCloneable, propsAreCloneDynamic, cloneEntity, TRIGGER_OFF_VALUE, NEAR_GRAB_RADIUS, findGroupParent, entityIsCloneable, propsAreCloneDynamic, cloneEntity,
HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, BUMPER_ON_VALUE HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, BUMPER_ON_VALUE, AddressManager
*/ */
(function() { (function() {
@ -85,7 +85,7 @@
function cleanup() { function cleanup() {
disableDispatcherModule("LeftNearGrabHyperLink"); disableDispatcherModule("LeftNearGrabHyperLink");
disableDispactherModule("RightNearGrabHyperLink"); disableDispatcherModule("RightNearGrabHyperLink");
} }

12
scripts/system/libraries/controllerDispatcherUtils.js
View file

@ -234,17 +234,6 @@ entityIsDistanceGrabbable = function(props) {
return true; return true;
}; };
entityHasHyperlink = function(entityID) {
var hasHyperlink = false;
var desiredProperties = ["href"];
var entityProperties = Entities.getEntityProperties(entityID, desiredProperties);
print(entityProperties.href);
if (entityProperties.href !== "") {
hasHyperlink = true;
}
return hasHyperlink;
}
getControllerJointIndex = function (hand) { getControllerJointIndex = function (hand) {
if (HMD.isHandControllerAvailable()) { if (HMD.isHandControllerAvailable()) {
var controllerJointIndex = -1; var controllerJointIndex = -1;
@ -409,7 +398,6 @@ if (typeof module !== 'undefined') {
entityIsGrabbable: entityIsGrabbable, entityIsGrabbable: entityIsGrabbable,
NEAR_GRAB_RADIUS: NEAR_GRAB_RADIUS, NEAR_GRAB_RADIUS: NEAR_GRAB_RADIUS,
projectOntoOverlayXYPlane: projectOntoOverlayXYPlane, projectOntoOverlayXYPlane: projectOntoOverlayXYPlane,
entityHasHyperlink: entityHasHyperlink,
projectOntoEntityXYPlane: projectOntoEntityXYPlane, projectOntoEntityXYPlane: projectOntoEntityXYPlane,
TRIGGER_OFF_VALUE: TRIGGER_OFF_VALUE, TRIGGER_OFF_VALUE: TRIGGER_OFF_VALUE,
TRIGGER_ON_VALUE: TRIGGER_ON_VALUE TRIGGER_ON_VALUE: TRIGGER_ON_VALUE