@cesium/engine 7.0.0 → 9.0.0

package/Source/Shaders/Voxels/convertUvToCylinder.glsl

@@ -1,10 +1,7 @@
 /* Cylinder defines (set in Scene/VoxelCylinderShape.js)
 #define CYLINDER_HAS_SHAPE_BOUNDS_RADIUS
-#define CYLINDER_HAS_SHAPE_BOUNDS_RADIUS_FLAT
 #define CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT
-#define CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT_FLAT
 #define CYLINDER_HAS_SHAPE_BOUNDS_ANGLE
-#define CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_RANGE_EQUAL_ZERO
 #define CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MIN_DISCONTINUITY
 #define CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MAX_DISCONTINUITY
 #define CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MIN_MAX_REVERSED
@@ -26,49 +23,76 @@
     uniform float u_cylinderShapeUvAngleRangeZeroMid;
 #endif
 
-vec3 convertUvToShapeUvSpace(in vec3 positionUv) {
-    vec3 positionLocal = positionUv * 2.0 - 1.0; // [-1,+1]
+PointJacobianT convertUvToShapeSpaceDerivative(in vec3 positionUv) {
+    // Convert from Cartesian UV space [0, 1] to Cartesian local space [-1, 1]
+    vec3 position = positionUv * 2.0 - 1.0;
 
-    // Compute radius
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS_FLAT)
-        float radius = 1.0;
-    #else
-        float radius = length(positionLocal.xy); // [0,1]
-        #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS)
-            radius = radius * u_cylinderUvToShapeUvRadius.x + u_cylinderUvToShapeUvRadius.y; // x = scale, y = offset
-        #endif
+    float radius = length(position.xy); // [0, 1]
+    vec3 radial = normalize(vec3(position.xy, 0.0));
+
+    // Shape space height is defined within [0, 1]
+    float height = positionUv.z; // [0, 1]
+    vec3 z = vec3(0.0, 0.0, 1.0);
+
+    float angle = atan(position.y, position.x);
+    vec3 east = normalize(vec3(-position.y, position.x, 0.0));
+
+    vec3 point = vec3(radius, height, angle);
+    mat3 jacobianT = mat3(radial, z, east / length(position.xy));
+    return PointJacobianT(point, jacobianT);
+}
+
+vec3 convertShapeToShapeUvSpace(in vec3 positionShape) {
+    float radius = positionShape.x;
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS)
+        radius = radius * u_cylinderUvToShapeUvRadius.x + u_cylinderUvToShapeUvRadius.y;
     #endif
 
-    // Compute height
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT_FLAT)
-        float height = 1.0;
-    #else
-        float height = positionUv.z; // [0,1]
-        #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)
-            height = height * u_cylinderUvToShapeUvHeight.x + u_cylinderUvToShapeUvHeight.y; // x = scale, y = offset
-        #endif
+    float height = positionShape.y;
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)
+        height = height * u_cylinderUvToShapeUvHeight.x + u_cylinderUvToShapeUvHeight.y;
     #endif
 
-    // Compute angle
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_RANGE_EQUAL_ZERO)
-        float angle = 1.0;
-    #else
-        float angle = (atan(positionLocal.y, positionLocal.x) + czm_pi) / czm_twoPi; // [0,1]
-        #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE)
-            #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MIN_MAX_REVERSED)
-                // Comparing against u_cylinderShapeUvAngleMinMax has precision problems. u_cylinderShapeUvAngleRangeZeroMid is more conservative.
-                angle += float(angle < u_cylinderShapeUvAngleRangeZeroMid);
-            #endif
-
-            // Avoid flickering from reading voxels from both sides of the -pi/+pi discontinuity.
-            #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MIN_DISCONTINUITY)
-                angle = angle > u_cylinderShapeUvAngleRangeZeroMid ? u_cylinderShapeUvAngleMinMax.x : angle;
-            #elif defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MAX_DISCONTINUITY)
-                angle = angle < u_cylinderShapeUvAngleRangeZeroMid ? u_cylinderShapeUvAngleMinMax.y : angle;
-            #endif
-
-            angle = angle * u_cylinderUvToShapeUvAngle.x + u_cylinderUvToShapeUvAngle.y; // x = scale, y = offset
+    float angle = (positionShape.z + czm_pi) / czm_twoPi;
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE)
+        #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MIN_MAX_REVERSED)
+            // Comparing against u_cylinderShapeUvAngleMinMax has precision problems. u_cylinderShapeUvAngleRangeZeroMid is more conservative.
+            angle += float(angle < u_cylinderShapeUvAngleRangeZeroMid);
+        #endif
+
+        // Avoid flickering from reading voxels from both sides of the -pi/+pi discontinuity.
+        #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MIN_DISCONTINUITY)
+            angle = angle > u_cylinderShapeUvAngleRangeZeroMid ? u_cylinderShapeUvAngleMinMax.x : angle;
+        #elif defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MAX_DISCONTINUITY)
+            angle = angle < u_cylinderShapeUvAngleRangeZeroMid ? u_cylinderShapeUvAngleMinMax.y : angle;
         #endif
+
+        angle = angle * u_cylinderUvToShapeUvAngle.x + u_cylinderUvToShapeUvAngle.y;
+    #endif
+
+    return vec3(radius, height, angle);
+}
+
+PointJacobianT convertUvToShapeUvSpaceDerivative(in vec3 positionUv) {
+    PointJacobianT pointJacobian = convertUvToShapeSpaceDerivative(positionUv);
+    pointJacobian.point = convertShapeToShapeUvSpace(pointJacobian.point);
+    return pointJacobian;
+}
+
+vec3 scaleShapeUvToShapeSpace(in vec3 shapeUv) {
+    float radius = shapeUv.x;
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS)
+        radius /= u_cylinderUvToShapeUvRadius.x;
+    #endif
+
+    float height = shapeUv.y;
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)
+        height /= u_cylinderUvToShapeUvHeight.x;
+    #endif
+
+    float angle = shapeUv.z * czm_twoPi;
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE)
+        angle /= u_cylinderUvToShapeUvAngle.x;
     #endif
 
     return vec3(radius, height, angle);

package/Source/Shaders/Voxels/convertUvToCylinder.js

@@ -1,11 +1,8 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "/* Cylinder defines (set in Scene/VoxelCylinderShape.js)\n\
 #define CYLINDER_HAS_SHAPE_BOUNDS_RADIUS\n\
-#define CYLINDER_HAS_SHAPE_BOUNDS_RADIUS_FLAT\n\
 #define CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT\n\
-#define CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT_FLAT\n\
 #define CYLINDER_HAS_SHAPE_BOUNDS_ANGLE\n\
-#define CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_RANGE_EQUAL_ZERO\n\
 #define CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MIN_DISCONTINUITY\n\
 #define CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MAX_DISCONTINUITY\n\
 #define CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MIN_MAX_REVERSED\n\
@@ -27,49 +24,76 @@ export default "/* Cylinder defines (set in Scene/VoxelCylinderShape.js)\n\
     uniform float u_cylinderShapeUvAngleRangeZeroMid;\n\
 #endif\n\
 \n\
-vec3 convertUvToShapeUvSpace(in vec3 positionUv) {\n\
-    vec3 positionLocal = positionUv * 2.0 - 1.0; // [-1,+1]\n\
+PointJacobianT convertUvToShapeSpaceDerivative(in vec3 positionUv) {\n\
+    // Convert from Cartesian UV space [0, 1] to Cartesian local space [-1, 1]\n\
+    vec3 position = positionUv * 2.0 - 1.0;\n\
 \n\
-    // Compute radius\n\
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS_FLAT)\n\
-        float radius = 1.0;\n\
-    #else\n\
-        float radius = length(positionLocal.xy); // [0,1]\n\
-        #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS)\n\
-            radius = radius * u_cylinderUvToShapeUvRadius.x + u_cylinderUvToShapeUvRadius.y; // x = scale, y = offset\n\
-        #endif\n\
+    float radius = length(position.xy); // [0, 1]\n\
+    vec3 radial = normalize(vec3(position.xy, 0.0));\n\
+\n\
+    // Shape space height is defined within [0, 1]\n\
+    float height = positionUv.z; // [0, 1]\n\
+    vec3 z = vec3(0.0, 0.0, 1.0);\n\
+\n\
+    float angle = atan(position.y, position.x);\n\
+    vec3 east = normalize(vec3(-position.y, position.x, 0.0));\n\
+\n\
+    vec3 point = vec3(radius, height, angle);\n\
+    mat3 jacobianT = mat3(radial, z, east / length(position.xy));\n\
+    return PointJacobianT(point, jacobianT);\n\
+}\n\
+\n\
+vec3 convertShapeToShapeUvSpace(in vec3 positionShape) {\n\
+    float radius = positionShape.x;\n\
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS)\n\
+        radius = radius * u_cylinderUvToShapeUvRadius.x + u_cylinderUvToShapeUvRadius.y;\n\
     #endif\n\
 \n\
-    // Compute height\n\
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT_FLAT)\n\
-        float height = 1.0;\n\
-    #else\n\
-        float height = positionUv.z; // [0,1]\n\
-        #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)\n\
-            height = height * u_cylinderUvToShapeUvHeight.x + u_cylinderUvToShapeUvHeight.y; // x = scale, y = offset\n\
-        #endif\n\
+    float height = positionShape.y;\n\
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)\n\
+        height = height * u_cylinderUvToShapeUvHeight.x + u_cylinderUvToShapeUvHeight.y;\n\
     #endif\n\
 \n\
-    // Compute angle\n\
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_RANGE_EQUAL_ZERO)\n\
-        float angle = 1.0;\n\
-    #else\n\
-        float angle = (atan(positionLocal.y, positionLocal.x) + czm_pi) / czm_twoPi; // [0,1]\n\
-        #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE)\n\
-            #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MIN_MAX_REVERSED)\n\
-                // Comparing against u_cylinderShapeUvAngleMinMax has precision problems. u_cylinderShapeUvAngleRangeZeroMid is more conservative.\n\
-                angle += float(angle < u_cylinderShapeUvAngleRangeZeroMid);\n\
-            #endif\n\
-\n\
-            // Avoid flickering from reading voxels from both sides of the -pi/+pi discontinuity.\n\
-            #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MIN_DISCONTINUITY)\n\
-                angle = angle > u_cylinderShapeUvAngleRangeZeroMid ? u_cylinderShapeUvAngleMinMax.x : angle;\n\
-            #elif defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MAX_DISCONTINUITY)\n\
-                angle = angle < u_cylinderShapeUvAngleRangeZeroMid ? u_cylinderShapeUvAngleMinMax.y : angle;\n\
-            #endif\n\
-\n\
-            angle = angle * u_cylinderUvToShapeUvAngle.x + u_cylinderUvToShapeUvAngle.y; // x = scale, y = offset\n\
+    float angle = (positionShape.z + czm_pi) / czm_twoPi;\n\
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE)\n\
+        #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MIN_MAX_REVERSED)\n\
+            // Comparing against u_cylinderShapeUvAngleMinMax has precision problems. u_cylinderShapeUvAngleRangeZeroMid is more conservative.\n\
+            angle += float(angle < u_cylinderShapeUvAngleRangeZeroMid);\n\
+        #endif\n\
+\n\
+        // Avoid flickering from reading voxels from both sides of the -pi/+pi discontinuity.\n\
+        #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MIN_DISCONTINUITY)\n\
+            angle = angle > u_cylinderShapeUvAngleRangeZeroMid ? u_cylinderShapeUvAngleMinMax.x : angle;\n\
+        #elif defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MAX_DISCONTINUITY)\n\
+            angle = angle < u_cylinderShapeUvAngleRangeZeroMid ? u_cylinderShapeUvAngleMinMax.y : angle;\n\
         #endif\n\
+\n\
+        angle = angle * u_cylinderUvToShapeUvAngle.x + u_cylinderUvToShapeUvAngle.y;\n\
+    #endif\n\
+\n\
+    return vec3(radius, height, angle);\n\
+}\n\
+\n\
+PointJacobianT convertUvToShapeUvSpaceDerivative(in vec3 positionUv) {\n\
+    PointJacobianT pointJacobian = convertUvToShapeSpaceDerivative(positionUv);\n\
+    pointJacobian.point = convertShapeToShapeUvSpace(pointJacobian.point);\n\
+    return pointJacobian;\n\
+}\n\
+\n\
+vec3 scaleShapeUvToShapeSpace(in vec3 shapeUv) {\n\
+    float radius = shapeUv.x;\n\
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS)\n\
+        radius /= u_cylinderUvToShapeUvRadius.x;\n\
+    #endif\n\
+\n\
+    float height = shapeUv.y;\n\
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT)\n\
+        height /= u_cylinderUvToShapeUvHeight.x;\n\
+    #endif\n\
+\n\
+    float angle = shapeUv.z * czm_twoPi;\n\
+    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE)\n\
+        angle /= u_cylinderUvToShapeUvAngle.x;\n\
     #endif\n\
 \n\
     return vec3(radius, height, angle);\n\

package/Source/Shaders/Voxels/convertUvToEllipsoid.glsl

@@ -2,19 +2,13 @@
 #define ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MIN_DISCONTINUITY
 #define ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MAX_DISCONTINUITY
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE
-#define ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_MIN_MAX_REVERSED
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE
-#define ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO
-#define ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_MIN
-#define ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_FLAT
-#define ELLIPSOID_IS_SPHERE
 */
 
 uniform vec3 u_ellipsoidRadiiUv; // [0,1]
