Merge pull request #6641 from xtassin/patch-1

Normalize cross product result for up vector to fix #6640
CesiumGS · Oct 23, 2018 · 3c69b57 · 3c69b57
2 parents 6757f83 + f40a5c9
commit 3c69b57
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -117,6 +117,9 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
    * [Chris Cooper](https://github.com/chris-cooper)
    * [Andrew McDowell](https://github.com/madole)
    * [Tony Luk](https://github.com/impactblue573)
+* [GeoFS](https://www.geo-fs.com)
+   * [Xavier Tassin](https://github.com/xtassin/)
+
 ## [Individual CLA](Documentation/Contributors/CLAs/individual-cla-agi-v1.0.txt)
 * [Victor Berchet](https://github.com/vicb)
 * [Caleb Morse](https://github.com/cmorse)

diff --git a/Source/Core/Transforms.js b/Source/Core/Transforms.js
@@ -808,13 +808,16 @@ define([
 
         var normal = defaultValue(ellipsoid, Ellipsoid.WGS84).geodeticSurfaceNormal(position, normalScratch);
         var right = Cartesian3.cross(velocity, normal, rightScratch);
+
         if (Cartesian3.equalsEpsilon(right, Cartesian3.ZERO, CesiumMath.EPSILON6)) {
             right = Cartesian3.clone(Cartesian3.UNIT_X, right);
         }
 
         var up = Cartesian3.cross(right, velocity, upScratch);
+        Cartesian3.normalize(up, up);
         Cartesian3.cross(velocity, up, right);
         Cartesian3.negate(right, right);
+        Cartesian3.normalize(right, right);
 
         if (!defined(result)) {
             result = new Matrix3();