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

Update editEntities to always be on + use right click for select

Browse source
This commit is contained in:
Ryan Huffman 2015-01-30 09:21:27 -08:00
parent 7a849e97ec
commit cddce8f795
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
examples/editEntities.js
View file

@ -56,6 +56,11 @@ selectionManager.addEventListener(function() {
entityListTool.setVisible(true); entityListTool.setVisible(true);
hasShownPropertiesTool = true; hasShownPropertiesTool = true;
} }
if (!selectionManager.hasSelection()) {
toolBar.setActive(false);
} else {
toolBar.setActive(true);
}
}); });
var windowDimensions = Controller.getViewportDimensions(); var windowDimensions = Controller.getViewportDimensions();
@ -123,11 +128,13 @@ var toolBar = (function () {
function initialize() { function initialize() {
toolBar = new ToolBar(0, 0, ToolBar.VERTICAL); toolBar = new ToolBar(0, 0, ToolBar.VERTICAL);
// Hide active button for now - this may come back, so not deleting yet.
activeButton = toolBar.addTool({ activeButton = toolBar.addTool({
imageURL: toolIconUrl + "models-tool.svg", imageURL: toolIconUrl + "models-tool.svg",
subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT }, // subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
width: toolWidth, subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: 0, height: 0 },
height: toolHeight, width: 0,//toolWidth,
height: 0,//toolHeight,
alpha: 0.9, alpha: 0.9,
visible: true visible: true
}, true, false); }, true, false);
@ -543,19 +550,16 @@ function mouseMoveEvent(event) {
} }
mouseHasMovedSincePress = true; mouseHasMovedSincePress = true;
if (isActive) {
// 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;
}
lastMousePosition = { x: event.x, y: event.y }; // 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)) {
highlightEntityUnderCursor(lastMousePosition, false); return;
idleMouseTimerId = Script.setTimeout(handleIdleMouse, IDLE_MOUSE_TIMEOUT);
} else {
cameraManager.mouseMoveEvent(event);
} }
lastMousePosition = { x: event.x, y: event.y };
highlightEntityUnderCursor(lastMousePosition, false);
idleMouseTimerId = Script.setTimeout(handleIdleMouse, IDLE_MOUSE_TIMEOUT);
} }
function handleIdleMouse() { function handleIdleMouse() {
@ -608,7 +612,7 @@ function mouseReleaseEvent(event) {
} }
function mouseClickEvent(event) { function mouseClickEvent(event) {
if (!isActive) { if (!event.isRightButton) {
return; return;
} }
@ -619,6 +623,7 @@ function mouseClickEvent(event) {
} }
return; return;
} }
toolBar.setActive(true);
var pickRay = result.pickRay; var pickRay = result.pickRay;
var foundEntity = result.entityID; var foundEntity = result.entityID;
@ -830,6 +835,8 @@ 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
if (event.text == "BACKSPACE" || event.text == "DELETE") { if (event.text == "BACKSPACE" || event.text == "DELETE") {
deleteSelectedEntities(); deleteSelectedEntities();
} else if (event.text == "ESC") {
selectionManager.clearSelections();
} else if (event.text == "TAB") { } else if (event.text == "TAB") {
selectionDisplay.toggleSpaceMode(); selectionDisplay.toggleSpaceMode();
} else if (event.text == "f") { } else if (event.text == "f") {
@ -1082,4 +1089,4 @@ PropertiesTool = function(opts) {
}; };
propertiesTool = PropertiesTool(); propertiesTool = PropertiesTool();
toolBar.setActive(true);