Update orbit-camera.js

orbit-camera.js

@@ -1,63 +1,205 @@
-// orbit-camera.js
+// orbit-camera.js (fixed to clamp world Y at minY, with debug logs)
+
+///////////////////////////////////////////////////////////////////////////////
+//                             Orbit Camera Script                           //
+///////////////////////////////////////////////////////////////////////////////
 
-// Orbit Camera Component
 var OrbitCamera = pc.createScript('orbitCamera');
 
-OrbitCamera.attributes.add('distanceMax', { type: 'number', default: 20, title: 'Distance Max' });
+OrbitCamera.attributes.add('distanceMax', { type: 'number', default: 20, title: 'Distance Max', description: 'Setting this at 0 will give an infinite distance limit' });
 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: -90, title: 'Pitch Angle Min (degrees)' });
+// Note: This default will be overridden by your JSON config. In your JSON you set minAngle to -90.
+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('minY', { type: 'number', default: 0, title: 'Minimum Y', description: 'Minimum Y value for the camera during orbiting or translation' });
 
-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('inertiaFactor', {
+    type: 'number',
+    default: 0.2,
+    title: 'Inertia Factor',
+    description: 'Higher value means that the camera will continue moving after the user has stopped dragging. 0 is fully responsive.'
+});
+
+OrbitCamera.attributes.add('focusEntity', {
+    type: 'entity',
+    title: 'Focus Entity',
+    description: 'Entity for the camera to focus on. If blank, then the camera will use the whole scene'
+});
 
+OrbitCamera.attributes.add('frameOnStart', {
+    type: 'boolean',
+    default: true,
+    title: 'Frame on Start',
+    description: 'Frames the entity or scene at the start of the application."'
+});
+
+// Property to get and set the distance between the pivot point and camera
 Object.defineProperty(OrbitCamera.prototype, 'distance', {
-    get: function () { return this._targetDistance; },
-    set: function (v) { this._targetDistance = this._clampDistance(v); }
+    get: function () {
+        return this._targetDistance;
+    },
+    set: function (value) {
+        this._targetDistance = this._clampDistance(value);
+    }
+});
+
+// Property to get and set the camera orthoHeight (clamped above 0)
+Object.defineProperty(OrbitCamera.prototype, 'orthoHeight', {
+    get: function () {
+        return this.entity.camera.orthoHeight;
+    },
+    set: function (value) {
+        this.entity.camera.orthoHeight = Math.max(0, value);
+    }
 });
+
+// Property to get and set the pitch (in degrees) of the camera around the pivot.
 Object.defineProperty(OrbitCamera.prototype, 'pitch', {
-    get: function () { return this._targetPitch; },
-    set: function (v) { this._targetPitch = this._clampPitchAngle(v); }
+    get: function () {
+        return this._targetPitch;
+    },
+    set: function (value) {
+        this._targetPitch = this._clampPitchAngle(value);
+    }
 });
+
+// Property to get and set the yaw (in degrees) of the camera around the pivot.
 Object.defineProperty(OrbitCamera.prototype, 'yaw', {
-    get: function () { return this._targetYaw; },
-    set: function (v) { this._targetYaw = this._clampYawAngle(v); }
+    get: function () {
+        return this._targetYaw;
+    },
+    set: function (value) {
+        this._targetYaw = this._clampYawAngle(value);
+    }
 });
+
+// Property to get and set the world position of the pivot point that the camera orbits around.
 Object.defineProperty(OrbitCamera.prototype, 'pivotPoint', {
-    get: function () { return this._pivotPoint; },
-    set: function (v) { this._pivotPoint.copy(v); }
+    get: function () {
+        return this._pivotPoint;
+    },
+    set: function (value) {
+        this._pivotPoint.copy(value);
+    }
 });
 
