Updated engine to v1.70.2 (#292)

* Updated engine to v1.70.2 * removed unnecessary tsignore * fixed syntax for arrayBuffer in VertexBuffer
playcanvas · May 2, 2024 · ecbc921 · ecbc921
1 parent 1e4a1e2
commit ecbc921
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 28 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -67,7 +67,7 @@
     "eslint": "^8.56.0",
     "fflate": "^0.8.2",
     "handlebars": "^4.7.8",
-    "playcanvas": "^1.69.2",
+    "playcanvas": "^1.70.2",
     "prop-types": "^15.8.1",
     "qrious": "^4.0.2",
     "react": "^18.2.0",

diff --git a/rollup.config.mjs b/rollup.config.mjs
@@ -22,7 +22,6 @@ if (process.env.BUILD_TYPE === 'prod') {
 // debug, profile, release
 const BUILD_TYPE = process.env.BUILD_TYPE || 'release';
 const ENGINE_DIR = process.env.ENGINE_PATH || 'node_modules/playcanvas';
-const EXTRAS_DIR = path.resolve(ENGINE_DIR, 'build', 'playcanvas-extras.mjs');
 const PCUI_DIR = path.resolve(process.env.PCUI_PATH || 'node_modules/@playcanvas/pcui', 'react');
 
 const ENGINE_NAME = (BUILD_TYPE === 'debug') ? 'playcanvas.dbg.mjs' : 'playcanvas.mjs';
@@ -71,7 +70,6 @@ export default {
         alias({
             entries: {
                 'playcanvas': ENGINE_PATH,
-                'playcanvas-extras': EXTRAS_DIR,
                 'pcui': PCUI_DIR
             }
         }),
@@ -82,7 +80,6 @@ export default {
                 baseUrl: '.',
                 paths: {
                     'playcanvas': [ENGINE_DIR],
-                    'playcanvas-extras': [EXTRAS_DIR],
                     'pcui': [PCUI_DIR]
                 }
             }

diff --git a/src/debug-lines.ts b/src/debug-lines.ts
@@ -137,7 +137,7 @@ class DebugLines {
 
         // construct the mesh
         const mesh = new Mesh(device);
-        mesh.vertexBuffer = new VertexBuffer(device, vertexFormat, 8192, BUFFER_DYNAMIC);
+        mesh.vertexBuffer = new VertexBuffer(device, vertexFormat, 8192, { usage: BUFFER_DYNAMIC });
         mesh.primitive[0].type = PRIMITIVE_LINES;
         mesh.primitive[0].base = 0;
         mesh.primitive[0].indexed = false;
@@ -224,8 +224,7 @@ class DebugLines {
                 this.app.graphicsDevice,
                 oldVBuffer.getFormat(),
                 oldVBuffer.getNumVertices() * 2,
-                BUFFER_DYNAMIC,
-                arrayBuffer
+                { usage: BUFFER_DYNAMIC, data: arrayBuffer }
             );
             this.vertexData = new Float32Array(arrayBuffer);
             this.colorData = new Uint32Array(arrayBuffer);

diff --git a/src/ui/popup-panel/index.tsx b/src/ui/popup-panel/index.tsx
@@ -4,7 +4,7 @@ import { SetProperty, ObserverData } from '../../types';
 import AnimationControls from './animation-controls';
 import { CameraPanel, SkyboxPanel, LightPanel, DebugPanel, ViewPanel } from './panels';
 // @ts-ignore no type defs included
-import { UsdzExporter } from 'playcanvas-extras';
+import { UsdzExporter } from 'playcanvas';
 import { addEventListenerOnClickOnly } from '../../helpers';
 
 const PopupPanelControls = (props: { observerData: ObserverData, setProperty: SetProperty }) => {

diff --git a/src/viewer.ts b/src/viewer.ts
@@ -45,6 +45,7 @@ import {
     MorphInstance,
     MorphTarget,
     Mouse,
+    MiniStats,
     Quat,
     RenderComponent,
     RenderTarget,
@@ -59,10 +60,6 @@ import {
 import { App } from './app';
 
 import { Observer } from '@playcanvas/observer';
-// @ts-ignore: library file import
-import { MiniStats } from 'playcanvas-extras';
-// @ts-ignore: library file import
-// import * as VoxParser from 'playcanvas/scripts/parsers/vox-parser.js';
 import { MeshoptDecoder } from '../lib/meshopt_decoder.module.js';
 import { CreateDropHandler } from './drop-handler';
 import { MorphTargetData, File, HierarchyNode } from './types';
@@ -195,9 +192,6 @@ class Viewer {
         observer.set('camera.multisampleSupported', multisampleSupported);
         observer.set('camera.multisample', multisampleSupported && observer.get('camera.multisample'));
 
-        // register vox support
-        // VoxParser.registerVoxParser(app);
-
         // create the exporter
         this.pngExporter = new PngExporter();
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -17,8 +17,7 @@
         "noEmit": true,
         "baseUrl": ".",
         "paths": {
-            "pcui": ["node_modules/@playcanvas/pcui/react"],
-            "playcanvas-extras": ["node_modules/playcanvas/build/playcanvas-extras.mjs"]
+            "pcui": ["node_modules/@playcanvas/pcui/react"]
         }
     },
     "include": ["**/*.ts", "**/*.tsx"],