@cesium/engine 1.1.0 → 2.1.0

package/Source/Shaders/Voxels/VoxelFS.js

@@ -14,6 +14,7 @@ export default "// See Intersection.glsl for the definition of intersectScene\n\
 \n\
 uniform mat3 u_transformDirectionViewToLocal;\n\
 uniform vec3 u_cameraPositionUv;\n\
+uniform float u_stepSize;\n\
 \n\
 #if defined(PICKING)\n\
     uniform vec4 u_pickColor;\n\
@@ -28,6 +29,20 @@ float hash(vec2 p)\n\
 }\n\
 #endif\n\
 \n\
+vec4 getStepSize(in SampleData sampleData, in Ray viewRay, in RayShapeIntersection shapeIntersection) {\n\
+#if defined(SHAPE_BOX)\n\
+    Box voxelBox = constructVoxelBox(sampleData.tileCoords, sampleData.tileUv);\n\
+    RayShapeIntersection voxelIntersection = intersectBox(viewRay, voxelBox);\n\
+    vec4 entry = shapeIntersection.entry.w >= voxelIntersection.entry.w ? shapeIntersection.entry : voxelIntersection.entry;\n\
+    float exit = min(voxelIntersection.exit.w, shapeIntersection.exit.w);\n\
+    float dt = (exit - entry.w) * RAY_SCALE;\n\
+    return vec4(normalize(entry.xyz), dt);\n\
+#else\n\
+    float dimAtLevel = pow(2.0, float(sampleData.tileCoords.w));\n\
+    return vec4(viewRay.dir, u_stepSize / dimAtLevel);\n\
+#endif\n\
+}\n\
+\n\
 void main()\n\
 {\n\
     vec4 fragCoord = gl_FragCoord;\n\
@@ -36,34 +51,36 @@ void main()\n\
     vec3 viewDirWorld = normalize(czm_inverseViewRotation * eyeDirection); // normalize again just in case\n\
     vec3 viewDirUv = normalize(u_transformDirectionViewToLocal * eyeDirection); // normalize again just in case\n\
     vec3 viewPosUv = u_cameraPositionUv;\n\
+    #if defined(SHAPE_BOX)\n\
+        vec3 dInv = 1.0 / viewDirUv;\n\
+        Ray viewRayUv = Ray(viewPosUv, viewDirUv, dInv);\n\
+    #else\n\
+        Ray viewRayUv = Ray(viewPosUv, viewDirUv);\n\
+    #endif\n\
 \n\
     Intersections ix;\n\
-    vec2 entryExitT = intersectScene(screenCoord, viewPosUv, viewDirUv, ix);\n\
+    RayShapeIntersection shapeIntersection = intersectScene(screenCoord, viewRayUv, ix);\n\
 \n\
     // Exit early if the scene was completely missed.\n\
-    if (entryExitT.x == NO_HIT) {\n\
+    if (shapeIntersection.entry.w == NO_HIT) {\n\
         discard;\n\
     }\n\
 \n\
-    float currT = entryExitT.x;\n\
-    float endT = entryExitT.y;\n\
+    float currT = shapeIntersection.entry.w * RAY_SCALE;\n\
+    float endT = shapeIntersection.exit.w;\n\
     vec3 positionUv = viewPosUv + currT * viewDirUv;\n\
-    // TODO: is it possible for this to be out of bounds, and does it matter?\n\
     vec3 positionUvShapeSpace = convertUvToShapeUvSpace(positionUv);\n\
 \n\
     // Traverse the tree from the start position\n\
     TraversalData traversalData;\n\
     SampleData sampleDatas[SAMPLE_COUNT];\n\
     traverseOctreeFromBeginning(positionUvShapeSpace, traversalData, sampleDatas);\n\
+    vec4 step = getStepSize(sampleDatas[0], viewRayUv, shapeIntersection);\n\
 \n\
-    // TODO:\n\
-    //  - jitter doesn't affect the first traversal?\n\
-    //  - jitter is always > 0?\n\
-    //  - jitter is only applied at one step?\n\
     #if defined(JITTER)\n\
         float noise = hash(screenCoord); // [0,1]\n\
-        currT += noise * traversalData.stepT;\n\
-        positionUv += noise * traversalData.stepT * viewDirUv;\n\
+        currT += noise * step.w;\n\
+        positionUv += noise * step.w * viewDirUv;\n\
     #endif\n\
 \n\
     FragmentInput fragmentInput;\n\
@@ -84,7 +101,8 @@ void main()\n\
         fragmentInput.voxel.positionUvLocal = sampleDatas[0].tileUv;\n\
         fragmentInput.voxel.viewDirUv = viewDirUv;\n\
         fragmentInput.voxel.viewDirWorld = viewDirWorld;\n\
-        fragmentInput.voxel.travelDistance = traversalData.stepT;\n\
+        fragmentInput.voxel.surfaceNormal = step.xyz;\n\
+        fragmentInput.voxel.travelDistance = step.w;\n\
 \n\
         // Run the custom shader\n\
         czm_modelMaterial materialOutput;\n\
@@ -104,36 +122,38 @@ void main()\n\
             break;\n\
         }\n\
 \n\
-        if (traversalData.stepT == 0.0) {\n\
-            // Shape is infinitely thin, no need to traverse further\n\
-            break;\n\
+        if (step.w == 0.0) {\n\
+            // Shape is infinitely thin. The ray may have hit the edge of a\n\
+            // foreground voxel. Step ahead slightly to check for more voxels\n\
+            step.w == 0.00001;\n\
         }\n\
 \n\
         // Keep raymarching\n\
-        currT += traversalData.stepT;\n\
-        positionUv += traversalData.stepT * viewDirUv;\n\
+        currT += step.w;\n\
+        positionUv += step.w * viewDirUv;\n\
 \n\
         // Check if there's more intersections.\n\
         if (currT > endT) {\n\
             #if (INTERSECTION_COUNT == 1)\n\
                 break;\n\
             #else\n\
-                vec2 entryExitT = nextIntersection(ix);\n\
-                if (entryExitT.x == NO_HIT) {\n\
+                shapeIntersection = nextIntersection(ix);\n\
+                if (shapeIntersection.entry.w == NO_HIT) {\n\
                     break;\n\
                 } else {\n\
                     // Found another intersection. Resume raymarching there\n\
-                    currT = entryExitT.x;\n\
-                    endT = entryExitT.y;\n\
+                    currT = shapeIntersection.entry.w * RAY_SCALE;\n\
+                    endT = shapeIntersection.exit.w;\n\
                     positionUv = viewPosUv + currT * viewDirUv;\n\
                 }\n\
             #endif\n\
         }\n\
 \n\
         // Traverse the tree from the current ray position.\n\
-        // This is similar to traverseOctree but is faster when the ray is in the same tile as the previous step.\n\
+        // This is similar to traverseOctreeFromBeginning but is faster when the ray is in the same tile as the previous step.\n\
         positionUvShapeSpace = convertUvToShapeUvSpace(positionUv);\n\
         traverseOctreeFromExisting(positionUvShapeSpace, traversalData, sampleDatas);\n\
+        step = getStepSize(sampleDatas[0], viewRayUv, shapeIntersection);\n\
     }\n\
 \n\
     // Convert the alpha from [0,ALPHA_ACCUM_MAX] to [0,1]\n\
@@ -144,9 +164,9 @@ void main()\n\
         if (colorAccum.a == 0.0) {\n\
             discard;\n\
         }\n\
-        gl_FragColor = u_pickColor;\n\
+        out_FragColor = u_pickColor;\n\
     #else\n\
-        gl_FragColor = colorAccum;\n\
+        out_FragColor = colorAccum;\n\
     #endif\n\
 }\n\
 ";

