Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-29 12:19:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support MTOON in Material Assistant

Browse source 
Support MTOON in Material Assistant
This commit is contained in:
Alezia Kurdis 2024-07-21 22:34:16 -04:00 committed by GitHub
parent 4a69e90035
commit d189f70b36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1736 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scripts/system/create/entityProperties/html/js/entityProperties.js
View file

@ -1841,6 +1841,7 @@ let createAppTooltip = new CreateAppTooltip();
let currentSpaceMode = PROPERTY_SPACE_MODE.LOCAL; let currentSpaceMode = PROPERTY_SPACE_MODE.LOCAL;
let zonesList = []; let zonesList = [];
let canViewAssetURLs = false; let canViewAssetURLs = false;
let maSelectedId;
function createElementFromHTML(htmlString) { function createElementFromHTML(htmlString) {
let elTemplate = document.createElement('template'); let elTemplate = document.createElement('template');
@ -3613,10 +3614,9 @@ function saveMaterialData() {
function openMaterialAssistant() { function openMaterialAssistant() {
if (materialEditor === null) { if (materialEditor === null) {
loadDataInMaUi({}); newJSONMaterialEditor();
} else {
loadDataInMaUi(materialEditor.getText());
} }
loadDataInMaUi(materialEditor.getText());
$('#uiMaterialAssistant').show(); $('#uiMaterialAssistant').show();
$('#properties-list').hide(); $('#properties-list').hide();
} }
@ -4177,7 +4177,16 @@ function handleEntitySelectionUpdate(selections, isPropertiesToolUpdate) {
const multipleSelections = currentSelections.length > 1; const multipleSelections = currentSelections.length > 1;
const hasSelectedEntityChanged = !areSetsEqual(selectedEntityIDs, previouslySelectedEntityIDs); const hasSelectedEntityChanged = !areSetsEqual(selectedEntityIDs, previouslySelectedEntityIDs);
closeMaterialAssistant(); if (selections.length === 1) {
if (maSelectedId !== selections[0].id) {
closeMaterialAssistant();
}
maSelectedId = selections[0].id;
} else {
closeMaterialAssistant();
maSelectedId = "";
}
requestZoneList(); requestZoneList();
if (selections.length === 0) { if (selections.length === 0) {

1840
scripts/system/create/entityProperties/html/js/materialAssistant.js
View file

File diff suppressed because it is too large Load diff