mirror of
https://github.com/Armored-Dragon/overte.git
synced 2025-03-11 16:13:16 +01:00
[Case 6491] eslint pass: Cleaning up comma-dangle noise.
* eslint pass using .eslintrc.js Changes Committed: modified: scripts/system/libraries/entitySelectionTool.js
This commit is contained in:
parent
c131686f1b
commit
97ecf84f3d
1 changed files with 72 additions and 72 deletions
|
@ -217,7 +217,7 @@ SelectionManager = (function() {
|
||||||
that.worldPosition = {
|
that.worldPosition = {
|
||||||
x: brn.x + (that.worldDimensions.x / 2),
|
x: brn.x + (that.worldDimensions.x / 2),
|
||||||
y: brn.y + (that.worldDimensions.y / 2),
|
y: brn.y + (that.worldDimensions.y / 2),
|
||||||
z: brn.z + (that.worldDimensions.z / 2),
|
z: brn.z + (that.worldDimensions.z / 2)
|
||||||
};
|
};
|
||||||
|
|
||||||
// For 1+ selections we can only modify selections in world space
|
// For 1+ selections we can only modify selections in world space
|
||||||
|
@ -373,7 +373,7 @@ SelectionDisplay = (function() {
|
||||||
dashed: false,
|
dashed: false,
|
||||||
lineWidth: grabberLineWidth,
|
lineWidth: grabberLineWidth,
|
||||||
drawInFront: true,
|
drawInFront: true,
|
||||||
borderSize: 1.4,
|
borderSize: 1.4
|
||||||
};
|
};
|
||||||
|
|
||||||
var grabberPropertiesEdge = {
|
var grabberPropertiesEdge = {
|
||||||
|
@ -390,7 +390,7 @@ SelectionDisplay = (function() {
|
||||||
dashed: false,
|
dashed: false,
|
||||||
lineWidth: grabberLineWidth,
|
lineWidth: grabberLineWidth,
|
||||||
drawInFront: true,
|
drawInFront: true,
|
||||||
borderSize: 1.4,
|
borderSize: 1.4
|
||||||
};
|
};
|
||||||
|
|
||||||
var grabberPropertiesFace = {
|
var grabberPropertiesFace = {
|
||||||
|
@ -407,7 +407,7 @@ SelectionDisplay = (function() {
|
||||||
dashed: false,
|
dashed: false,
|
||||||
lineWidth: grabberLineWidth,
|
lineWidth: grabberLineWidth,
|
||||||
drawInFront: true,
|
drawInFront: true,
|
||||||
borderSize: 1.4,
|
borderSize: 1.4
|
||||||
};
|
};
|
||||||
|
|
||||||
var grabberPropertiesCloner = {
|
var grabberPropertiesCloner = {
|
||||||
|
@ -424,12 +424,12 @@ SelectionDisplay = (function() {
|
||||||
dashed: false,
|
dashed: false,
|
||||||
lineWidth: grabberLineWidth,
|
lineWidth: grabberLineWidth,
|
||||||
drawInFront: true,
|
drawInFront: true,
|
||||||
borderSize: 1.4,
|
borderSize: 1.4
|
||||||
};
|
};
|
||||||
|
|
||||||
var spotLightLineProperties = {
|
var spotLightLineProperties = {
|
||||||
color: lightOverlayColor,
|
color: lightOverlayColor,
|
||||||
lineWidth: 1.5,
|
lineWidth: 1.5
|
||||||
};
|
};
|
||||||
|
|
||||||
var highlightBox = Overlays.addOverlay("cube", {
|
var highlightBox = Overlays.addOverlay("cube", {
|
||||||
|
@ -469,7 +469,7 @@ SelectionDisplay = (function() {
|
||||||
solid: false,
|
solid: false,
|
||||||
visible: false,
|
visible: false,
|
||||||
dashed: false,
|
dashed: false,
|
||||||
lineWidth: 1.0,
|
lineWidth: 1.0
|
||||||
});
|
});
|
||||||
|
|
||||||
var selectionBoxes = [];
|
var selectionBoxes = [];
|
||||||
|
@ -505,7 +505,7 @@ SelectionDisplay = (function() {
|
||||||
topMargin: 0,
|
topMargin: 0,
|
||||||
rightMargin: 0,
|
rightMargin: 0,
|
||||||
bottomMargin: 0,
|
bottomMargin: 0,
|
||||||
leftMargin: 0,
|
leftMargin: 0
|
||||||
});
|
});
|
||||||
|
|
||||||
var grabberMoveUp = Overlays.addOverlay("image3d", {
|
var grabberMoveUp = Overlays.addOverlay("image3d", {
|
||||||
|
@ -521,7 +521,7 @@ SelectionDisplay = (function() {
|
||||||
size: 0.1,
|
size: 0.1,
|
||||||
scale: 0.1,
|
scale: 0.1,
|
||||||
isFacingAvatar: true,
|
isFacingAvatar: true,
|
||||||
drawInFront: true,
|
drawInFront: true
|
||||||
});
|
});
|
||||||
|
|
||||||
// var normalLine = Overlays.addOverlay("line3d", {
|
// var normalLine = Overlays.addOverlay("line3d", {
|
||||||
|
@ -613,7 +613,7 @@ SelectionDisplay = (function() {
|
||||||
var pointLightGrabberHandles = [
|
var pointLightGrabberHandles = [
|
||||||
grabberPointLightCircleX, grabberPointLightCircleY, grabberPointLightCircleZ,
|
grabberPointLightCircleX, grabberPointLightCircleY, grabberPointLightCircleZ,
|
||||||
grabberPointLightT, grabberPointLightB, grabberPointLightL,
|
grabberPointLightT, grabberPointLightB, grabberPointLightL,
|
||||||
grabberPointLightR, grabberPointLightF, grabberPointLightN,
|
grabberPointLightR, grabberPointLightF, grabberPointLightN
|
||||||
];
|
];
|
||||||
|
|
||||||
var grabberCloner = Overlays.addOverlay("cube", grabberPropertiesCloner);
|
var grabberCloner = Overlays.addOverlay("cube", grabberPropertiesCloner);
|
||||||
|
@ -692,7 +692,7 @@ SelectionDisplay = (function() {
|
||||||
width: 300,
|
width: 300,
|
||||||
height: 200,
|
height: 200,
|
||||||
rotation: baseOverlayRotation,
|
rotation: baseOverlayRotation,
|
||||||
ignoreRayIntersection: true, // always ignore this
|
ignoreRayIntersection: true // always ignore this
|
||||||
});
|
});
|
||||||
|
|
||||||
var yawOverlayAngles = {
|
var yawOverlayAngles = {
|
||||||
|
@ -793,7 +793,7 @@ SelectionDisplay = (function() {
|
||||||
green: 0,
|
green: 0,
|
||||||
blue: 0
|
blue: 0
|
||||||
},
|
},
|
||||||
ignoreRayIntersection: true, // always ignore this
|
ignoreRayIntersection: true // always ignore this
|
||||||
});
|
});
|
||||||
|
|
||||||
var rotateCurrentOverlay = Overlays.addOverlay("line3d", {
|
var rotateCurrentOverlay = Overlays.addOverlay("line3d", {
|
||||||
|
@ -814,7 +814,7 @@ SelectionDisplay = (function() {
|
||||||
green: 0,
|
green: 0,
|
||||||
blue: 255
|
blue: 255
|
||||||
},
|
},
|
||||||
ignoreRayIntersection: true, // always ignore this
|
ignoreRayIntersection: true // always ignore this
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@ -849,7 +849,7 @@ SelectionDisplay = (function() {
|
||||||
green: 0,
|
green: 0,
|
||||||
blue: 0
|
blue: 0
|
||||||
},
|
},
|
||||||
ignoreRayIntersection: true, // always ignore this
|
ignoreRayIntersection: true // always ignore this
|
||||||
});
|
});
|
||||||
|
|
||||||
var rotateOverlayOuter = Overlays.addOverlay("circle3d", {
|
var rotateOverlayOuter = Overlays.addOverlay("circle3d", {
|
||||||
|
@ -884,7 +884,7 @@ SelectionDisplay = (function() {
|
||||||
green: 0,
|
green: 0,
|
||||||
blue: 0
|
blue: 0
|
||||||
},
|
},
|
||||||
ignoreRayIntersection: true, // always ignore this
|
ignoreRayIntersection: true // always ignore this
|
||||||
});
|
});
|
||||||
|
|
||||||
var rotateOverlayCurrent = Overlays.addOverlay("circle3d", {
|
var rotateOverlayCurrent = Overlays.addOverlay("circle3d", {
|
||||||
|
@ -914,7 +914,7 @@ SelectionDisplay = (function() {
|
||||||
red: 0,
|
red: 0,
|
||||||
green: 0,
|
green: 0,
|
||||||
blue: 0
|
blue: 0
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
var yawHandle = Overlays.addOverlay("image3d", {
|
var yawHandle = Overlays.addOverlay("image3d", {
|
||||||
|
@ -930,7 +930,7 @@ SelectionDisplay = (function() {
|
||||||
size: 0.1,
|
size: 0.1,
|
||||||
scale: 0.1,
|
scale: 0.1,
|
||||||
isFacingAvatar: false,
|
isFacingAvatar: false,
|
||||||
drawInFront: true,
|
drawInFront: true
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@ -947,7 +947,7 @@ SelectionDisplay = (function() {
|
||||||
size: 0.1,
|
size: 0.1,
|
||||||
scale: 0.1,
|
scale: 0.1,
|
||||||
isFacingAvatar: false,
|
isFacingAvatar: false,
|
||||||
drawInFront: true,
|
drawInFront: true
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@ -964,7 +964,7 @@ SelectionDisplay = (function() {
|
||||||
size: 0.1,
|
size: 0.1,
|
||||||
scale: 0.1,
|
scale: 0.1,
|
||||||
isFacingAvatar: false,
|
isFacingAvatar: false,
|
||||||
drawInFront: true,
|
drawInFront: true
|
||||||
});
|
});
|
||||||
|
|
||||||
var allOverlays = [
|
var allOverlays = [
|
||||||
|
@ -987,7 +987,7 @@ SelectionDisplay = (function() {
|
||||||
grabberSpotLightCircle,
|
grabberSpotLightCircle,
|
||||||
grabberPointLightCircleX,
|
grabberPointLightCircleX,
|
||||||
grabberPointLightCircleY,
|
grabberPointLightCircleY,
|
||||||
grabberPointLightCircleZ,
|
grabberPointLightCircleZ
|
||||||
|
|
||||||
].concat(stretchHandles);
|
].concat(stretchHandles);
|
||||||
|
|
||||||
|
@ -1532,20 +1532,20 @@ SelectionDisplay = (function() {
|
||||||
|
|
||||||
for (var i = 0; i < stretchHandles.length; i++) {
|
for (var i = 0; i < stretchHandles.length; i++) {
|
||||||
Overlays.editOverlay(stretchHandles[i], {
|
Overlays.editOverlay(stretchHandles[i], {
|
||||||
size: grabberSize,
|
size: grabberSize
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
var handleSize = Vec3.length(diff) * GRABBER_DISTANCE_TO_SIZE_RATIO * 7;
|
var handleSize = Vec3.length(diff) * GRABBER_DISTANCE_TO_SIZE_RATIO * 7;
|
||||||
handleSize = Math.min(handleSize, avgDimension / 3);
|
handleSize = Math.min(handleSize, avgDimension / 3);
|
||||||
|
|
||||||
Overlays.editOverlay(yawHandle, {
|
Overlays.editOverlay(yawHandle, {
|
||||||
scale: handleSize,
|
scale: handleSize
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(pitchHandle, {
|
Overlays.editOverlay(pitchHandle, {
|
||||||
scale: handleSize,
|
scale: handleSize
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(rollHandle, {
|
Overlays.editOverlay(rollHandle, {
|
||||||
scale: handleSize,
|
scale: handleSize
|
||||||
});
|
});
|
||||||
var pos = Vec3.sum(grabberMoveUpPosition, {
|
var pos = Vec3.sum(grabberMoveUpPosition, {
|
||||||
x: 0,
|
x: 0,
|
||||||
|
@ -1554,7 +1554,7 @@ SelectionDisplay = (function() {
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberMoveUp, {
|
Overlays.editOverlay(grabberMoveUp, {
|
||||||
position: pos,
|
position: pos,
|
||||||
scale: handleSize / 1.25,
|
scale: handleSize / 1.25
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -1642,7 +1642,7 @@ SelectionDisplay = (function() {
|
||||||
var registrationPointDimensions = {
|
var registrationPointDimensions = {
|
||||||
x: dimensions.x * registrationPoint.x,
|
x: dimensions.x * registrationPoint.x,
|
||||||
y: dimensions.y * registrationPoint.y,
|
y: dimensions.y * registrationPoint.y,
|
||||||
z: dimensions.z * registrationPoint.z,
|
z: dimensions.z * registrationPoint.z
|
||||||
};
|
};
|
||||||
|
|
||||||
// Center of entity, relative to registration point
|
// Center of entity, relative to registration point
|
||||||
|
@ -1877,33 +1877,33 @@ SelectionDisplay = (function() {
|
||||||
var showEdgeSpotGrabbers = !(inModeTranslate || inModeRotate);
|
var showEdgeSpotGrabbers = !(inModeTranslate || inModeRotate);
|
||||||
Overlays.editOverlay(grabberSpotLightCenter, {
|
Overlays.editOverlay(grabberSpotLightCenter, {
|
||||||
position: position,
|
position: position,
|
||||||
visible: false,
|
visible: false
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberSpotLightRadius, {
|
Overlays.editOverlay(grabberSpotLightRadius, {
|
||||||
position: NEAR,
|
position: NEAR,
|
||||||
rotation: rotation,
|
rotation: rotation,
|
||||||
visible: showEdgeSpotGrabbers,
|
visible: showEdgeSpotGrabbers
|
||||||
});
|
});
|
||||||
|
|
||||||
Overlays.editOverlay(grabberSpotLightL, {
|
Overlays.editOverlay(grabberSpotLightL, {
|
||||||
position: EdgeNL,
|
position: EdgeNL,
|
||||||
rotation: rotation,
|
rotation: rotation,
|
||||||
visible: showEdgeSpotGrabbers,
|
visible: showEdgeSpotGrabbers
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberSpotLightR, {
|
Overlays.editOverlay(grabberSpotLightR, {
|
||||||
position: EdgeNR,
|
position: EdgeNR,
|
||||||
rotation: rotation,
|
rotation: rotation,
|
||||||
visible: showEdgeSpotGrabbers,
|
visible: showEdgeSpotGrabbers
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberSpotLightT, {
|
Overlays.editOverlay(grabberSpotLightT, {
|
||||||
position: EdgeTN,
|
position: EdgeTN,
|
||||||
rotation: rotation,
|
rotation: rotation,
|
||||||
visible: showEdgeSpotGrabbers,
|
visible: showEdgeSpotGrabbers
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberSpotLightB, {
|
Overlays.editOverlay(grabberSpotLightB, {
|
||||||
position: EdgeBN,
|
position: EdgeBN,
|
||||||
rotation: rotation,
|
rotation: rotation,
|
||||||
visible: showEdgeSpotGrabbers,
|
visible: showEdgeSpotGrabbers
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberSpotLightCircle, {
|
Overlays.editOverlay(grabberSpotLightCircle, {
|
||||||
position: NEAR,
|
position: NEAR,
|
||||||
|
@ -1914,28 +1914,28 @@ SelectionDisplay = (function() {
|
||||||
},
|
},
|
||||||
lineWidth: 1.5,
|
lineWidth: 1.5,
|
||||||
rotation: rotation,
|
rotation: rotation,
|
||||||
visible: true,
|
visible: true
|
||||||
});
|
});
|
||||||
|
|
||||||
Overlays.editOverlay(grabberSpotLightLineT, {
|
Overlays.editOverlay(grabberSpotLightLineT, {
|
||||||
start: position,
|
start: position,
|
||||||
end: EdgeTN,
|
end: EdgeTN,
|
||||||
visible: true,
|
visible: true
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberSpotLightLineB, {
|
Overlays.editOverlay(grabberSpotLightLineB, {
|
||||||
start: position,
|
start: position,
|
||||||
end: EdgeBN,
|
end: EdgeBN,
|
||||||
visible: true,
|
visible: true
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberSpotLightLineR, {
|
Overlays.editOverlay(grabberSpotLightLineR, {
|
||||||
start: position,
|
start: position,
|
||||||
end: EdgeNR,
|
end: EdgeNR,
|
||||||
visible: true,
|
visible: true
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberSpotLightLineL, {
|
Overlays.editOverlay(grabberSpotLightLineL, {
|
||||||
start: position,
|
start: position,
|
||||||
end: EdgeNL,
|
end: EdgeNL,
|
||||||
visible: true,
|
visible: true
|
||||||
});
|
});
|
||||||
|
|
||||||
} else { // ..it's a PointLight
|
} else { // ..it's a PointLight
|
||||||
|
@ -1945,32 +1945,32 @@ SelectionDisplay = (function() {
|
||||||
Overlays.editOverlay(grabberPointLightT, {
|
Overlays.editOverlay(grabberPointLightT, {
|
||||||
position: TOP,
|
position: TOP,
|
||||||
rotation: rotation,
|
rotation: rotation,
|
||||||
visible: showEdgePointGrabbers,
|
visible: showEdgePointGrabbers
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberPointLightB, {
|
Overlays.editOverlay(grabberPointLightB, {
|
||||||
position: BOTTOM,
|
position: BOTTOM,
|
||||||
rotation: rotation,
|
rotation: rotation,
|
||||||
visible: showEdgePointGrabbers,
|
visible: showEdgePointGrabbers
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberPointLightL, {
|
Overlays.editOverlay(grabberPointLightL, {
|
||||||
position: LEFT,
|
position: LEFT,
|
||||||
rotation: rotation,
|
rotation: rotation,
|
||||||
visible: showEdgePointGrabbers,
|
visible: showEdgePointGrabbers
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberPointLightR, {
|
Overlays.editOverlay(grabberPointLightR, {
|
||||||
position: RIGHT,
|
position: RIGHT,
|
||||||
rotation: rotation,
|
rotation: rotation,
|
||||||
visible: showEdgePointGrabbers,
|
visible: showEdgePointGrabbers
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberPointLightF, {
|
Overlays.editOverlay(grabberPointLightF, {
|
||||||
position: FAR,
|
position: FAR,
|
||||||
rotation: rotation,
|
rotation: rotation,
|
||||||
visible: showEdgePointGrabbers,
|
visible: showEdgePointGrabbers
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberPointLightN, {
|
Overlays.editOverlay(grabberPointLightN, {
|
||||||
position: NEAR,
|
position: NEAR,
|
||||||
rotation: rotation,
|
rotation: rotation,
|
||||||
visible: showEdgePointGrabbers,
|
visible: showEdgePointGrabbers
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberPointLightCircleX, {
|
Overlays.editOverlay(grabberPointLightCircleX, {
|
||||||
position: position,
|
position: position,
|
||||||
|
@ -1980,7 +1980,7 @@ SelectionDisplay = (function() {
|
||||||
y: properties.dimensions.z / 2.0,
|
y: properties.dimensions.z / 2.0,
|
||||||
z: 1
|
z: 1
|
||||||
},
|
},
|
||||||
visible: true,
|
visible: true
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberPointLightCircleY, {
|
Overlays.editOverlay(grabberPointLightCircleY, {
|
||||||
position: position,
|
position: position,
|
||||||
|
@ -1990,7 +1990,7 @@ SelectionDisplay = (function() {
|
||||||
y: properties.dimensions.z / 2.0,
|
y: properties.dimensions.z / 2.0,
|
||||||
z: 1
|
z: 1
|
||||||
},
|
},
|
||||||
visible: true,
|
visible: true
|
||||||
});
|
});
|
||||||
Overlays.editOverlay(grabberPointLightCircleZ, {
|
Overlays.editOverlay(grabberPointLightCircleZ, {
|
||||||
position: position,
|
position: position,
|
||||||
|
@ -2000,7 +2000,7 @@ SelectionDisplay = (function() {
|
||||||
y: properties.dimensions.z / 2.0,
|
y: properties.dimensions.z / 2.0,
|
||||||
z: 1
|
z: 1
|
||||||
},
|
},
|
||||||
visible: true,
|
visible: true
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else { // ..it's not a light at all
|
} else { // ..it's not a light at all
|
||||||
|
@ -2096,7 +2096,7 @@ SelectionDisplay = (function() {
|
||||||
position: selectionBoxPosition,
|
position: selectionBoxPosition,
|
||||||
dimensions: dimensions,
|
dimensions: dimensions,
|
||||||
rotation: rotation,
|
rotation: rotation,
|
||||||
visible: !inModeRotate,
|
visible: !inModeRotate
|
||||||
});
|
});
|
||||||
|
|
||||||
// Create more selection box overlays if we don't have enough
|
// Create more selection box overlays if we don't have enough
|
||||||
|
@ -2120,7 +2120,7 @@ SelectionDisplay = (function() {
|
||||||
visible: false,
|
visible: false,
|
||||||
dashed: false,
|
dashed: false,
|
||||||
lineWidth: 1.0,
|
lineWidth: 1.0,
|
||||||
ignoreRayIntersection: true,
|
ignoreRayIntersection: true
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2150,7 +2150,7 @@ SelectionDisplay = (function() {
|
||||||
color: color,
|
color: color,
|
||||||
rotation: props.rotation,
|
rotation: props.rotation,
|
||||||
dimensions: props.dimensions,
|
dimensions: props.dimensions,
|
||||||
visible: true,
|
visible: true
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2244,7 +2244,7 @@ SelectionDisplay = (function() {
|
||||||
x: selectionManager.worldDimensions.x,
|
x: selectionManager.worldDimensions.x,
|
||||||
y: selectionManager.worldDimensions.z
|
y: selectionManager.worldDimensions.z
|
||||||
},
|
},
|
||||||
rotation: Quat.fromPitchYawRollDegrees(90, 0, 0),
|
rotation: Quat.fromPitchYawRollDegrees(90, 0, 0)
|
||||||
});
|
});
|
||||||
|
|
||||||
if (wantDebug) {
|
if (wantDebug) {
|
||||||
|
@ -2368,7 +2368,7 @@ SelectionDisplay = (function() {
|
||||||
var entityID = Entities.addEntity(properties);
|
var entityID = Entities.addEntity(properties);
|
||||||
duplicatedEntityIDs.push({
|
duplicatedEntityIDs.push({
|
||||||
entityID: entityID,
|
entityID: entityID,
|
||||||
properties: properties,
|
properties: properties
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2519,7 +2519,7 @@ SelectionDisplay = (function() {
|
||||||
z: vector.z
|
z: vector.z
|
||||||
});
|
});
|
||||||
Entities.editEntity(SelectionManager.selections[i], {
|
Entities.editEntity(SelectionManager.selections[i], {
|
||||||
position: newPosition,
|
position: newPosition
|
||||||
});
|
});
|
||||||
|
|
||||||
if (wantDebug) {
|
if (wantDebug) {
|
||||||
|
@ -2562,7 +2562,7 @@ SelectionDisplay = (function() {
|
||||||
var entityID = Entities.addEntity(properties);
|
var entityID = Entities.addEntity(properties);
|
||||||
duplicatedEntityIDs.push({
|
duplicatedEntityIDs.push({
|
||||||
entityID: entityID,
|
entityID: entityID,
|
||||||
properties: properties,
|
properties: properties
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2602,12 +2602,12 @@ SelectionDisplay = (function() {
|
||||||
var newPosition = Vec3.sum(properties.position, vector);
|
var newPosition = Vec3.sum(properties.position, vector);
|
||||||
|
|
||||||
Entities.editEntity(id, {
|
Entities.editEntity(id, {
|
||||||
position: newPosition,
|
position: newPosition
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
SelectionManager._update();
|
SelectionManager._update();
|
||||||
},
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// GRABBER TOOL: GRABBER CLONER
|
// GRABBER TOOL: GRABBER CLONER
|
||||||
|
@ -2661,13 +2661,13 @@ SelectionDisplay = (function() {
|
||||||
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)
|
||||||
};
|
};
|
||||||
|
|
||||||
var mask = {
|
var mask = {
|
||||||
x: Math.abs(direction.x) > 0 ? 1 : 0,
|
x: Math.abs(direction.x) > 0 ? 1 : 0,
|
||||||
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
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -2755,7 +2755,7 @@ SelectionDisplay = (function() {
|
||||||
Overlays.editOverlay(xRailOverlay, {
|
Overlays.editOverlay(xRailOverlay, {
|
||||||
start: start,
|
start: start,
|
||||||
end: end,
|
end: end,
|
||||||
visible: true,
|
visible: true
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if ((numDimensions === 1) && mask.y) {
|
if ((numDimensions === 1) && mask.y) {
|
||||||
|
@ -2774,7 +2774,7 @@ SelectionDisplay = (function() {
|
||||||
Overlays.editOverlay(yRailOverlay, {
|
Overlays.editOverlay(yRailOverlay, {
|
||||||
start: start,
|
start: start,
|
||||||
end: end,
|
end: end,
|
||||||
visible: true,
|
visible: true
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if ((numDimensions === 1) && mask.z) {
|
if ((numDimensions === 1) && mask.z) {
|
||||||
|
@ -2793,7 +2793,7 @@ SelectionDisplay = (function() {
|
||||||
Overlays.editOverlay(zRailOverlay, {
|
Overlays.editOverlay(zRailOverlay, {
|
||||||
start: start,
|
start: start,
|
||||||
end: end,
|
end: end,
|
||||||
visible: true,
|
visible: true
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (numDimensions === 1) {
|
if (numDimensions === 1) {
|
||||||
|
@ -2962,7 +2962,7 @@ SelectionDisplay = (function() {
|
||||||
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
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3090,7 +3090,7 @@ SelectionDisplay = (function() {
|
||||||
var cutoff = Math.atan2(newSize, radius) * 180 / Math.PI;
|
var cutoff = Math.atan2(newSize, radius) * 180 / Math.PI;
|
||||||
|
|
||||||
Entities.editEntity(selectionManager.selections[0], {
|
Entities.editEntity(selectionManager.selections[0], {
|
||||||
cutoff: cutoff,
|
cutoff: cutoff
|
||||||
});
|
});
|
||||||
|
|
||||||
SelectionManager._update();
|
SelectionManager._update();
|
||||||
|
@ -3117,7 +3117,7 @@ SelectionDisplay = (function() {
|
||||||
};
|
};
|
||||||
|
|
||||||
Entities.editEntity(selectionManager.selections[0], {
|
Entities.editEntity(selectionManager.selections[0], {
|
||||||
dimensions: newDimensions,
|
dimensions: newDimensions
|
||||||
});
|
});
|
||||||
|
|
||||||
SelectionManager._update();
|
SelectionManager._update();
|
||||||
|
@ -3544,7 +3544,7 @@ SelectionDisplay = (function() {
|
||||||
var position = {
|
var position = {
|
||||||
x: Math.cos(angle) * outerRadius * ROTATION_DISPLAY_DISTANCE_MULTIPLIER,
|
x: Math.cos(angle) * outerRadius * ROTATION_DISPLAY_DISTANCE_MULTIPLIER,
|
||||||
y: Math.sin(angle) * outerRadius * ROTATION_DISPLAY_DISTANCE_MULTIPLIER,
|
y: Math.sin(angle) * outerRadius * ROTATION_DISPLAY_DISTANCE_MULTIPLIER,
|
||||||
z: 0,
|
z: 0
|
||||||
};
|
};
|
||||||
if (wantDebug) {
|
if (wantDebug) {
|
||||||
print(" Angle: " + angle);
|
print(" Angle: " + angle);
|
||||||
|
@ -3560,7 +3560,7 @@ SelectionDisplay = (function() {
|
||||||
y: innerRadius * ROTATION_DISPLAY_SIZE_Y_MULTIPLIER
|
y: innerRadius * ROTATION_DISPLAY_SIZE_Y_MULTIPLIER
|
||||||
},
|
},
|
||||||
lineHeight: innerRadius * ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER,
|
lineHeight: innerRadius * ROTATION_DISPLAY_LINE_HEIGHT_MULTIPLIER,
|
||||||
text: normalizeDegrees(angleFromZero) + "°",
|
text: normalizeDegrees(angleFromZero) + "°"
|
||||||
};
|
};
|
||||||
if (wantDebug) {
|
if (wantDebug) {
|
||||||
print(" TranslatedPos: " + position.x + ", " + position.y + ", " + position.z);
|
print(" TranslatedPos: " + position.x + ", " + position.y + ", " + position.z);
|
||||||
|
@ -3594,7 +3594,7 @@ SelectionDisplay = (function() {
|
||||||
var initialProperties = SelectionManager.savedProperties[entityID];
|
var initialProperties = SelectionManager.savedProperties[entityID];
|
||||||
|
|
||||||
var newProperties = {
|
var newProperties = {
|
||||||
rotation: Quat.multiply(rotationChange, initialProperties.rotation),
|
rotation: Quat.multiply(rotationChange, initialProperties.rotation)
|
||||||
};
|
};
|
||||||
|
|
||||||
if (reposition) {
|
if (reposition) {
|
||||||
|
@ -3637,7 +3637,7 @@ SelectionDisplay = (function() {
|
||||||
innerRadius: 0.9,
|
innerRadius: 0.9,
|
||||||
startAt: 0,
|
startAt: 0,
|
||||||
endAt: 360,
|
endAt: 360,
|
||||||
alpha: innerAlpha,
|
alpha: innerAlpha
|
||||||
});
|
});
|
||||||
|
|
||||||
Overlays.editOverlay(rotateOverlayOuter, {
|
Overlays.editOverlay(rotateOverlayOuter, {
|
||||||
|
@ -3648,7 +3648,7 @@ SelectionDisplay = (function() {
|
||||||
innerRadius: 0.9,
|
innerRadius: 0.9,
|
||||||
startAt: 0,
|
startAt: 0,
|
||||||
endAt: 360,
|
endAt: 360,
|
||||||
alpha: outerAlpha,
|
alpha: outerAlpha
|
||||||
});
|
});
|
||||||
|
|
||||||
Overlays.editOverlay(rotateOverlayCurrent, {
|
Overlays.editOverlay(rotateOverlayCurrent, {
|
||||||
|
@ -3658,11 +3658,11 @@ SelectionDisplay = (function() {
|
||||||
size: outerRadius,
|
size: outerRadius,
|
||||||
startAt: 0,
|
startAt: 0,
|
||||||
endAt: 0,
|
endAt: 0,
|
||||||
innerRadius: 0.9,
|
innerRadius: 0.9
|
||||||
});
|
});
|
||||||
|
|
||||||
Overlays.editOverlay(rotationDegreesDisplay, {
|
Overlays.editOverlay(rotationDegreesDisplay, {
|
||||||
visible: true,
|
visible: true
|
||||||
});
|
});
|
||||||
|
|
||||||
updateRotationDegreesOverlay(0, handleRotation, rotCenter);
|
updateRotationDegreesOverlay(0, handleRotation, rotCenter);
|
||||||
|
@ -3756,7 +3756,7 @@ SelectionDisplay = (function() {
|
||||||
majorTickMarksAngle: innerSnapAngle,
|
majorTickMarksAngle: innerSnapAngle,
|
||||||
minorTickMarksAngle: 0,
|
minorTickMarksAngle: 0,
|
||||||
majorTickMarksLength: -0.25,
|
majorTickMarksLength: -0.25,
|
||||||
minorTickMarksLength: 0,
|
minorTickMarksLength: 0
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
Overlays.editOverlay(rotateOverlayInner, {
|
Overlays.editOverlay(rotateOverlayInner, {
|
||||||
|
@ -3774,7 +3774,7 @@ SelectionDisplay = (function() {
|
||||||
majorTickMarksAngle: 45.0,
|
majorTickMarksAngle: 45.0,
|
||||||
minorTickMarksAngle: 5,
|
minorTickMarksAngle: 5,
|
||||||
majorTickMarksLength: 0.25,
|
majorTickMarksLength: 0.25,
|
||||||
minorTickMarksLength: 0.1,
|
minorTickMarksLength: 0.1
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}// End_If(results.intersects)
|
}// End_If(results.intersects)
|
||||||
|
|
Loading…
Reference in a new issue