-#if !defined(ELLIPSOID_IS_SPHERE)
-    uniform vec3 u_ellipsoidInverseRadiiSquaredUv;
-#endif
+uniform vec2 u_evoluteScale; // (radiiUv.x ^ 2 - radiiUv.z ^ 2) * vec2(1.0, -1.0) / radiiUv;
+uniform vec3 u_ellipsoidInverseRadiiSquaredUv;
 #if defined(ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MIN_DISCONTINUITY) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MAX_DISCONTINUITY) || defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_MIN_MAX_REVERSED)
     uniform vec3 u_ellipsoidShapeUvLongitudeMinMaxMid;
 #endif
@@ -24,107 +18,122 @@ uniform vec3 u_ellipsoidRadiiUv; // [0,1]
 #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE)
     uniform vec2 u_ellipsoidUvToShapeUvLatitude; // x = scale, y = offset
 #endif
-#if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_MIN) && !defined(ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_FLAT)
-    uniform float u_ellipsoidInverseHeightDifferenceUv;
-    uniform vec2 u_ellipseInnerRadiiUv; // [0,1]
-#endif
+uniform float u_ellipsoidInverseHeightDifferenceUv;
 
 // robust iterative solution without trig functions
 // https://github.com/0xfaded/ellipse_demo/issues/1
 // https://stackoverflow.com/questions/22959698/distance-from-given-point-to-given-ellipse
