Revert "Solve struct ellipsoid caused the model to dark"

This reverts commit d6f91aa.

CONTRIBUTORS.md

@@ -211,4 +211,3 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
 * [Trubie Turner](https://github.com/flexei)
 * [Merijn Wijngaard](https://github.com/mwijngaard)
 * [Dennis Adams](https://github.com/dennisadams)
-* [Hai Zhou](https://github.com/verybigzhouhai)

Source/Scene/processPbrMaterials.js

@@ -740,9 +740,9 @@ define([
 
             fragmentShader += '    vec3 r = normalize(czm_inverseViewRotation * normalize(reflect(v, n)));\n';
             // Figure out if the reflection vector hits the ellipsoid
-            fragmentShader += '    czm_getWgs84EllipsoidEC();\n';
+            fragmentShader += '    czm_ellipsoid ellipsoid = czm_getWgs84EllipsoidEC();\n';
             fragmentShader += '    float vertexRadius = length(positionWC);\n';
-            fragmentShader += '    float horizonDotNadir = 1.0 - min(1.0, czm_ellipsoid_radii.x / vertexRadius);\n';
+            fragmentShader += '    float horizonDotNadir = 1.0 - min(1.0, ellipsoid.radii.x / vertexRadius);\n';
             fragmentShader += '    float reflectionDotNadir = dot(r, normalize(positionWC));\n';
             // Flipping the X vector is a cheap way to get the inverse of czm_temeToPseudoFixed, since that's a rotation about Z.
             fragmentShader += '    r.x = -r.x;\n';

Source/Shaders/Builtin/Functions/ellipsoidNew.glsl

@@ -9,8 +9,6 @@ czm_ellipsoid czm_ellipsoidNew(vec3 center, vec3 radii)
 {
     vec3 inverseRadii = vec3(1.0 / radii.x, 1.0 / radii.y, 1.0 / radii.z);
     vec3 inverseRadiiSquared = inverseRadii * inverseRadii;
-    czm_ellipsoid_center = center;
-    czm_ellipsoid_radii = radii;
-    czm_ellipsoid_inverseRadii = inverseRadii;
-    czm_ellipsoid_inverseRadiiSquared = inverseRadiiSquared;
+    czm_ellipsoid temp = czm_ellipsoid(center, radii, inverseRadii, inverseRadiiSquared);
+    return temp;
 }

Source/Shaders/Builtin/Functions/getWgs84EllipsoidEC.glsl

@@ -4,20 +4,18 @@
  * @name czm_getWgs84EllipsoidEC
  * @glslFunction
  *
+ * @returns {czm_ellipsoid} The WGS84 ellipsoid, with its center at the origin of world coordinates, in eye coordinates.
  *
  * @see Ellipsoid.WGS84
  *
  * @example
- * czm_getWgs84EllipsoidEC();
+ * czm_ellipsoid ellipsoid = czm_getWgs84EllipsoidEC();
  */
 czm_ellipsoid czm_getWgs84EllipsoidEC()
 {
     vec3 radii = vec3(6378137.0, 6378137.0, 6356752.314245);
     vec3 inverseRadii = vec3(1.0 / radii.x, 1.0 / radii.y, 1.0 / radii.z);
     vec3 inverseRadiiSquared = inverseRadii * inverseRadii;
-    czm_ellipsoid_center = czm_view[3].xyz;
-    czm_ellipsoid_radii = radii;
-    czm_ellipsoid_inverseRadii = inverseRadii;
-    czm_ellipsoid_inverseRadiiSquared = inverseRadiiSquared;
-
+    czm_ellipsoid temp = czm_ellipsoid(czm_view[3].xyz, radii, inverseRadii, inverseRadiiSquared);
+    return temp;
 }

Source/Shaders/Builtin/Functions/rayEllipsoidIntersectionInterval.glsl

@@ -4,17 +4,17 @@
  * @name czm_rayEllipsoidIntersectionInterval
  * @glslFunction
  */
-czm_raySegment czm_rayEllipsoidIntersectionInterval(czm_ray ray, vec3 center, vec3 inverseRadii)
+czm_raySegment czm_rayEllipsoidIntersectionInterval(czm_ray ray, czm_ellipsoid ellipsoid)
 {
-    // ray and ellipsoid center in eye coordinates.  radii in model coordinates.
-    vec3 q = inverseRadii * (czm_inverseModelView * vec4(ray.origin, 1.0)).xyz;
-    vec3 w = inverseRadii * (czm_inverseModelView * vec4(ray.direction, 0.0)).xyz;
-
-    q = q - inverseRadii * (czm_inverseModelView * vec4(center, 1.0)).xyz;
-
+   // ray and ellipsoid center in eye coordinates.  radii in model coordinates.
+    vec3 q = ellipsoid.inverseRadii * (czm_inverseModelView * vec4(ray.origin, 1.0)).xyz;
+    vec3 w = ellipsoid.inverseRadii * (czm_inverseModelView * vec4(ray.direction, 0.0)).xyz;
+   
+    q = q - ellipsoid.inverseRadii * (czm_inverseModelView * vec4(ellipsoid.center, 1.0)).xyz;
+    
     float q2 = dot(q, q);
     float qw = dot(q, w);
-
+    
     if (q2 > 1.0) // Outside ellipsoid.
     {
         if (qw >= 0.0) // Looking outward or tangent (0 intersections).
@@ -27,11 +27,11 @@ czm_raySegment czm_rayEllipsoidIntersectionInterval(czm_ray ray, vec3 center, ve
             float difference = q2 - 1.0; // Positively valued.
             float w2 = dot(w, w);
             float product = w2 * difference;
-
+            
             if (qw2 < product) // Imaginary roots (0 intersections).
             {
-                return czm_emptyRaySegment;
-            }
+                return czm_emptyRaySegment;     
+            }   
             else if (qw2 > product) // Distinct roots (2 intersections).
             {
                 float discriminant = qw * qw - product;

Source/Shaders/Builtin/Structs/ellipsoid.glsl

@@ -1,8 +1,12 @@
-/**
-*
-struct ellipsoid
-*/
-vec3 czm_ellipsoid_center;
-vec3 czm_ellipsoid_radii;
-vec3 czm_ellipsoid_inverseRadii;
-vec3 czm_ellipsoid_inverseRadiiSquared;
+/** DOC_TBA
+ *
+ * @name czm_ellipsoid
+ * @glslStruct
+ */
+struct czm_ellipsoid
+{
+    vec3 center;
+    vec3 radii;
+    vec3 inverseRadii;
+    vec3 inverseRadiiSquared;
+};

Source/Shaders/DepthPlaneFS.glsl

@@ -3,12 +3,12 @@ varying vec4 positionEC;
 void main()
 {
     // TODO: make arbitrary ellipsoid
-    czm_getWgs84EllipsoidEC();
+    czm_ellipsoid ellipsoid = czm_getWgs84EllipsoidEC();
 
     vec3 direction = normalize(positionEC.xyz);
     czm_ray ray = czm_ray(vec3(0.0), direction);
 
-    czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, czm_ellipsoid_center, czm_ellipsoid_inverseRadii);
+    czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, ellipsoid);
     if (!czm_isEmpty(intersection))
     {
         gl_FragColor = vec4(1.0, 1.0, 0.0, 1.0);

Source/Shaders/EllipsoidFS.glsl

@@ -73,9 +73,9 @@ void main()
 
     // March ray forward to intersection with larger sphere and find
     // actual intersection point with ellipsoid.
-    czm_ellipsoidNew(ellipsoidCenter, u_radii);
+    czm_ellipsoid ellipsoid = czm_ellipsoidNew(ellipsoidCenter, u_radii);
     czm_ray ray = czm_ray(t * direction, direction);
-    czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, czm_ellipsoid_center, czm_ellipsoid_inverseRadii);
+    czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, ellipsoid);
 
     if (czm_isEmpty(intersection))
     {

Source/Shaders/GlobeFS.glsl

@@ -278,8 +278,7 @@ void main()
     float fadeOutDist = u_lightingFadeDistance.x;
     float fadeInDist = u_lightingFadeDistance.y;
     if (czm_sceneMode != czm_sceneMode3D) {
-        czm_getWgs84EllipsoidEC();
-        vec3 radii = czm_ellipsoid_radii;
+        vec3 radii = czm_getWgs84EllipsoidEC().radii;
         float maxRadii = max(radii.x, max(radii.y, radii.z));
         fadeOutDist -= maxRadii;
         fadeInDist -= maxRadii;
@@ -377,7 +376,7 @@ void main()
     }
 
 #if defined(PER_FRAGMENT_GROUND_ATMOSPHERE) && (defined(ENABLE_DAYNIGHT_SHADING) || defined(ENABLE_VERTEX_LIGHTING))
-    czm_getWgs84EllipsoidEC();
+    czm_ellipsoid ellipsoid = czm_getWgs84EllipsoidEC();
 
     float mpp = czm_metersPerPixel(vec4(0.0, 0.0, -czm_currentFrustum.x, 1.0));
     vec2 xy = gl_FragCoord.xy / czm_viewport.zw * 2.0 - vec2(1.0);
@@ -386,7 +385,7 @@ void main()
     vec3 direction = normalize(vec3(xy, -czm_currentFrustum.x));
     czm_ray ray = czm_ray(vec3(0.0), direction);
 
-    czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, czm_ellipsoid_center, czm_ellipsoid_inverseRadii);
+    czm_raySegment intersection = czm_rayEllipsoidIntersectionInterval(ray, ellipsoid);
 
     vec3 ellipsoidPosition = czm_pointAlongRay(ray, intersection.start);
     ellipsoidPosition = (czm_inverseView * vec4(ellipsoidPosition, 1.0)).xyz;

Source/Shaders/GlobeVS.glsl

@@ -176,8 +176,7 @@ void main()
 #endif
 
 #ifdef APPLY_MATERIAL
-    czm_getWgs84EllipsoidEC();
-    float northPoleZ = czm_ellipsoid_radii.z;
+    float northPoleZ = czm_getWgs84EllipsoidEC().radii.z;
     vec3 northPolePositionMC = vec3(0.0, 0.0, northPoleZ);
     vec3 ellipsoidNormal = normalize(v_positionMC); // For a sphere this is correct, but not generally for an ellipsoid.
     vec3 vectorEastMC = normalize(cross(northPolePositionMC - v_positionMC, ellipsoidNormal));