Update orbit-camera.js

orbit-camera.js

@@ -1,31 +1,31 @@
 // orbit-camera.js
-// ========================================
+// ==============================
 
-var OrbitCamera = pc.createScript('orbitCamera');
+/*
+ * PlayCanvas Orbit Camera for GSplat/SOGS/GLB viewers.
+ * - Handles min/max zoom, pitch, yaw, minY (don't go below ground)
+ * - Mouse & touch controls (orbit, pan, zoom)
+ * - Attributes are auto-injected by viewer.js
+ */
 
-// Camera attributes
-OrbitCamera.attributes.add('distanceMax', { type: 'number', default: 20, title: 'Distance Max' });
-OrbitCamera.attributes.add('distanceMin', { type: 'number', default: 1, title: 'Distance Min' });
-OrbitCamera.attributes.add('pitchAngleMax', { type: 'number', default: 90, title: 'Pitch Angle Max (degrees)' });
-OrbitCamera.attributes.add('pitchAngleMin', { type: 'number', default: 0, title: 'Pitch Angle Min (degrees)' });
-OrbitCamera.attributes.add('yawAngleMax', { type: 'number', default: 360, title: 'Yaw Angle Max (degrees)' });
-OrbitCamera.attributes.add('yawAngleMin', { type: 'number', default: -360, title: 'Yaw Angle Min (degrees)' });
-OrbitCamera.attributes.add('minY', { type: 'number', default: 0, title: 'Minimum Y', description: 'Minimum Y value for camera world position' });
+var OrbitCamera = pc.createScript('orbitCamera');
 
-OrbitCamera.attributes.add('inertiaFactor', { type: 'number', default: 0.2, title: 'Inertia Factor' });
-OrbitCamera.attributes.add('focusEntity', { type: 'entity', title: 'Focus Entity' });
-OrbitCamera.attributes.add('frameOnStart', { type: 'boolean', default: true, title: 'Frame on Start' });
+OrbitCamera.attributes.add('distanceMax',      { type: 'number', default: 20,  title: 'Distance Max' });
+OrbitCamera.attributes.add('distanceMin',      { type: 'number', default: 1,   title: 'Distance Min' });
+OrbitCamera.attributes.add('pitchAngleMax',    { type: 'number', default: 90,  title: 'Pitch Angle Max (degrees)' });
+OrbitCamera.attributes.add('pitchAngleMin',    { type: 'number', default: 0,   title: 'Pitch Angle Min (degrees)' });
+OrbitCamera.attributes.add('yawAngleMax',      { type: 'number', default: 360, title: 'Yaw Angle Max (degrees)' });
+OrbitCamera.attributes.add('yawAngleMin',      { type: 'number', default: -360,title: 'Yaw Angle Min (degrees)' });
+OrbitCamera.attributes.add('minY',             { type: 'number', default: 0,   title: 'Minimum Y' });
+OrbitCamera.attributes.add('inertiaFactor',    { type: 'number', default: 0.2, title: 'Inertia Factor' });
+OrbitCamera.attributes.add('focusEntity',      { type: 'entity',               title: 'Focus Entity' });
+OrbitCamera.attributes.add('frameOnStart',     { type: 'boolean', default: true, title: 'Frame on Start' });
 
 Object.defineProperty(OrbitCamera.prototype, 'distance', {
     get: function () { return this._targetDistance; },
     set: function (value) { this._targetDistance = this._clampDistance(value); }
 });
 
