Update to latest engine, bump package version (#305)

playcanvas · Sep 18, 2024 · 78f9208 · 78f9208
1 parent 830428e
commit 78f9208
Show file tree

Hide file tree

Showing 10 changed files with 527 additions and 526 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,97 +1,101 @@
 {
-  "name": "model-viewer",
-  "version": "4.13.0",
-  "author": "PlayCanvas<[email protected]>",
-  "homepage": "https://playcanvas.com",
-  "description": "PlayCanvas glTF Viewer",
-  "keywords": [
-    "2d",
-    "3d",
-    "html5",
-    "gltf",
-    "webgl",
-    "webgl2",
-    "viewer"
-  ],
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/playcanvas/model-viewer/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/playcanvas/model-viewer.git"
-  },
-  "eslintConfig": {
-    "root": true,
-    "parser": "@typescript-eslint/parser",
-    "plugins": [
-      "@typescript-eslint"
+    "name": "model-viewer",
+    "version": "4.14.0",
+    "author": "PlayCanvas<[email protected]>",
+    "homepage": "https://playcanvas.com",
+    "description": "PlayCanvas glTF Viewer",
+    "keywords": [
+        "2d",
+        "3d",
+        "html5",
+        "gltf",
+        "webgl",
+        "webgl2",
+        "viewer"
     ],
-    "extends": [
-      "@playcanvas/eslint-config",
-      "plugin:@typescript-eslint/recommended",
-      "plugin:import/typescript"
-    ],
-    "rules": {
-      "@typescript-eslint/ban-ts-comment": 0,
-      "@typescript-eslint/no-explicit-any": 0,
-      "@typescript-eslint/explicit-module-boundary-types": 0,
-      "lines-between-class-members": [
-        "error",
-        "always",
-        {
-          "exceptAfterSingleLine": true
-        }
-      ],
-      "import/no-unresolved": "off",
-      "import/extensions": [
-        "error",
-        "ignorePackages",
-        {
-          "ts": "never",
-          "tsx": "never"
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/playcanvas/model-viewer/issues"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/playcanvas/model-viewer.git"
+    },
+    "eslintConfig": {
+        "root": true,
+        "parser": "@typescript-eslint/parser",
+        "plugins": [
+            "@typescript-eslint"
+        ],
+        "extends": [
+            "@playcanvas/eslint-config",
+            "plugin:@typescript-eslint/recommended",
+            "plugin:import/typescript"
+        ],
+        "rules": {
+            "@typescript-eslint/ban-ts-comment": 0,
+            "@typescript-eslint/no-explicit-any": 0,
+            "@typescript-eslint/explicit-module-boundary-types": 0,
+            "lines-between-class-members": [
+                "error",
+                "always",
+                {
+                    "exceptAfterSingleLine": true
+                }
+            ],
+            "import/no-unresolved": "off",
+            "import/extensions": [
+                "error",
+                "ignorePackages",
+                {
+                    "ts": "never",
+                    "tsx": "never"
+                }
+            ],
+            "indent": [
+                "warn",
+                4
+            ]
         }
-      ]
+    },
+    "devDependencies": {
+        "@playcanvas/eslint-config": "^1.7.1",
+        "@playcanvas/observer": "^1.5.1",
+        "@playcanvas/pcui": "^4.4.0",
+        "@rollup/plugin-alias": "^5.1.0",
+        "@rollup/plugin-commonjs": "^26.0.1",
+        "@rollup/plugin-image": "^3.0.3",
+        "@rollup/plugin-json": "^6.1.0",
+        "@rollup/plugin-node-resolve": "^15.2.3",
+        "@rollup/plugin-replace": "^5.0.7",
+        "@rollup/plugin-terser": "^0.4.4",
+        "@rollup/plugin-typescript": "^11.1.6",
+        "@types/react": "^18.3.7",
+        "@types/react-dom": "^18.3.0",
+        "@typescript-eslint/eslint-plugin": "^7.14.1",
+        "@typescript-eslint/parser": "^7.14.1",
+        "concurrently": "^9.0.1",
+        "cross-env": "^7.0.3",
+        "eslint": "^8.56.0",
+        "playcanvas": "^1.74.0",
+        "qrious": "^4.0.2",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
+        "react-visibility-sensor": "^5.1.1",
+        "rollup": "^4.21.3",
+        "rollup-plugin-sass": "^1.13.2",
+        "serve": "^14.2.3",
+        "tslib": "^2.7.0",
+        "typescript": "^5.6.2"
+    },
+    "scripts": {
+        "build": "rollup -c",
+        "watch": "rollup -c -w",
+        "serve": "serve dist",
+        "develop": "cross-env concurrently --kill-others \"npm run watch\" \"npm run serve\"",
+        "develop:local": "cross-env ENGINE_PATH=../engine npm run develop",
+        "build:local": "cross-env ENGINE_PATH=../engine npm run build",
+        "watch:local": "cross-env ENGINE_PATH=../engine npm run watch",
+        "lint": "eslint --ext .ts src"
     }
-  },
-  "devDependencies": {
-    "@playcanvas/eslint-config": "^1.7.1",
-    "@playcanvas/observer": "^1.5.1",
-    "@playcanvas/pcui": "^4.4.0",
-    "@rollup/plugin-alias": "^5.1.0",
-    "@rollup/plugin-commonjs": "^26.0.1",
-    "@rollup/plugin-image": "^3.0.3",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-replace": "^5.0.7",
-    "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^11.1.6",
-    "@types/react": "^18.3.3",
-    "@types/react-dom": "^18.3.0",
-    "@typescript-eslint/eslint-plugin": "^7.14.1",
-    "@typescript-eslint/parser": "^7.14.1",
-    "concurrently": "^8.2.2",
-    "cross-env": "^7.0.3",
-    "eslint": "^8.56.0",
-    "playcanvas": "^1.72.0",
-    "qrious": "^4.0.2",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-visibility-sensor": "^5.1.1",
-    "rollup": "^4.18.0",
-    "rollup-plugin-sass": "^1.13.0",
-    "serve": "^14.2.3",
-    "tslib": "^2.6.3",
-    "typescript": "^5.5.2"
-  },
-  "scripts": {
-    "build": "rollup -c",
-    "watch": "rollup -c -w",
-    "serve": "serve dist",
-    "develop": "cross-env concurrently --kill-others \"npm run watch\" \"npm run serve\"",
-    "develop:local": "cross-env ENGINE_PATH=../engine npm run develop",
-    "build:local": "cross-env ENGINE_PATH=../engine npm run build",
-    "watch:local": "cross-env ENGINE_PATH=../engine npm run watch",
-    "lint": "eslint --ext .ts src"
-  }
-}
+}
diff --git a/src/cameras/multi-camera.ts b/src/cameras/multi-camera.ts
@@ -1,4 +1,5 @@
 import { Entity, Vec2, Vec3, Ray, Plane, math } from 'playcanvas';
+
 import { BaseCamera } from './base-camera';
 
 type PointerMoveEvent = PointerEvent & {

diff --git a/src/debug-lines.ts b/src/debug-lines.ts
@@ -26,6 +26,7 @@ import {
     VertexIterator,
     WebglGraphicsDevice
 } from 'playcanvas';
+
 import { App } from './app';
 
 let debugLayerFront: Layer = null;

diff --git a/src/declaration.d.ts b/src/declaration.d.ts
@@ -0,0 +1,14 @@
+declare module '*.png' {
+    const value: any;
+    export default value;
+}
+
+declare module '*.svg' {
+    const value: any;
+    export default value;
+}
+
+declare module '*.scss' {
+    const value: any;
+    export default value;
+}
diff --git a/src/drop-handler.ts b/src/drop-handler.ts
@@ -73,13 +73,13 @@ const CreateDropHandler = (target: HTMLElement, dropHandler: DropHandlerFunc) =>
     target.addEventListener('dragstart', (ev) => {
         ev.preventDefault();
         ev.stopPropagation();
-        ev.dataTransfer.effectAllowed = "all";
+        ev.dataTransfer.effectAllowed = 'all';
     }, false);
 
     target.addEventListener('dragover', (ev) => {
         ev.preventDefault();
         ev.stopPropagation();
-        ev.dataTransfer.effectAllowed = "all";
+        ev.dataTransfer.effectAllowed = 'all';
     }, false);
 
     target.addEventListener('drop', (ev) => {

diff --git a/src/png-exporter.ts b/src/png-exporter.ts
@@ -77,7 +77,7 @@ class PngExporter {
 
     // download the data uri
     _downloadFile(filename: string, data: any) {
-        const blob = new Blob([data], { type: "octet/stream" });
+        const blob = new Blob([data], { type: 'octet/stream' });
         const url = window.URL.createObjectURL(blob);
 
         const el = document.createElement('a');

diff --git a/src/projective-skybox.ts b/src/projective-skybox.ts
@@ -2,7 +2,7 @@ import {
     shaderChunks,
     AppBase,
     Vec3
-} from "playcanvas";
+} from 'playcanvas';
 
 const projectiveSkyboxVS = (shaderChunks as any).skyboxVS.replace(' * cubeMapRotationMatrix', '');
 

diff --git a/src/viewer.ts b/src/viewer.ts
@@ -1,3 +1,4 @@
+import { Observer } from '@playcanvas/observer';
 import {
     ADDRESS_CLAMP_TO_EDGE,
     BLENDMODE_ONE,
@@ -58,24 +59,19 @@ import {
 } from 'playcanvas';
 
 import { App } from './app';
-
-import { Observer } from '@playcanvas/observer';
-import { MeshoptDecoder } from '../lib/meshopt_decoder.module.js';
-import { CreateDropHandler } from './drop-handler';
-import { MorphTargetData, File, HierarchyNode } from './types';
+import { MultiCamera } from './cameras/multi-camera';
 import { DebugLines } from './debug-lines';
+import { CreateDropHandler } from './drop-handler';
 import { Multiframe } from './multiframe';
-import { ReadDepth } from './read-depth';
-import { MultiCamera } from './cameras/multi-camera';
 import { PngExporter } from './png-exporter';
 import { ProjectiveSkybox } from './projective-skybox';
+import { ReadDepth } from './read-depth';
 import { ShadowCatcher } from './shadow-catcher';
-import { XRObjectPlacementController } from './xr-mode';
-
-// @ts-ignore
-import arModeImage from './svg/ar-mode.svg';
-// @ts-ignore
 import arCloseImage from './svg/ar-close.svg';
+import arModeImage from './svg/ar-mode.svg';
+import { File, HierarchyNode, MorphTargetData } from './types';
+import { XRObjectPlacementController } from './xr-mode';
+import { MeshoptDecoder } from '../lib/meshopt_decoder.module.js';
 
 // model filename extensions
 const modelExtensions = ['gltf', 'glb', 'vox'];
@@ -671,7 +667,7 @@ class Viewer {
                 for (let i = 0; i < names.length; ++i) {
                     const nameList = names[i];
                     for (let j = 0; j < nameList.length; ++j) {
-                        if (fn.indexOf(nameList[j] + '.') !== -1) {
+                        if (fn.indexOf(`${nameList[j]}.`) !== -1) {
                             return j;
                         }
                     }
@@ -689,7 +685,7 @@ class Viewer {
 
             // construct an asset for each cubemap face
             const faceAssets = files.map((file, index) => {
-                const faceAsset = new Asset('skybox_face' + index, 'texture', file);
+                const faceAsset = new Asset(`skybox_face${index}`, 'texture', file);
                 app.assets.add(faceAsset);
                 app.assets.load(faceAsset);
                 return faceAsset;
@@ -1030,7 +1026,7 @@ class Viewer {
 
             const processImage = function (gltfImage: any, continuation: (err: string, result: any) => void) {
                 const u: File = externalUrls.find((url) => {
-                    return url.filename === decodeURIComponent(path.normalize(gltfImage.uri || ''))
+                    return url.filename === decodeURIComponent(path.normalize(gltfImage.uri || ''));
                 });
                 if (u) {
                     const textureAsset = new Asset(u.filename, 'texture', {
@@ -1054,7 +1050,7 @@ class Viewer {
 
             const processBuffer = function (gltfBuffer: any, continuation: (err: string, result: any) => void) {
                 const u = externalUrls.find((url) => {
-                    return url.filename === decodeURIComponent(path.normalize(gltfBuffer.uri || ''))
+                    return url.filename === decodeURIComponent(path.normalize(gltfBuffer.uri || ''));
                 });
                 if (u) {
                     const bufferAsset = new Asset(u.filename, 'binary', {
@@ -1620,7 +1616,7 @@ class Viewer {
                 morphInstances[i] = morphInstance;
 
                 // mesh name line
-                const meshName = (meshInstance && meshInstance.node && meshInstance.node.name) || 'Mesh ' + i;
+                const meshName = (meshInstance && meshInstance.node && meshInstance.node.name) || `Mesh ${i}`;
                 morphs[i] = {
                     name: meshName,
                     targets: {}
@@ -1703,11 +1699,12 @@ class Viewer {
                     {
                         name: 'transition',
                         time: t.duration,
-                        nextTrack: 'track_' + (i === this.animTracks.length - 1 ? 0 : i + 1)
+                        nextTrack: `track_${i === this.animTracks.length - 1 ? 0 : i + 1}`
                     }
                 ]);
-                entity.anim.assignAnimation('track_' + i, t);
-                this.animationMap[t.name] = 'track_' + i;
+                const path = `track_${i}`;
+                entity.anim.assignAnimation(path, t);
+                this.animationMap[t.name] = path;
             });
             // if the user has selected to play all tracks in succession, then transition to the next track after a set amount of loops
             entity.anim.on('transition', (e) => {

diff --git a/src/xr-mode.ts b/src/xr-mode.ts
@@ -129,7 +129,7 @@ class XRObjectPlacementController {
         };
 
         // handle xr mode availability change
-        xr.on('available:' + XRTYPE_AR, (available: boolean) => {
+        xr.on(`available: ${XRTYPE_AR}`, (available: boolean) => {
             this.events.fire('xr:available', available);
         });