@woosh/meep-engine 2.48.12 → 2.48.14

package/src/view/elements/MeshPreview.js

@@ -110,91 +110,93 @@ class MeshPreview extends View {
         const self = this;
 
         this.pContents = new Promise(function (resolve, reject) {
-            assetManager.get(url, mimeType, function (asset) {
-                const mesh = asset.create();
-                const preview = makeMeshPreviewScene(mesh, size, {
-                    x0: 0,
-                    y0: 0,
-                    x1: 1,
-                    y1: 1
-                });
-                const camera = preview.camera;
-                const scene = preview.scene;
-
-
-                //wrap mesh so it stays centered relative to bb
-                const group = new Group();
-
-                const wrapAll = false;
-                if (wrapAll) {
-                    const objects = scene.children.slice();
-                    scene.children = [];
-
-                    objects.forEach(function (o) {
-                        group.add(o);
+            assetManager.get({
+                path: url, type: mimeType, callback: function (asset) {
+                    const mesh = asset.create();
+                    const preview = makeMeshPreviewScene(mesh, size, {
+                        x0: 0,
+                        y0: 0,
+                        x1: 1,
+                        y1: 1
                     });
-                } else {
-                    scene.remove(mesh);
-                    group.add(mesh);
-                }
-
+                    const camera = preview.camera;
+                    const scene = preview.scene;
 
-                scene.add(group);
 
-                self.camera = camera;
-                self.scene = scene;
+                    //wrap mesh so it stays centered relative to bb
+                    const group = new Group();
 
+                    const wrapAll = false;
+                    if (wrapAll) {
+                        const objects = scene.children.slice();
+                        scene.children = [];
 
-                if (hooks !== undefined) {
-                    if (typeof hooks.meshAdded === "function") {
-                        hooks.meshAdded(mesh);
+                        objects.forEach(function (o) {
+                            group.add(o);
+                        });
+                    } else {
+                        scene.remove(mesh);
+                        group.add(mesh);
                     }
-                    if (typeof hooks.sceneConstructed === "function") {
-                        hooks.sceneConstructed(scene, mesh, camera, group);
+
+
+                    scene.add(group);
+
+                    self.camera = camera;
+                    self.scene = scene;
+
+
+                    if (hooks !== undefined) {
+                        if (typeof hooks.meshAdded === "function") {
+                            hooks.meshAdded(mesh);
+                        }
+                        if (typeof hooks.sceneConstructed === "function") {
+                            hooks.sceneConstructed(scene, mesh, camera, group);
+                        }
                     }
-                }
 
-                mesh.rotation.y = -Math.PI / 6;
+                    mesh.rotation.y = -Math.PI / 6;
 
-                //
+                    //
 
-                function playAnimation(animationName) {
+                    function playAnimation(animationName) {
 
-                    const mixer = new AnimationMixer(mesh);
+                        const mixer = new AnimationMixer(mesh);
 
-                    let clipAction = null;
+                        let clipAction = null;
 
-                    const animations = asset.animations;
-                    if (animations !== undefined) {
-                        self.__animationMixer = mixer;
-                        for (let i = 0; i < animations.length; i++) {
-                            const animation = animations[i];
-                            if (animation.name === animationName) {
-                                const root = null;
-                                clipAction = mixer.clipAction(animation, root);
-                                //bail, correct animation found
-                                break;
+                        const animations = asset.animations;
+                        if (animations !== undefined) {
+                            self.__animationMixer = mixer;
+                            for (let i = 0; i < animations.length; i++) {
+                                const animation = animations[i];
+                                if (animation.name === animationName) {
+                                    const root = null;
+                                    clipAction = mixer.clipAction(animation, root);
+                                    //bail, correct animation found
+                                    break;
+                                }
                             }
                         }
-                    }
 
-                    if (clipAction !== null) {
-                        clipAction.play();
+                        if (clipAction !== null) {
+                            clipAction.play();
+                        }
                     }
-                }
 
 
-                if (animation !== null) {
-                    playAnimation(animation);
-                }
+                    if (animation !== null) {
+                        playAnimation(animation);
+                    }
 
-                resolve({
-                    group
-                });
+                    resolve({
+                        group
+                    });
 
-            }, function () {
-                console.error(arguments);
-                reject(arguments);
+                }, failure: function () {
+                    console.error(arguments);
+                    reject(arguments);
+                }
             });
         });
 

package/src/view/elements/image/SvgImageView.js

@@ -29,12 +29,14 @@ class SvgImageView extends View {
 
         const self = this;
 
-        assetManager.get(url, "image/svg", function (asset) {
-            const svgDom = asset.create();
-            elIcon.appendChild(svgDom);
-            resize(self.size.x, self.size.y);
-        }, function (error) {
-            console.error("Failed to load icon: " + url, error);
+        assetManager.get({
+            path: url, type: "image/svg", callback: function (asset) {
+                const svgDom = asset.create();
+                elIcon.appendChild(svgDom);
+                resize(self.size.x, self.size.y);
+            }, failure: function (error) {
+                console.error("Failed to load icon: " + url, error);
+            }
         });
 
         let currentScale = 1;

package/src/view/renderModel.js

@@ -80,7 +80,7 @@ function makeModelView(url, assetManager, size, renderer, focus) {
 
                 const assetType = guessAssetType(url);
 
-                assetManager.get(url, assetType, success, reject);
+                assetManager.get({ path: url, type: assetType, callback: success, failure: reject });
             });
 
             const task = futureTask(dataURL, "Building Image URL");