Update orbit-camera.js

orbit-camera.js

@@ -1,4 +1,5 @@
 // orbit-camera.js
+// ========================================
 
 var OrbitCamera = pc.createScript('orbitCamera');
 
@@ -166,43 +167,31 @@ OrbitCamera.prototype._updatePosition = function () {
     this.entity.setPosition(position);
 };
 
-OrbitCamera.prototype._removeInertia = function () {
-    this._yaw = this._targetYaw;
-    this._pitch = this._targetPitch;
-    this._distance = this._targetDistance;
-};
-
-OrbitCamera.prototype._checkAspectRatio = function () {
-    var height = this.app.graphicsDevice.height;
-    var width = this.app.graphicsDevice.width;
-    this.entity.camera.horizontalFov = (height > width);
-};
-
+// ---- Modernized SOGS/GSplat AABB support
 OrbitCamera.prototype._buildAabb = function (entity) {
-    var i, m, meshInstances = [];
+    var meshInstances = [];
+    // Standard renders
     var renders = entity.findComponents('render');
-    for (i = 0; i < renders.length; i++) {
-        var render = renders[i];
-        for (m = 0; m < render.meshInstances.length; m++) {
-            meshInstances.push(render.meshInstances[m]);
-        }
+    for (let render of renders) {
+        for (let m of render.meshInstances) meshInstances.push(m);
     }
+    // Old model components
     var models = entity.findComponents('model');
-    for (i = 0; i < models.length; i++) {
-        var model = models[i];
-        for (m = 0; m < model.meshInstances.length; m++) {
-            meshInstances.push(model.meshInstances[m]);
-        }
+    for (let model of models) {
+        for (let m of model.meshInstances) meshInstances.push(m);
     }
+    // GSplat SOGS support (PlayCanvas 2.8+)
     var gsplats = entity.findComponents('gsplat');
-    for (i = 0; i < gsplats.length; i++) {
-        var gsplat = gsplats[i];
-        var instance = gsplat.instance;
-        if (instance?.meshInstance) {
-            meshInstances.push(instance.meshInstance);
+    for (let gsplat of gsplats) {
+        if (gsplat.instance) {
+            if (gsplat.instance.meshInstance) meshInstances.push(gsplat.instance.meshInstance);
+            // For SOGS: meshInstances is an array (for multi-SOGS objects)
+            if (gsplat.instance.meshInstances) {
+                for (let mi of gsplat.instance.meshInstances) meshInstances.push(mi);
+            }
         }
     }
-    for (i = 0; i < meshInstances.length; i++) {
+    for (let i = 0; i < meshInstances.length; i++) {
         if (i === 0) {
             this._modelsAabb.copy(meshInstances[i].aabb);
         } else {
@@ -245,6 +234,7 @@ OrbitCamera.prototype._calcPitch = function (quat, yaw) {
     return Math.atan2(-transformedForward.y, -transformedForward.z) * pc.math.RAD_TO_DEG;
 };
 
+
 // ===================== Orbit Camera Input Mouse Script ========================
 var OrbitCameraInputMouse = pc.createScript('orbitCameraInputMouse');
 OrbitCameraInputMouse.attributes.add('orbitSensitivity', { type: 'number', default: 0.3, title: 'Orbit Sensitivity' });
@@ -490,4 +480,3 @@ OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
         this.lastPinchMidPoint.copy(pinchMidPoint);
     }
 };
-