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

Merge pull request #1030 from AleziaKurdis/CreateApp_FEB2021_Bundle

Browse source 
Create App FEB2021 bundle
This commit is contained in:
Kalila 2021-02-17 16:09:57 -05:00 committed by GitHub
commit 6732628d20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 108 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -25,9 +25,10 @@
</head> </head>
<body onload='loaded();' id="entity-list-body"> <body onload='loaded();' id="entity-list-body">
<div id="entity-list-menubar"> <div id="entity-list-menubar">
<input type="button" class="normal" id="selection" value="Select&#9662;" /> <input type="button" class="entity-list-menutitle" id="actions" value="Edit&#9662;" />
<input type="button" class="normal" id="actions" value="Edit&#9662;" /> <input type="button" class="entity-list-menutitle" id="selection" value="Select&#9662;" />
<input type="button" class="normal" id="tools" value="Tools&#9662;" /> <input type="button" class="entity-list-menutitle" id="transform" value="Transform&#9662;" />
<input type="button" class="entity-list-menutitle" id="tools" value="Tools&#9662;" />
</div> </div>
<div id="entity-list-header"> <div id="entity-list-header">
<input type="button" class="glyph" id="refresh" value="F" /> <input type="button" class="glyph" id="refresh" value="F" />
@ -146,35 +147,22 @@
</div> </div>
</button> </button>
<div class="menu-separator"></div> <div class="menu-separator"></div>
<button class="menu-button" id="moveEntitySelectionToAvatar" > <button class="menu-button" id="exportSelectedEntities" >
<div class = "menu-item"> <div class = "menu-item">
<div class = "menu-item-caption">Move Selected Entities to Avatar</div> <div class = "menu-item-caption">Export 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="importEntitiesFromFile" >
<button class="menu-button" id="rotateAsTheNextClickedSurface" >
<div class = "menu-item"> <div class = "menu-item">
<div class = "menu-item-caption">Snap To Next Clicked Surface</div> <div class = "menu-item-caption">Import Entities (.json) From a File</div>
<div class = "menu-item-shortcut">0</div> <div class = "menu-item-shortcut"></div>
</div> </div>
</button> </button>
<button class="menu-button" id="quickRotate90x" > <button class="menu-button" id="importEntitiesFromUrl" >
<div class = "menu-item"> <div class = "menu-item">
<div class = "menu-item-caption">Rotate 90&deg; on X axis</div> <div class = "menu-item-caption">Import Entities (.json) From a URL</div>
<div class = "menu-item-shortcut">7</div> <div class = "menu-item-shortcut"></div>
</div>
</button>
<button class="menu-button" id="quickRotate90y" >
<div class = "menu-item">
<div class = "menu-item-caption">Rotate 90&deg; on Y axis</div>
<div class = "menu-item-shortcut">8</div>
</div>
</button>
<button class="menu-button" id="quickRotate90z" >
<div class = "menu-item">
<div class = "menu-item-caption">Rotate 90&deg; on Z axis</div>
<div class = "menu-item-shortcut">9</div>
</div> </div>
</button> </button>
</div> </div>
@ -242,6 +230,40 @@
</div> </div>
</button> </button>
</div> </div>
<div class="entity-list-menu" id="transform-menu" >
<button class="menu-button" id="moveEntitySelectionToAvatar" >
<div class = "menu-item">
<div class = "menu-item-caption">Move Selected Entities to Avatar</div>
<div class = "menu-item-shortcut"></div>
</div>
</button>
<div class="menu-separator"></div>
<button class="menu-button" id="rotateAsTheNextClickedSurface" >
<div class = "menu-item">
<div class = "menu-item-caption">Snap To Next Clicked Surface</div>
<div class = "menu-item-shortcut">0</div>
</div>
</button>
<div class="menu-separator"></div>
<button class="menu-button" id="quickRotate90x" >
<div class = "menu-item">
<div class = "menu-item-caption">Rotate 90&deg; on X axis</div>
<div class = "menu-item-shortcut">7</div>
</div>
</button>
<button class="menu-button" id="quickRotate90y" >
<div class = "menu-item">
<div class = "menu-item-caption">Rotate 90&deg; on Y axis</div>
<div class = "menu-item-shortcut">8</div>
</div>
</button>
<button class="menu-button" id="quickRotate90z" >
<div class = "menu-item">
<div class = "menu-item-caption">Rotate 90&deg; on Z axis</div>
<div class = "menu-item-shortcut">9</div>
</div>
</button>
</div>
<div class="entity-list-menu" id="tools-menu" > <div class="entity-list-menu" id="tools-menu" >
<button class="menu-button" id="setCameraFocusToSelection" > <button class="menu-button" id="setCameraFocusToSelection" >
<div class = "menu-item"> <div class = "menu-item">
@ -261,25 +283,6 @@
<div class = "menu-item-caption">Toggle Local/World Mode</div> <div class = "menu-item-caption">Toggle Local/World Mode</div>
<div class = "menu-item-shortcut">T</div> <div class = "menu-item-shortcut">T</div>
</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> </button>
<div class="menu-separator"></div> <div class="menu-separator"></div>
<button class="menu-button" id="gridActivator" > <button class="menu-button" id="gridActivator" >

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

