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

Merge pull request #5777 from highfidelity/revert-5769-edit-js-adjustment

Browse source 
Revert "edit.js adjustment"
This commit is contained in:
Seth Alves 2015-09-11 10:59:00 -07:00
commit 59c0cb4e6a
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
examples/edit.js
View file

@ -260,6 +260,7 @@ var toolBar = (function () {
cameraManager.disable(); cameraManager.disable();
} else { } else {
hasShownPropertiesTool = false; hasShownPropertiesTool = false;
cameraManager.enable();
entityListTool.setVisible(true); entityListTool.setVisible(true);
gridTool.setVisible(true); gridTool.setVisible(true);
grid.setEnabled(true); grid.setEnabled(true);
@ -669,11 +670,15 @@ function mouseMove(event) {
lastMousePosition = { x: event.x, y: event.y }; lastMousePosition = { x: event.x, y: event.y };
highlightEntityUnderCursor(lastMousePosition, false);
idleMouseTimerId = Script.setTimeout(handleIdleMouse, IDLE_MOUSE_TIMEOUT); idleMouseTimerId = Script.setTimeout(handleIdleMouse, IDLE_MOUSE_TIMEOUT);
} }
function handleIdleMouse() { function handleIdleMouse() {
idleMouseTimerId = null; idleMouseTimerId = null;
if (isActive) {
highlightEntityUnderCursor(lastMousePosition, true);
}
} }
function highlightEntityUnderCursor(position, accurateRay) { function highlightEntityUnderCursor(position, accurateRay) {
@ -797,7 +802,6 @@ function mouseClickEvent(event) {
selectionDisplay.select(selectedEntityID, event); selectionDisplay.select(selectedEntityID, event);
if (Menu.isOptionChecked(MENU_AUTO_FOCUS_ON_SELECT)) { if (Menu.isOptionChecked(MENU_AUTO_FOCUS_ON_SELECT)) {
cameraManager.enable();
cameraManager.focus(selectionManager.worldPosition, cameraManager.focus(selectionManager.worldPosition,
selectionManager.worldDimensions, selectionManager.worldDimensions,
Menu.isOptionChecked(MENU_EASE_ON_FOCUS)); Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
@ -1138,7 +1142,6 @@ Controller.keyReleaseEvent.connect(function (event) {
} else if (event.text == "f") { } else if (event.text == "f") {
if (isActive) { if (isActive) {
if (selectionManager.hasSelection()) { if (selectionManager.hasSelection()) {
cameraManager.enable();
cameraManager.focus(selectionManager.worldPosition, cameraManager.focus(selectionManager.worldPosition,
selectionManager.worldDimensions, selectionManager.worldDimensions,
Menu.isOptionChecked(MENU_EASE_ON_FOCUS)); Menu.isOptionChecked(MENU_EASE_ON_FOCUS));

3
examples/libraries/entityList.js
View file

@ -49,7 +49,7 @@ EntityListTool = function(opts) {
var selectedIDs = []; var selectedIDs = [];
for (var i = 0; i < selectionManager.selections.length; i++) { for (var i = 0; i < selectionManager.selections.length; i++) {
selectedIDs.push(selectionManager.selections[i].id); selectedIDs.push(selectionManager.selections[i].id); // ?
} }
var data = { var data = {
@ -70,7 +70,6 @@ EntityListTool = function(opts) {
} }
selectionManager.setSelections(entityIDs); selectionManager.setSelections(entityIDs);
if (data.focus) { if (data.focus) {
cameraManager.enable();
cameraManager.focus(selectionManager.worldPosition, cameraManager.focus(selectionManager.worldPosition,
selectionManager.worldDimensions, selectionManager.worldDimensions,
Menu.isOptionChecked(MENU_EASE_ON_FOCUS)); Menu.isOptionChecked(MENU_EASE_ON_FOCUS));