From 021b603dc5d985ef8d953ffb403ce56e59af2b4c Mon Sep 17 00:00:00 2001 From: hybridherbst Date: Mon, 21 Aug 2023 18:22:39 +0200 Subject: [PATCH] cleanup --- javascript/MaterialXView/source/dropHandling.js | 2 +- javascript/MaterialXView/source/index.js | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/javascript/MaterialXView/source/dropHandling.js b/javascript/MaterialXView/source/dropHandling.js index 84d1816fc5..adcbef2ca1 100644 --- a/javascript/MaterialXView/source/dropHandling.js +++ b/javascript/MaterialXView/source/dropHandling.js @@ -1,7 +1,7 @@ import * as THREE from 'three'; import * as fflate from 'three/examples/jsm/libs/fflate.module.js'; -const debugFileHandling = true; +const debugFileHandling = false; let loadingCallback; export function setLoadingCallback(cb) { diff --git a/javascript/MaterialXView/source/index.js b/javascript/MaterialXView/source/index.js index 117a192470..56e2e1f5a2 100644 --- a/javascript/MaterialXView/source/index.js +++ b/javascript/MaterialXView/source/index.js @@ -116,8 +116,11 @@ function init() console.error(Number.isInteger(err) ? this.getMx().getExceptionMessage(err) : err); }) + // allow dropping files and directories + document.addEventListener('drop', dropHandler, false); + document.addEventListener('dragover', dragOverHandler, false); + setLoadingCallback(file => { - console.log("Loading callback", file); materialFilename = file.fullPath || file.name; viewer.getEditor().clearFolders(); viewer.getMaterial().loadMaterials(viewer, materialFilename); @@ -125,14 +128,8 @@ function init() viewer.getScene().setUpdateTransforms(); }); - // allow dropping files and directories - - document.addEventListener('drop', dropHandler, false); - document.addEventListener('dragover', dragOverHandler, false); - - // enable three.js Cache + // enable three.js Cache so that dropped files can reference each other THREE.Cache.enabled = true; - window.THREE = THREE; } function onWindowResize()