Merge branch 'main' into multicam-api

playcanvas · Nov 15, 2024 · c40a184 · c40a184
2 parents 5161f77 + 503be80
commit c40a184
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 24 deletions.
diff --git a/examples/package-lock.json b/examples/package-lock.json
diff --git a/examples/package.json b/examples/package.json
@@ -36,7 +36,7 @@
     "examples": "file:./iframe",
     "fflate": "^0.8.2",
     "fs-extra": "^11.2.0",
-    "monaco-editor": "^0.52.0",
+    "monaco-editor": "^0.33.0",
     "playcanvas": "file:..",
     "prop-types": "^15.7.2",
     "puppeteer": "^23.8.0",

diff --git a/examples/rollup.config.js b/examples/rollup.config.js
@@ -125,7 +125,7 @@ const STATIC_FILES = [
         once: true
     },
 
-    // modules (N.B. destination folder is 'modules' as 'node_modules' are automatically excluded by git pages)
+    // monaco loader
     { src: './node_modules/monaco-editor/min/vs', dest: 'dist/modules/monaco-editor/min/vs', once: true },
 
     // fflate (for when using ENGINE_PATH)

diff --git a/scripts/physics/render-physics.js b/scripts/physics/render-physics.js
@@ -182,23 +182,8 @@ RenderPhysics.prototype.postUpdate = function (dt) {
                     debugShape._collisionType = collision.type;
                     collision._debugShape = debugShape;
                 }
-
-                // Use the rigid body position if we have it
-                if (collision.entity.rigidbody) {
-                    var body = collision.entity.rigidbody.body;
-                    if (body) {
-                        var t = body.getWorldTransform();
-
-                        var p = t.getOrigin();
-                        var q = t.getRotation();
-                        collision._debugShape.setPosition(p.x(), p.y(), p.z());
-                        collision._debugShape.setRotation(q.x(), q.y(), q.z(), q.w());
-                    }
-                } else {
-                    collision._debugShape.setPosition(collision.entity.getPosition());
-                    collision._debugShape.setRotation(collision.entity.getRotation());
-                }
-
+                collision._debugShape.setPosition(collision.getShapePosition());
+                collision._debugShape.setRotation(collision.getShapeRotation());
                 // If the shape is a capsule, cone or cylinder, rotate it so that its axis is taken into account
                 if (collision.type === 'capsule' || collision.type === 'cone' || collision.type === 'cylinder') {
                     if (collision._debugShape._axis === 0) {