Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-15 06:09:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Inspect tool to newEditEntities

Browse source
This commit is contained in:
Ryan Huffman 2014-11-04 08:32:21 -08:00
parent 640c2c5fbf
commit 185b9ac545
2 changed files with 127 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/libraries/entityCameraTool.js
View file

@ -77,10 +77,6 @@ CameraManager = function() {
var focalPoint = Vec3.sum(Camera.getPosition(), var focalPoint = Vec3.sum(Camera.getPosition(),
Vec3.multiply(that.zoomDistance, Quat.getFront(Camera.getOrientation()))); Vec3.multiply(that.zoomDistance, Quat.getFront(Camera.getOrientation())));
if (Camera.getMode() == 'first person') {
that.targetZoomDistance = INITIAL_ZOOM_DISTANCE_FIRST_PERSON;
}
// Determine the correct yaw and pitch to keep the camera in the same location // Determine the correct yaw and pitch to keep the camera in the same location
var dPos = Vec3.subtract(focalPoint, Camera.getPosition()); var dPos = Vec3.subtract(focalPoint, Camera.getPosition());
var xzDist = Math.sqrt(dPos.x * dPos.x + dPos.z * dPos.z); var xzDist = Math.sqrt(dPos.x * dPos.x + dPos.z * dPos.z);

230
examples/newEditEntities.js
View file

@ -51,6 +51,9 @@ var wantEntityGlow = false;
var SPAWN_DISTANCE = 1; var SPAWN_DISTANCE = 1;
var DEFAULT_DIMENSION = 0.20; var DEFAULT_DIMENSION = 0.20;
var MENU_INSPECT_TOOL_ENABLED = 'Inspect Tool';
var MENU_EASE_ON_FOCUS = 'Ease Orientation on Focus';
var modelURLs = [ var modelURLs = [
HIFI_PUBLIC_BUCKET + "meshes/Feisar_Ship.FBX", HIFI_PUBLIC_BUCKET + "meshes/Feisar_Ship.FBX",
HIFI_PUBLIC_BUCKET + "meshes/birarda/birarda_head.fbx", HIFI_PUBLIC_BUCKET + "meshes/birarda/birarda_head.fbx",
@ -387,7 +390,6 @@ function isLocked(properties) {
var selectedEntityID; var selectedEntityID;
var mouseLastPosition;
var orientation; var orientation;
var intersection; var intersection;
@ -401,142 +403,154 @@ function rayPlaneIntersection(pickRay, point, normal) {
return Vec3.sum(pickRay.origin, Vec3.multiply(pickRay.direction, t)); return Vec3.sum(pickRay.origin, Vec3.multiply(pickRay.direction, t));
} }
function findClickedEntity(event) {
var pickRay = Camera.computePickRay(event.x, event.y);
var foundIntersection = Entities.findRayIntersection(pickRay);
if (!foundIntersection.accurate) {
return null;
}
var foundEntity = foundIntersection.entityID;
if (!foundEntity.isKnownID) {
var identify = Entities.identifyEntity(foundEntity);
if (!identify.isKnownID) {
print("Unknown ID " + identify.id + " (update loop " + foundEntity.id + ")");
selectionManager.clearSelections();
return null;
}
foundEntity = identify;
}
return { pickRay: pickRay, entityID: foundEntity };
}
function mousePressEvent(event) { function mousePressEvent(event) {
mouseLastPosition = { x: event.x, y: event.y }; if (toolBar.mousePressEvent(event) || progressDialog.mousePressEvent(event)) {
var clickedOverlay = Overlays.getOverlayAtPoint({ x: event.x, y: event.y });
var entitySelected = false;
if (toolBar.mousePressEvent(event) || progressDialog.mousePressEvent(event)
|| cameraManager.mousePressEvent(event) || selectionDisplay.mousePressEvent(event)) {
// Event handled; do nothing.
return; return;
} else { }
if (isActive) {
// If we aren't active and didn't click on an overlay: quit var entitySelected = false;
if (!isActive) { if (cameraManager.mousePressEvent(event) || selectionDisplay.mousePressEvent(event)) {
// Event handled; do nothing.
return; return;
} } else {
var result = findClickedEntity(event);
var pickRay = Camera.computePickRay(event.x, event.y); if (result === null) {
Vec3.print("[Mouse] Looking at: ", pickRay.origin);
var foundIntersection = Entities.findRayIntersection(pickRay);
if(!foundIntersection.accurate) {
selectionManager.clearSelections();
return;
}
var foundEntity = foundIntersection.entityID;
if (!foundEntity.isKnownID) {
var identify = Entities.identifyEntity(foundEntity);
if (!identify.isKnownID) {
print("Unknown ID " + identify.id + " (update loop " + foundEntity.id + ")");
selectionManager.clearSelections(); selectionManager.clearSelections();
return; return;
} }
foundEntity = identify; var pickRay = result.pickRay;
} var foundEntity = result.entityID;
var properties = Entities.getEntityProperties(foundEntity); var properties = Entities.getEntityProperties(foundEntity);
if (isLocked(properties)) { if (isLocked(properties)) {
print("Model locked " + properties.id); print("Model locked " + properties.id);
} else { } else {
var halfDiagonal = Vec3.length(properties.dimensions) / 2.0; var halfDiagonal = Vec3.length(properties.dimensions) / 2.0;
print("Checking properties: " + properties.id + " " + properties.isKnownID + " - Half Diagonal:" + halfDiagonal); print("Checking properties: " + properties.id + " " + properties.isKnownID + " - Half Diagonal:" + halfDiagonal);
// P P - Model // P P - Model
// /| A - Palm // /| A - Palm
// / | d B - unit vector toward tip // / | d B - unit vector toward tip
// / | X - base of the perpendicular line // / | X - base of the perpendicular line
// A---X----->B d - distance fom axis // A---X----->B d - distance fom axis
// x x - distance from A // x x - distance from A
// //
// |X-A| = (P-A).B // |X-A| = (P-A).B
// X == A + ((P-A).B)B // X == A + ((P-A).B)B
// d = |P-X| // d = |P-X|
var A = pickRay.origin; var A = pickRay.origin;
var B = Vec3.normalize(pickRay.direction); var B = Vec3.normalize(pickRay.direction);
var P = properties.position; var P = properties.position;
var x = Vec3.dot(Vec3.subtract(P, A), B); var x = Vec3.dot(Vec3.subtract(P, A), B);
var X = Vec3.sum(A, Vec3.multiply(B, x)); var X = Vec3.sum(A, Vec3.multiply(B, x));
var d = Vec3.length(Vec3.subtract(P, X)); var d = Vec3.length(Vec3.subtract(P, X));
var halfDiagonal = Vec3.length(properties.dimensions) / 2.0; var halfDiagonal = Vec3.length(properties.dimensions) / 2.0;
var angularSize = 2 * Math.atan(halfDiagonal / Vec3.distance(Camera.getPosition(), properties.position)) * 180 / 3.14; var angularSize = 2 * Math.atan(halfDiagonal / Vec3.distance(Camera.getPosition(), properties.position)) * 180 / 3.14;
var sizeOK = (allowLargeModels || angularSize < MAX_ANGULAR_SIZE) var sizeOK = (allowLargeModels || angularSize < MAX_ANGULAR_SIZE)
&& (allowSmallModels || angularSize > MIN_ANGULAR_SIZE); && (allowSmallModels || angularSize > MIN_ANGULAR_SIZE);
if (0 < x && sizeOK) { if (0 < x && sizeOK) {
entitySelected = true; entitySelected = true;
selectedEntityID = foundEntity; selectedEntityID = foundEntity;
orientation = MyAvatar.orientation; orientation = MyAvatar.orientation;
intersection = rayPlaneIntersection(pickRay, P, Quat.getFront(orientation)); intersection = rayPlaneIntersection(pickRay, P, Quat.getFront(orientation));
if (!event.isShifted) { if (!event.isShifted) {
selectionManager.clearSelections(); selectionManager.clearSelections();
}
selectionManager.addEntity(foundEntity);
print("Model selected: " + foundEntity.id);
} }
selectionManager.addEntity(foundEntity);
print("Model selected: " + foundEntity.id);
} }
} }
} if (entitySelected) {
if (entitySelected) { selectionDisplay.select(selectedEntityID, event);
selectionDisplay.select(selectedEntityID, event); }
} else if (Menu.isOptionChecked(MENU_INSPECT_TOOL_ENABLED)) {
var result = findClickedEntity(event);
if (result !== null && event.isRightButton) {
var currentProperties = Entities.getEntityProperties(result.entityID);
cameraManager.enable();
cameraManager.focus(currentProperties.position, null, Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
cameraManager.mousePressEvent(event);
}
} }
} }
var highlightedEntityID = { isKnownID: false }; var highlightedEntityID = { isKnownID: false };
function mouseMoveEvent(event) { function mouseMoveEvent(event) {
if (!isActive) { if (isActive) {
return; // allow the selectionDisplay and cameraManager to handle the event first, if it doesn't handle it, then do our own thing
} if (selectionDisplay.mouseMoveEvent(event) || cameraManager.mouseMoveEvent(event)) {
return;
// allow the selectionDisplay and cameraManager to handle the event first, if it doesn't handle it, then do our own thing
if (selectionDisplay.mouseMoveEvent(event) || cameraManager.mouseMoveEvent(event)) {
return;
}
var pickRay = Camera.computePickRay(event.x, event.y);
var entityIntersection = Entities.findRayIntersection(pickRay);
if (entityIntersection.accurate) {
if(highlightedEntityID.isKnownID && highlightedEntityID.id != entityIntersection.entityID.id) {
selectionDisplay.unhighlightSelectable(highlightedEntityID);
highlightedEntityID = { id: -1, isKnownID: false };
} }
var halfDiagonal = Vec3.length(entityIntersection.properties.dimensions) / 2.0; var pickRay = Camera.computePickRay(event.x, event.y);
var entityIntersection = Entities.findRayIntersection(pickRay);
var angularSize = 2 * Math.atan(halfDiagonal / Vec3.distance(Camera.getPosition(), if (entityIntersection.accurate) {
entityIntersection.properties.position)) * 180 / 3.14; if(highlightedEntityID.isKnownID && highlightedEntityID.id != entityIntersection.entityID.id) {
selectionDisplay.unhighlightSelectable(highlightedEntityID);
var sizeOK = (allowLargeModels || angularSize < MAX_ANGULAR_SIZE) highlightedEntityID = { id: -1, isKnownID: false };
&& (allowSmallModels || angularSize > MIN_ANGULAR_SIZE);
if (entityIntersection.entityID.isKnownID && sizeOK) {
if (wantEntityGlow) {
Entities.editEntity(entityIntersection.entityID, { glowLevel: 0.25 });
} }
highlightedEntityID = entityIntersection.entityID;
selectionDisplay.highlightSelectable(entityIntersection.entityID);
}
var halfDiagonal = Vec3.length(entityIntersection.properties.dimensions) / 2.0;
var angularSize = 2 * Math.atan(halfDiagonal / Vec3.distance(Camera.getPosition(),
entityIntersection.properties.position)) * 180 / 3.14;
var sizeOK = (allowLargeModels || angularSize < MAX_ANGULAR_SIZE)
&& (allowSmallModels || angularSize > MIN_ANGULAR_SIZE);
if (entityIntersection.entityID.isKnownID && sizeOK) {
if (wantEntityGlow) {
Entities.editEntity(entityIntersection.entityID, { glowLevel: 0.25 });
}
highlightedEntityID = entityIntersection.entityID;
selectionDisplay.highlightSelectable(entityIntersection.entityID);
}
}
} else {
cameraManager.mouseMoveEvent(event);
} }
} }
function mouseReleaseEvent(event) { function mouseReleaseEvent(event) {
if (!isActive) { if (isActive && selectionManager.hasSelection()) {
return;
}
if (selectionManager.hasSelection()) {
tooltip.show(false); tooltip.show(false);
} }
cameraManager.mouseReleaseEvent(event); cameraManager.mouseReleaseEvent(event);
} }
@ -574,6 +588,9 @@ function setupModelMenus() {
Menu.addMenuItem({ menuName: "File", menuItemName: "Export Models", shortcutKey: "CTRL+META+E", afterItem: "Models" }); Menu.addMenuItem({ menuName: "File", menuItemName: "Export Models", shortcutKey: "CTRL+META+E", afterItem: "Models" });
Menu.addMenuItem({ menuName: "File", menuItemName: "Import Models", shortcutKey: "CTRL+META+I", afterItem: "Export Models" }); Menu.addMenuItem({ menuName: "File", menuItemName: "Import Models", shortcutKey: "CTRL+META+I", afterItem: "Export Models" });
Menu.addMenuItem({ menuName: "Developer", menuItemName: "Debug Ryans Rotation Problems", isCheckable: true }); Menu.addMenuItem({ menuName: "Developer", menuItemName: "Debug Ryans Rotation Problems", isCheckable: true });
Menu.addMenuItem({ menuName: "View", menuItemName: MENU_INSPECT_TOOL_ENABLED, afterItem: "Edit Entities Help...", isCheckable: true });
Menu.addMenuItem({ menuName: "View", menuItemName: MENU_EASE_ON_FOCUS, afterItem: MENU_INSPECT_TOOL_ENABLED, isCheckable: true });
} }
setupModelMenus(); // do this when first running our script. setupModelMenus(); // do this when first running our script.
@ -594,6 +611,9 @@ function cleanupModelMenus() {
Menu.removeMenuItem("File", "Export Models"); Menu.removeMenuItem("File", "Export Models");
Menu.removeMenuItem("File", "Import Models"); Menu.removeMenuItem("File", "Import Models");
Menu.removeMenuItem("Developer", "Debug Ryans Rotation Problems"); Menu.removeMenuItem("Developer", "Debug Ryans Rotation Problems");
Menu.removeMenuItem("View", MENU_INSPECT_TOOL_ENABLED);
Menu.removeMenuItem("View", MENU_EASE_ON_FOCUS);
} }
Script.scriptEnding.connect(function() { Script.scriptEnding.connect(function() {
@ -684,7 +704,11 @@ Controller.keyReleaseEvent.connect(function (event) {
} else if (event.text == "TAB") { } else if (event.text == "TAB") {
selectionDisplay.toggleSpaceMode(); selectionDisplay.toggleSpaceMode();
} else if (event.text == "f") { } else if (event.text == "f") {
cameraManager.focus(); if (isActive) {
cameraManager.focus(selectionManager.worldPosition,
selectionManager.worldDimensions,
Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
}
} else if (event.text == '[') { } else if (event.text == '[') {
if (isActive) { if (isActive) {
cameraManager.enable(); cameraManager.enable();