-// Pro: Good when radii.x ~= radii.y
-// Con: Breaks at pos.x ~= 0.0, especially inside the ellipse
-// Con: Inaccurate with exterior points and thin ellipses
-float ellipseDistanceIterative (vec2 pos, vec2 radii) {
+// Extended to return radius of curvature along with the point
+vec3 nearestPointAndRadiusOnEllipse(vec2 pos, vec2 radii) {
     vec2 p = abs(pos);
-    vec2 invRadii = 1.0 / radii;
-    vec2 a = vec2(1.0, -1.0) * (radii.x * radii.x - radii.y * radii.y) * invRadii;
-    vec2 t = vec2(0.70710678118); // sqrt(2) / 2
-    vec2 v = radii * t;
+    vec2 inverseRadii = 1.0 / radii;
+
+    // We describe the ellipse parametrically: v = radii * vec2(cos(t), sin(t))
+    // but store the cos and sin of t in a vec2 for efficiency.
+    // Initial guess: t = pi/4
+    vec2 tTrigs = vec2(0.7071067811865476);
+    // Initial guess of point on ellipsoid
+    vec2 v = radii * tTrigs;
+    // Center of curvature of the ellipse at v
+    vec2 evolute = u_evoluteScale * tTrigs * tTrigs * tTrigs;
 
     const int iterations = 3;
     for (int i = 0; i < iterations; ++i) {
-        vec2 e = a * pow(t, vec2(3.0));
-        vec2 q = normalize(p - e) * length(v - e);
-        t = normalize((q + e) * invRadii);
-        v = radii * t;
+        // Find the (approximate) intersection of p - evolute with the ellipsoid.
+        vec2 q = normalize(p - evolute) * length(v - evolute);
+        // Update the estimate of t.
+        tTrigs = (q + evolute) * inverseRadii;
+        tTrigs = normalize(clamp(tTrigs, 0.0, 1.0));
+        v = radii * tTrigs;
+        evolute = u_evoluteScale * tTrigs * tTrigs * tTrigs;
     }
-    return length(v * sign(pos) - pos) * sign(p.y - v.y);
+
+    return vec3(v * sign(pos), length(v - evolute));
+}
+
+PointJacobianT convertUvToShapeSpaceDerivative(in vec3 positionUv) {
+    // Convert from UV space [0, 1] to local space [-1, 1]
+    vec3 position = positionUv * 2.0 - 1.0;
+    // Undo the scaling from ellipsoid to sphere
+    position = position * u_ellipsoidRadiiUv;
+
+    float longitude = atan(position.y, position.x);
+    vec3 east = normalize(vec3(-position.y, position.x, 0.0));
+
+    // Convert the 3D position to a 2D position relative to the ellipse (radii.x, radii.z)
+    // (assume radii.y == radii.x) and find the nearest point on the ellipse and its normal
+    float distanceFromZAxis = length(position.xy);
+    vec2 posEllipse = vec2(distanceFromZAxis, position.z);
+    vec3 surfacePointAndRadius = nearestPointAndRadiusOnEllipse(posEllipse, u_ellipsoidRadiiUv.xz);
+    vec2 surfacePoint = surfacePointAndRadius.xy;
+
+    vec2 normal2d = normalize(surfacePoint * u_ellipsoidInverseRadiiSquaredUv.xz);
+    float latitude = atan(normal2d.y, normal2d.x);
+    vec3 north = vec3(-normal2d.y * normalize(position.xy), abs(normal2d.x));
+
+    float heightSign = length(posEllipse) < length(surfacePoint) ? -1.0 : 1.0;
+    float height = heightSign * length(posEllipse - surfacePoint);
+    vec3 up = normalize(cross(east, north));
+
+    vec3 point = vec3(longitude, latitude, height);
+    mat3 jacobianT = mat3(east / distanceFromZAxis, north / (surfacePointAndRadius.z + height), up);
+    return PointJacobianT(point, jacobianT);
 }
 
-vec3 convertUvToShapeUvSpace(in vec3 positionUv) {
-    // Compute position and normal.
-    // Convert positionUv [0,1] to local space [-1,+1] to "normalized" cartesian space [-a,+a] where a = (radii + height) / (max(radii) + height).
-    // A point on the largest ellipsoid axis would be [-1,+1] and everything else would be smaller.
-    vec3 positionLocal = positionUv * 2.0 - 1.0;
-    #if defined(ELLIPSOID_IS_SPHERE)
-        vec3 posEllipsoid = positionLocal * u_ellipsoidRadiiUv.x;
-        vec3 normal = normalize(posEllipsoid);
-    #else
-        vec3 posEllipsoid = positionLocal * u_ellipsoidRadiiUv;
-        vec3 normal = normalize(posEllipsoid * u_ellipsoidInverseRadiiSquaredUv); // geodetic surface normal
+vec3 convertShapeToShapeUvSpace(in vec3 positionShape) {
+    // Longitude: shift & scale to [0, 1]
+    float longitude = (positionShape.x + czm_pi) / czm_twoPi;
+
+    // Correct the angle when max < min
+    // Technically this should compare against min longitude - but it has precision problems so compare against the middle of empty space.
+    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_MIN_MAX_REVERSED)
+        longitude += float(longitude < u_ellipsoidShapeUvLongitudeMinMaxMid.z);
     #endif
 
-    // Compute longitude
-    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO)
-        float longitude = 1.0;
-    #else
-        float longitude = (atan(normal.y, normal.x) + czm_pi) / czm_twoPi;
-
-        // Correct the angle when max < min
-        // Technically this should compare against min longitude - but it has precision problems so compare against the middle of empty space.
-        #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_MIN_MAX_REVERSED)
-            longitude += float(longitude < u_ellipsoidShapeUvLongitudeMinMaxMid.z);
-        #endif
-
-        // Avoid flickering from reading voxels from both sides of the -pi/+pi discontinuity.
-        #if defined(ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MIN_DISCONTINUITY)
-            longitude = longitude > u_ellipsoidShapeUvLongitudeMinMaxMid.z ? u_ellipsoidShapeUvLongitudeMinMaxMid.x : longitude;
-        #endif
-        #if defined(ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MAX_DISCONTINUITY)
-            longitude = longitude < u_ellipsoidShapeUvLongitudeMinMaxMid.z ? u_ellipsoidShapeUvLongitudeMinMaxMid.y : longitude;
-        #endif
-
-        #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE)
-            longitude = longitude * u_ellipsoidUvToShapeUvLongitude.x + u_ellipsoidUvToShapeUvLongitude.y;
-        #endif
+    // Avoid flickering from reading voxels from both sides of the -pi/+pi discontinuity.
+    #if defined(ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MIN_DISCONTINUITY)
+        longitude = longitude > u_ellipsoidShapeUvLongitudeMinMaxMid.z ? u_ellipsoidShapeUvLongitudeMinMaxMid.x : longitude;
     #endif
+    #if defined(ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MAX_DISCONTINUITY)
+        longitude = longitude < u_ellipsoidShapeUvLongitudeMinMaxMid.z ? u_ellipsoidShapeUvLongitudeMinMaxMid.y : longitude;
+    #endif
+
+    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE)
+        longitude = longitude * u_ellipsoidUvToShapeUvLongitude.x + u_ellipsoidUvToShapeUvLongitude.y;
+    #endif
+
+    // Latitude: shift and scale to [0, 1]
+    float latitude = (positionShape.y + czm_piOverTwo) / czm_pi;
+    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE)
+        latitude = latitude * u_ellipsoidUvToShapeUvLatitude.x + u_ellipsoidUvToShapeUvLatitude.y;
+    #endif
+
+    // Height: scale to the range [0, 1]
+    float height = 1.0 + positionShape.z * u_ellipsoidInverseHeightDifferenceUv;
+
+    return vec3(longitude, latitude, height);
+}
+
+PointJacobianT convertUvToShapeUvSpaceDerivative(in vec3 positionUv) {
+    PointJacobianT pointJacobian = convertUvToShapeSpaceDerivative(positionUv);
+    pointJacobian.point = convertShapeToShapeUvSpace(pointJacobian.point);
+    return pointJacobian;
+}
 