package/Source/Shaders/Voxels/VoxelVS.glsl

@@ -1,4 +1,4 @@
-attribute vec2 position;
+in vec2 position;
 
 uniform vec4 u_ndcSpaceAxisAlignedBoundingBox;
 

package/Source/Shaders/Voxels/VoxelVS.js

@@ -1,5 +1,5 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "attribute vec2 position;\n\
+export default "in vec2 position;\n\
 \n\
 uniform vec4 u_ndcSpaceAxisAlignedBoundingBox;\n\
 \n\

package/Source/Shaders/Voxels/convertUvToBox.glsl

@@ -8,9 +8,17 @@
 #endif
 
 vec3 convertUvToShapeUvSpace(in vec3 positionUv) {
-    #if defined(BOX_HAS_SHAPE_BOUNDS)
-        return positionUv * u_boxUvToShapeUvScale + u_boxUvToShapeUvTranslate;
-    #else
-        return positionUv;
-    #endif
+#if defined(BOX_HAS_SHAPE_BOUNDS)
+    return positionUv * u_boxUvToShapeUvScale + u_boxUvToShapeUvTranslate;
+#else
+    return positionUv;
+#endif
+}
+
+vec3 convertShapeUvToUvSpace(in vec3 shapeUv) {
+#if defined(BOX_HAS_SHAPE_BOUNDS)
+    return (shapeUv - u_boxUvToShapeUvTranslate) / u_boxUvToShapeUvScale;
+#else
+    return shapeUv;
+#endif
 }

