Add stepCount to voxel fragment input struct

CesiumGS · Nov 14, 2023 · c744988 · c744988
1 parent 1beaf9e
commit c744988
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/packages/engine/Source/Scene/processVoxelProperties.js b/packages/engine/Source/Scene/processVoxelProperties.js
@@ -152,6 +152,7 @@ function processVoxelProperties(renderResources, primitive) {
   shaderBuilder.addStructField(voxelStructId, "vec3", "viewDirUv");
   shaderBuilder.addStructField(voxelStructId, "vec3", "viewDirWorld");
   shaderBuilder.addStructField(voxelStructId, "vec3", "surfaceNormal");
+  shaderBuilder.addStructField(voxelStructId, "int", "stepCount");
   shaderBuilder.addStructField(voxelStructId, "float", "travelDistance");
 
   // FragmentInput struct

diff --git a/packages/engine/Source/Shaders/Voxels/VoxelFS.glsl b/packages/engine/Source/Shaders/Voxels/VoxelFS.glsl
@@ -113,6 +113,7 @@ void main()
         fragmentInput.voxel.viewDirUv = viewDirUv;
         fragmentInput.voxel.viewDirWorld = viewDirWorld;
         fragmentInput.voxel.surfaceNormal = cellIntersection.xyz;
+        fragmentInput.voxel.stepCount = stepCount;
         fragmentInput.voxel.travelDistance = dt;
 
         // Run the custom shader

diff --git a/packages/engine/Source/Shaders/Voxels/convertUvToEllipsoid.glsl b/packages/engine/Source/Shaders/Voxels/convertUvToEllipsoid.glsl
@@ -110,7 +110,7 @@ vec3 convertShapeToShapeUvSpace(in vec3 positionShape) {
     #endif
 
     // Height: scale to the range [0, 1]
-    float height = positionShape.z * u_ellipsoidInverseHeightDifferenceUv;
+    float height = 1.0 + positionShape.z * u_ellipsoidInverseHeightDifferenceUv;
 
     return vec3(longitude, latitude, height);
 }