-    // Compute latitude
-    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO)
-        float latitude = 1.0;
-    #else
-        float latitude = (asin(normal.z) + czm_piOverTwo) / czm_pi;
-        #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE)
-            latitude = latitude * u_ellipsoidUvToShapeUvLatitude.x + u_ellipsoidUvToShapeUvLatitude.y;
-        #endif
+vec3 scaleShapeUvToShapeSpace(in vec3 shapeUv) {
+    // Convert from [0, 1] to radians [-pi, pi]
+    float longitude = shapeUv.x * czm_twoPi;
+    #if defined (ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE)
+        longitude /= u_ellipsoidUvToShapeUvLongitude.x;
     #endif
 
-    // Compute height
-    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_FLAT)
-        // TODO: This breaks down when minBounds == maxBounds. To fix it, this
-        // function would have to know if ray is intersecting the front or back of the shape
-        // and set the shape space position to 1 (front) or 0 (back) accordingly.
-        float height = 1.0;
-    #else
-        #if defined(ELLIPSOID_IS_SPHERE)
-            #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_MIN)
-                float height = (length(posEllipsoid) - u_ellipseInnerRadiiUv.x) * u_ellipsoidInverseHeightDifferenceUv;
-            #else
-                float height = length(posEllipsoid);
-            #endif
-        #else
-            #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_MIN)
-                // Convert the 3D position to a 2D position relative to the ellipse (radii.x, radii.z) (assuming radii.x == radii.y which is true for WGS84).
-                // This is an optimization so that math can be done with ellipses instead of ellipsoids.
-                vec2 posEllipse = vec2(length(posEllipsoid.xy), posEllipsoid.z);
-                float height = ellipseDistanceIterative(posEllipse, u_ellipseInnerRadiiUv) * u_ellipsoidInverseHeightDifferenceUv;
-            #else
-                // TODO: this is probably not correct
-                float height = length(posEllipsoid);
-            #endif
-        #endif
+    // Convert from [0, 1] to radians [-pi/2, pi/2]
+    float latitude = shapeUv.y * czm_pi;
+    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE)
+        latitude /= u_ellipsoidUvToShapeUvLatitude.x;
     #endif
+    
+    float height = shapeUv.z / u_ellipsoidInverseHeightDifferenceUv;
 
     return vec3(longitude, latitude, height);
 }