David Catuhe 6 rokov pred
rodič
commit
4dd309ddf4
1 zmenil súbory, kde vykonal 24 pridanie a 17 odobranie
  1. 24 17
      src/Culling/ray.ts

+ 24 - 17
src/Culling/ray.ts

@@ -252,21 +252,28 @@ export class Ray {
      * @returns a vector containing the coordinates where 'axis' is equal to zero (else offset), or null if there is no intercept.
      */
     public intersectsAxis(axis: string, offset: number = 0): Nullable<Vector3> {
-          switch (axis) {
-              case 'y':
-        var t = (this.origin.y - offset) / this.direction.y;
-        if (t > 0) { return null; } // for example if the sky was clicked
-        return new Vector3(this.origin.x + (this.direction.x * -t), offset, this.origin.z + (this.direction.z * -t));
-              case 'x':
-        var t = (this.origin.x - offset) / this.direction.x;
-        if (t > 0) { return null; }
-        return new Vector3(offset, this.origin.y + (this.direction.y * -t), this.origin.z + (this.direction.z * -t));
-              case 'z':
-        var t = (this.origin.z - offset) / this.direction.z;
-        if (t > 0) { return null; }
-        return new Vector3(this.origin.x + (this.direction.x * -t), this.origin.y + (this.direction.y * -t), offset);
-              default: return null;
-          }
+        switch (axis) {
+            case 'y':
+                var t = (this.origin.y - offset) / this.direction.y;
+                if (t > 0) {
+                    return null;
+                }
+                return new Vector3(this.origin.x + (this.direction.x * -t), offset, this.origin.z + (this.direction.z * -t));
+            case 'x':
+                var t = (this.origin.x - offset) / this.direction.x;
+                if (t > 0) {
+                    return null;
+                }
+                return new Vector3(offset, this.origin.y + (this.direction.y * -t), this.origin.z + (this.direction.z * -t));
+            case 'z':
+                var t = (this.origin.z - offset) / this.direction.z;
+                if (t > 0) {
+                    return null;
+                }
+                return new Vector3(this.origin.x + (this.direction.x * -t), this.origin.y + (this.direction.y * -t), offset);
+            default:
+                return null;
+        }
     }
 
     /**
@@ -689,8 +696,8 @@ Scene.prototype._internalPick = function(rayFunction: (world: Matrix) => Ray, pr
 };
 
 Scene.prototype._internalMultiPick = function(rayFunction: (world: Matrix) => Ray,
-        predicate?: (mesh: AbstractMesh) => boolean,
-        trianglePredicate?: TrianglePickingPredicate): Nullable<PickingInfo[]> {
+    predicate?: (mesh: AbstractMesh) => boolean,
+    trianglePredicate?: TrianglePickingPredicate): Nullable<PickingInfo[]> {
     if (!PickingInfo) {
         return null;
     }