@ -155,7 +155,15 @@ const COLUMNS = {
propertyID: "lastEdited", propertyID: "lastEdited",
initialWidth: 0.38, initialWidth: 0.38,
defaultSortOrder: DESCENDING_SORT, defaultSortOrder: DESCENDING_SORT,
}, },
urlWithPath: {
columnHeader: "URL",
dropdownLabel: "URL",
propertyID: "urlWithPath",
initialWidth: 0.54,
initiallyShown: false,
defaultSortOrder: ASCENDING_SORT,
},
}; };
const FILTER_TYPES = [ const FILTER_TYPES = [
@ -226,9 +234,10 @@ let elEntityTable,
elToggleVisible, elToggleVisible,
elActionsMenu, elActionsMenu,
elSelectionMenu, elSelectionMenu,
elToolsMenu, elTransformMenu,
elToolsMenu,
elMenuBackgroundOverlay, elMenuBackgroundOverlay,
elHmdMultiSelect, elHmdMultiSelect,
elHmdCopy, elHmdCopy,
elHmdCut, elHmdCut,
elHmdPaste, elHmdPaste,
@ -313,6 +322,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");
elTransformMenu = document.getElementById("transform");
elToolsMenu = document.getElementById("tools"); elToolsMenu = document.getElementById("tools");
elMenuBackgroundOverlay = document.getElementById("menuBackgroundOverlay"); elMenuBackgroundOverlay = document.getElementById("menuBackgroundOverlay");
elHmdCopy = document.getElementById("hmdcopy"); elHmdCopy = document.getElementById("hmdcopy");
@ -395,6 +405,10 @@ 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";
}; };
elTransformMenu.onclick = function() {
document.getElementById("menuBackgroundOverlay").style.display = "block";
document.getElementById("transform-menu").style.display = "block";
};
elToolsMenu.onclick = function() { elToolsMenu.onclick = function() {
document.getElementById("menuBackgroundOverlay").style.display = "block"; document.getElementById("menuBackgroundOverlay").style.display = "block";
document.getElementById("tools-menu").style.display = "block"; document.getElementById("tools-menu").style.display = "block";
@ -919,7 +933,7 @@ function loaded() {
entityIds: selection, entityIds: selection,
})); }));
} }
function updateEntityData(entityData) { function updateEntityData(entityData) {
entities = []; entities = [];
entitiesByID = {}; entitiesByID = {};
@ -929,13 +943,14 @@ function loaded() {
entityData.forEach(function(entity) { entityData.forEach(function(entity) {
let type = entity.type; let type = entity.type;
let filename = getFilename(entity.url); let filename = getFilename(entity.url);
let entityData = { let entityData = {
id: entity.id, id: entity.id,
name: entity.name, name: entity.name,
type: type, type: type,
url: entity.certificateID === "" ? filename : "<i>" + CERTIFIED_PLACEHOLDER + "</i>", url: entity.certificateID === "" ? filename : "<i>" + CERTIFIED_PLACEHOLDER + "</i>",
fullUrl: entity.certificateID === "" ? filename : CERTIFIED_PLACEHOLDER, fullUrl: entity.certificateID === "" ? filename : CERTIFIED_PLACEHOLDER,
urlWithPath: entity.certificateID === "" ? entity.url : "<i>" + CERTIFIED_PLACEHOLDER + "</i>",
locked: entity.locked, locked: entity.locked,
visible: entity.visible, visible: entity.visible,
certificateID: entity.certificateID, certificateID: entity.certificateID,
@ -975,11 +990,13 @@ function loaded() {
let searchFilter = searchTerm === '' || (e.name.toLowerCase().indexOf(searchTerm) > -1 || let searchFilter = searchTerm === '' || (e.name.toLowerCase().indexOf(searchTerm) > -1 ||
e.type.toLowerCase().indexOf(searchTerm) > -1 || e.type.toLowerCase().indexOf(searchTerm) > -1 ||
e.fullUrl.toLowerCase().indexOf(searchTerm) > -1 || e.fullUrl.toLowerCase().indexOf(searchTerm) > -1 ||
(e.urlWithPath.toLowerCase().indexOf(searchTerm) > -1 &&
columnsByID["urlWithPath"].elTh.style.visibility === "visible") ||
e.id.toLowerCase().indexOf(searchTerm) > -1); e.id.toLowerCase().indexOf(searchTerm) > -1);
return typeFilter && searchFilter; return typeFilter && searchFilter;
}); });
}); });
PROFILE("sort", function() { PROFILE("sort", function() {
let isAscendingSort = currentSortOrder === ASCENDING_SORT; let isAscendingSort = currentSortOrder === ASCENDING_SORT;
let isDefaultSort = currentSortOrder === COLUMNS[currentSortColumnID].defaultSortOrder; let isDefaultSort = currentSortOrder === COLUMNS[currentSortColumnID].defaultSortOrder;
@ -1850,6 +1867,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("transform-menu").style.display = "none";
document.getElementById("tools-menu").style.display = "none"; document.getElementById("tools-menu").style.display = "none";
} }

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

@ -1364,10 +1364,46 @@ div#grid-section, body#entity-list-body {
} }
#entity-list-menubar { #entity-list-menubar {
margin: 0px -8px 6px -8px; margin: 0px -8px 6px -8px;
padding: 0px 8px 0px 8px; padding: 0px 9px 0px 9px;
border: none; border: none;
background-color: #000; background-color: #000;
background: linear-gradient(#343434 20%, #000 100%); background: linear-gradient(#343434 30%, #000 100%);
}
input[type=button].entity-list-menutitle {
font-family: FiraSans-SemiBold;
font-size: 15px;
text-transform: none;
vertical-align: top;
height: 28px;
min-width: 30px;
padding: 0px 8px;
margin-right: 6px;
border-radius: 5px;
border: none;
color: #fff;
background-color: #000;
background: linear-gradient(#343434 30%, #000 100%);
cursor: pointer;
}
input[type=button].entity-list-menutitle:enabled:hover {
background: linear-gradient(#000, #000);
border: none;
}
input[type=button].entity-list-menutitle:active {
background: linear-gradient(#343434, #343434);
}
input[type=button].entity-list-menutitle:disabled {
color: #252525;
background: linear-gradient(#575757 30%, #252525 100%);
}
input[type=button].entity-list-menutitle[pressed=pressed] {
color: #00b4ef;
}
input[type=button].entity-list-menutitle:focus {
outline: none;
color: #000000;
background: linear-gradient(#c0c0c0, #c0c0c0);
border-radius: 5px 5px 0px 0px;
} }
.icon-input-radius input { .icon-input-radius input {
position: relative; position: relative;