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

Fix Style

Browse source 
- Replace tabs by 4 spaces;
- Add indents and spaces;
- Formated multi/line statement
- Removed out-of-scope comments.
This commit is contained in:
Delanir 2017-04-10 22:16:56 +01:00
parent 19de579057
commit fcde85e51b
1 changed files with 142 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

283
scripts/system/libraries/entitySelectionTool.js
View file

@ -3,7 +3,7 @@
// examples // examples
// //
// Created by Brad hefta-Gaub on 10/1/14. // Created by Brad hefta-Gaub on 10/1/14.
// Modified by Daniela Fontes @DanielaFifo and Tiago Andrade @TagoWill on 4/7/2017 // Modified by Daniela Fontes @DanielaFifo and Tiago Andrade @TagoWill on 4/7/2017
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// //
// This script implements a class useful for building tools for editing entities. // This script implements a class useful for building tools for editing entities.
@ -2593,17 +2593,17 @@ SelectionDisplay = (function() {
// pivot - point to use as a pivot // pivot - point to use as a pivot
// offset - the position of the overlay tool relative to the selections center position // offset - the position of the overlay tool relative to the selections center position
var makeStretchTool = function(stretchMode, direction, pivot, offset, customOnMove) { var makeStretchTool = function(stretchMode, direction, pivot, offset, customOnMove) {
// directionFor3DStretch - direction and pivot for 3D stretch // directionFor3DStretch - direction and pivot for 3D stretch
// distanceFor3DStretch - distance from the intersection point and the handController // distanceFor3DStretch - distance from the intersection point and the handController
// used to increase the scale taking into account the distance to the object // used to increase the scale taking into account the distance to the object
// DISTANCE_INFLUENCE_THRESHOLD - constant that holds the minimum distance where the // DISTANCE_INFLUENCE_THRESHOLD - constant that holds the minimum distance where the
// distance to the object will influence the stretch/resize/scale // distance to the object will influence the stretch/resize/scale
var directionFor3DStretch = getDirectionsFor3DStretch(stretchMode); var directionFor3DStretch = getDirectionsFor3DStretch(stretchMode);
var distanceFor3DStretch = 0; var distanceFor3DStretch = 0;
var DISTANCE_INFLUENCE_THRESHOLD = 1.2; var DISTANCE_INFLUENCE_THRESHOLD = 1.2;
var signs = { var signs = {
x: direction.x < 0 ? -1 : (direction.x > 0 ? 1 : 0), x: direction.x < 0 ? -1 : (direction.x > 0 ? 1 : 0),
y: direction.y < 0 ? -1 : (direction.y > 0 ? 1 : 0), y: direction.y < 0 ? -1 : (direction.y > 0 ? 1 : 0),
z: direction.z < 0 ? -1 : (direction.z > 0 ? 1 : 0), z: direction.z < 0 ? -1 : (direction.z > 0 ? 1 : 0),
@ -2614,23 +2614,23 @@ SelectionDisplay = (function() {
y: Math.abs(direction.y) > 0 ? 1 : 0, y: Math.abs(direction.y) > 0 ? 1 : 0,
z: Math.abs(direction.z) > 0 ? 1 : 0, z: Math.abs(direction.z) > 0 ? 1 : 0,
}; };
var numDimensions = mask.x + mask.y + mask.z; var numDimensions = mask.x + mask.y + mask.z;
var planeNormal = null; var planeNormal = null;
var lastPick = null; var lastPick = null;
var lastPick3D = null; var lastPick3D = null;
var initialPosition = null; var initialPosition = null;
var initialDimensions = null; var initialDimensions = null;
var initialIntersection = null; var initialIntersection = null;
var initialProperties = null; var initialProperties = null;
var registrationPoint = null; var registrationPoint = null;
var deltaPivot = null; var deltaPivot = null;
var deltaPivot3D = null; var deltaPivot3D = null;
var pickRayPosition = null; var pickRayPosition = null;
var pickRayPosition3D = null; var pickRayPosition3D = null;
var rotation = null; var rotation = null;
var onBegin = function(event) { var onBegin = function(event) {
@ -2668,18 +2668,20 @@ SelectionDisplay = (function() {
// Scaled offset in world coordinates // Scaled offset in world coordinates
var scaledOffsetWorld = vec3Mult(initialDimensions, offsetRP); var scaledOffsetWorld = vec3Mult(initialDimensions, offsetRP);
pickRayPosition = Vec3.sum(initialPosition, Vec3.multiplyQbyV(rotation, scaledOffsetWorld)); pickRayPosition = Vec3.sum(initialPosition, Vec3.multiplyQbyV(rotation, scaledOffsetWorld));
// Scaled offset in world coordinates for 3D manipulation
if (directionFor3DStretch){ if (directionFor3DStretch) {
// Scale pivot to be in the same range as registrationPoint // pivot, offset and pickPlanePosition for 3D manipulation
var scaledPivot3D = Vec3.multiply(0.5, Vec3.multiply(1.0, directionFor3DStretch)); var scaledPivot3D = Vec3.multiply(0.5, Vec3.multiply(1.0, directionFor3DStretch));
deltaPivot3D = Vec3.subtract(centeredRP, scaledPivot3D); deltaPivot3D = Vec3.subtract(centeredRP, scaledPivot3D);
var scaledOffsetWorld3D = vec3Mult(initialDimensions, var scaledOffsetWorld3D = vec3Mult(initialDimensions,
Vec3.subtract(Vec3.multiply(0.5, Vec3.multiply(-1.0, directionFor3DStretch)), centeredRP)); Vec3.subtract(Vec3.multiply(0.5, Vec3.multiply(-1.0, directionFor3DStretch)),
pickRayPosition3D = Vec3.sum(initialPosition, Vec3.multiplyQbyV(rotation, scaledOffsetWorld)); centeredRP));
}
pickRayPosition3D = Vec3.sum(initialPosition, Vec3.multiplyQbyV(rotation, scaledOffsetWorld));
}
var start = null; var start = null;
var end = null; var end = null;
if (numDimensions == 1 && mask.x) { if (numDimensions == 1 && mask.x) {
@ -2780,25 +2782,25 @@ SelectionDisplay = (function() {
}; };
} }
} }
planeNormal = Vec3.multiplyQbyV(rotation, planeNormal); planeNormal = Vec3.multiplyQbyV(rotation, planeNormal);
var pickRay = generalComputePickRay(event.x, event.y); var pickRay = generalComputePickRay(event.x, event.y);
lastPick = rayPlaneIntersection(pickRay, lastPick = rayPlaneIntersection(pickRay,
pickRayPosition, pickRayPosition,
planeNormal); planeNormal);
var planeNormal3D = { var planeNormal3D = {
x: 0, x: 0,
y: 0, y: 0,
z: 0 z: 0
}; };
if (directionFor3DStretch){ if (directionFor3DStretch) {
lastPick3D = rayPlaneIntersection(pickRay, lastPick3D = rayPlaneIntersection(pickRay,
pickRayPosition3D, pickRayPosition3D,
planeNormal3D); planeNormal3D);
distanceFor3DStretch = Vec3.length(Vec3.subtract(pickRayPosition3D, pickRay.origin)); distanceFor3DStretch = Vec3.length(Vec3.subtract(pickRayPosition3D, pickRay.origin));
} }
SelectionManager.saveProperties(); SelectionManager.saveProperties();
}; };
@ -2829,104 +2831,103 @@ SelectionDisplay = (function() {
dimensions = SelectionManager.worldDimensions; dimensions = SelectionManager.worldDimensions;
rotation = SelectionManager.worldRotation; rotation = SelectionManager.worldRotation;
} }
var localDeltaPivot = deltaPivot; var localDeltaPivot = deltaPivot;
var localSigns = signs; var localSigns = signs;
var pickRay = generalComputePickRay(event.x, event.y); var pickRay = generalComputePickRay(event.x, event.y);
// Are we using handControllers or Mouse - only relevant for 3D tools // Are we using handControllers or Mouse - only relevant for 3D tools
var controllerPose = getControllerWorldLocation(activeHand, true); var controllerPose = getControllerWorldLocation(activeHand, true);
if (HMD.isHMDAvailable() && HMD.isHandControllerAvailable() && controllerPose.valid && that.triggered && directionFor3DStretch ){ if (HMD.isHMDAvailable() && HMD.isHandControllerAvailable() && controllerPose.valid && that.triggered && directionFor3DStretch ) {
localDeltaPivot = deltaPivot3D; localDeltaPivot = deltaPivot3D;
newPick = pickRay.origin; newPick = pickRay.origin;
var vector = Vec3.subtract(newPick, lastPick3D); var vector = Vec3.subtract(newPick, lastPick3D);
vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector); vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
// Range of Motion if (distanceFor3DStretch > DISTANCE_INFLUENCE_THRESHOLD) {
if (distanceFor3DStretch > DISTANCE_INFLUENCE_THRESHOLD){ // Range of Motion
// Range of Motion vector = Vec3.multiply(distanceFor3DStretch , vector);
vector = Vec3.multiply(distanceFor3DStretch , vector); }
}
localSigns = directionFor3DStretch;
localSigns = directionFor3DStretch;
} else {
}else{ newPick = rayPlaneIntersection(pickRay,
newPick = rayPlaneIntersection(pickRay,
pickRayPosition, pickRayPosition,
planeNormal); planeNormal);
var vector = Vec3.subtract(newPick, lastPick); var vector = Vec3.subtract(newPick, lastPick);
vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector); vector = Vec3.multiplyQbyV(Quat.inverse(rotation), vector);
vector = vec3Mult(mask, vector); vector = vec3Mult(mask, vector);
} }
if (customOnMove) { if (customOnMove) {
var change = Vec3.multiply(-1, vec3Mult(localSigns, vector)); var change = Vec3.multiply(-1, vec3Mult(localSigns, vector));
customOnMove(vector, change); customOnMove(vector, change);
} else { } else {
vector = grid.snapToSpacing(vector); vector = grid.snapToSpacing(vector);
var changeInDimensions = Vec3.multiply(-1, vec3Mult(localSigns, vector)); var changeInDimensions = Vec3.multiply(-1, vec3Mult(localSigns, vector));
var newDimensions; var newDimensions;
if (proportional) { if (proportional) {
var absX = Math.abs(changeInDimensions.x); var absX = Math.abs(changeInDimensions.x);
var absY = Math.abs(changeInDimensions.y); var absY = Math.abs(changeInDimensions.y);
var absZ = Math.abs(changeInDimensions.z); var absZ = Math.abs(changeInDimensions.z);
var pctChange = 0; var pctChange = 0;
if (absX > absY && absX > absZ) { if (absX > absY && absX > absZ) {
pctChange = changeInDimensions.x / initialProperties.dimensions.x; pctChange = changeInDimensions.x / initialProperties.dimensions.x;
pctChange = changeInDimensions.x / initialDimensions.x; pctChange = changeInDimensions.x / initialDimensions.x;
} else if (absY > absZ) { } else if (absY > absZ) {
pctChange = changeInDimensions.y / initialProperties.dimensions.y; pctChange = changeInDimensions.y / initialProperties.dimensions.y;
pctChange = changeInDimensions.y / initialDimensions.y; pctChange = changeInDimensions.y / initialDimensions.y;
} else { } else {
pctChange = changeInDimensions.z / initialProperties.dimensions.z; pctChange = changeInDimensions.z / initialProperties.dimensions.z;
pctChange = changeInDimensions.z / initialDimensions.z; pctChange = changeInDimensions.z / initialDimensions.z;
} }
pctChange += 1.0; pctChange += 1.0;
newDimensions = Vec3.multiply(pctChange, initialDimensions); newDimensions = Vec3.multiply(pctChange, initialDimensions);
} else { } else {
newDimensions = Vec3.sum(initialDimensions, changeInDimensions); newDimensions = Vec3.sum(initialDimensions, changeInDimensions);
} }
} }
newDimensions.x = Math.max(newDimensions.x, MINIMUM_DIMENSION); newDimensions.x = Math.max(newDimensions.x, MINIMUM_DIMENSION);
newDimensions.y = Math.max(newDimensions.y, MINIMUM_DIMENSION); newDimensions.y = Math.max(newDimensions.y, MINIMUM_DIMENSION);
newDimensions.z = Math.max(newDimensions.z, MINIMUM_DIMENSION); newDimensions.z = Math.max(newDimensions.z, MINIMUM_DIMENSION);
var changeInPosition = Vec3.multiplyQbyV(rotation, vec3Mult(localDeltaPivot, changeInDimensions)); var changeInPosition = Vec3.multiplyQbyV(rotation, vec3Mult(localDeltaPivot, changeInDimensions));
var newPosition = Vec3.sum(initialPosition, changeInPosition); var newPosition = Vec3.sum(initialPosition, changeInPosition);
for (var i = 0; i < SelectionManager.selections.length; i++) { for (var i = 0; i < SelectionManager.selections.length; i++) {
Entities.editEntity(SelectionManager.selections[i], { Entities.editEntity(SelectionManager.selections[i], {
position: newPosition, position: newPosition,
dimensions: newDimensions, dimensions: newDimensions,
}); });
} }
var wantDebug = false; var wantDebug = false;
if (wantDebug) { if (wantDebug) {
print(stretchMode); print(stretchMode);
//Vec3.print(" newIntersection:", newIntersection); //Vec3.print(" newIntersection:", newIntersection);
Vec3.print(" vector:", vector); Vec3.print(" vector:", vector);
//Vec3.print(" oldPOS:", oldPOS); //Vec3.print(" oldPOS:", oldPOS);
//Vec3.print(" newPOS:", newPOS); //Vec3.print(" newPOS:", newPOS);
Vec3.print(" changeInDimensions:", changeInDimensions); Vec3.print(" changeInDimensions:", changeInDimensions);
Vec3.print(" newDimensions:", newDimensions); Vec3.print(" newDimensions:", newDimensions);
Vec3.print(" changeInPosition:", changeInPosition); Vec3.print(" changeInPosition:", changeInPosition);
Vec3.print(" newPosition:", newPosition); Vec3.print(" newPosition:", newPosition);
} }
SelectionManager._update(); SelectionManager._update();
}; };
@ -2937,9 +2938,9 @@ SelectionDisplay = (function() {
onEnd: onEnd onEnd: onEnd
}; };
}; };
// Direction for the stretch tool when using hand controller // Direction for the stretch tool when using hand controller
var directionsFor3DGrab = { var directionsFor3DGrab = {
LBN: { LBN: {
x: 1, x: 1,
y: 1, y: 1,
@ -2960,7 +2961,7 @@ SelectionDisplay = (function() {
y: 1, y: 1,
z: -1 z: -1
}, },
LTN: { LTN: {
x: 1, x: 1,
y: -1, y: -1,
z: 1 z: 1
@ -2981,31 +2982,31 @@ SelectionDisplay = (function() {
z: -1 z: -1
} }
}; };
// Returns a vector with directions for the stretch tool in 3D using hand controllers // Returns a vector with directions for the stretch tool in 3D using hand controllers
function getDirectionsFor3DStretch(mode){ function getDirectionsFor3DStretch(mode) {
if(mode === "STRETCH_LBN"){ if (mode === "STRETCH_LBN") {
return directionsFor3DGrab.LBN; return directionsFor3DGrab.LBN;
} else if(mode === "STRETCH_RBN"){ } else if (mode === "STRETCH_RBN") {
return directionsFor3DGrab.RBN; return directionsFor3DGrab.RBN;
}else if(mode === "STRETCH_LBF"){ } else if (mode === "STRETCH_LBF") {
return directionsFor3DGrab.LBF; return directionsFor3DGrab.LBF;
}else if(mode === "STRETCH_RBF"){ } else if (mode === "STRETCH_RBF") {
return directionsFor3DGrab.RBF; return directionsFor3DGrab.RBF;
}else if(mode === "STRETCH_LTN"){ } else if (mode === "STRETCH_LTN") {
return directionsFor3DGrab.LTN; return directionsFor3DGrab.LTN;
}else if(mode === "STRETCH_RTN"){ } else if (mode === "STRETCH_RTN") {
return directionsFor3DGrab.RTN; return directionsFor3DGrab.RTN;
}else if(mode === "STRETCH_LTF"){ } else if (mode === "STRETCH_LTF") {
return directionsFor3DGrab.LTF; return directionsFor3DGrab.LTF;
}else if(mode === "STRETCH_RTF"){ } else if (mode === "STRETCH_RTF") {
return directionsFor3DGrab.RTF; return directionsFor3DGrab.RTF;
}else{ } else {
return null; return null;
} }
} }
function addStretchTool(overlay, mode, pivot, direction, offset, handleMove) { function addStretchTool(overlay, mode, pivot, direction, offset, handleMove) {
if (!pivot) { if (!pivot) {