-OrbitCamera.prototype._clampDistance = function (d) {
-    if (this.distanceMax > 0) return pc.math.clamp(d, this.distanceMin, this.distanceMax);
-    return Math.max(d, this.distanceMin);
+// Moves the camera to look at an entity and all its children so they are all in view.
+OrbitCamera.prototype.focus = function (focusEntity) {
+    this._buildAabb(focusEntity);
+    var halfExtents = this._modelsAabb.halfExtents;
+    var radius = Math.max(halfExtents.x, Math.max(halfExtents.y, halfExtents.z));
+    this.distance = (radius * 1.5) / Math.sin(0.5 * this.entity.camera.fov * pc.math.DEG_TO_RAD);
+    this._removeInertia();
+    this._pivotPoint.copy(this._modelsAabb.center);
+};
+
+OrbitCamera.distanceBetween = new pc.Vec3();
+
+OrbitCamera.prototype.resetAndLookAtPoint = function (resetPoint, lookAtPoint) {
+    this.pivotPoint.copy(lookAtPoint);
+    this.entity.setPosition(resetPoint);
+    this.entity.lookAt(lookAtPoint);
+    var distance = OrbitCamera.distanceBetween;
+    distance.sub2(lookAtPoint, resetPoint);
+    this.distance = distance.length();
+    this.pivotPoint.copy(lookAtPoint);
+    var cameraQuat = this.entity.getRotation();
+    this.yaw = this._calcYaw(cameraQuat);
+    this.pitch = this._calcPitch(cameraQuat, this.yaw);
+    this._removeInertia();
+    this._updatePosition();
 };
-OrbitCamera.prototype._clampPitchAngle = function (p) {
-    return pc.math.clamp(p, this.pitchAngleMin, this.pitchAngleMax);
+
+OrbitCamera.prototype.resetAndLookAtEntity = function (resetPoint, entity) {
+    this._buildAabb(entity);
+    this.resetAndLookAtPoint(resetPoint, this._modelsAabb.center);
 };
-OrbitCamera.prototype._clampYawAngle = function (y) {
-    return pc.math.clamp(y, this.yawAngleMin, this.yawAngleMax);
+
+OrbitCamera.prototype.reset = function (yaw, pitch, distance) {
+    this.pitch = pitch;
+    this.yaw = yaw;
+    this.distance = distance;
+    this._removeInertia();
+};
+
+OrbitCamera.prototype.resetToPosition = function (position, lookAtPoint) {
+    this.entity.setPosition(position);
+    this.entity.lookAt(lookAtPoint);
+    this._pivotPoint.copy(lookAtPoint);
+    var distanceVec = new pc.Vec3();
+    distanceVec.sub2(position, lookAtPoint);
+    this._targetDistance = this._distance = distanceVec.length();
+    var cameraQuat = this.entity.getRotation();
+    this._targetYaw = this._yaw = this._calcYaw(cameraQuat);
+    this._targetPitch = this._pitch = this._calcPitch(cameraQuat, this._yaw);
+    this._removeInertia();
+    this._updatePosition();
 };
 
+////////////////////////////////////////////////////////////////////////////////
+//                          Private Methods                                   //
+////////////////////////////////////////////////////////////////////////////////
+
 OrbitCamera.prototype.initialize = function () {
+    var self = this;
+    var onWindowResize = function () {
+        self._checkAspectRatio();
+    };
+
+    window.addEventListener('resize', onWindowResize, false);
+    this._checkAspectRatio();
+    this._modelsAabb = new pc.BoundingBox();
+    this._buildAabb(this.focusEntity || this.app.root);
+    this.entity.lookAt(this._modelsAabb.center);
     this._pivotPoint = new pc.Vec3();
-    this._pivotPoint.copy(this.entity.getPosition());
+    this._pivotPoint.copy(this._modelsAabb.center);
     var cameraQuat = this.entity.getRotation();
     this._yaw = this._calcYaw(cameraQuat);
     this._pitch = this._clampPitchAngle(this._calcPitch(cameraQuat, this._yaw));
+    this.entity.setLocalEulerAngles(this._pitch, this._yaw, 0);
+    this._distance = 0;
     this._targetYaw = this._yaw;
     this._targetPitch = this._pitch;
-    var dist = new pc.Vec3().sub2(this.entity.getPosition(), this._pivotPoint).length();
-    this._distance = this._clampDistance(dist);
+
+    if (this.frameOnStart) {
+        this.focus(this.focusEntity || this.app.root);
+    } else {
+        var distanceBetween = new pc.Vec3();
+        distanceBetween.sub2(this.entity.getPosition(), this._pivotPoint);
+        this._distance = this._clampDistance(distanceBetween.length());
+    }
+
     this._targetDistance = this._distance;
-    this.on('attr:distanceMin', () => { this._distance = this._clampDistance(this._distance); });
-    this.on('attr:distanceMax', () => { this._distance = this._clampDistance(this._distance); });
-    this.on('attr:pitchAngleMin', () => { this._pitch = this._clampPitchAngle(this._pitch); });
-    this.on('attr:pitchAngleMax', () => { this._pitch = this._clampPitchAngle(this._pitch); });
+
+    this.on('attr:distanceMin', function (value, prev) {
+        this._distance = this._clampDistance(this._distance);
+    });
+    this.on('attr:distanceMax', function (value, prev) {
+        this._distance = this._clampDistance(this._distance);
+    });
+    this.on('attr:pitchAngleMin', function (value, prev) {
+        this._pitch = this._clampPitchAngle(this._pitch);
+    });
+    this.on('attr:pitchAngleMax', function (value, prev) {
+        this._pitch = this._clampPitchAngle(this._pitch);
+    });
+    this.on('attr:focusEntity', function (value, prev) {
+        if (this.frameOnStart) {
+            this.focus(value || this.app.root);
+        } else {
+            this.resetAndLookAtEntity(this.entity.getPosition(), value || this.app.root);
+        }
+    });
+    this.on('attr:frameOnStart', function (value, prev) {
+        if (value) {
+            this.focus(this.focusEntity || this.app.root);
+        }
+    });
+    this.on('destroy', function () {
+        window.removeEventListener('resize', onWindowResize, false);
+    });
 };
 
 OrbitCamera.prototype.update = function (dt) {
@@ -65,88 +207,133 @@ OrbitCamera.prototype.update = function (dt) {
     this._distance = pc.math.lerp(this._distance, this._targetDistance, t);
     this._yaw = pc.math.lerp(this._yaw, this._targetYaw, t);
     this._pitch = pc.math.lerp(this._pitch, this._targetPitch, t);
+    this._updatePosition();
+};
 
-    // 1. Clamp pitch to pitchAngleMin/max
-    this._pitch = this._clampPitchAngle(this._pitch);
-
-    // 2. Compute camera position
-    var quat = new pc.Quat();
-    quat.setFromEulerAngles(this._pitch, this._yaw, 0);
-    var forward = new pc.Vec3();
-    quat.transformVector(pc.Vec3.FORWARD, forward);
-
-    var position = new pc.Vec3();
-    position.copy(this._pivotPoint);
-    position.add(forward.clone().scale(-this._distance)); // <-- Fixed line
-
-    // 3. If Y would be below minY, clamp pitch upward to keep Y >= minY
-    var minY = this.minY;
-    if (position.y < minY) {
-        // Calculate max downward pitch that keeps camera.y >= minY
-        var dy = minY - this._pivotPoint.y;
-        var safePitch = 0;
-        if (Math.abs(this._distance) > 1e-5) {
-            var ratio = pc.math.clamp(dy / this._distance, -1, 1);
-            safePitch = -Math.asin(ratio) * pc.math.RAD_TO_DEG;
+OrbitCamera.prototype._updatePosition = function () {
+    this.entity.setLocalPosition(0, 0, 0);
+    this.entity.setLocalEulerAngles(this._pitch, this._yaw, 0);
+    var position = this.entity.getPosition();
+    position.copy(this.entity.forward);
+    position.mulScalar(-this._distance);
+    position.add(this.pivotPoint);
+    // Clamp camera's Y position so it never goes below minY (after all rotations)
+    position.y = Math.max(position.y, this.minY);
+    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);
+};
+
+OrbitCamera.prototype._buildAabb = function (entity) {
+    var i, m, meshInstances = [];
+    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]);
+        }
+    }
+    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]);
+        }
+    }
+    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);
         }
