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

Merge pull request #894 from AleziaKurdis/CreateApp_DEC2020

Browse source 
Create App. - Feature Bundle - Dec 2020
This commit is contained in:
Kalila 2020-12-10 17:54:10 -05:00 committed by GitHub
commit 3c44d11bfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 360 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

119
scripts/system/create/edit.js
View file

@ -41,7 +41,7 @@ Script.include([
var CreateWindow = Script.require('./modules/createWindow.js'); var CreateWindow = Script.require('./modules/createWindow.js');
var TITLE_OFFSET = 60; var TITLE_OFFSET = 60;
var CREATE_TOOLS_WIDTH = 490; var CREATE_TOOLS_WIDTH = 750;
var MAX_DEFAULT_ENTITY_LIST_HEIGHT = 942; var MAX_DEFAULT_ENTITY_LIST_HEIGHT = 942;
var ENTIRE_DOMAIN_SCAN_RADIUS = 27713; var ENTIRE_DOMAIN_SCAN_RADIUS = 27713;
@ -148,7 +148,10 @@ var DEFAULT_DIMENSIONS = {
var DEFAULT_LIGHT_DIMENSIONS = Vec3.multiply(20, DEFAULT_DIMENSIONS); var DEFAULT_LIGHT_DIMENSIONS = Vec3.multiply(20, DEFAULT_DIMENSIONS);
var SUBMENU_ENTITY_EDITOR_PREFERENCES = "Edit > Create Application - Preferences"; var MENU_IMPORT_FROM_FILE = "Import Entities (.json) From a File";
var MENU_IMPORT_FROM_URL = "Import Entities (.json) From a URL";
var MENU_CREATE_SEPARATOR = "Create Application";
var SUBMENU_ENTITY_EDITOR_PREFERENCES = "Edit > Preferences";
var MENU_AUTO_FOCUS_ON_SELECT = "Auto Focus on Select"; var MENU_AUTO_FOCUS_ON_SELECT = "Auto Focus on Select";
var MENU_EASE_ON_FOCUS = "Ease Orientation on Focus"; var MENU_EASE_ON_FOCUS = "Ease Orientation on Focus";
var MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE = "Show Lights and Particle Systems in Create Mode"; var MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE = "Show Lights and Particle Systems in Create Mode";
@ -880,13 +883,11 @@ var toolBar = (function () {
}); });
addButton("importEntitiesButton", function() { addButton("importEntitiesButton", function() {
Window.browseChanged.connect(onFileOpenChanged); importEntitiesFromFile();
Window.browseAsync("Select .json to Import", "", "*.json");
}); });
addButton("importEntitiesFromUrlButton", function() { addButton("importEntitiesFromUrlButton", function() {
Window.promptTextChanged.connect(onPromptTextChanged); importEntitiesFromUrl();
Window.promptAsync("URL of a .json to import", "");
}); });
addButton("openAssetBrowserButton", function() { addButton("openAssetBrowserButton", function() {
@ -1402,6 +1403,22 @@ function setupModelMenus() {
position: 1, position: 1,
}); });
Menu.addMenuItem({
menuName: "Edit",
menuItemName: MENU_CREATE_SEPARATOR,
isSeparator: true
});
Menu.addMenuItem({
menuName: "Edit",
menuItemName: MENU_IMPORT_FROM_FILE,
afterItem: MENU_CREATE_SEPARATOR
});
Menu.addMenuItem({
menuName: "Edit",
menuItemName: MENU_IMPORT_FROM_URL,
afterItem: MENU_IMPORT_FROM_FILE
});
Menu.addMenu(SUBMENU_ENTITY_EDITOR_PREFERENCES); Menu.addMenu(SUBMENU_ENTITY_EDITOR_PREFERENCES);
Menu.addMenuItem({ Menu.addMenuItem({
@ -1485,6 +1502,9 @@ function cleanupModelMenus() {
Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_CREATE_ENTITIES_GRABBABLE); Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_CREATE_ENTITIES_GRABBABLE);
Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_ENTITY_LIST_DEFAULT_RADIUS); Menu.removeMenuItem(SUBMENU_ENTITY_EDITOR_PREFERENCES, MENU_ENTITY_LIST_DEFAULT_RADIUS);
Menu.removeMenu(SUBMENU_ENTITY_EDITOR_PREFERENCES); Menu.removeMenu(SUBMENU_ENTITY_EDITOR_PREFERENCES);
Menu.removeMenuItem("Edit", MENU_IMPORT_FROM_URL);
Menu.removeMenuItem("Edit", MENU_IMPORT_FROM_FILE);
Menu.removeSeparator("Edit", MENU_CREATE_SEPARATOR);
} }
Script.scriptEnding.connect(function () { Script.scriptEnding.connect(function () {
@ -1858,6 +1878,10 @@ function handleMenuEvent(menuItem) {
} else if (menuItem === MENU_ENTITY_LIST_DEFAULT_RADIUS) { } else if (menuItem === MENU_ENTITY_LIST_DEFAULT_RADIUS) {
Window.promptTextChanged.connect(onPromptTextChangedDefaultRadiusUserPref); Window.promptTextChanged.connect(onPromptTextChangedDefaultRadiusUserPref);
Window.promptAsync("Entity List Default Radius (in meters)", "" + Settings.getValue(SETTING_ENTITY_LIST_DEFAULT_RADIUS, 100)); Window.promptAsync("Entity List Default Radius (in meters)", "" + Settings.getValue(SETTING_ENTITY_LIST_DEFAULT_RADIUS, 100));
} else if (menuItem === MENU_IMPORT_FROM_FILE) {
importEntitiesFromFile();
} else if (menuItem === MENU_IMPORT_FROM_URL) {
importEntitiesFromUrl();
} }
tooltip.show(false); tooltip.show(false);
} }
@ -2015,18 +2039,27 @@ function toggleKey(value) {
} }
function focusKey(value) { function focusKey(value) {
if (value === 0) { // on release if (value === 0) { // on release
cameraManager.enable(); setCameraFocusToSelection();
if (selectionManager.hasSelection()) {
cameraManager.focus(selectionManager.worldPosition, selectionManager.worldDimensions,
Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
}
} }
} }
function gridKey(value) { function gridKey(value) {
if (value === 0) { // on release if (value === 0) { // on release
if (selectionManager.hasSelection()) { alignGridToSelection();
grid.moveToSelection();
} }
}
function viewGridKey(value) {
if (value === 0) { // on release
toggleGridVisibility();
}
}
function snapKey(value) {
if (value === 0) { // on release
entityListTool.toggleSnapToGrid();
}
}
function gridToAvatarKey(value) {
if (value === 0) { // on release
alignGridToAvatar();
} }
} }
function recursiveAdd(newParentID, parentData) { function recursiveAdd(newParentID, parentData) {
@ -2426,7 +2459,6 @@ var PropertiesTool = function (opts) {
} }
} }
if (data.onlyUpdateEntities) { if (data.onlyUpdateEntities) {
blockPropertyUpdates = true; blockPropertyUpdates = true;
} else { } else {
@ -2435,6 +2467,10 @@ var PropertiesTool = function (opts) {
} }
selectionManager._update(false, this); selectionManager._update(false, this);
blockPropertyUpdates = false; blockPropertyUpdates = false;
if (data.snapToGrid !== undefined) {
entityListTool.setListMenuSnapToGrid(data.snapToGrid);
}
} else if (data.type === 'saveUserData' || data.type === 'saveMaterialData') { } else if (data.type === 'saveUserData' || data.type === 'saveMaterialData') {
data.ids.forEach(function(entityID) { data.ids.forEach(function(entityID) {
Entities.editEntity(entityID, data.properties); Entities.editEntity(entityID, data.properties);
@ -2789,7 +2825,10 @@ if (isOnMacPlatform) {
} }
mapping.from([Controller.Hardware.Keyboard.T]).to(toggleKey); mapping.from([Controller.Hardware.Keyboard.T]).to(toggleKey);
mapping.from([Controller.Hardware.Keyboard.F]).to(focusKey); mapping.from([Controller.Hardware.Keyboard.F]).to(focusKey);
mapping.from([Controller.Hardware.Keyboard.G]).to(gridKey); mapping.from([Controller.Hardware.Keyboard.J]).to(gridKey);
mapping.from([Controller.Hardware.Keyboard.G]).to(viewGridKey);
mapping.from([Controller.Hardware.Keyboard.H]).to(snapKey);
mapping.from([Controller.Hardware.Keyboard.K]).to(gridToAvatarKey);
mapping.from([Controller.Hardware.Keyboard.X]) mapping.from([Controller.Hardware.Keyboard.X])
.when([Controller.Hardware.Keyboard.Control]) .when([Controller.Hardware.Keyboard.Control])
.to(whenReleased(function() { selectionManager.cutSelectedEntities() })); .to(whenReleased(function() { selectionManager.cutSelectedEntities() }));
@ -2830,8 +2869,14 @@ keyUpEventFromUIWindow = function(keyUpEvent) {
toggleKey(pressedValue); toggleKey(pressedValue);
} else if (keyUpEvent.keyCodeString === "F") { } else if (keyUpEvent.keyCodeString === "F") {
focusKey(pressedValue); focusKey(pressedValue);
} else if (keyUpEvent.keyCodeString === "G") { } else if (keyUpEvent.keyCodeString === "J") {
gridKey(pressedValue); gridKey(pressedValue);
} else if (keyUpEvent.keyCodeString === "G") {
viewGridKey(pressedValue);
} else if (keyUpEvent.keyCodeString === "H") {
snapKey(pressedValue);
} else if (keyUpEvent.keyCodeString === "K") {
gridToAvatarKey(pressedValue);
} else if (keyUpEvent.controlKey && keyUpEvent.keyCodeString === "X") { } else if (keyUpEvent.controlKey && keyUpEvent.keyCodeString === "X") {
selectionManager.cutSelectedEntities(); selectionManager.cutSelectedEntities();
} else if (keyUpEvent.controlKey && keyUpEvent.keyCodeString === "C") { } else if (keyUpEvent.controlKey && keyUpEvent.keyCodeString === "C") {
@ -2938,4 +2983,46 @@ function getDomainOnlyChildrenIDs(id) {
return realChildren; return realChildren;
} }
function importEntitiesFromFile() {
Window.browseChanged.connect(onFileOpenChanged);
Window.browseAsync("Select .json to Import", "", "*.json");
}
function importEntitiesFromUrl() {
Window.promptTextChanged.connect(onPromptTextChanged);
Window.promptAsync("URL of a .json to import", "");
}
function setCameraFocusToSelection() {
cameraManager.enable();
if (selectionManager.hasSelection()) {
cameraManager.focus(selectionManager.worldPosition, selectionManager.worldDimensions,
Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
}
}
function alignGridToSelection() {
if (selectionManager.hasSelection()) {
if (!grid.getVisible()) {
grid.setVisible(true, true);
}
grid.moveToSelection();
}
}
function alignGridToAvatar() {
if (!grid.getVisible()) {
grid.setVisible(true, true);
}
grid.moveToAvatar();
}
function toggleGridVisibility() {
if (!grid.getVisible()) {
grid.setVisible(true, true);
} else {
grid.setVisible(false, true);
}
}
}()); // END LOCAL_SCOPE }()); // END LOCAL_SCOPE

29
scripts/system/create/entityList/entityList.js
View file

@ -146,6 +146,20 @@ EntityListTool = function(shouldUseEditTabletApp) {
}); });
}; };
that.setListMenuSnapToGrid = function (isSnapToGrid) {
emitJSONScriptEvent({ "type": "setSnapToGrid", "snap": isSnapToGrid });
};
that.toggleSnapToGrid = function () {
if (!grid.getSnapToGrid()) {
grid.setSnapToGrid(true);
emitJSONScriptEvent({ "type": "setSnapToGrid", "snap": true });
} else {
grid.setSnapToGrid(false);
emitJSONScriptEvent({ "type": "setSnapToGrid", "snap": false });
}
};
function valueIfDefined(value) { function valueIfDefined(value) {
return value !== undefined ? value : ""; return value !== undefined ? value : "";
} }
@ -381,7 +395,22 @@ EntityListTool = function(shouldUseEditTabletApp) {
}); });
} else if (data.type === 'saveColumnsConfigSetting') { } else if (data.type === 'saveColumnsConfigSetting') {
Settings.setValue(SETTING_EDITOR_COLUMNS_SETUP, data.columnsData); Settings.setValue(SETTING_EDITOR_COLUMNS_SETUP, data.columnsData);
} else if (data.type === 'importFromFile') {
importEntitiesFromFile();
} else if (data.type === 'importFromUrl') {
importEntitiesFromUrl();
} else if (data.type === 'setCameraFocusToSelection') {
setCameraFocusToSelection();
} else if (data.type === 'alignGridToSelection') {
alignGridToSelection();
} else if (data.type === 'alignGridToAvatar') {
alignGridToAvatar();
} else if (data.type === 'toggleGridVisibility') {
toggleGridVisibility();
} else if (data.type === 'toggleSnapToGrid') {
that.toggleSnapToGrid();
} }
}; };
webView.webEventReceived.connect(onWebEventReceived); webView.webEventReceived.connect(onWebEventReceived);