-Object.defineProperty(OrbitCamera.prototype, 'orthoHeight', {
-    get: function () { return this.entity.camera.orthoHeight; },
-    set: function (value) { this.entity.camera.orthoHeight = Math.max(0, value); }
-});
-
 Object.defineProperty(OrbitCamera.prototype, 'pitch', {
     get: function () { return this._targetPitch; },
     set: function (value) { this._targetPitch = this._clampPitchAngle(value); }
@@ -93,7 +93,6 @@ OrbitCamera.prototype.resetToPosition = function (position, lookAtPoint) {
     this._updatePosition();
 };
 
-// ==== Clamp helper for panning/orbiting so camera never under minY ====
 OrbitCamera.prototype.worldCameraYForPivot = function(pivot) {
     var quat = new pc.Quat();
     quat.setFromEulerAngles(this._pitch, this._yaw, 0);
@@ -104,10 +103,6 @@ OrbitCamera.prototype.worldCameraYForPivot = function(pivot) {
     return camPos.y;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//                          Private Methods                                   //
-////////////////////////////////////////////////////////////////////////////////
-
 OrbitCamera.prototype.initialize = function () {
     var self = this;
     var onWindowResize = function () { self._checkAspectRatio(); };
@@ -167,31 +162,43 @@ OrbitCamera.prototype._updatePosition = function () {
     this.entity.setPosition(position);
 };
 
-// ---- Modernized SOGS/GSplat AABB support
+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);
+};
+
 OrbitCamera.prototype._buildAabb = function (entity) {
-    var meshInstances = [];
-    // Standard renders
+    var i, m, meshInstances = [];
     var renders = entity.findComponents('render');
-    for (let render of renders) {
-        for (let m of render.meshInstances) meshInstances.push(m);
+    for (i = 0; i < renders.length; i++) {
+        var render = renders[i];
+        for (m = 0; m < render.meshInstances.length; m++) {
+            meshInstances.push(render.meshInstances[m]);
+        }
     }
-    // Old model components
     var models = entity.findComponents('model');
-    for (let model of models) {
-        for (let m of model.meshInstances) meshInstances.push(m);
+    for (i = 0; i < models.length; i++) {
+        var model = models[i];
+        for (m = 0; m < model.meshInstances.length; m++) {
+            meshInstances.push(model.meshInstances[m]);
+        }
     }
-    // GSplat SOGS support (PlayCanvas 2.8+)
     var gsplats = entity.findComponents('gsplat');
-    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 < gsplats.length; i++) {
+        var gsplat = gsplats[i];
+        var instance = gsplat.instance;
+        if (instance?.meshInstance) {
+            meshInstances.push(instance.meshInstance);
         }
     }
-    for (let i = 0; i < meshInstances.length; i++) {
+    for (i = 0; i < meshInstances.length; i++) {
         if (i === 0) {
             this._modelsAabb.copy(meshInstances[i].aabb);
         } else {
@@ -203,7 +210,7 @@ OrbitCamera.prototype._buildAabb = function (entity) {
 OrbitCamera.prototype._calcYaw = function (quat) {
     var transformedForward = new pc.Vec3();
     quat.transformVector(pc.Vec3.FORWARD, transformedForward);
-    return Math.atan2(-transformedForward.x, -transformedForward.z) * pc.math.RAD_TO_DEG;
+    return Math.atan2(-transformedForward.x, -transformedForward.z) * pc.math.DEG_TO_RAD * 180 / Math.PI;
 };
 
 OrbitCamera.prototype._clampDistance = function (distance) {
@@ -218,7 +225,7 @@ OrbitCamera.prototype._clampPitchAngle = function (pitch) {
 };
 
 OrbitCamera.prototype._clampYawAngle = function (yaw) {
-    return pc.math.clamp(yaw, -this.yawAngleMax, -this.yawAngleMin);
+    return pc.math.clamp(yaw, this.yawAngleMin, this.yawAngleMax);
 };
 
 OrbitCamera.quatWithoutYaw = new pc.Quat();
@@ -234,11 +241,11 @@ OrbitCamera.prototype._calcPitch = function (quat, yaw) {
     return Math.atan2(-transformedForward.y, -transformedForward.z) * pc.math.RAD_TO_DEG;
 };
 
+// =================== Orbit Camera Input Mouse Script ========================
 
-// ===================== Orbit Camera Input Mouse Script ========================
 var OrbitCameraInputMouse = pc.createScript('orbitCameraInputMouse');
-OrbitCameraInputMouse.attributes.add('orbitSensitivity', { type: 'number', default: 0.3, title: 'Orbit Sensitivity' });
-OrbitCameraInputMouse.attributes.add('distanceSensitivity', { type: 'number', default: 0.4, title: 'Distance Sensitivity' });
+OrbitCameraInputMouse.attributes.add('orbitSensitivity',   { type: 'number', default: 0.3, title: 'Orbit Sensitivity' });
+OrbitCameraInputMouse.attributes.add('distanceSensitivity',{ type: 'number', default: 0.4, title: 'Distance Sensitivity' });
 
 OrbitCameraInputMouse.prototype.initialize = function () {
     this.orbitCamera = this.entity.script.orbitCamera;
@@ -363,7 +370,7 @@ OrbitCameraInputMouse.prototype.onMouseOut = function (event) {
 
 // =================== Orbit Camera Input Touch Script ========================
 var OrbitCameraInputTouch = pc.createScript('orbitCameraInputTouch');
-OrbitCameraInputTouch.attributes.add('orbitSensitivity', { type: 'number', default: 0.6, title: 'Orbit Sensitivity' });
+OrbitCameraInputTouch.attributes.add('orbitSensitivity',    { type: 'number', default: 0.6, title: 'Orbit Sensitivity' });
 OrbitCameraInputTouch.attributes.add('distanceSensitivity', { type: 'number', default: 0.5, title: 'Distance Sensitivity' });
 OrbitCameraInputTouch.prototype.initialize = function () {
     this.orbitCamera = this.entity.script.orbitCamera;