package/Source/Shaders/Voxels/convertUvToBox.js

@@ -9,10 +9,18 @@ export default "/* Box defines (set in Scene/VoxelBoxShape.js)\n\
 #endif\n\
 \n\
 vec3 convertUvToShapeUvSpace(in vec3 positionUv) {\n\
-    #if defined(BOX_HAS_SHAPE_BOUNDS)\n\
-        return positionUv * u_boxUvToShapeUvScale + u_boxUvToShapeUvTranslate;\n\
-    #else\n\
-        return positionUv;\n\
-    #endif\n\
+#if defined(BOX_HAS_SHAPE_BOUNDS)\n\
+    return positionUv * u_boxUvToShapeUvScale + u_boxUvToShapeUvTranslate;\n\
+#else\n\
+    return positionUv;\n\
+#endif\n\
+}\n\
+\n\
+vec3 convertShapeUvToUvSpace(in vec3 shapeUv) {\n\
+#if defined(BOX_HAS_SHAPE_BOUNDS)\n\
+    return (shapeUv - u_boxUvToShapeUvTranslate) / u_boxUvToShapeUvScale;\n\
+#else\n\
+    return shapeUv;\n\
+#endif\n\
 }\n\
 ";

package/Source/Shaders/Voxels/convertUvToCylinder.glsl

