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

Code adjustment

Browse source 
Accronyms in variable name that must be in uppercase.
This commit is contained in:
Alezia Kurdis 2022-07-21 16:39:40 -04:00 committed by GitHub
parent 3d48527e81
commit 87a5565e3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4472,20 +4472,20 @@ function handleEntitySelectionUpdate(selections, isPropertiesToolUpdate) {
let materialDataMultiValue = getMultiplePropertyValue("materialData"); let materialDataMultiValue = getMultiplePropertyValue("materialData");
let materialDataTextArea = getPropertyInputElement("materialData"); let materialDataTextArea = getPropertyInputElement("materialData");
let materialJson = null; let materialJSON = null;
if (!materialDataMultiValue.isMultiDiffValue) { if (!materialDataMultiValue.isMultiDiffValue) {
try { try {
materialJson = JSON.parse(materialDataMultiValue.value); materialJSON = JSON.parse(materialDataMultiValue.value);
} catch (e) { } catch (e) {
} }
} }
if (materialJson !== null && !lockedMultiValue.isMultiDiffValue && !lockedMultiValue.value) { if (materialJSON !== null && !lockedMultiValue.isMultiDiffValue && !lockedMultiValue.value) {
if (materialEditor === null) { if (materialEditor === null) {
createJSONMaterialEditor(); createJSONMaterialEditor();
} }
materialDataTextArea.classList.remove('multi-diff'); materialDataTextArea.classList.remove('multi-diff');
setMaterialEditorJSON(materialJson); setMaterialEditorJSON(materialJSON);
showSaveMaterialDataButton(); showSaveMaterialDataButton();
hideMaterialDataTextArea(); hideMaterialDataTextArea();
hideNewJSONMaterialEditorButton(); hideNewJSONMaterialEditorButton();
@ -4501,7 +4501,7 @@ function handleEntitySelectionUpdate(selections, isPropertiesToolUpdate) {
hideMaterialDataSaved(); hideMaterialDataSaved();
} }
maGetMaterialDataAssistantAvailability(materialJson); maGetMaterialDataAssistantAvailability(materialJSON);
if (hasSelectedEntityChanged && selections.length === 1 && entityTypes[0] === "Material") { if (hasSelectedEntityChanged && selections.length === 1 && entityTypes[0] === "Material") {
requestMaterialTarget(); requestMaterialTarget();

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

@ -904,19 +904,19 @@ function maGetRGB(colorArray){
* @param {string or object} materialData - json of the materialData as a string or as an object. * @param {string or object} materialData - json of the materialData as a string or as an object.
*/ */
function maGetMaterialDataAssistantAvailability(materialData) { function maGetMaterialDataAssistantAvailability(materialData) {
var materialDataJson, materialDataString; var materialDataJSON, materialDataString;
if (typeof materialData === "string") { if (typeof materialData === "string") {
materialDataJson = JSON.parse(materialData); materialDataJSON = JSON.parse(materialData);
materialDataString = materialData; materialDataString = materialData;
} else { } else {
materialDataJson = materialData; materialDataJSON = materialData;
materialDataString = JSON.stringify(materialData); materialDataString = JSON.stringify(materialData);
} }
if (getPropertyInputElement("materialURL").value === "materialData" && materialDataString.indexOf("hifi_shader_simple") === -1 && if (getPropertyInputElement("materialURL").value === "materialData" && materialDataString.indexOf("hifi_shader_simple") === -1 &&
materialDataString.indexOf("glossMap") === -1 && materialDataString.indexOf("specularMap") === -1 && materialDataString.indexOf("glossMap") === -1 && materialDataString.indexOf("specularMap") === -1 &&
materialDataString.indexOf("bumpMap") === -1 && materialDataString.indexOf("lightMap") === -1 && materialDataString.indexOf("bumpMap") === -1 && materialDataString.indexOf("lightMap") === -1 &&
materialDataString.indexOf("texCoordTransform0") === -1 && materialDataString.indexOf("texCoordTransform1") === -1 && materialDataString.indexOf("texCoordTransform0") === -1 && materialDataString.indexOf("texCoordTransform1") === -1 &&
(materialDataJson.materials === undefined || materialDataJson.materials.length <= 1 || typeof materialDataJson.materials === "object")) { (materialDataJSON.materials === undefined || materialDataJSON.materials.length <= 1 || typeof materialDataJSON.materials === "object")) {
showMaterialAssistantButton(); showMaterialAssistantButton();
} else { } else {
hideMaterialAssistantButton(); hideMaterialAssistantButton();