69
scripts/system/create/entityList/html/entityList.html
View file

@ -32,8 +32,9 @@
</div> </div>
<button id="toggle-space-mode" class="hifi-edit-button space-mode-local">Local</button> <button id="toggle-space-mode" class="hifi-edit-button space-mode-local">Local</button>
<input type="button" class="vglyph" id="hmdmultiselect" value="I" style="display: none;" /> <input type="button" class="vglyph" id="hmdmultiselect" value="I" style="display: none;" />
<input type="button" class="normal" id="selection" value="Selection..." /> <input type="button" class="normal" id="selection" value="Select&#9662;" />
<input type="button" class="normal" id="actions" value="Actions..." /> <input type="button" class="normal" id="actions" value="Edit&#9662;" />
<input type="button" class="normal" id="tools" value="Tools&#9662;" />
</div> </div>
<div id="entity-list"> <div id="entity-list">
<div id="filter-area"> <div id="filter-area">
@ -159,7 +160,7 @@
<div class="entity-list-menu" id="selection-menu" > <div class="entity-list-menu" id="selection-menu" >
<button class="menu-button" id="selectall" > <button class="menu-button" id="selectall" >
<div class = "menu-item"> <div class = "menu-item">
<div class = "menu-item-caption">Select All</div> <div class = "menu-item-caption">Select All (in List)</div>
<div class = "menu-item-shortcut">Ctrl-A</div> <div class = "menu-item-shortcut">Ctrl-A</div>
</div> </div>
</button> </button>
@ -171,7 +172,7 @@
</button> </button>
<button class="menu-button" id="selectinverse" > <button class="menu-button" id="selectinverse" >
<div class = "menu-item"> <div class = "menu-item">
<div class = "menu-item-caption">Inverse Selection</div> <div class = "menu-item-caption">Inverse Selection (in List)</div>
<div class = "menu-item-shortcut">Ctrl-I</div> <div class = "menu-item-shortcut">Ctrl-I</div>
</div> </div>
</button> </button>
@ -219,13 +220,71 @@
<div class = "menu-item-shortcut"></div> <div class = "menu-item-shortcut"></div>
</div> </div>
</button> </button>
<div class="menu-separator"></div> </div>
<div class="entity-list-menu" id="tools-menu" >
<button class="menu-button" id="setCameraFocusToSelection" >
<div class = "menu-item">
<div class = "menu-item-caption">Set Camera Focus To Selection</div>
<div class = "menu-item-shortcut">F</div>
</div>
</button>
<button class="menu-button" id="teleport-to-entity" > <button class="menu-button" id="teleport-to-entity" >
<div class = "menu-item"> <div class = "menu-item">
<div class = "menu-item-caption">Teleport To Selected Entities</div> <div class = "menu-item-caption">Teleport To Selected Entities</div>
<div class = "menu-item-shortcut"></div> <div class = "menu-item-shortcut"></div>
</div> </div>
</button> </button>
<div class="menu-separator"></div>
<button class="menu-button" id="toggleLocalWorldMode" >
<div class = "menu-item">
<div class = "menu-item-caption">Toggle Local/World Mode</div>
<div class = "menu-item-shortcut">T</div>
</div>
</button>
<div class="menu-separator"></div>
<button class="menu-button" id="exportSelectedEntities" >
<div class = "menu-item">
<div class = "menu-item-caption">Export Selected Entities</div>
<div class = "menu-item-shortcut"></div>
</div>
</button>
<button class="menu-button" id="importEntitiesFromFile" >
<div class = "menu-item">
<div class = "menu-item-caption">Import Entities (.json) From a File</div>
<div class = "menu-item-shortcut"></div>
</div>
</button>
<button class="menu-button" id="importEntitiesFromUrl" >
<div class = "menu-item">
<div class = "menu-item-caption">Import Entities (.json) From a URL</div>
<div class = "menu-item-shortcut"></div>
</div>
</button>
<div class="menu-separator"></div>
<button class="menu-button" id="gridActivator" >
<div class = "menu-item">
<div class = "menu-item-caption">Toggle Grid</div>
<div class = "menu-item-shortcut">G</div>
</div>
</button>
<button class="menu-button" id="snapToGridActivator" >
<div class = "menu-item">
<div class = "menu-item-caption" id="snapToGridActivatorCaption">Activate Snap to Grid</div>
<div class = "menu-item-shortcut">H</div>
</div>
</button>
<button class="menu-button" id="alignGridToSelection" >
<div class = "menu-item">
<div class = "menu-item-caption">Align Grid to Selected Entities</div>
<div class = "menu-item-shortcut">J</div>
</div>
</button>
<button class="menu-button" id="alignGridToAvatar" >
<div class = "menu-item">
<div class = "menu-item-caption">Align Grid to Avatar</div>
<div class = "menu-item-shortcut">K</div>
</div>
</button>
</div> </div>
<div id="menuBackgroundOverlay" ></div> <div id="menuBackgroundOverlay" ></div>
</body> </body>