@@ -1,8 +1,4 @@
 /* Cylinder defines (set in Scene/VoxelCylinderShape.js)
-#define CYLINDER_HAS_RENDER_BOUNDS_RADIUS_FLAT
-#define CYLINDER_HAS_RENDER_BOUNDS_HEIGHT_FLAT
-#define CYLINDER_HAS_RENDER_BOUNDS_ANGLE_RANGE_EQUAL_ZERO
-
 #define CYLINDER_HAS_SHAPE_BOUNDS_RADIUS
 #define CYLINDER_HAS_SHAPE_BOUNDS_RADIUS_FLAT
 #define CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT
@@ -34,8 +30,8 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {
     vec3 positionLocal = positionUv * 2.0 - 1.0; // [-1,+1]
 
     // Compute radius
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS_FLAT) || defined(CYLINDER_HAS_RENDER_BOUNDS_RADIUS_FLAT)
-        float radius = length(positionLocal.xy); // [0,1]
+    #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)
@@ -44,8 +40,8 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {
     #endif
 
     // Compute height
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT_FLAT) || defined(CYLINDER_HAS_RENDER_BOUNDS_HEIGHT_FLAT)
-        float height = positionUv.z; // [0,1]
+    #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)
@@ -54,7 +50,7 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {
     #endif
 
     // Compute angle
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_RANGE_EQUAL_ZERO) || defined(CYLINDER_HAS_RENDER_BOUNDS_ANGLE_RANGE_EQUAL_ZERO)
+    #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]

package/Source/Shaders/Voxels/convertUvToCylinder.js

@@ -1,9 +1,5 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "/* Cylinder defines (set in Scene/VoxelCylinderShape.js)\n\
-#define CYLINDER_HAS_RENDER_BOUNDS_RADIUS_FLAT\n\
-#define CYLINDER_HAS_RENDER_BOUNDS_HEIGHT_FLAT\n\
-#define CYLINDER_HAS_RENDER_BOUNDS_ANGLE_RANGE_EQUAL_ZERO\n\
-\n\
 #define CYLINDER_HAS_SHAPE_BOUNDS_RADIUS\n\
 #define CYLINDER_HAS_SHAPE_BOUNDS_RADIUS_FLAT\n\
 #define CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT\n\
@@ -35,8 +31,8 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {\n\
     vec3 positionLocal = positionUv * 2.0 - 1.0; // [-1,+1]\n\
 \n\
     // Compute radius\n\
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_RADIUS_FLAT) || defined(CYLINDER_HAS_RENDER_BOUNDS_RADIUS_FLAT)\n\
-        float radius = length(positionLocal.xy); // [0,1]\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\
@@ -45,8 +41,8 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {\n\
     #endif\n\
 \n\
     // Compute height\n\
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_HEIGHT_FLAT) || defined(CYLINDER_HAS_RENDER_BOUNDS_HEIGHT_FLAT)\n\
-        float height = positionUv.z; // [0,1]\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\
@@ -55,7 +51,7 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {\n\
     #endif\n\
 \n\
     // Compute angle\n\
-    #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_RANGE_EQUAL_ZERO) || defined(CYLINDER_HAS_RENDER_BOUNDS_ANGLE_RANGE_EQUAL_ZERO)\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\

package/Source/Shaders/Voxels/convertUvToEllipsoid.glsl

@@ -1,14 +1,11 @@
 /* Ellipsoid defines (set in Scene/VoxelEllipsoidShape.js)
-#define ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO
 #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_RENDER_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO
-#define ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_FLAT
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_MIN
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_FLAT
 #define ELLIPSOID_IS_SPHERE
@@ -69,7 +66,7 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {
     #endif
 
     // Compute longitude
-    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO)
+    #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;
@@ -94,7 +91,7 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {
     #endif
 
     // Compute latitude
-    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO)
+    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO)
         float latitude = 1.0;
     #else
         float latitude = (asin(normal.z) + czm_piOverTwo) / czm_pi;
@@ -104,7 +101,7 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {
     #endif
 
     // Compute height
-    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_FLAT) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_FLAT)
+    #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.

package/Source/Shaders/Voxels/convertUvToEllipsoid.js

@@ -1,15 +1,12 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "/* Ellipsoid defines (set in Scene/VoxelEllipsoidShape.js)\n\
-#define ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO\n\
 #define ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MIN_DISCONTINUITY\n\
 #define ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MAX_DISCONTINUITY\n\
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE\n\
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO\n\
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_MIN_MAX_REVERSED\n\
-#define ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO\n\
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE\n\
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO\n\
-#define ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_FLAT\n\
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_MIN\n\
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_FLAT\n\
 #define ELLIPSOID_IS_SPHERE\n\
@@ -70,7 +67,7 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {\n\
     #endif\n\
 \n\
     // Compute longitude\n\
-    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO)\n\
+    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO)\n\
         float longitude = 1.0;\n\
     #else\n\
         float longitude = (atan(normal.y, normal.x) + czm_pi) / czm_twoPi;\n\
@@ -95,7 +92,7 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {\n\
     #endif\n\
 \n\
     // Compute latitude\n\
-    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO)\n\
+    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE_RANGE_EQUAL_ZERO)\n\
         float latitude = 1.0;\n\
     #else\n\
         float latitude = (asin(normal.z) + czm_piOverTwo) / czm_pi;\n\
@@ -105,7 +102,7 @@ vec3 convertUvToShapeUvSpace(in vec3 positionUv) {\n\
     #endif\n\
 \n\
     // Compute height\n\
-    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_FLAT) || defined(ELLIPSOID_HAS_RENDER_BOUNDS_HEIGHT_FLAT)\n\
+    #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_HEIGHT_FLAT)\n\
         // TODO: This breaks down when minBounds == maxBounds. To fix it, this\n\
         // function would have to know if ray is intersecting the front or back of the shape\n\
         // and set the shape space position to 1 (front) or 0 (back) accordingly.\n\