-        safePitch = pc.math.clamp(safePitch, this.pitchAngleMin, this.pitchAngleMax);
-        this._pitch = safePitch;
+    }
+    for (i = 0; i < meshInstances.length; i++) {
+        if (i === 0) {
+            this._modelsAabb.copy(meshInstances[i].aabb);
+        } else {
+            this._modelsAabb.add(meshInstances[i].aabb);
+        }
+    }
+};
 
-        // Recompute position with safe pitch
-        quat.setFromEulerAngles(this._pitch, this._yaw, 0);
-        quat.transformVector(pc.Vec3.FORWARD, forward);
-        position.copy(this._pivotPoint);
-        position.add(forward.clone().scale(-this._distance));
+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;
+};
 
-        if (position.y < minY) position.y = minY;
+OrbitCamera.prototype._clampDistance = function (distance) {
+    if (this.distanceMax > 0) {
+        return pc.math.clamp(distance, this.distanceMin, this.distanceMax);
     }
+    return Math.max(distance, this.distanceMin);
+};
 
-    this.entity.setPosition(position);
-    this.entity.lookAt(this._pivotPoint);
+OrbitCamera.prototype._clampPitchAngle = function (pitch) {
+    return pc.math.clamp(pitch, this.pitchAngleMin, this.pitchAngleMax);
 };
 
