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

Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels

Browse source
This commit is contained in:
Andrzej Kapolka 2014-10-21 16:27:41 -07:00
commit 9c0e3ead13
3 changed files with 1277 additions and 1538 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
examples/libraries/entityCameraTool.js
View file

@ -97,11 +97,12 @@ EntityCameraTool = function() {
that.focus = function(entityProperties) { that.focus = function(entityProperties) {
var dim = entityProperties.dimensions; var dim = entityProperties.dimensions;
dim = SelectionManager.worldDimensions;
var size = Math.max(dim.x, Math.max(dim.y, dim.z)); var size = Math.max(dim.x, Math.max(dim.y, dim.z));
that.targetZoomDistance = Math.max(size * FOCUS_ZOOM_SCALE, FOCUS_MIN_ZOOM); that.targetZoomDistance = Math.max(size * FOCUS_ZOOM_SCALE, FOCUS_MIN_ZOOM);
that.setFocalPoint(entityProperties.position); that.setFocalPoint(SelectionManager.worldPosition);//entityProperties.position);
that.updateCamera(); that.updateCamera();
} }
@ -184,7 +185,7 @@ EntityCameraTool = function() {
// Scale based on current zoom level // Scale based on current zoom level
dZoom *= that.targetZoomDistance * ZOOM_SCALING; dZoom *= that.targetZoomDistance * ZOOM_SCALING;
that.targetZoomDistance = Math.max(Math.min(that.targetZoomDistance + dZoom, MAX_ZOOM_DISTANCE), MIN_ZOOM_DISTANCE); that.targetZoomDistance = Math.max(that.targetZoomDistance + dZoom, MIN_ZOOM_DISTANCE);
that.updateCamera(); that.updateCamera();
} }

2793
examples/libraries/entitySelectionTool.js
View file

File diff suppressed because it is too large Load diff

17
examples/newEditEntities.js
View file

@ -21,6 +21,7 @@ Script.include("libraries/progressDialog.js");
Script.include("libraries/entitySelectionTool.js"); Script.include("libraries/entitySelectionTool.js");
var selectionDisplay = SelectionDisplay; var selectionDisplay = SelectionDisplay;
var selectionManager = SelectionManager;
Script.include("libraries/ModelImporter.js"); Script.include("libraries/ModelImporter.js");
var modelImporter = new ModelImporter(); var modelImporter = new ModelImporter();
@ -34,6 +35,8 @@ var entityPropertyDialogBox = EntityPropertyDialogBox;
Script.include("libraries/entityCameraTool.js"); Script.include("libraries/entityCameraTool.js");
var entityCameraTool = new EntityCameraTool(); var entityCameraTool = new EntityCameraTool();
selectionManager.setEventListener(selectionDisplay.updateHandles());
var windowDimensions = Controller.getViewportDimensions(); var windowDimensions = Controller.getViewportDimensions();
var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/"; var toolIconUrl = HIFI_PUBLIC_BUCKET + "images/tools/";
var toolHeight = 50; var toolHeight = 50;
@ -440,6 +443,11 @@ function mousePressEvent(event) {
orientation = MyAvatar.orientation; orientation = MyAvatar.orientation;
intersection = rayPlaneIntersection(pickRay, P, Quat.getFront(orientation)); intersection = rayPlaneIntersection(pickRay, P, Quat.getFront(orientation));
if (!event.isShifted) {
selectionManager.clearSelections();
}
selectionManager.addEntity(foundEntity);
print("Model selected selectedEntityID:" + selectedEntityID.id); print("Model selected selectedEntityID:" + selectedEntityID.id);
} }
@ -641,14 +649,21 @@ Menu.menuItemEvent.connect(handeMenuEvent);
Controller.keyReleaseEvent.connect(function (event) { Controller.keyReleaseEvent.connect(function (event) {
// since sometimes our menu shortcut keys don't work, trap our menu items here also and fire the appropriate menu items // since sometimes our menu shortcut keys don't work, trap our menu items here also and fire the appropriate menu items
print(event.text);
if (event.text == "`") { if (event.text == "`") {
handeMenuEvent("Edit Properties..."); handeMenuEvent("Edit Properties...");
} }
if (event.text == "BACKSPACE") { if (event.text == "BACKSPACE") {
handeMenuEvent("Delete"); handeMenuEvent("Delete");
} else if (event.text == "TAB") {
selectionDisplay.toggleSpaceMode();
} else if (event.text == "ESC") {
selectionDisplay.cancelTool();
} else if (event.text == "f") { } else if (event.text == "f") {
if (entitySelected) { if (entitySelected) {
entityCameraTool.focus(selectedEntityProperties); // Get latest properties
var properties = Entities.getEntityProperties(selectedEntityID);
entityCameraTool.focus(properties);
} }
} }
}); });