Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-04 19:18:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Hierarchy display in List and Selection

Browse source 
Add Hierarchy display in List and Selection
This commit is contained in:
Alezia Kurdis 2020-10-21 00:47:55 -04:00 committed by GitHub
parent 8afa978122
commit 48bd101d08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/system/create/entitySelectionTool/entitySelectionTool.js
View file

@ -697,8 +697,10 @@ SelectionDisplay = (function() {
const COLOR_HOVER = { red: 255, green: 220, blue: 82 }; const COLOR_HOVER = { red: 255, green: 220, blue: 82 };
const COLOR_DUPLICATOR = { red: 162, green: 0, blue: 255 }; const COLOR_DUPLICATOR = { red: 162, green: 0, blue: 255 };
const COLOR_ROTATE_CURRENT_RING = { red: 255, green: 99, blue: 9 }; const COLOR_ROTATE_CURRENT_RING = { red: 255, green: 99, blue: 9 };
const COLOR_BOUNDING_EDGE = { red: 128, green: 128, blue: 128 }; const COLOR_BOUNDING_EDGE = { red: 160, green: 160, blue: 160 };
const COLOR_SCALE_CUBE = { red: 160, green: 160, blue: 160 }; const COLOR_BOUNDING_EDGE_PARENT = { red: 194, green: 123, blue: 0 }; //{ red: 255, green: 160, blue: 0 };
const COLOR_BOUNDING_EDGE_CHILDREN = { red: 0, green: 168, blue: 214 }; // { red: 0, green: 200, blue: 255 }
const COLOR_SCALE_CUBE = { red: 192, green: 192, blue: 192 };
const COLOR_DEBUG_PICK_PLANE = { red: 255, green: 255, blue: 255 }; const COLOR_DEBUG_PICK_PLANE = { red: 255, green: 255, blue: 255 };
const COLOR_DEBUG_PICK_PLANE_HIT = { red: 255, green: 165, blue: 0 }; const COLOR_DEBUG_PICK_PLANE_HIT = { red: 255, green: 165, blue: 0 };
@ -1828,6 +1830,18 @@ SelectionDisplay = (function() {
var rotationZ = Quat.multiply(rotation, localRotationZ); var rotationZ = Quat.multiply(rotation, localRotationZ);
worldRotationZ = rotationZ; worldRotationZ = rotationZ;
var handleBoundingBoxColor = COLOR_BOUNDING_EDGE;
if (SelectionManager.selections.length === 1) {
var parentState = getParentState(SelectionManager.selections[0]);
if (parentState === "CHILDREN") {
handleBoundingBoxColor = COLOR_BOUNDING_EDGE_CHILDREN;
} else {
if (parentState === "PARENT" || parentState === "PARENT_CHILDREN") {
handleBoundingBoxColor = COLOR_BOUNDING_EDGE_PARENT;
}
}
}
var selectionBoxGeometry = { var selectionBoxGeometry = {
position: position, position: position,
rotation: rotation, rotation: rotation,
@ -1949,6 +1963,7 @@ SelectionDisplay = (function() {
Entities.editEntity(handleBoundingBox, { Entities.editEntity(handleBoundingBox, {
position: position, position: position,
rotation: rotation, rotation: rotation,
color: handleBoundingBoxColor,
dimensions: dimensions dimensions: dimensions
}); });