-OrbitCamera.prototype._calcYaw = function (quat) {
-    var v = new pc.Vec3();
-    quat.transformVector(pc.Vec3.FORWARD, v);
-    return Math.atan2(-v.x, -v.z) * pc.math.RAD_TO_DEG;
+OrbitCamera.prototype._clampYawAngle = function (yaw) {
+    return pc.math.clamp(yaw, -this.yawAngleMax, -this.yawAngleMin);
 };
+
+OrbitCamera.quatWithoutYaw = new pc.Quat();
+OrbitCamera.yawOffset = new pc.Quat();
+
 OrbitCamera.prototype._calcPitch = function (quat, yaw) {
-    var yawOffset = new pc.Quat();
+    var quatWithoutYaw = OrbitCamera.quatWithoutYaw;
+    var yawOffset = OrbitCamera.yawOffset;
     yawOffset.setFromEulerAngles(0, -yaw, 0);
-    var q = new pc.Quat();
-    q.mul2(yawOffset, quat);
-    var v = new pc.Vec3();
-    q.transformVector(pc.Vec3.FORWARD, v);
-    return Math.atan2(-v.y, -v.z) * pc.math.RAD_TO_DEG;
+    quatWithoutYaw.mul2(yawOffset, quat);
+    var transformedForward = new pc.Vec3();
+    quatWithoutYaw.transformVector(pc.Vec3.FORWARD, transformedForward);
+    return Math.atan2(-transformedForward.y, -transformedForward.z) * pc.math.RAD_TO_DEG;
 };
 
-
-// Orbit Camera Mouse Input
+////////////////////////////////////////////////////////////////////////////////
+//                       Orbit Camera Mouse Input Script                      //
+////////////////////////////////////////////////////////////////////////////////
 var OrbitCameraInputMouse = pc.createScript('orbitCameraInputMouse');
 
 OrbitCameraInputMouse.attributes.add('orbitSensitivity', {
     type: 'number',
     default: 0.3,
-    title: 'Orbit Sensitivity'
+    title: 'Orbit Sensitivity',
+    description: 'How fast the camera moves around the orbit. Higher is faster'
 });
 OrbitCameraInputMouse.attributes.add('distanceSensitivity', {
     type: 'number',
     default: 0.4,
-    title: 'Distance Sensitivity'
+    title: 'Distance Sensitivity',
+    description: 'How fast the camera moves in and out. Higher is faster'
 });
-
 OrbitCameraInputMouse.prototype.initialize = function () {
     this.orbitCamera = this.entity.script.orbitCamera;
     if (this.orbitCamera) {
+        var self = this;
+        var onMouseOut = function (e) { self.onMouseOut(e); };
         this.app.mouse.on(pc.EVENT_MOUSEDOWN, this.onMouseDown, this);
         this.app.mouse.on(pc.EVENT_MOUSEUP, this.onMouseUp, this);
         this.app.mouse.on(pc.EVENT_MOUSEMOVE, this.onMouseMove, this);
         this.app.mouse.on(pc.EVENT_MOUSEWHEEL, this.onMouseWheel, this);
+        window.addEventListener('mouseout', onMouseOut, false);
         this.on('destroy', function () {
             this.app.mouse.off(pc.EVENT_MOUSEDOWN, this.onMouseDown, this);
             this.app.mouse.off(pc.EVENT_MOUSEUP, this.onMouseUp, this);
             this.app.mouse.off(pc.EVENT_MOUSEMOVE, this.onMouseMove, this);
             this.app.mouse.off(pc.EVENT_MOUSEWHEEL, this.onMouseWheel, this);
+            window.removeEventListener('mouseout', onMouseOut, false);
         });
     }
     this.app.mouse.disableContextMenu();
@@ -167,6 +354,11 @@ OrbitCameraInputMouse.prototype.pan = function (screenPoint) {
     camera.screenToWorld(this.lastPoint.x, this.lastPoint.y, distance, toWorldPoint);
     worldDiff.sub2(toWorldPoint, fromWorldPoint);
     this.orbitCamera.pivotPoint.add(worldDiff);
+    var pitchRadians = this.orbitCamera.pitch * pc.math.DEG_TO_RAD;
+    var minPivotY = this.orbitCamera.distance * Math.sin(pitchRadians);
+    if (this.orbitCamera.pivotPoint.y < minPivotY) {
+        this.orbitCamera.pivotPoint.y = minPivotY;
+    }
 };
 OrbitCameraInputMouse.prototype.onMouseDown = function (event) {
     switch (event.button) {
@@ -178,7 +370,6 @@ OrbitCameraInputMouse.prototype.onMouseDown = function (event) {
             this.lookButtonDown = true;
             break;
     }
-    this.lastPoint.set(event.x, event.y);
 };
 OrbitCameraInputMouse.prototype.onMouseUp = function (event) {
     switch (event.button) {
@@ -191,6 +382,8 @@ OrbitCameraInputMouse.prototype.onMouseUp = function (event) {
             break;
     }
 };
+
+// ---------- PATCHED: orbit suppression at minY (mouse) ---------------
 OrbitCameraInputMouse.prototype.onMouseMove = function (event) {
     if (this.lookButtonDown) {
         var sens = this.orbitSensitivity;
@@ -202,14 +395,14 @@ OrbitCameraInputMouse.prototype.onMouseMove = function (event) {
         var currDist = this.orbitCamera.distance;
         var currPivot = this.orbitCamera.pivotPoint.clone();
 
-        // Compute world position before move
+        // Compute the world position before the change
         var camQuat = new pc.Quat();
         camQuat.setFromEulerAngles(currPitch, currYaw, 0);
         var forward = new pc.Vec3();
         camQuat.transformVector(pc.Vec3.FORWARD, forward);
         var preY = currPivot.y + (-forward.y) * currDist;
 
-        // Compute world position after vertical move
+        // Compute the world position after applying the vertical delta
         var proposedPitch = currPitch - deltaPitch;
         var testQuat = new pc.Quat();
         testQuat.setFromEulerAngles(proposedPitch, currYaw, 0);
@@ -218,21 +411,27 @@ OrbitCameraInputMouse.prototype.onMouseMove = function (event) {
         var proposedY = currPivot.y + (-testForward.y) * currDist;
 
         var minY = this.orbitCamera.minY;
+        var isAtMinY = preY <= minY + 1e-4;
         var wouldGoBelow = proposedY < minY - 1e-4;
+        var suppressed = false;
 
-        // Suppress only downward movement beyond minY
+        // Only suppress if going *further* below minY (upward)
         if (wouldGoBelow && (proposedY < preY)) {
-            // Only yaw allowed
+            // Suppress vertical, allow horizontal (yaw)
             this.orbitCamera.yaw = currYaw - deltaYaw;
+            suppressed = true;
         } else {
             this.orbitCamera.pitch = proposedPitch;
             this.orbitCamera.yaw = currYaw - deltaYaw;
         }
+
     } else if (this.panButtonDown) {
         this.pan(new pc.Vec2(event.x, event.y));
     }
     this.lastPoint.set(event.x, event.y);
 };
+// ---------------------------------------------------------------------
+
 OrbitCameraInputMouse.prototype.onMouseWheel = function (event) {
     if (this.entity.camera.projection === pc.PROJECTION_PERSPECTIVE) {
         this.orbitCamera.distance -= event.wheelDelta * this.distanceSensitivity * (this.orbitCamera.distance * 0.1);
@@ -241,19 +440,27 @@ OrbitCameraInputMouse.prototype.onMouseWheel = function (event) {
     }
     event.event.preventDefault();
 };
+OrbitCameraInputMouse.prototype.onMouseOut = function (event) {
+    this.lookButtonDown = false;
+    this.panButtonDown = false;
+};
 
-// Orbit Camera Touch Input
+////////////////////////////////////////////////////////////////////////////////
+//                       Orbit Camera Touch Input Script                      //
+////////////////////////////////////////////////////////////////////////////////
 var OrbitCameraInputTouch = pc.createScript('orbitCameraInputTouch');
 
 OrbitCameraInputTouch.attributes.add('orbitSensitivity', {
     type: 'number',
     default: 0.6,
-    title: 'Orbit Sensitivity'
+    title: 'Orbit Sensitivity',
+    description: 'How fast the camera moves around the orbit. Higher is faster'
 });
 OrbitCameraInputTouch.attributes.add('distanceSensitivity', {
     type: 'number',
     default: 0.5,
-    title: 'Distance Sensitivity'
+    title: 'Distance Sensitivity',
+    description: 'How fast the camera moves in and out. Higher is faster'
 });
 OrbitCameraInputTouch.prototype.initialize = function () {
     this.orbitCamera = this.entity.script.orbitCamera;
@@ -306,9 +513,15 @@ OrbitCameraInputTouch.prototype.pan = function (midPoint) {
     camera.screenToWorld(this.lastPinchMidPoint.x, this.lastPinchMidPoint.y, distance, toWorldPoint);
     worldDiff.sub2(toWorldPoint, fromWorldPoint);
     this.orbitCamera.pivotPoint.add(worldDiff);
+    var pitchRadians = this.orbitCamera.pitch * pc.math.DEG_TO_RAD;
+    var minPivotY = this.orbitCamera.distance * Math.sin(pitchRadians);
+    if (this.orbitCamera.pivotPoint.y < minPivotY) {
+        this.orbitCamera.pivotPoint.y = minPivotY;
+    }
 };
 OrbitCameraInputTouch.pinchMidPoint = new pc.Vec2();
 
+// ---------- PATCHED: orbit suppression at minY (touch) ---------------
 OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
     var pinchMidPoint = OrbitCameraInputTouch.pinchMidPoint;
     var touches = event.touches;
@@ -323,12 +536,14 @@ OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
         var currDist = this.orbitCamera.distance;
         var currPivot = this.orbitCamera.pivotPoint.clone();
 
+        // Compute the world position before the change
         var camQuat = new pc.Quat();
         camQuat.setFromEulerAngles(currPitch, currYaw, 0);
         var forward = new pc.Vec3();
         camQuat.transformVector(pc.Vec3.FORWARD, forward);
         var preY = currPivot.y + (-forward.y) * currDist;
 
+        // Compute the world position after applying the vertical delta
         var proposedPitch = currPitch - deltaPitch;
         var testQuat = new pc.Quat();
         testQuat.setFromEulerAngles(proposedPitch, currYaw, 0);
@@ -337,14 +552,19 @@ OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
         var proposedY = currPivot.y + (-testForward.y) * currDist;
 
         var minY = this.orbitCamera.minY;
+        var isAtMinY = preY <= minY + 1e-4;
         var wouldGoBelow = proposedY < minY - 1e-4;
+        var suppressed = false;
 
         if (wouldGoBelow && (proposedY < preY)) {
+            // Suppress vertical, allow horizontal (yaw)
             this.orbitCamera.yaw = currYaw - deltaYaw;
+            suppressed = true;
         } else {
             this.orbitCamera.pitch = proposedPitch;
             this.orbitCamera.yaw = currYaw - deltaYaw;
         }
+        
         this.lastTouchPoint.set(touch.x, touch.y);
     } else if (touches.length === 2) {
         var currentPinchDistance = this.getPinchDistance(touches[0], touches[1]);
@@ -356,3 +576,4 @@ OrbitCameraInputTouch.prototype.onTouchMove = function (event) {
         this.lastPinchMidPoint.copy(pinchMidPoint);
     }
 };
+// ---------------------------------------------------------------------