Cleaned up version of collada pickray intersection code.

markpet49 · markpet49 · commit 00aed5252765 · 2020-09-16T18:52:35.000-05:00
diff --git a/examples/Collada.js b/examples/Collada.js
@@ -26,7 +26,8 @@
  * PDF found in code  directory.
  */
 /**
- * Illustrates how to load and display a Collada 3D model onto the globe.
+ * Illustrates how to load and display a Collada 3D model onto the globe. Also shows how to calculate
+ * intersection points when you click on the model.
  */
 
 requirejs(['./WorldWindShim',
@@ -79,13 +80,18 @@ requirejs(['./WorldWindShim',
             duckScene = scene;
         });
 
+        // Add place marks to intersection points with the ray extending from the eye point when the
+        // model is clicked.
         var placemarkAttributes = new WorldWind.PlacemarkAttributes(null);
         placemarkAttributes.imageScale = 1;
         placemarkAttributes.imageColor = WorldWind.Color.RED;
         placemarkAttributes.labelAttributes.color = WorldWind.Color.YELLOW;
         placemarkAttributes.drawLeaderLine = true;
         placemarkAttributes.leaderLineAttributes.outlineColor = WorldWind.Color.RED;
         placemarkAttributes.imageSource = WorldWind.configuration.baseUrl + "images/crosshair.png";
+        var closestPlacemarkAttributes = new WorldWind.PlacemarkAttributes(placemarkAttributes);
+        closestPlacemarkAttributes.imageColor = WorldWind.Color.GREEN;
+        closestPlacemarkAttributes.leaderLineAttributes.outlineColor = WorldWind.Color.GREEN;
         var handleClick = function (o) {
             if (duckScene == null) {
                 return;
@@ -98,7 +104,11 @@ requirejs(['./WorldWindShim',
                 for (var i = 0, len = intersections.length; i < len; i++) {
                     var placemark = new WorldWind.Placemark(intersections[i], true, null);
                     placemark.altitudeMode = WorldWind.ABSOLUTE;
-                    placemark.attributes = placemarkAttributes;
+                    if (i == 0) {
+                        placemark.attributes = closestPlacemarkAttributes;
+                    } else {
+                        placemark.attributes = placemarkAttributes;
+                    }
                     placemarkLayer.addRenderable(placemark);
                 }
             }
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,75 +1,74 @@
 // Karma configuration
 // Generated on Thu Feb 04 2016 14:07:41 GMT+0100 (CET)
 
-module.exports = function(config) {
-  config.set({
+module.exports = function (config) {
+    config.set({
 
-    // base path that will be used to resolve all patterns (eg. files, exclude)
-    basePath: '',
+        // base path that will be used to resolve all patterns (eg. files, exclude)
+        basePath: '',
 
 
-    // frameworks to use
-    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-    frameworks: ['jasmine', 'requirejs'],
+        // frameworks to use
+        // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+        frameworks: ['jasmine', 'requirejs'],
 
 
-    // list of files / patterns to load in the browser
-    files: [
-      'test/test-main.js',
-      {pattern: 'test/**/*.test.js', included: false},
-      {pattern: 'src/**/*.js', included: false},
-      {pattern: 'examples/data/KML_Samples.kml', included: false},
-      {pattern: 'test/formats/geotiff/*.tif', included: false},
-      {pattern: 'test/ogc/wcs/*.xml', included: false},
-      {pattern: 'test/formats/aaigrid/*.asc', included: false}
-    ],
+        // list of files / patterns to load in the browser
+        files: [
+            'test/test-main.js',
+            {pattern: 'test/**/*.test.js', included: false},
+            {pattern: 'src/**/*.js', included: false},
+            {pattern: 'examples/data/KML_Samples.kml', included: false},
+            {pattern: 'test/formats/geotiff/*.tif', included: false},
+            {pattern: 'test/ogc/wcs/*.xml', included: false},
+            {pattern: 'test/formats/aaigrid/*.asc', included: false},
+            {pattern: 'test/formats/collada/*.dae', included: false}
+        ],
 
 
-    // list of files to exclude
-    exclude: [
-    ],
+        // list of files to exclude
+        exclude: [],
 
 
-    // preprocess matching files before serving them to the browser
-    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-    preprocessors: {
-    },
+        // preprocess matching files before serving them to the browser
+        // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+        preprocessors: {},
 
 
-    // test results reporter to use
-    // possible values: 'dots', 'progress'
-    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-    reporters: ['progress'],
+        // test results reporter to use
+        // possible values: 'dots', 'progress'
+        // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+        reporters: ['progress'],
 
 
-    // web server port
-    port: 9876,
+        // web server port
+        port: 9876,
 
 
-    // enable / disable colors in the output (reporters and logs)
-    colors: true,
+        // enable / disable colors in the output (reporters and logs)
+        colors: true,
 
 
-    // level of logging
-    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
-    logLevel: config.LOG_INFO,
+        // level of logging
+        // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+        logLevel: config.LOG_INFO,
 
 
-    // enable / disable watching file and executing tests whenever any file changes
-    autoWatch: true,
+        // enable / disable watching file and executing tests whenever any file changes
+        autoWatch: true,
 
 
-    // start these browsers
-    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ['PhantomJS'],
+        // start these browsers
+        // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+        browsers: ['PhantomJS'],
 
 
-    // Continuous Integration mode
-    // if true, Karma captures browsers, runs the tests and exits
-    singleRun: false,
+        // Continuous Integration mode
+        // if true, Karma captures browsers, runs the tests and exits
+        singleRun: false,
 
-    // Concurrency level
-    // how many browser should be started simultaneous
-    concurrency: Infinity
-  })
+        // Concurrency level
+        // how many browser should be started simultaneous
+        concurrency: Infinity
+    })
 };
diff --git a/src/formats/collada/ColladaScene.js b/src/formats/collada/ColladaScene.js
@@ -74,11 +74,7 @@ define([
             }
 
             Renderable.call(this);
-
-            this._currentData = {
-                expired: true,
-                transformedPoints: []
-            };
+            this.resetCurrentData();
             // Documented in defineProperties below.
             this._position = position;
 
@@ -516,6 +512,14 @@ define([
 
         });
 
+        // Internal. Resets the cache of calculated data that doesn't need to be recomputed each time.
+        ColladaScene.prototype.resetCurrentData = function () {
+            this._currentData = {
+                expired: true,
+                transformedPoints: []
+            };
+        };
+
         // Internal. Intentionally not documented.
         ColladaScene.prototype.setSceneData = function (sceneData) {
             if (sceneData) {
@@ -622,6 +626,7 @@ define([
             return this;
         };
 
+        // Internal. Calculates the transformed cartesian coordinates of a mesh.
         ColladaScene.prototype.computeTransformedPoints = function (mesh) {
             var vtxs = mesh.vertices;
             var points = [];
@@ -646,6 +651,15 @@ define([
             return points;
         };
 
+        /**
+         * Calculates the intersection positions of a given ray with this scene.
+         * @param {Globe} globe The globe to use for translating points to positions.
+         * @param {Line} pointRay The ray to test for intersections.
+         * @param {Position[]} results An array to hold the results if any. This list is sorted in ascending order by
+         * distance from the eyepoint. The closest intersection will be the 0th element of the list.
+         * @returns {Boolean} true if any intersections are found.
+         * @throws {ArgumentError} if any of the arguments are not supplied.
+         */
         ColladaScene.prototype.computePointIntersections = function (globe, pointRay, results) {
             if (!globe) {
                 throw new ArgumentError(Logger.logMessage(Logger.LEVEL_SEVERE, "ColladaScene",
@@ -663,10 +677,12 @@ define([
                     "computePointIntersections", "missingResults"));
             }
 
+            var eyePoint = pointRay.origin;
             var computeTransforms = this._currentData.transformedPoints.length <= this._entities.length;
             if (computeTransforms) {
                 this._currentData.transformedPoints = [];
             }
+            var eyeDists = [];
             for (var i = 0, len = this._entities.length; i < len; i++) {
                 var mesh = this._entities[i].mesh;
                 if (computeTransforms) {
@@ -679,7 +695,20 @@ define([
                         var position = new Position(0, 0, 0);
                         globe.computePositionFromPoint(intersectionPoints[j][0],
                             intersectionPoints[j][1], intersectionPoints[j][2], position);
-                        results.push(position);
+                        // sorted insert
+                        var jEyeDist = intersectionPoints[j].distanceTo(eyePoint);
+                        var inserted = false;
+                        for (var k = 0, eLen = eyeDists.length; k < eLen && !inserted; k++) {
+                            if (jEyeDist < eyeDists[k]) {
+                                results.splice(k, 0, position);
+                                eyeDists.splice(k, 0, jEyeDist);
+                                inserted = true;
+                            }
+                        }
+                        if (!inserted) {
+                            results.push(position);
+                            eyeDists.push(jEyeDist);
+                        }
                     }
                 }
             }
@@ -708,7 +737,7 @@ define([
         // Internal. Intentionally not documented.
         ColladaScene.prototype.beginDrawing = function (dc) {
             if (this._currentData.expired) {
-                this._currentData.transformedPoints = [];
+                this.resetCurrentData();
             }
             var gl = dc.currentGlContext;
             var gpuResourceCache = dc.gpuResourceCache;
diff --git a/src/geom/Matrix.js b/src/geom/Matrix.js
@@ -1500,8 +1500,7 @@ define([
                     for (j = ii; j <= i - 1; j += 1) {
                         sum -= A[i][j] * b[j];
                     }
-                }
-                else if (sum != 0.0) {
+                } else if (sum != 0.0) {
                     ii = i;
                 }
 
@@ -1548,8 +1547,7 @@ define([
 
                 if (big == 0.0) {
                     return 0.0; // Matrix is singular if the entire row contains zero.
-                }
-                else {
+                } else {
                     vv[i] = 1.0 / big;
                 }
             }
@@ -1928,6 +1926,17 @@ define([
             return true;
         };
 
+        /**
+         * Returns a string representation of this matrix.
+         * @returns {String} A string representation of this matrix.
+         */
+        Matrix.prototype.toString = function () {
+            return "(" + this[0] + ", " + this[1] + ", " + this[2] + ", " + this[3] + ")\n" +
+                "(" + this[4] + ", " + this[5] + ", " + this[6] + ", " + this[7] + ")\n" +
+                "(" + this[8] + ", " + this[9] + ", " + this[10] + ", " + this[11] + ")\n" +
+                "(" + this[12] + ", " + this[13] + ", " + this[14] + ", " + this[15] + ")";
+        };
+
         return Matrix;
     });
 
diff --git a/src/shapes/PlacemarkAttributes.js b/src/shapes/PlacemarkAttributes.js
@@ -61,9 +61,9 @@ define([
             this._imageScale = attributes ? attributes._imageScale : 1;
             this._imageSource = attributes ? attributes._imageSource : null;
             this._depthTest = attributes ? attributes._depthTest : true;
-            this._labelAttributes = attributes ? attributes._labelAttributes : new TextAttributes(null);
+            this._labelAttributes = attributes ? new TextAttributes(attributes._labelAttributes) : new TextAttributes(null);
             this._drawLeaderLine = attributes ? attributes._drawLeaderLine : false;
-            this._leaderLineAttributes = attributes ? attributes._leaderLineAttributes : new ShapeAttributes(null);
+            this._leaderLineAttributes = attributes ? new ShapeAttributes(attributes._leaderLineAttributes) : new ShapeAttributes(null);
 
             /**
              * Indicates whether this object's state key is invalid. Subclasses must set this value to true when their
diff --git a/src/util/WWMath.js b/src/util/WWMath.js
@@ -258,6 +258,16 @@ define([
                 }
             },
 
+            /**
+             * Computes the Cartesian intersection point(s) of a specified line with a non-indexed list of
+             * triangle vertices.
+             * @param {Line} line The line for which to compute the intersection(s).
+             * @param {Vec3[]} points The list of triangle vertices arranged such that each
+             * 3-tuple, (i,i+1,i+2), specifies a triangle.
+             * @param {Vec3[]} results The Cartesian intersection point(s) if any.
+             * @returns {boolean} true if the line intersects any triangle, otherwise false
+             * @throws {ArgumentError} If any of the arguments is not supplied.
+             */
             computeTriangleListIntersection: function (line, points, results) {
                 if (!line) {
                     throw new ArgumentError(Logger.logMessage(Logger.LEVEL_SEVERE, "WWMath",
diff --git a/test/formats/collada/ColladaScene.test.js b/test/formats/collada/ColladaScene.test.js
@@ -26,12 +26,20 @@
  * PDF found in code  directory.
  */
 define([
+    'src/formats/collada/ColladaScene',
+    'test/CustomMatchers.test',
+    'src/globe/ElevationModel',
+    'src/globe/Globe',
+    'src/geom/Line',
+    'src/geom/Matrix',
     'src/geom/Position',
-    'src/formats/collada/ColladaScene'
-], function (Position, ColladaScene) {
+    'src/projections/ProjectionWgs84',
+    'src/geom/Vec3'
+], function (ColladaScene, CustomMatchers, ElevationModel, Globe, Line, Matrix, Position, ProjectionWgs84, Vec3) {
     "use strict";
 
     describe("ColladaScene calculation and data manipulation testing", function () {
+
         it("Should properly calculate new normals and create proper vertex order", function () {
             var indices = [0, 1, 2, 3, 2, 1, 4, 5, 6, 7, 6, 5, 8, 9, 10, 11, 10, 9, 12, 13, 14, 15, 14, 13, 16, 17, 18,
                 19, 18, 17, 20, 21, 22, 23, 22, 21];
@@ -92,5 +100,44 @@ define([
                 expect(mesh.uvs[i]).toBe(expectedUvs[i]);
             }
         });
+        it("Should properly compute intersection points with a ray", function () {
+            var colladaLoader = new WorldWind.ColladaLoader(new Position(44, -96, 10000));
+            colladaLoader.init({dirPath: '../base/test/formats/collada/'});
+            colladaLoader.load('bad_normals.dae', function (scene) {
+                scene.scale = 5000;
+                var transformation = new Matrix(-522.6423163382683, 3454.283622726456, -3576.9777274867624, -4577455.847120033,
+                    -5.898059818402838e-13, 3596.6807208022315, 3473.3107826121095, 4415038.196148923,
+                    4972.609476841367, 363.05983855741573, -375.9555086098537, -481109.9962739506,
+                    0, 0, 0, 1);
+                scene._transformationMatrix = transformation;
+                var origin = new Vec3(-12416258.178691395, 10375578.62866234, -2479066.981438789);
+                var direction = new Vec3(0.8649427998779189, -0.4976765198118716, 0.06474592317119227);
+                var pointRay = new Line(origin, direction);
+                var intersections = [];
+                var globe = new Globe(new WorldWind.ElevationModel(), new WorldWind.ProjectionWgs84());
+                var intersectionsFound = scene.computePointIntersections(globe, pointRay, intersections);
+                expect(intersectionsFound).toBe(false);
+                expect(intersections.length).toBe(0);
+                origin = new Vec3(-5117511.089956183, 4226332.17224274, -193896.81490928633);
+                direction = new Vec3(0.862977304871313, 0.24683805077319543, -0.4408414090889536);
+                pointRay = new Line(origin, direction);
+                intersectionsFound = scene.computePointIntersections(globe, pointRay, intersections);
+                expect(intersectionsFound).toBe(true);
+                expect(intersections.length).toBe(2);
+                var i1 = new Position(43.088776730634535, -95.18631436743668, 29685.22045946613);
+                var i2 = new Position(43.30646919618773, -95.39472743244926, 15659.079434582456);
+                expect(intersections[0]).toBeCloseToPosition(i1, 7, 7, 7);
+                expect(intersections[1]).toBeCloseToPosition(i2, 7, 7, 7);
+                expect(function () {
+                    scene.computePointIntersections(null, pointRay, intersections);
+                }).toThrow();
+                expect(function () {
+                    scene.computePointIntersections(globe, null, intersections);
+                }).toThrow();
+                expect(function () {
+                    scene.computePointIntersections(globe, pointRay, null);
+                }).toThrow();
+            });
+        });
     });
 });
diff --git a/test/formats/collada/bad_normals.dae b/test/formats/collada/bad_normals.dae
