@xviewer.js/debug 1.0.5-alhpa.13 → 1.0.5-alhpa.15

package/dist/main.cjs

@@ -2651,147 +2651,6 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
   return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-class ViewerHelper extends core.ObjectInstance {
-    get outputColorSpace() {
-        return this._renderer.outputColorSpace;
-    }
-    set outputColorSpace(v) {
-        this._renderer.outputColorSpace = v;
-    }
-    get toneMapping() {
-        return this._renderer.toneMapping;
-    }
-    set toneMapping(v) {
-        this._renderer.toneMapping = v;
-    }
-    get toneMappingExposure() {
-        return this._renderer.toneMappingExposure;
-    }
-    set toneMappingExposure(v) {
-        this._renderer.toneMappingExposure = v;
-    }
-    get shadows() {
-        return this._renderer.shadowMap.enabled;
-    }
-    set shadows(v) {
-        this._renderer.shadowMap.enabled = v;
-    }
-    get backgroundBlurriness() {
-        return this._scene.backgroundBlurriness;
-    }
-    set backgroundBlurriness(v) {
-        this._scene.backgroundBlurriness = v;
-    }
-    get environment() {
-        return this._scene.environment;
-    }
-    set environment(v) {
-        this._scene.environment = v;
-    }
-    get environmentIntensity() {
-        return this._scene.environmentIntensity;
-    }
-    set environmentIntensity(v) {
-        this._scene.environmentIntensity = v;
-    }
-    get environmentRotation() {
-        return this._scene.environmentRotation;
-    }
-    set environmentRotation(v) {
-        this._scene.environmentRotation.copy(v);
-    }
-    get background() {
-        return this._scene.background;
-    }
-    set background(v) {
-        this._scene.background = v;
-    }
-    get backgroundRotation() {
-        return this._scene.backgroundRotation;
-    }
-    set backgroundRotation(v) {
-        this._scene.backgroundRotation.copy(v);
-    }
-    get targetFrameRate() {
-        return this._viewer.targetFrameRate;
-    }
-    set targetFrameRate(v) {
-        this._viewer.targetFrameRate = v;
-    }
-    constructor(viewer){
-        super();
-        this._viewer = viewer;
-        this._scene = viewer.scene;
-        this._renderer = viewer.renderer;
-    }
-}
-__decorate([
-    core.property({
-        value: {
-            SRGBColorSpace: "srgb",
-            LinearSRGBColorSpace: "srgb-linear",
-            DisplayP3ColorSpace: "display-p3",
-            LinearDisplayP3ColorSpace: "display-p3-linear"
-        }
-    })
-], ViewerHelper.prototype, "outputColorSpace", null);
-__decorate([
-    core.property({
-        value: {
-            NoToneMapping: 0,
-            LinearToneMapping: 1,
-            ReinhardToneMapping: 2,
-            CineonToneMapping: 3,
-            ACESFilmicToneMapping: 4
-        }
-    })
-], ViewerHelper.prototype, "toneMapping", null);
-__decorate([
-    core.property({
-        min: 0,
-        max: 10,
-        step: 0.01
-    })
-], ViewerHelper.prototype, "toneMappingExposure", null);
-__decorate([
-    core.property
-], ViewerHelper.prototype, "shadows", null);
-__decorate([
-    core.property({
-        min: 0,
-        max: 1,
-        step: 0.01
-    })
-], ViewerHelper.prototype, "backgroundBlurriness", null);
-__decorate([
-    core.property({
-        value: new three.Texture()
-    })
-], ViewerHelper.prototype, "environment", null);
-__decorate([
-    core.property({
-        min: 0,
-        max: 5,
-        step: 0.01
-    })
-], ViewerHelper.prototype, "environmentIntensity", null);
-__decorate([
-    core.property({
-        step: 0.01
-    })
-], ViewerHelper.prototype, "environmentRotation", null);
-__decorate([
-    core.property
-], ViewerHelper.prototype, "background", null);
-__decorate([
-    core.property({
-        step: 0.01
-    })
-], ViewerHelper.prototype, "backgroundRotation", null);
-__decorate([
-    core.property
-], ViewerHelper.prototype, "targetFrameRate", null);
-
 const vert_Sprite = `
 uniform vec4 u_transform;
 uniform vec4 u_resolution;
@@ -2828,54 +2687,49 @@ class Inspector extends core.Component {
             width: 310,
             title: "Inspector"
         }).close();
-        this._tree = this._gui.addSceneTree(this.viewer.scene);
         this._gui.addFolder("Viewer").close().hide();
         this._gui.addFolder("Component").close().hide();
         this._gui.addFolder("Material").close().hide();
         this._gui.addFolder("Other").close().hide();
-        this._inspect(new ViewerHelper(this.viewer));
+        this._inspect(viewerProperites(this.viewer));
     }
     onDestroy() {
-        if (this._tree) {
-            this._tree.destroy();
-        }
         this._gui.destroy();
         this._refCntMap.clear();
         this._targetMap.clear();
     }
     update(dt) {
         this._gui.update();
-        if (this._tree) {
-            this._tree.update();
-        }
         this._updateFolders();
     }
     resize(width, height) {
         this._spriteUniforms.u_resolution.value.set(width, height, 1 / width, 1 / height);
     }
     _renderSprite(texture, w, h) {
+        const viewer = this.viewer;
         const resolution = this._spriteUniforms.u_resolution.value;
         this._camera.viewport.set(0, resolution.y - h, w, h);
         this._spriteUniforms.u_transform.value.set(0, resolution.y - h, w, h);
         this._spriteUniforms.u_texture.value = texture;
-        this.viewer.render(null, this._sprite, this._camera, 0, 0);
-        return this.viewer.canvas;
+        viewer.render(null, this._sprite, this._camera, 0, 0);
+        return viewer.canvas;
     }
     _updateFolders() {
+        const viewer = this.viewer;
         const refCntMap = this._refCntMap;
         const setState = (v)=>{
             if (refCntMap.get(v) === -1) refCntMap.set(v, 0);
             if (refCntMap.get(v) === undefined) refCntMap.set(v, 1);
         };
         refCntMap.forEach((_, k, map)=>map.set(k, -1));
-        const { scene, componentManager } = this.viewer;
-        scene.traverse((item)=>{
+        viewer.scene.traverse((item)=>{
             if (item.material) {
                 if (Array.isArray(item.material)) item.material.forEach(setState);
                 else setState(item.material);
             }
         });
-        componentManager.traverseComponents(setState);
+        viewer.componentManager.traverseComponents(setState);
+        this.others.forEach(setState);
         refCntMap.forEach((v, k, map)=>{
             if (v === 1) {
                 this._inspect(k);
@@ -2888,11 +2742,14 @@ class Inspector extends core.Component {
     }
     _getPropertiesList(target) {
         const list = [];
-        let props = core.PropertyManager._getMergedProperties(target.constructor);
-        if (props) {
+        const addSortedProps = (props, target)=>{
             const values = propsSort(props);
             this._targetMap.set(values, target);
             list.push(values);
+        };
+        let props = core.PropertyManager._getMergedProperties(target.constructor);
+        if (props) {
+            addSortedProps(props, target);
         }
         if (target instanceof three.ShaderMaterial) {
             props = Object.create(null);
@@ -2906,9 +2763,7 @@ class Inspector extends core.Component {
                     dir: "uniforms"
                 };
             });
-            const values = propsSort(props);
-            this._targetMap.set(values, uniforms);
-            list.push(values);
+            addSortedProps(props, uniforms);
         }
         return list;
     }
@@ -2916,17 +2771,19 @@ class Inspector extends core.Component {
         let propsList = this._getPropertiesList(target);
         if (propsList.length === 0) return;
         let gui = this._gui;
-        if (target instanceof ViewerHelper) {
+        if (target.type === "Viewer") {
             gui = gui.getFolder("Viewer").show();
-        } else if (target instanceof core.Component) {
-            gui = gui.getFolder("Component").show();
-        } else if (target instanceof three.Material) {
-            gui = gui.getFolder("Material").show();
         } else {
-            gui = gui.getFolder("Other").show();
-        }
-        if (gui._title !== "Viewer") {
-            gui = gui.getFolder(target.uuid) || gui.addFolder(targetName(target), target.uuid).close();
+            if (target instanceof core.Component) {
+                gui = gui.getFolder("Component").show();
+            } else if (target instanceof three.Material) {
+                gui = gui.getFolder("Material").show();
+            } else {
+                gui = gui.getFolder("Other").show();
+            }
+            const name = targetName(target);
+            const uuid = target.uuid || name;
+            gui = gui.getFolder(uuid) || gui.addFolder(name, uuid).close();
         }
         this._addGUI(gui, propsList, target);
         return target;
@@ -3008,10 +2865,12 @@ class Inspector extends core.Component {
             u_resolution: {
                 value: new three.Vector4()
             }
-        }, this._refCntMap = new Map(), this._targetMap = new Map();
+        }, this._refCntMap = new Map(), this._targetMap = new Map(), this.others = [];
     }
 }
-Inspector.viewport = new three.Vector4();
+Inspector = __decorate([
+    core.single()
+], Inspector);
 function targetName(target) {
     return target.name || target.constructor.name || target.type;
 }
@@ -3022,6 +2881,87 @@ function propsSort(props) {
     const array1 = values.filter((v)=>v[1].dir).sort((a, b)=>order(a[1]) - order(b[1]));
     return array0.concat(array1);
 }
+function viewerProperites(viewer) {
+    const properties = {
+        outputColorSpace: {
+            get: ()=>viewer.renderer.outputColorSpace,
+            set: (v)=>viewer.renderer.outputColorSpace = v,
+            value: {
+                SRGBColorSpace: "srgb",
+                LinearSRGBColorSpace: "srgb-linear",
+                DisplayP3ColorSpace: "display-p3",
+                LinearDisplayP3ColorSpace: "display-p3-linear"
+            }
+        },
+        toneMapping: {
+            get: ()=>viewer.renderer.toneMapping,
+            set: (v)=>viewer.renderer.toneMapping = v,
+            value: {
+                NoToneMapping: 0,
+                LinearToneMapping: 1,
+                ReinhardToneMapping: 2,
+                CineonToneMapping: 3,
+                ACESFilmicToneMapping: 4
+            }
+        },
+        toneMappingExposure: {
+            get: ()=>viewer.renderer.toneMappingExposure,
+            set: (v)=>viewer.renderer.toneMappingExposure = v,
+            min: 0,
+            max: 10
+        },
+        shadows: {
+            get: ()=>viewer.renderer.shadowMap.enabled,
+            set: (v)=>viewer.renderer.shadowMap.enabled = v
+        },
+        environment: {
+            get: ()=>viewer.scene.environment,
+            set: (v)=>viewer.scene.environment = v,
+            value: new three.Texture()
+        },
+        environmentIntensity: {
+            get: ()=>viewer.scene.environmentIntensity,
+            set: (v)=>viewer.scene.environmentIntensity = v,
+            min: 0,
+            max: 5
+        },
+        environmentRotation: {
+            get: ()=>viewer.scene.environmentRotation,
+            set: (v)=>viewer.scene.environmentRotation = v
+        },
+        background: {
+            get: ()=>viewer.scene.background,
+            set: (v)=>viewer.scene.background = v
+        },
+        backgroundRotation: {
+            get: ()=>viewer.scene.backgroundRotation,
+            set: (v)=>viewer.scene.backgroundRotation = v
+        },
+        backgroundBlurriness: {
+            get: ()=>viewer.scene.backgroundBlurriness,
+            set: (v)=>viewer.scene.backgroundBlurriness = v,
+            min: 0,
+            max: 1
+        },
+        targetFrameRate: {
+            get: ()=>viewer.targetFrameRate,
+            set: (v)=>viewer.targetFrameRate = v
+        }
+    };
+    const wrapper = Object.assign(Object.create((function() {}).prototype), {
+        name: "Viewer",
+        type: "Viewer"
+    });
+    for(let k in properties){
+        const prop = properties[k];
+        Object.defineProperty(wrapper, k, {
+            get: prop.get,
+            set: prop.set
+        });
+        core.property(prop)(wrapper, k);
+    }
+    return wrapper;
+}
 const materialProperties = {
     visible: {
         order: 1
@@ -3417,6 +3357,9 @@ class Stats extends core.Component {
         super(...args), this._stats = new Stats$1(), this._dcPanel = new Panel('DC', '#ff8', '#221'), this._triPanel = new Panel("TRI", '#ff8', '#221'), this._texPanel = new Panel('TEX', '#ff8', '#221'), this._prgPanel = new Panel('PRG', '#ff8', '#221');
     }
 }
+Stats = __decorate([
+    core.single()
+], Stats);
 
 exports.GUI = GUI;
 exports.Inspector = Inspector;