191
scripts/system/create/entityList/html/js/entityList.js
View file

@ -9,8 +9,8 @@
const ASCENDING_SORT = 1; const ASCENDING_SORT = 1;
const DESCENDING_SORT = -1; const DESCENDING_SORT = -1;
const ASCENDING_STRING = '&#x25B4;'; const ASCENDING_STRING = "&#x25B4;";
const DESCENDING_STRING = '&#x25BE;'; const DESCENDING_STRING = "&#x25BE;";
const BYTES_PER_MEGABYTE = 1024 * 1024; const BYTES_PER_MEGABYTE = 1024 * 1024;
const COLLAPSE_EXTRA_INFO = "E"; const COLLAPSE_EXTRA_INFO = "E";
const EXPAND_EXTRA_INFO = "D"; const EXPAND_EXTRA_INFO = "D";
@ -34,7 +34,7 @@ function displayIfNonZero(number) {
} }
function getFilename(url) { function getFilename(url) {
let urlParts = url.split('/'); let urlParts = url.split("/");
return urlParts[urlParts.length - 1]; return urlParts[urlParts.length - 1];
} }
@ -195,7 +195,7 @@ let lastSelectedEntity;
*/ */
let entityListContextMenu = null; let entityListContextMenu = null;
let currentSortColumnID = 'type'; let currentSortColumnID = "type";
let currentSortOrder = ASCENDING_SORT; let currentSortOrder = ASCENDING_SORT;
let elSortOrders = {}; let elSortOrders = {};
let typeFilters = []; let typeFilters = [];
@ -226,6 +226,7 @@ let elEntityTable,
elToggleVisible, elToggleVisible,
elActionsMenu, elActionsMenu,
elSelectionMenu, elSelectionMenu,
elToolsMenu,
elMenuBackgroundOverlay, elMenuBackgroundOverlay,
elHmdMultiSelect, elHmdMultiSelect,
elHmdCopy, elHmdCopy,
@ -249,6 +250,16 @@ let elEntityTable,
elSelectFamily, elSelectFamily,
elSelectTopFamily, elSelectTopFamily,
elTeleportToEntity, elTeleportToEntity,
elSetCameraFocusToSelection,
elToggleLocalWorldMode,
elExportSelectedEntities,
elImportEntitiesFromFile,
elImportEntitiesFromUrl,
elGridActivator,
elSnapToGridActivator,
elSnapToGridActivatorCaption,
elAlignGridToSelection,
elAlignGridToAvatar,
elFilterTypeMultiselectBox, elFilterTypeMultiselectBox,
elFilterTypeText, elFilterTypeText,
elFilterTypeOptions, elFilterTypeOptions,
@ -268,7 +279,7 @@ let elEntityTable,
elRenameInput; elRenameInput;
const ENABLE_PROFILING = false; const ENABLE_PROFILING = false;
let profileIndent = ''; let profileIndent = "";
const PROFILE_NOOP = function(_name, fn, args) { const PROFILE_NOOP = function(_name, fn, args) {
fn.apply(this, args); fn.apply(this, args);
} ; } ;
@ -298,6 +309,7 @@ function loaded() {
elHmdMultiSelect = document.getElementById("hmdmultiselect"); elHmdMultiSelect = document.getElementById("hmdmultiselect");
elActionsMenu = document.getElementById("actions"); elActionsMenu = document.getElementById("actions");
elSelectionMenu = document.getElementById("selection"); elSelectionMenu = document.getElementById("selection");
elToolsMenu = document.getElementById("tools");
elMenuBackgroundOverlay = document.getElementById("menuBackgroundOverlay"); elMenuBackgroundOverlay = document.getElementById("menuBackgroundOverlay");
elHmdCopy = document.getElementById("hmdcopy"); elHmdCopy = document.getElementById("hmdcopy");
elHmdCut = document.getElementById("hmdcut"); elHmdCut = document.getElementById("hmdcut");
@ -320,6 +332,16 @@ function loaded() {
elSelectFamily = document.getElementById("selectfamily"); elSelectFamily = document.getElementById("selectfamily");
elSelectTopFamily = document.getElementById("selecttopfamily"); elSelectTopFamily = document.getElementById("selecttopfamily");
elTeleportToEntity = document.getElementById("teleport-to-entity"); elTeleportToEntity = document.getElementById("teleport-to-entity");
elSetCameraFocusToSelection = document.getElementById("setCameraFocusToSelection");
elToggleLocalWorldMode = document.getElementById("toggleLocalWorldMode");
elExportSelectedEntities = document.getElementById("exportSelectedEntities");
elImportEntitiesFromFile = document.getElementById("importEntitiesFromFile");
elImportEntitiesFromUrl = document.getElementById("importEntitiesFromUrl");
elGridActivator = document.getElementById("gridActivator");
elSnapToGridActivator = document.getElementById("snapToGridActivator");
elSnapToGridActivatorCaption = document.getElementById("snapToGridActivatorCaption");
elAlignGridToSelection = document.getElementById("alignGridToSelection");
elAlignGridToAvatar = document.getElementById("alignGridToAvatar");
elFilterTypeMultiselectBox = document.getElementById("filter-type-multiselect-box"); elFilterTypeMultiselectBox = document.getElementById("filter-type-multiselect-box");
elFilterTypeText = document.getElementById("filter-type-text"); elFilterTypeText = document.getElementById("filter-type-text");
elFilterTypeOptions = document.getElementById("filter-type-options"); elFilterTypeOptions = document.getElementById("filter-type-options");
@ -335,17 +357,17 @@ function loaded() {
elNoEntitiesMessage = document.getElementById("no-entities"); elNoEntitiesMessage = document.getElementById("no-entities");
elColumnsMultiselectBox = document.getElementById("entity-table-columns-multiselect-box"); elColumnsMultiselectBox = document.getElementById("entity-table-columns-multiselect-box");
elColumnsOptions = document.getElementById("entity-table-columns-options"); elColumnsOptions = document.getElementById("entity-table-columns-options");
elToggleSpaceMode = document.getElementById('toggle-space-mode'); elToggleSpaceMode = document.getElementById("toggle-space-mode");
document.body.onclick = onBodyClick; document.body.onclick = onBodyClick;
elToggleLocked.onclick = function() { elToggleLocked.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'toggleLocked' })); EventBridge.emitWebEvent(JSON.stringify({ type: "toggleLocked" }));
}; };
elToggleVisible.onclick = function() { elToggleVisible.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'toggleVisible' })); EventBridge.emitWebEvent(JSON.stringify({ type: "toggleVisible" }));
}; };
elExport.onclick = function() { elExport.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'export'})); EventBridge.emitWebEvent(JSON.stringify({ type: "export"}));
}; };
elHmdMultiSelect.onclick = function() { elHmdMultiSelect.onclick = function() {
if (hmdMultiSelectMode) { if (hmdMultiSelectMode) {
@ -355,7 +377,7 @@ function loaded() {
elHmdMultiSelect.className = "white vglyph"; elHmdMultiSelect.className = "white vglyph";
hmdMultiSelectMode = true; hmdMultiSelectMode = true;
} }
EventBridge.emitWebEvent(JSON.stringify({ type: 'hmdMultiSelectMode', value: hmdMultiSelectMode })); EventBridge.emitWebEvent(JSON.stringify({ type: "hmdMultiSelectMode", value: hmdMultiSelectMode }));
}; };
elActionsMenu.onclick = function() { elActionsMenu.onclick = function() {
document.getElementById("menuBackgroundOverlay").style.display = "block"; document.getElementById("menuBackgroundOverlay").style.display = "block";
@ -365,47 +387,51 @@ function loaded() {
document.getElementById("menuBackgroundOverlay").style.display = "block"; document.getElementById("menuBackgroundOverlay").style.display = "block";
document.getElementById("selection-menu").style.display = "block"; document.getElementById("selection-menu").style.display = "block";
}; };
elToolsMenu.onclick = function() {
document.getElementById("menuBackgroundOverlay").style.display = "block";
document.getElementById("tools-menu").style.display = "block";
};
elMenuBackgroundOverlay.onclick = function() { elMenuBackgroundOverlay.onclick = function() {
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elHmdCopy.onclick = function() { elHmdCopy.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'copy' })); EventBridge.emitWebEvent(JSON.stringify({ type: "copy" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elHmdCut.onclick = function() { elHmdCut.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'cut' })); EventBridge.emitWebEvent(JSON.stringify({ type: "cut" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elHmdPaste.onclick = function() { elHmdPaste.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'paste' })); EventBridge.emitWebEvent(JSON.stringify({ type: "paste" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elHmdDuplicate.onclick = function() { elHmdDuplicate.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'duplicate' })); EventBridge.emitWebEvent(JSON.stringify({ type: "duplicate" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elParent.onclick = function() { elParent.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'parent' })); EventBridge.emitWebEvent(JSON.stringify({ type: "parent" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elUnparent.onclick = function() { elUnparent.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'unparent' })); EventBridge.emitWebEvent(JSON.stringify({ type: "unparent" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elUndo.onclick = function() { elUndo.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'undo' })); EventBridge.emitWebEvent(JSON.stringify({ type: "undo" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elRedo.onclick = function() { elRedo.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'redo' })); EventBridge.emitWebEvent(JSON.stringify({ type: "redo" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elDelete.onclick = function() { elDelete.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'delete' })); EventBridge.emitWebEvent(JSON.stringify({ type: "delete" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elMoveEntitySelectionToAvatar.onclick = function() { elMoveEntitySelectionToAvatar.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'moveEntitySelectionToAvatar' })); EventBridge.emitWebEvent(JSON.stringify({ type: "moveEntitySelectionToAvatar" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elSelectAll.onclick = function() { elSelectAll.onclick = function() {
@ -467,39 +493,75 @@ function loaded() {
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elSelectAllInBox.onclick = function() { elSelectAllInBox.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'selectAllInBox' })); EventBridge.emitWebEvent(JSON.stringify({ type: "selectAllInBox" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elSelectAllTouchingBox.onclick = function() { elSelectAllTouchingBox.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'selectAllTouchingBox' })); EventBridge.emitWebEvent(JSON.stringify({ type: "selectAllTouchingBox" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elSelectParent.onclick = function() { elSelectParent.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'selectParent' })); EventBridge.emitWebEvent(JSON.stringify({ type: "selectParent" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elSelectTopParent.onclick = function() { elSelectTopParent.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'selectTopParent' })); EventBridge.emitWebEvent(JSON.stringify({ type: "selectTopParent" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elAddChildrenToSelection.onclick = function() { elAddChildrenToSelection.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'addChildrenToSelection' })); EventBridge.emitWebEvent(JSON.stringify({ type: "addChildrenToSelection" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elSelectFamily.onclick = function() { elSelectFamily.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'selectFamily' })); EventBridge.emitWebEvent(JSON.stringify({ type: "selectFamily" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elSelectTopFamily.onclick = function() { elSelectTopFamily.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'selectTopFamily' })); EventBridge.emitWebEvent(JSON.stringify({ type: "selectTopFamily" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elTeleportToEntity.onclick = function () { elTeleportToEntity.onclick = function () {
EventBridge.emitWebEvent(JSON.stringify({ type: "teleportToEntity" })); EventBridge.emitWebEvent(JSON.stringify({ type: "teleportToEntity" }));
closeAllEntityListMenu(); closeAllEntityListMenu();
}; };
elSetCameraFocusToSelection.onclick = function () {
EventBridge.emitWebEvent(JSON.stringify({ type: "setCameraFocusToSelection" }));
closeAllEntityListMenu();
};
elToggleLocalWorldMode.onclick = function () {
EventBridge.emitWebEvent(JSON.stringify({ type: "toggleSpaceMode" }));
closeAllEntityListMenu();
};
elExportSelectedEntities.onclick = function () {
EventBridge.emitWebEvent(JSON.stringify({ type: "export"}));
closeAllEntityListMenu();
};
elImportEntitiesFromFile.onclick = function () {
EventBridge.emitWebEvent(JSON.stringify({ type: "importFromFile"}));
closeAllEntityListMenu();
};
elImportEntitiesFromUrl.onclick = function () {
EventBridge.emitWebEvent(JSON.stringify({ type: "importFromUrl"}));
closeAllEntityListMenu();
};
elGridActivator.onclick = function () {
EventBridge.emitWebEvent(JSON.stringify({ type: "toggleGridVisibility" }));
closeAllEntityListMenu();
};
elSnapToGridActivator.onclick = function () {
EventBridge.emitWebEvent(JSON.stringify({ type: "toggleSnapToGrid" }));
closeAllEntityListMenu();
};
elAlignGridToSelection.onclick = function () {
EventBridge.emitWebEvent(JSON.stringify({ type: "alignGridToSelection" }));
closeAllEntityListMenu();
};
elAlignGridToAvatar.onclick = function () {
EventBridge.emitWebEvent(JSON.stringify({ type: "alignGridToAvatar" }));
closeAllEntityListMenu();
};
elToggleSpaceMode.onclick = function() { elToggleSpaceMode.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'toggleSpaceMode' })); EventBridge.emitWebEvent(JSON.stringify({ type: "toggleSpaceMode" }));
}; };
elRefresh.onclick = refreshEntities; elRefresh.onclick = refreshEntities;
elFilterTypeMultiselectBox.onclick = onToggleTypeDropdown; elFilterTypeMultiselectBox.onclick = onToggleTypeDropdown;
@ -517,11 +579,11 @@ function loaded() {
let type = FILTER_TYPES[i]; let type = FILTER_TYPES[i];
let typeFilterID = "filter-type-" + type; let typeFilterID = "filter-type-" + type;
let elDiv = document.createElement('div'); let elDiv = document.createElement("div");
elDiv.onclick = onToggleTypeFilter; elDiv.onclick = onToggleTypeFilter;
elFilterTypeOptions.insertBefore(elDiv, elFilterTypeOptionsButtons); elFilterTypeOptions.insertBefore(elDiv, elFilterTypeOptionsButtons);
let elInput = document.createElement('input'); let elInput = document.createElement("input");
elInput.setAttribute("type", "checkbox"); elInput.setAttribute("type", "checkbox");
elInput.setAttribute("id", typeFilterID); elInput.setAttribute("id", typeFilterID);
elInput.setAttribute("filterType", type); elInput.setAttribute("filterType", type);
@ -529,12 +591,12 @@ function loaded() {
elFilterTypeInputs[type] = elInput; elFilterTypeInputs[type] = elInput;
elDiv.appendChild(elInput); elDiv.appendChild(elInput);
let elLabel = document.createElement('label'); let elLabel = document.createElement("label");
elLabel.setAttribute("for", typeFilterID); elLabel.setAttribute("for", typeFilterID);
elLabel.innerText = type; elLabel.innerText = type;
elDiv.appendChild(elLabel); elDiv.appendChild(elLabel);
let elSpan = document.createElement('span'); let elSpan = document.createElement("span");
elSpan.setAttribute("class", "typeIcon"); elSpan.setAttribute("class", "typeIcon");
elSpan.innerHTML = ENTITY_TYPE_ICON[type]; elSpan.innerHTML = ENTITY_TYPE_ICON[type];
@ -567,11 +629,11 @@ function loaded() {
elTh.innerText = columnData.columnHeader; elTh.innerText = columnData.columnHeader;
} }
elTh.onmousedown = function(event) { elTh.onmousedown = function(event) {
if (event.target.nodeName === 'TH') { if (event.target.nodeName === "TH") {
elTargetTh = event.target; elTargetTh = event.target;
targetColumnIndex = parseInt(elTargetTh.getAttribute("columnIndex")); targetColumnIndex = parseInt(elTargetTh.getAttribute("columnIndex"));
lastColumnSwapPosition = event.clientX; lastColumnSwapPosition = event.clientX;
} else if (event.target.nodeName === 'SPAN') { } else if (event.target.nodeName === "SPAN") {
elTargetSpan = event.target; elTargetSpan = event.target;
} }
initialThEvent = event; initialThEvent = event;
@ -594,18 +656,18 @@ function loaded() {
if (columnData.alwaysShown !== true) { if (columnData.alwaysShown !== true) {
let columnDropdownID = "entity-table-column-" + columnID; let columnDropdownID = "entity-table-column-" + columnID;
let elDiv = document.createElement('div'); let elDiv = document.createElement("div");
elDiv.onclick = onToggleColumn; elDiv.onclick = onToggleColumn;
elColumnsOptions.appendChild(elDiv); elColumnsOptions.appendChild(elDiv);
let elInput = document.createElement('input'); let elInput = document.createElement("input");
elInput.setAttribute("type", "checkbox"); elInput.setAttribute("type", "checkbox");
elInput.setAttribute("id", columnDropdownID); elInput.setAttribute("id", columnDropdownID);
elInput.setAttribute("columnID", columnID); elInput.setAttribute("columnID", columnID);
elInput.checked = columnData.initiallyShown === true; elInput.checked = columnData.initiallyShown === true;
elDiv.appendChild(elInput); elDiv.appendChild(elInput);
let elLabel = document.createElement('label'); let elLabel = document.createElement("label");
elLabel.setAttribute("for", columnDropdownID); elLabel.setAttribute("for", columnDropdownID);
elLabel.innerText = columnData.dropdownLabel; elLabel.innerText = columnData.dropdownLabel;
elDiv.appendChild(elLabel); elDiv.appendChild(elLabel);
@ -640,7 +702,7 @@ function loaded() {
let elCell = entity.elRow.childNodes[getColumnIndex("name")]; let elCell = entity.elRow.childNodes[getColumnIndex("name")];
elRenameInput = document.createElement("input"); elRenameInput = document.createElement("input");
elRenameInput.setAttribute('class', 'rename-entity'); elRenameInput.setAttribute("class", "rename-entity");
elRenameInput.value = entity.name; elRenameInput.value = entity.name;
let ignoreClicks = function(event) { let ignoreClicks = function(event) {
event.stopPropagation(); event.stopPropagation();
@ -705,22 +767,22 @@ function loaded() {
entityListContextMenu.setOnSelectedCallback(function(optionName, selectedEntityID) { entityListContextMenu.setOnSelectedCallback(function(optionName, selectedEntityID) {
switch (optionName) { switch (optionName) {
case "Cut": case "Cut":
EventBridge.emitWebEvent(JSON.stringify({ type: 'cut' })); EventBridge.emitWebEvent(JSON.stringify({ type: "cut" }));
break; break;
case "Copy": case "Copy":
EventBridge.emitWebEvent(JSON.stringify({ type: 'copy' })); EventBridge.emitWebEvent(JSON.stringify({ type: "copy" }));
break; break;
case "Paste": case "Paste":
EventBridge.emitWebEvent(JSON.stringify({ type: 'paste' })); EventBridge.emitWebEvent(JSON.stringify({ type: "paste" }));
break; break;
case "Rename": case "Rename":
startRenamingEntity(selectedEntityID); startRenamingEntity(selectedEntityID);
break; break;
case "Duplicate": case "Duplicate":
EventBridge.emitWebEvent(JSON.stringify({ type: 'duplicate' })); EventBridge.emitWebEvent(JSON.stringify({ type: "duplicate" }));
break; break;
case "Delete": case "Delete":
EventBridge.emitWebEvent(JSON.stringify({ type: 'delete' })); EventBridge.emitWebEvent(JSON.stringify({ type: "delete" }));
break; break;
} }
}); });
@ -744,11 +806,11 @@ function loaded() {
})); }));
} }
let enabledContextMenuItems = ['Copy', 'Paste', 'Duplicate']; let enabledContextMenuItems = ["Copy", "Paste", "Duplicate"];
if (entitiesByID[entityID] && !entitiesByID[entityID].locked) { if (entitiesByID[entityID] && !entitiesByID[entityID].locked) {
enabledContextMenuItems.push('Cut'); enabledContextMenuItems.push("Cut");
enabledContextMenuItems.push('Rename'); enabledContextMenuItems.push("Rename");
enabledContextMenuItems.push('Delete'); enabledContextMenuItems.push("Delete");
} }
entityListContextMenu.open(clickEvent, entityID, enabledContextMenuItems); entityListContextMenu.open(clickEvent, entityID, enabledContextMenuItems);
@ -947,7 +1009,7 @@ function loaded() {
if (id === deletedIDs[i]) { if (id === deletedIDs[i]) {
let elRow = entities[j].elRow; let elRow = entities[j].elRow;
if (elRow) { if (elRow) {
elRow.className = ''; elRow.className = "";
elRow.dataset.entityID = EMPTY_ENTITY_ID; elRow.dataset.entityID = EMPTY_ENTITY_ID;
} }
entities.splice(j, 1); entities.splice(j, 1);
@ -1030,7 +1092,7 @@ function loaded() {
} }
function refreshEntities() { function refreshEntities() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'refresh' })); EventBridge.emitWebEvent(JSON.stringify({ type: "refresh" }));
} }
function refreshFooter() { function refreshFooter() {
@ -1057,7 +1119,7 @@ function loaded() {
if (entity !== undefined) { if (entity !== undefined) {
entity.selected = false; entity.selected = false;
if (entity.elRow) { if (entity.elRow) {
entity.elRow.className = ''; entity.elRow.className = "";
} }
} }
}); });
@ -1071,9 +1133,9 @@ function loaded() {
entity.selected = true; entity.selected = true;
if (entity.elRow) { if (entity.elRow) {
if (id === lastSelectedEntity) { if (id === lastSelectedEntity) {
entity.elRow.className = 'last-selected'; entity.elRow.className = "last-selected";
} else { } else {
entity.elRow.className = 'selected'; entity.elRow.className = "selected";
} }
} }
} else { } else {
@ -1144,12 +1206,12 @@ function loaded() {
// if this entity was previously selected flag it's row as selected // if this entity was previously selected flag it's row as selected
if (itemData.selected) { if (itemData.selected) {
if (itemData.id === lastSelectedEntity) { if (itemData.id === lastSelectedEntity) {
elRow.className = 'last-selected'; elRow.className = "last-selected";
} else { } else {
elRow.className = 'selected'; elRow.className = "selected";
} }
} else { } else {
elRow.className = ''; elRow.className = "";
} }
// if this row previously had an associated entity ID that wasn't the new entity ID then clear // if this row previously had an associated entity ID that wasn't the new entity ID then clear
@ -1202,9 +1264,9 @@ function loaded() {
} }
function onRadiusChange() { function onRadiusChange() {
elFilterRadius.value = elFilterRadius.value.replace(/[^0-9]/g, ''); elFilterRadius.value = elFilterRadius.value.replace(/[^0-9]/g, "");
elFilterRadius.value = Math.max(elFilterRadius.value, 0); elFilterRadius.value = Math.max(elFilterRadius.value, 0);
EventBridge.emitWebEvent(JSON.stringify({ type: 'radius', radius: elFilterRadius.value })); EventBridge.emitWebEvent(JSON.stringify({ type: "radius", radius: elFilterRadius.value }));
refreshEntities(); refreshEntities();
} }
@ -1425,7 +1487,7 @@ function loaded() {
} }
if (isColumnsSettingLoaded) { if (isColumnsSettingLoaded) {
EventBridge.emitWebEvent(JSON.stringify({ type: 'saveColumnsConfigSetting', columnsData: columns })); EventBridge.emitWebEvent(JSON.stringify({ type: "saveColumnsConfigSetting", columnsData: columns }));
} }
entityList.refresh(); entityList.refresh();
@ -1628,7 +1690,7 @@ function loaded() {
} }
EventBridge.emitWebEvent(JSON.stringify({ EventBridge.emitWebEvent(JSON.stringify({
type: 'keyUpEvent', type: "keyUpEvent",
keyUpEvent: { keyUpEvent: {
code, code,
key, key,
@ -1673,6 +1735,12 @@ function loaded() {
removeEntities(data.ids); removeEntities(data.ids);
} else if (data.type === "setSpaceMode") { } else if (data.type === "setSpaceMode") {
setSpaceMode(data.spaceMode); setSpaceMode(data.spaceMode);
} else if (data.type === "setSnapToGrid") {
if (data.snap) {
elSnapToGridActivatorCaption.innerHTML = "&#x2713; Deactivate Snap to Grid";
} else {
elSnapToGridActivatorCaption.innerHTML = "Activate Snap to Grid";
}
} else if (data.type === "confirmHMDstate") { } else if (data.type === "confirmHMDstate") {
if (data.isHmd) { if (data.isHmd) {
document.getElementById("hmdmultiselect").style.display = "inline"; document.getElementById("hmdmultiselect").style.display = "inline";
@ -1722,7 +1790,7 @@ function loaded() {
} }
} }
} else { } else {
EventBridge.emitWebEvent(JSON.stringify({ type: 'saveColumnsConfigSetting', columnsData: "" })); EventBridge.emitWebEvent(JSON.stringify({ type: "saveColumnsConfigSetting", columnsData: "" }));
} }
} }
isColumnsSettingLoaded = true; isColumnsSettingLoaded = true;
@ -1735,7 +1803,7 @@ function loaded() {
window.addEventListener("resize", updateColumnWidths); window.addEventListener("resize", updateColumnWidths);
EventBridge.emitWebEvent(JSON.stringify({ type: 'loadConfigSetting' })); EventBridge.emitWebEvent(JSON.stringify({ type: "loadConfigSetting" }));
}); });
augmentSpinButtons(); augmentSpinButtons();
@ -1758,6 +1826,7 @@ function loaded() {
document.getElementById("menuBackgroundOverlay").style.display = "none"; document.getElementById("menuBackgroundOverlay").style.display = "none";
document.getElementById("selection-menu").style.display = "none"; document.getElementById("selection-menu").style.display = "none";
document.getElementById("actions-menu").style.display = "none"; document.getElementById("actions-menu").style.display = "none";
document.getElementById("tools-menu").style.display = "none";
} }
} }

10
scripts/system/create/qml/EditToolsTabView.qml
View file

@ -210,8 +210,8 @@ TabBar {
text: "Import Entities (.json) from a File" text: "Import Entities (.json) from a File"
color: hifi.buttons.black color: hifi.buttons.black
colorScheme: hifi.colorSchemes.dark colorScheme: hifi.colorSchemes.dark
anchors.right: parent.horizontalCenter anchors.right: parent.right
anchors.rightMargin: 10 anchors.rightMargin: 55
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 55 anchors.leftMargin: 55
anchors.top: assetServerButton.bottom anchors.top: assetServerButton.bottom
@ -231,9 +231,9 @@ TabBar {
colorScheme: hifi.colorSchemes.dark colorScheme: hifi.colorSchemes.dark
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 55 anchors.rightMargin: 55
anchors.left: parent.horizontalCenter anchors.left: parent.left
anchors.leftMargin: 10 anchors.leftMargin: 55
anchors.top: assetServerButton.bottom anchors.top: importButton.bottom
anchors.topMargin: 20 anchors.topMargin: 20
onClicked: { onClicked: {
editRoot.sendToScript({ editRoot.sendToScript({

2
scripts/system/html/css/edit-style.css
View file

@ -404,7 +404,7 @@ input[type=button], button.hifi-edit-button {
text-transform: uppercase; text-transform: uppercase;
vertical-align: top; vertical-align: top;
height: 28px; height: 28px;
min-width: 120px; min-width: 70px;
padding: 0 18px; padding: 0 18px;
margin-right: 6px; margin-right: 6px;
border-radius: 5px; border-radius: 5px;

37
scripts/system/libraries/gridTool.js
View file

@ -1,10 +1,19 @@
// gridTool.js
//
// Created by Ryan Huffman on 6 Nov 2014
// Copyright 2014 High Fidelity, Inc.
// Copyright 2020 Vircadia contributors.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
/* global keyUpEventFromUIWindow */ /* global keyUpEventFromUIWindow */
var GRID_CONTROLS_HTML_URL = Script.resolvePath('../html/gridControls.html'); var GRID_CONTROLS_HTML_URL = Script.resolvePath('../html/gridControls.html');
Grid = function() { Grid = function() {
var that = {}; var that = {};
var gridColor = { red: 0, green: 0, blue: 0 }; var gridColor = { red: 255, green: 255, blue: 255 };
var gridAlpha = 0.6; var gridAlpha = 0.6;
var origin = { x: 0, y: +MyAvatar.getJointPosition('LeftToeBase').y.toFixed(1) + 0.1, z: 0 }; var origin = { x: 0, y: +MyAvatar.getJointPosition('LeftToeBase').y.toFixed(1) + 0.1, z: 0 };
var scale = 500; var scale = 500;
@ -16,18 +25,19 @@ Grid = function() {
var snapToGrid = false; var snapToGrid = false;
var gridOverlay = Overlays.addOverlay("grid", { var gridEntityTool = Entities.addEntity({
type: "Grid",
rotation: Quat.fromPitchYawRollDegrees(90, 0, 0), rotation: Quat.fromPitchYawRollDegrees(90, 0, 0),
dimensions: { x: scale, y: scale, z: scale }, dimensions: { x: scale, y: scale, z: scale },
position: origin, position: origin,
visible: false, visible: false,
drawInFront: false, renderLayer: "world",
color: gridColor, color: gridColor,
alpha: gridAlpha, alpha: gridAlpha,
minorGridEvery: minorGridEvery, minorGridEvery: minorGridEvery,
majorGridEvery: majorGridEvery, majorGridEvery: majorGridEvery,
ignorePickIntersection: true ignorePickIntersection: true
}); }, "local");
that.visible = false; that.visible = false;
that.enabled = false; that.enabled = false;
@ -164,6 +174,14 @@ Grid = function() {
that.setPosition(newPosition); that.setPosition(newPosition);
}; };
that.moveToAvatar = function() {
var position = MyAvatar.getJointPosition("LeftFoot");
if (position.x === 0.0 && position.y === 0.0 && position.z === 0.0) {
position = MyAvatar.position;
}
that.setPosition(position);
};
that.emitUpdate = function() { that.emitUpdate = function() {
if (that.onUpdate) { if (that.onUpdate) {
that.onUpdate({ that.onUpdate({
@ -214,7 +232,7 @@ Grid = function() {
}; };
function updateGrid(noUpdate) { function updateGrid(noUpdate) {
Overlays.editOverlay(gridOverlay, { Entities.editEntity(gridEntityTool, {
position: { x: 0, y: origin.y, z: 0 }, position: { x: 0, y: origin.y, z: 0 },
visible: that.visible && that.enabled, visible: that.visible && that.enabled,
minorGridEvery: minorGridEvery, minorGridEvery: minorGridEvery,
@ -223,13 +241,14 @@ Grid = function() {
alpha: gridAlpha alpha: gridAlpha
}); });
if (!noUpdate) { if (!noUpdate) {
that.emitUpdate(); that.emitUpdate();
} }
} }
function cleanup() { function cleanup() {
Overlays.deleteOverlay(gridOverlay); Entities.deleteEntity(gridEntityTool);
} }
that.addListener = function(callback) { that.addListener = function(callback) {
@ -283,11 +302,7 @@ GridTool = function(opts) {
} else if (data.type === "action") { } else if (data.type === "action") {
var action = data.action; var action = data.action;
if (action === "moveToAvatar") { if (action === "moveToAvatar") {
var position = MyAvatar.getJointPosition("LeftFoot"); horizontalGrid.moveToAvatar();
if (position.x === 0 && position.y === 0 && position.z === 0) {
position = MyAvatar.position;
}
horizontalGrid.setPosition(position);
} else if (action === "moveToSelection") { } else if (action === "moveToSelection") {
horizontalGrid.moveToSelection(); horizontalGrid.moveToSelection();
} }