@cesium/engine 24.0.0 → 26.0.0

package/Source/Shaders/Model/MaterialStageFS.glsl

@@ -11,17 +11,12 @@ vec3 blend(vec3 sourceColor, vec3 styleColor, float styleColorBlend)
     return color;
 }
 
-vec2 computeTextureTransform(vec2 texCoord, mat3 textureTransform)
-{
-    return vec2(textureTransform * vec3(texCoord, 1.0));
-}
-
 #ifdef HAS_NORMAL_TEXTURE
 vec2 getNormalTexCoords()
 {
     vec2 texCoord = TEXCOORD_NORMAL;
     #ifdef HAS_NORMAL_TEXTURE_TRANSFORM
-        texCoord = vec2(u_normalTextureTransform * vec3(texCoord, 1.0));
+        texCoord = czm_computeTextureTransform(texCoord, u_normalTextureTransform);
     #endif
     return texCoord;
 }
@@ -64,7 +59,18 @@ NormalInfo getNormalInfo(ProcessedAttributes attributes)
 
     #ifdef HAS_NORMAL_TEXTURE
         mat3 tbn = mat3(tangent, bitangent, geometryNormal);
-        vec3 normalSample = texture(u_normalTexture, normalTexCoords).rgb;
+        
+        vec3 normalSample;
+        #if defined(HAS_NORMAL_CONSTANT_LOD) && defined(HAS_CONSTANT_LOD)
+            #ifdef HAS_NORMAL_TEXTURE_TRANSFORM
+                normalSample = constantLodTextureLookup(u_normalTexture, u_normalTextureConstantLodParams, u_normalTextureTransform).rgb;
+            #else
+                normalSample = constantLodTextureLookup(u_normalTexture, u_normalTextureConstantLodParams).rgb;
+            #endif
+        #else
+            normalSample = texture(u_normalTexture, normalTexCoords).rgb;
+        #endif
+        
         normalSample = 2.0 * normalSample - 1.0;
         #ifdef HAS_NORMAL_TEXTURE_SCALE
             normalSample.xy *= u_normalTextureScale;
@@ -109,7 +115,18 @@ vec3 getNormalFromTexture(ProcessedAttributes attributes, vec3 geometryNormal)
     #endif
 
     mat3 tbn = mat3(t, b, geometryNormal);
-    vec3 normalSample = texture(u_normalTexture, normalTexCoords).rgb;
+    
+    vec3 normalSample;
+    #if defined(HAS_NORMAL_CONSTANT_LOD) && defined(HAS_CONSTANT_LOD)
+        #ifdef HAS_NORMAL_TEXTURE_TRANSFORM
+            normalSample = constantLodTextureLookup(u_normalTexture, u_normalTextureConstantLodParams, u_normalTextureTransform).rgb;
+        #else
+            normalSample = constantLodTextureLookup(u_normalTexture, u_normalTextureConstantLodParams).rgb;
+        #endif
+    #else
+        normalSample = texture(u_normalTexture, normalTexCoords).rgb;
+    #endif
+    
     normalSample = 2.0 * normalSample - 1.0;
     #ifdef HAS_NORMAL_TEXTURE_SCALE
         normalSample.xy *= u_normalTextureScale;
@@ -171,10 +188,19 @@ vec4 getBaseColorFromTexture()
 {
     vec2 baseColorTexCoords = TEXCOORD_BASE_COLOR;
     #ifdef HAS_BASE_COLOR_TEXTURE_TRANSFORM
-        baseColorTexCoords = computeTextureTransform(baseColorTexCoords, u_baseColorTextureTransform);
+        baseColorTexCoords = czm_computeTextureTransform(baseColorTexCoords, u_baseColorTextureTransform);
     #endif
 
-    vec4 baseColorWithAlpha = czm_srgbToLinear(texture(u_baseColorTexture, baseColorTexCoords));
+    vec4 baseColorWithAlpha;
+    #if defined(HAS_BASE_COLOR_CONSTANT_LOD) && defined(HAS_CONSTANT_LOD)
+        #ifdef HAS_BASE_COLOR_TEXTURE_TRANSFORM
+            baseColorWithAlpha = czm_srgbToLinear(constantLodTextureLookup(u_baseColorTexture, u_baseColorTextureConstantLodParams, u_baseColorTextureTransform));
+        #else
+            baseColorWithAlpha = czm_srgbToLinear(constantLodTextureLookup(u_baseColorTexture, u_baseColorTextureConstantLodParams));
+        #endif
+    #else
+        baseColorWithAlpha = czm_srgbToLinear(texture(u_baseColorTexture, baseColorTexCoords));
+    #endif
 
     #ifdef HAS_BASE_COLOR_FACTOR
         baseColorWithAlpha *= u_baseColorFactor;
@@ -189,7 +215,7 @@ vec3 getEmissiveFromTexture()
 {
     vec2 emissiveTexCoords = TEXCOORD_EMISSIVE;
     #ifdef HAS_EMISSIVE_TEXTURE_TRANSFORM
-        emissiveTexCoords = computeTextureTransform(emissiveTexCoords, u_emissiveTextureTransform);
+        emissiveTexCoords = czm_computeTextureTransform(emissiveTexCoords, u_emissiveTextureTransform);
     #endif
 
     vec3 emissive = czm_srgbToLinear(texture(u_emissiveTexture, emissiveTexCoords).rgb);
@@ -207,7 +233,7 @@ void setSpecularGlossiness(inout czm_modelMaterial material)
     #ifdef HAS_SPECULAR_GLOSSINESS_TEXTURE
         vec2 specularGlossinessTexCoords = TEXCOORD_SPECULAR_GLOSSINESS;
         #ifdef HAS_SPECULAR_GLOSSINESS_TEXTURE_TRANSFORM
-            specularGlossinessTexCoords = computeTextureTransform(specularGlossinessTexCoords, u_specularGlossinessTextureTransform);
+            specularGlossinessTexCoords = czm_computeTextureTransform(specularGlossinessTexCoords, u_specularGlossinessTextureTransform);
         #endif
 
         vec4 specularGlossiness = czm_srgbToLinear(texture(u_specularGlossinessTexture, specularGlossinessTexCoords));
@@ -237,7 +263,7 @@ void setSpecularGlossiness(inout czm_modelMaterial material)
     #ifdef HAS_DIFFUSE_TEXTURE
         vec2 diffuseTexCoords = TEXCOORD_DIFFUSE;
         #ifdef HAS_DIFFUSE_TEXTURE_TRANSFORM
-            diffuseTexCoords = computeTextureTransform(diffuseTexCoords, u_diffuseTextureTransform);
+            diffuseTexCoords = czm_computeTextureTransform(diffuseTexCoords, u_diffuseTextureTransform);
         #endif
 
         vec4 diffuse = czm_srgbToLinear(texture(u_diffuseTexture, diffuseTexCoords));
@@ -266,7 +292,7 @@ float setMetallicRoughness(inout czm_modelMaterial material)
     #ifdef HAS_METALLIC_ROUGHNESS_TEXTURE
         vec2 metallicRoughnessTexCoords = TEXCOORD_METALLIC_ROUGHNESS;
         #ifdef HAS_METALLIC_ROUGHNESS_TEXTURE_TRANSFORM
-            metallicRoughnessTexCoords = computeTextureTransform(metallicRoughnessTexCoords, u_metallicRoughnessTextureTransform);
+            metallicRoughnessTexCoords = czm_computeTextureTransform(metallicRoughnessTexCoords, u_metallicRoughnessTextureTransform);
         #endif
 
         vec3 metallicRoughness = texture(u_metallicRoughnessTexture, metallicRoughnessTexCoords).rgb;
@@ -313,7 +339,7 @@ void setSpecular(inout czm_modelMaterial material, in float metalness)
     #ifdef HAS_SPECULAR_TEXTURE
         vec2 specularTexCoords = TEXCOORD_SPECULAR;
         #ifdef HAS_SPECULAR_TEXTURE_TRANSFORM
-            specularTexCoords = computeTextureTransform(specularTexCoords, u_specularTextureTransform);
+            specularTexCoords = czm_computeTextureTransform(specularTexCoords, u_specularTextureTransform);
         #endif
         float specularWeight = texture(u_specularTexture, specularTexCoords).a;
         #ifdef HAS_SPECULAR_FACTOR
@@ -330,7 +356,7 @@ void setSpecular(inout czm_modelMaterial material, in float metalness)
     #ifdef HAS_SPECULAR_COLOR_TEXTURE
         vec2 specularColorTexCoords = TEXCOORD_SPECULAR_COLOR;
         #ifdef HAS_SPECULAR_COLOR_TEXTURE_TRANSFORM
-            specularColorTexCoords = computeTextureTransform(specularColorTexCoords, u_specularColorTextureTransform);
+            specularColorTexCoords = czm_computeTextureTransform(specularColorTexCoords, u_specularColorTextureTransform);
         #endif
         vec3 specularColorSample = texture(u_specularColorTexture, specularColorTexCoords).rgb;
         vec3 specularColorFactor = czm_srgbToLinear(specularColorSample);
@@ -360,7 +386,7 @@ void setAnisotropy(inout czm_modelMaterial material, in NormalInfo normalInfo)
     #ifdef HAS_ANISOTROPY_TEXTURE
         vec2 anisotropyTexCoords = TEXCOORD_ANISOTROPY;
         #ifdef HAS_ANISOTROPY_TEXTURE_TRANSFORM
-            anisotropyTexCoords = computeTextureTransform(anisotropyTexCoords, u_anisotropyTextureTransform);
+            anisotropyTexCoords = czm_computeTextureTransform(anisotropyTexCoords, u_anisotropyTextureTransform);
         #endif
         vec3 anisotropySample = texture(u_anisotropyTexture, anisotropyTexCoords).rgb;
         direction = anisotropySample.rg * 2.0 - vec2(1.0);
@@ -383,7 +409,7 @@ void setClearcoat(inout czm_modelMaterial material, in ProcessedAttributes attri
     #ifdef HAS_CLEARCOAT_TEXTURE
         vec2 clearcoatTexCoords = TEXCOORD_CLEARCOAT;
         #ifdef HAS_CLEARCOAT_TEXTURE_TRANSFORM
-            clearcoatTexCoords = computeTextureTransform(clearcoatTexCoords, u_clearcoatTextureTransform);
+            clearcoatTexCoords = czm_computeTextureTransform(clearcoatTexCoords, u_clearcoatTextureTransform);
         #endif
         float clearcoatFactor = texture(u_clearcoatTexture, clearcoatTexCoords).r;
         #ifdef HAS_CLEARCOAT_FACTOR
@@ -401,7 +427,7 @@ void setClearcoat(inout czm_modelMaterial material, in ProcessedAttributes attri
     #ifdef HAS_CLEARCOAT_ROUGHNESS_TEXTURE
         vec2 clearcoatRoughnessTexCoords = TEXCOORD_CLEARCOAT_ROUGHNESS;
         #ifdef HAS_CLEARCOAT_ROUGHNESS_TEXTURE_TRANSFORM
-            clearcoatRoughnessTexCoords = computeTextureTransform(clearcoatRoughnessTexCoords, u_clearcoatRoughnessTextureTransform);
+            clearcoatRoughnessTexCoords = czm_computeTextureTransform(clearcoatRoughnessTexCoords, u_clearcoatRoughnessTextureTransform);
         #endif
         float clearcoatRoughness = texture(u_clearcoatRoughnessTexture, clearcoatRoughnessTexCoords).g;
         #ifdef HAS_CLEARCOAT_ROUGHNESS_FACTOR
@@ -469,7 +495,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
     #ifdef HAS_OCCLUSION_TEXTURE
         vec2 occlusionTexCoords = TEXCOORD_OCCLUSION;
         #ifdef HAS_OCCLUSION_TEXTURE_TRANSFORM
-            occlusionTexCoords = computeTextureTransform(occlusionTexCoords, u_occlusionTextureTransform);
+            occlusionTexCoords = czm_computeTextureTransform(occlusionTexCoords, u_occlusionTextureTransform);
         #endif
         material.occlusion = texture(u_occlusionTexture, occlusionTexCoords).r;
     #endif

package/Source/Shaders/Model/MaterialStageFS.js

@@ -12,17 +12,12 @@ vec3 blend(vec3 sourceColor, vec3 styleColor, float styleColorBlend)\n\
     return color;\n\
 }\n\
 \n\
-vec2 computeTextureTransform(vec2 texCoord, mat3 textureTransform)\n\
-{\n\
-    return vec2(textureTransform * vec3(texCoord, 1.0));\n\
-}\n\
-\n\
 #ifdef HAS_NORMAL_TEXTURE\n\
 vec2 getNormalTexCoords()\n\
 {\n\
     vec2 texCoord = TEXCOORD_NORMAL;\n\
     #ifdef HAS_NORMAL_TEXTURE_TRANSFORM\n\
-        texCoord = vec2(u_normalTextureTransform * vec3(texCoord, 1.0));\n\
+        texCoord = czm_computeTextureTransform(texCoord, u_normalTextureTransform);\n\
     #endif\n\
     return texCoord;\n\
 }\n\
@@ -65,7 +60,18 @@ NormalInfo getNormalInfo(ProcessedAttributes attributes)\n\
 \n\
     #ifdef HAS_NORMAL_TEXTURE\n\
         mat3 tbn = mat3(tangent, bitangent, geometryNormal);\n\
-        vec3 normalSample = texture(u_normalTexture, normalTexCoords).rgb;\n\
+        \n\
+        vec3 normalSample;\n\
+        #if defined(HAS_NORMAL_CONSTANT_LOD) && defined(HAS_CONSTANT_LOD)\n\
+            #ifdef HAS_NORMAL_TEXTURE_TRANSFORM\n\
+                normalSample = constantLodTextureLookup(u_normalTexture, u_normalTextureConstantLodParams, u_normalTextureTransform).rgb;\n\
+            #else\n\
+                normalSample = constantLodTextureLookup(u_normalTexture, u_normalTextureConstantLodParams).rgb;\n\
+            #endif\n\
+        #else\n\
+            normalSample = texture(u_normalTexture, normalTexCoords).rgb;\n\
+        #endif\n\
+        \n\
         normalSample = 2.0 * normalSample - 1.0;\n\
         #ifdef HAS_NORMAL_TEXTURE_SCALE\n\
             normalSample.xy *= u_normalTextureScale;\n\
@@ -110,7 +116,18 @@ vec3 getNormalFromTexture(ProcessedAttributes attributes, vec3 geometryNormal)\n
     #endif\n\
 \n\
     mat3 tbn = mat3(t, b, geometryNormal);\n\
-    vec3 normalSample = texture(u_normalTexture, normalTexCoords).rgb;\n\
+    \n\
+    vec3 normalSample;\n\
+    #if defined(HAS_NORMAL_CONSTANT_LOD) && defined(HAS_CONSTANT_LOD)\n\
+        #ifdef HAS_NORMAL_TEXTURE_TRANSFORM\n\
+            normalSample = constantLodTextureLookup(u_normalTexture, u_normalTextureConstantLodParams, u_normalTextureTransform).rgb;\n\
+        #else\n\
+            normalSample = constantLodTextureLookup(u_normalTexture, u_normalTextureConstantLodParams).rgb;\n\
+        #endif\n\
+    #else\n\
+        normalSample = texture(u_normalTexture, normalTexCoords).rgb;\n\
+    #endif\n\
+    \n\
     normalSample = 2.0 * normalSample - 1.0;\n\
     #ifdef HAS_NORMAL_TEXTURE_SCALE\n\
         normalSample.xy *= u_normalTextureScale;\n\
@@ -172,10 +189,19 @@ vec4 getBaseColorFromTexture()\n\
 {\n\
     vec2 baseColorTexCoords = TEXCOORD_BASE_COLOR;\n\
     #ifdef HAS_BASE_COLOR_TEXTURE_TRANSFORM\n\
-        baseColorTexCoords = computeTextureTransform(baseColorTexCoords, u_baseColorTextureTransform);\n\
+        baseColorTexCoords = czm_computeTextureTransform(baseColorTexCoords, u_baseColorTextureTransform);\n\
     #endif\n\
 \n\
-    vec4 baseColorWithAlpha = czm_srgbToLinear(texture(u_baseColorTexture, baseColorTexCoords));\n\
+    vec4 baseColorWithAlpha;\n\
+    #if defined(HAS_BASE_COLOR_CONSTANT_LOD) && defined(HAS_CONSTANT_LOD)\n\
+        #ifdef HAS_BASE_COLOR_TEXTURE_TRANSFORM\n\
+            baseColorWithAlpha = czm_srgbToLinear(constantLodTextureLookup(u_baseColorTexture, u_baseColorTextureConstantLodParams, u_baseColorTextureTransform));\n\
+        #else\n\
+            baseColorWithAlpha = czm_srgbToLinear(constantLodTextureLookup(u_baseColorTexture, u_baseColorTextureConstantLodParams));\n\
+        #endif\n\
+    #else\n\
+        baseColorWithAlpha = czm_srgbToLinear(texture(u_baseColorTexture, baseColorTexCoords));\n\
+    #endif\n\
 \n\
     #ifdef HAS_BASE_COLOR_FACTOR\n\
         baseColorWithAlpha *= u_baseColorFactor;\n\
@@ -190,7 +216,7 @@ vec3 getEmissiveFromTexture()\n\
 {\n\
     vec2 emissiveTexCoords = TEXCOORD_EMISSIVE;\n\
     #ifdef HAS_EMISSIVE_TEXTURE_TRANSFORM\n\
-        emissiveTexCoords = computeTextureTransform(emissiveTexCoords, u_emissiveTextureTransform);\n\
+        emissiveTexCoords = czm_computeTextureTransform(emissiveTexCoords, u_emissiveTextureTransform);\n\
     #endif\n\
 \n\
     vec3 emissive = czm_srgbToLinear(texture(u_emissiveTexture, emissiveTexCoords).rgb);\n\
@@ -208,7 +234,7 @@ void setSpecularGlossiness(inout czm_modelMaterial material)\n\
     #ifdef HAS_SPECULAR_GLOSSINESS_TEXTURE\n\
         vec2 specularGlossinessTexCoords = TEXCOORD_SPECULAR_GLOSSINESS;\n\
         #ifdef HAS_SPECULAR_GLOSSINESS_TEXTURE_TRANSFORM\n\
-            specularGlossinessTexCoords = computeTextureTransform(specularGlossinessTexCoords, u_specularGlossinessTextureTransform);\n\
+            specularGlossinessTexCoords = czm_computeTextureTransform(specularGlossinessTexCoords, u_specularGlossinessTextureTransform);\n\
         #endif\n\
 \n\
         vec4 specularGlossiness = czm_srgbToLinear(texture(u_specularGlossinessTexture, specularGlossinessTexCoords));\n\
@@ -238,7 +264,7 @@ void setSpecularGlossiness(inout czm_modelMaterial material)\n\
     #ifdef HAS_DIFFUSE_TEXTURE\n\
         vec2 diffuseTexCoords = TEXCOORD_DIFFUSE;\n\
         #ifdef HAS_DIFFUSE_TEXTURE_TRANSFORM\n\
-            diffuseTexCoords = computeTextureTransform(diffuseTexCoords, u_diffuseTextureTransform);\n\
+            diffuseTexCoords = czm_computeTextureTransform(diffuseTexCoords, u_diffuseTextureTransform);\n\
         #endif\n\
 \n\
         vec4 diffuse = czm_srgbToLinear(texture(u_diffuseTexture, diffuseTexCoords));\n\
@@ -267,7 +293,7 @@ float setMetallicRoughness(inout czm_modelMaterial material)\n\
     #ifdef HAS_METALLIC_ROUGHNESS_TEXTURE\n\
         vec2 metallicRoughnessTexCoords = TEXCOORD_METALLIC_ROUGHNESS;\n\
         #ifdef HAS_METALLIC_ROUGHNESS_TEXTURE_TRANSFORM\n\
-            metallicRoughnessTexCoords = computeTextureTransform(metallicRoughnessTexCoords, u_metallicRoughnessTextureTransform);\n\
+            metallicRoughnessTexCoords = czm_computeTextureTransform(metallicRoughnessTexCoords, u_metallicRoughnessTextureTransform);\n\
         #endif\n\
 \n\
         vec3 metallicRoughness = texture(u_metallicRoughnessTexture, metallicRoughnessTexCoords).rgb;\n\
@@ -314,7 +340,7 @@ void setSpecular(inout czm_modelMaterial material, in float metalness)\n\
     #ifdef HAS_SPECULAR_TEXTURE\n\
         vec2 specularTexCoords = TEXCOORD_SPECULAR;\n\
         #ifdef HAS_SPECULAR_TEXTURE_TRANSFORM\n\
-            specularTexCoords = computeTextureTransform(specularTexCoords, u_specularTextureTransform);\n\
+            specularTexCoords = czm_computeTextureTransform(specularTexCoords, u_specularTextureTransform);\n\
         #endif\n\
         float specularWeight = texture(u_specularTexture, specularTexCoords).a;\n\
         #ifdef HAS_SPECULAR_FACTOR\n\
@@ -331,7 +357,7 @@ void setSpecular(inout czm_modelMaterial material, in float metalness)\n\
     #ifdef HAS_SPECULAR_COLOR_TEXTURE\n\
         vec2 specularColorTexCoords = TEXCOORD_SPECULAR_COLOR;\n\
         #ifdef HAS_SPECULAR_COLOR_TEXTURE_TRANSFORM\n\
-            specularColorTexCoords = computeTextureTransform(specularColorTexCoords, u_specularColorTextureTransform);\n\
+            specularColorTexCoords = czm_computeTextureTransform(specularColorTexCoords, u_specularColorTextureTransform);\n\
         #endif\n\
         vec3 specularColorSample = texture(u_specularColorTexture, specularColorTexCoords).rgb;\n\
         vec3 specularColorFactor = czm_srgbToLinear(specularColorSample);\n\
@@ -361,7 +387,7 @@ void setAnisotropy(inout czm_modelMaterial material, in NormalInfo normalInfo)\n
     #ifdef HAS_ANISOTROPY_TEXTURE\n\
         vec2 anisotropyTexCoords = TEXCOORD_ANISOTROPY;\n\
         #ifdef HAS_ANISOTROPY_TEXTURE_TRANSFORM\n\
-            anisotropyTexCoords = computeTextureTransform(anisotropyTexCoords, u_anisotropyTextureTransform);\n\
+            anisotropyTexCoords = czm_computeTextureTransform(anisotropyTexCoords, u_anisotropyTextureTransform);\n\
         #endif\n\
         vec3 anisotropySample = texture(u_anisotropyTexture, anisotropyTexCoords).rgb;\n\
         direction = anisotropySample.rg * 2.0 - vec2(1.0);\n\
@@ -384,7 +410,7 @@ void setClearcoat(inout czm_modelMaterial material, in ProcessedAttributes attri
     #ifdef HAS_CLEARCOAT_TEXTURE\n\
         vec2 clearcoatTexCoords = TEXCOORD_CLEARCOAT;\n\
         #ifdef HAS_CLEARCOAT_TEXTURE_TRANSFORM\n\
-            clearcoatTexCoords = computeTextureTransform(clearcoatTexCoords, u_clearcoatTextureTransform);\n\
+            clearcoatTexCoords = czm_computeTextureTransform(clearcoatTexCoords, u_clearcoatTextureTransform);\n\
         #endif\n\
         float clearcoatFactor = texture(u_clearcoatTexture, clearcoatTexCoords).r;\n\
         #ifdef HAS_CLEARCOAT_FACTOR\n\
@@ -402,7 +428,7 @@ void setClearcoat(inout czm_modelMaterial material, in ProcessedAttributes attri
     #ifdef HAS_CLEARCOAT_ROUGHNESS_TEXTURE\n\
         vec2 clearcoatRoughnessTexCoords = TEXCOORD_CLEARCOAT_ROUGHNESS;\n\
         #ifdef HAS_CLEARCOAT_ROUGHNESS_TEXTURE_TRANSFORM\n\
-            clearcoatRoughnessTexCoords = computeTextureTransform(clearcoatRoughnessTexCoords, u_clearcoatRoughnessTextureTransform);\n\
+            clearcoatRoughnessTexCoords = czm_computeTextureTransform(clearcoatRoughnessTexCoords, u_clearcoatRoughnessTextureTransform);\n\
         #endif\n\
         float clearcoatRoughness = texture(u_clearcoatRoughnessTexture, clearcoatRoughnessTexCoords).g;\n\
         #ifdef HAS_CLEARCOAT_ROUGHNESS_FACTOR\n\
@@ -470,7 +496,7 @@ void materialStage(inout czm_modelMaterial material, ProcessedAttributes attribu
     #ifdef HAS_OCCLUSION_TEXTURE\n\
         vec2 occlusionTexCoords = TEXCOORD_OCCLUSION;\n\
         #ifdef HAS_OCCLUSION_TEXTURE_TRANSFORM\n\
-            occlusionTexCoords = computeTextureTransform(occlusionTexCoords, u_occlusionTextureTransform);\n\
+            occlusionTexCoords = czm_computeTextureTransform(occlusionTexCoords, u_occlusionTextureTransform);\n\
         #endif\n\
         material.occlusion = texture(u_occlusionTexture, occlusionTexCoords).r;\n\
     #endif\n\

package/Source/Shaders/Voxels/convertLocalToBoxUv.glsl

@@ -1,5 +1,4 @@
 uniform vec3 u_boxLocalToShapeUvScale;
-uniform vec3 u_boxLocalToShapeUvTranslate;
 
 uniform ivec4 u_cameraTileCoordinates;
 uniform vec3 u_cameraTileUv;

package/Source/Shaders/Voxels/convertLocalToBoxUv.js

@@ -1,6 +1,5 @@
 //This file is automatically rebuilt by the Cesium build process.
 export default "uniform vec3 u_boxLocalToShapeUvScale;\n\
-uniform vec3 u_boxLocalToShapeUvTranslate;\n\
 \n\
 uniform ivec4 u_cameraTileCoordinates;\n\
 uniform vec3 u_cameraTileUv;\n\

package/Source/Shaders/Voxels/convertLocalToCylinderUv.glsl

@@ -1,6 +1,4 @@
-uniform vec2 u_cylinderLocalToShapeUvRadius; // x = scale, y = offset
-uniform vec2 u_cylinderLocalToShapeUvHeight; // x = scale, y = offset
-uniform vec2 u_cylinderLocalToShapeUvAngle; // x = scale, y = offset
+uniform vec3 u_cylinderLocalToShapeUvScale; // x = radius scale, y = angle scale, z = height scale
 uniform float u_cylinderShapeUvAngleRangeOrigin;
 uniform mat3 u_cylinderEcToRadialTangentUp;
 uniform ivec4 u_cameraTileCoordinates;
@@ -15,9 +13,9 @@ mat3 convertLocalToShapeSpaceDerivative(in vec3 position) {
 }
 
 vec3 scaleShapeUvToShapeSpace(in vec3 shapeUv) {
-    float radius = shapeUv.x / u_cylinderLocalToShapeUvRadius.x;
-    float angle = shapeUv.y * czm_twoPi / u_cylinderLocalToShapeUvAngle.x;
-    float height = shapeUv.z / u_cylinderLocalToShapeUvHeight.x;
+    float radius = shapeUv.x / u_cylinderLocalToShapeUvScale.x;
+    float angle = shapeUv.y * czm_twoPi / u_cylinderLocalToShapeUvScale.y;
+    float height = shapeUv.z / u_cylinderLocalToShapeUvScale.z;
 
     return vec3(radius, angle, height);
 }
@@ -49,7 +47,7 @@ vec3 convertEcToDeltaShape(in vec3 positionEC) {
 vec3 convertEcToDeltaTile(in vec3 positionEC) {
     vec3 deltaShape = convertEcToDeltaShape(positionEC);
     // Convert to tileset coordinates in [0, 1]
-    float dx = u_cylinderLocalToShapeUvRadius.x * deltaShape.x;
+    float dx = u_cylinderLocalToShapeUvScale.x * deltaShape.x;
     float dy = deltaShape.y / czm_twoPi;
 #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE)
     // Wrap to ensure dy is not crossing through the unoccupied angle range, where
@@ -60,8 +58,8 @@ vec3 convertEcToDeltaTile(in vec3 positionEC) {
     float rotation = floor(rawOutputUvAngle);
     dy -= rotation;
 #endif
-    dy *= u_cylinderLocalToShapeUvAngle.x;
-    float dz = u_cylinderLocalToShapeUvHeight.x * deltaShape.z;
+    dy *= u_cylinderLocalToShapeUvScale.y;
+    float dz = u_cylinderLocalToShapeUvScale.z * deltaShape.z;
     // Convert to tile coordinate changes
     return vec3(dx, dy, dz) * float(1 << u_cameraTileCoordinates.w);
 }

package/Source/Shaders/Voxels/convertLocalToCylinderUv.js

@@ -1,7 +1,5 @@
 //This file is automatically rebuilt by the Cesium build process.
-export default "uniform vec2 u_cylinderLocalToShapeUvRadius; // x = scale, y = offset\n\
-uniform vec2 u_cylinderLocalToShapeUvHeight; // x = scale, y = offset\n\
-uniform vec2 u_cylinderLocalToShapeUvAngle; // x = scale, y = offset\n\
+export default "uniform vec3 u_cylinderLocalToShapeUvScale; // x = radius scale, y = angle scale, z = height scale\n\
 uniform float u_cylinderShapeUvAngleRangeOrigin;\n\
 uniform mat3 u_cylinderEcToRadialTangentUp;\n\
 uniform ivec4 u_cameraTileCoordinates;\n\
@@ -16,9 +14,9 @@ mat3 convertLocalToShapeSpaceDerivative(in vec3 position) {\n\
 }\n\
 \n\
 vec3 scaleShapeUvToShapeSpace(in vec3 shapeUv) {\n\
-    float radius = shapeUv.x / u_cylinderLocalToShapeUvRadius.x;\n\
-    float angle = shapeUv.y * czm_twoPi / u_cylinderLocalToShapeUvAngle.x;\n\
-    float height = shapeUv.z / u_cylinderLocalToShapeUvHeight.x;\n\
+    float radius = shapeUv.x / u_cylinderLocalToShapeUvScale.x;\n\
+    float angle = shapeUv.y * czm_twoPi / u_cylinderLocalToShapeUvScale.y;\n\
+    float height = shapeUv.z / u_cylinderLocalToShapeUvScale.z;\n\
 \n\
     return vec3(radius, angle, height);\n\
 }\n\
@@ -50,7 +48,7 @@ vec3 convertEcToDeltaShape(in vec3 positionEC) {\n\
 vec3 convertEcToDeltaTile(in vec3 positionEC) {\n\
     vec3 deltaShape = convertEcToDeltaShape(positionEC);\n\
     // Convert to tileset coordinates in [0, 1]\n\
-    float dx = u_cylinderLocalToShapeUvRadius.x * deltaShape.x;\n\
+    float dx = u_cylinderLocalToShapeUvScale.x * deltaShape.x;\n\
     float dy = deltaShape.y / czm_twoPi;\n\
 #if defined(CYLINDER_HAS_SHAPE_BOUNDS_ANGLE)\n\
     // Wrap to ensure dy is not crossing through the unoccupied angle range, where\n\
@@ -61,8 +59,8 @@ vec3 convertEcToDeltaTile(in vec3 positionEC) {\n\
     float rotation = floor(rawOutputUvAngle);\n\
     dy -= rotation;\n\
 #endif\n\
-    dy *= u_cylinderLocalToShapeUvAngle.x;\n\
-    float dz = u_cylinderLocalToShapeUvHeight.x * deltaShape.z;\n\
+    dy *= u_cylinderLocalToShapeUvScale.y;\n\
+    float dz = u_cylinderLocalToShapeUvScale.z * deltaShape.z;\n\
     // Convert to tile coordinate changes\n\
     return vec3(dx, dy, dz) * float(1 << u_cameraTileCoordinates.w);\n\
 }\n\

package/Source/Shaders/Voxels/convertLocalToEllipsoidUv.glsl

@@ -1,8 +1,5 @@
 /* Ellipsoid defines (set in Scene/VoxelEllipsoidShape.js)
-#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_MIN_MAX_REVERSED
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE
 */
 
@@ -12,17 +9,10 @@ uniform mat3 u_ellipsoidEcToEastNorthUp;
 uniform vec3 u_ellipsoidRadii;
 uniform vec2 u_evoluteScale; // (radii.x ^ 2 - radii.z ^ 2) * vec2(1.0, -1.0) / radii;
 uniform vec3 u_ellipsoidInverseRadiiSquared;
-#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
 #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE)
-    uniform vec2 u_ellipsoidLocalToShapeUvLongitude; // x = scale, y = offset
     uniform float u_ellipsoidShapeUvLongitudeRangeOrigin;
 #endif
-#if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE)
-    uniform vec2 u_ellipsoidLocalToShapeUvLatitude; // x = scale, y = offset
-#endif
-uniform float u_ellipsoidInverseHeightDifference;
+uniform vec3 u_ellipsoidLocalToShapeUvScale; // x = longitude scale, y = latitude scale, z = height scale
 
 uniform ivec4 u_cameraTileCoordinates;
 uniform vec3 u_cameraTileUv;
@@ -82,16 +72,16 @@ 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_ellipsoidLocalToShapeUvLongitude.x;
+        longitude /= u_ellipsoidLocalToShapeUvScale.x;
     #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_ellipsoidLocalToShapeUvLatitude.x;
+        latitude /= u_ellipsoidLocalToShapeUvScale.y;
     #endif
 
-    float height = shapeUv.z / u_ellipsoidInverseHeightDifference;
+    float height = shapeUv.z / u_ellipsoidLocalToShapeUvScale.z;
 
     return vec3(longitude, latitude, height);
 }
@@ -149,15 +139,15 @@ vec3 convertEcToDeltaTile(in vec3 positionEC) {
     float rawOutputUvLongitude = cameraUvLongitudeShift + dx;
     float rotation = floor(rawOutputUvLongitude);
     dx -= rotation;
-    dx *= u_ellipsoidLocalToShapeUvLongitude.x;
+    dx *= u_ellipsoidLocalToShapeUvScale.x;
 #endif
 
     float dy = deltaShape.y / czm_pi;
 #if (defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE))
-    dy *= u_ellipsoidLocalToShapeUvLatitude.x;
+    dy *= u_ellipsoidLocalToShapeUvScale.y;
 #endif
 
-    float dz = u_ellipsoidInverseHeightDifference * deltaShape.z;
+    float dz = u_ellipsoidLocalToShapeUvScale.z * deltaShape.z;
     // Convert to tile coordinate changes
     return vec3(dx, dy, dz) * float(1 << u_cameraTileCoordinates.w);
 }

package/Source/Shaders/Voxels/convertLocalToEllipsoidUv.js

@@ -1,9 +1,6 @@
 //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_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_MIN_MAX_REVERSED\n\
 #define ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE\n\
 */\n\
 \n\
@@ -13,17 +10,10 @@ uniform mat3 u_ellipsoidEcToEastNorthUp;\n\
 uniform vec3 u_ellipsoidRadii;\n\
 uniform vec2 u_evoluteScale; // (radii.x ^ 2 - radii.z ^ 2) * vec2(1.0, -1.0) / radii;\n\
 uniform vec3 u_ellipsoidInverseRadiiSquared;\n\
-#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)\n\
-    uniform vec3 u_ellipsoidShapeUvLongitudeMinMaxMid;\n\
-#endif\n\
 #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE)\n\
-    uniform vec2 u_ellipsoidLocalToShapeUvLongitude; // x = scale, y = offset\n\
     uniform float u_ellipsoidShapeUvLongitudeRangeOrigin;\n\
 #endif\n\
-#if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE)\n\
-    uniform vec2 u_ellipsoidLocalToShapeUvLatitude; // x = scale, y = offset\n\
-#endif\n\
-uniform float u_ellipsoidInverseHeightDifference;\n\
+uniform vec3 u_ellipsoidLocalToShapeUvScale; // x = longitude scale, y = latitude scale, z = height scale\n\
 \n\
 uniform ivec4 u_cameraTileCoordinates;\n\
 uniform vec3 u_cameraTileUv;\n\
@@ -83,16 +73,16 @@ vec3 scaleShapeUvToShapeSpace(in vec3 shapeUv) {\n\
     // Convert from [0, 1] to radians [-pi, pi]\n\
     float longitude = shapeUv.x * czm_twoPi;\n\
     #if defined (ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE)\n\
-        longitude /= u_ellipsoidLocalToShapeUvLongitude.x;\n\
+        longitude /= u_ellipsoidLocalToShapeUvScale.x;\n\
     #endif\n\
 \n\
     // Convert from [0, 1] to radians [-pi/2, pi/2]\n\
     float latitude = shapeUv.y * czm_pi;\n\
     #if defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE)\n\
-        latitude /= u_ellipsoidLocalToShapeUvLatitude.x;\n\
+        latitude /= u_ellipsoidLocalToShapeUvScale.y;\n\
     #endif\n\
 \n\
-    float height = shapeUv.z / u_ellipsoidInverseHeightDifference;\n\
+    float height = shapeUv.z / u_ellipsoidLocalToShapeUvScale.z;\n\
 \n\
     return vec3(longitude, latitude, height);\n\
 }\n\
@@ -150,15 +140,15 @@ vec3 convertEcToDeltaTile(in vec3 positionEC) {\n\
     float rawOutputUvLongitude = cameraUvLongitudeShift + dx;\n\
     float rotation = floor(rawOutputUvLongitude);\n\
     dx -= rotation;\n\
-    dx *= u_ellipsoidLocalToShapeUvLongitude.x;\n\
+    dx *= u_ellipsoidLocalToShapeUvScale.x;\n\
 #endif\n\
 \n\
     float dy = deltaShape.y / czm_pi;\n\
 #if (defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE))\n\
-    dy *= u_ellipsoidLocalToShapeUvLatitude.x;\n\
+    dy *= u_ellipsoidLocalToShapeUvScale.y;\n\
 #endif\n\
 \n\
-    float dz = u_ellipsoidInverseHeightDifference * deltaShape.z;\n\
+    float dz = u_ellipsoidLocalToShapeUvScale.z * deltaShape.z;\n\
     // Convert to tile coordinate changes\n\
     return vec3(dx, dy, dz) * float(1 << u_cameraTileCoordinates.w);\n\
 }\n\

package/Source/Widget/CesiumWidget.js

@@ -33,6 +33,7 @@ import SkyBox from "../Scene/SkyBox.js";
 import Sun from "../Scene/Sun.js";
 import TimeDynamicPointCloud from "../Scene/TimeDynamicPointCloud.js";
 import VoxelPrimitive from "../Scene/VoxelPrimitive.js";
+import BufferPrimitiveCollection from "../Scene/BufferPrimitiveCollection.js";
 
 function trackDataSourceClock(clock, dataSource) {
   if (defined(dataSource)) {
@@ -1241,7 +1242,7 @@ CesiumWidget.prototype._onDataSourceRemoved = function (
  * target will be the range. The heading will be determined from the offset. If the heading cannot be
  * determined from the offset, the heading will be north.</p>
  *
- * @param {Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|Promise<Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|VoxelPrimitive>} target The entity, array of entities, entity collection, data source, Cesium3DTileset, point cloud, or imagery layer to view. You can also pass a promise that resolves to one of the previously mentioned types.
+ * @param {Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|Promise<Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|VoxelPrimitive|BufferPrimitiveCollection<BufferPrimitive>>} target The entity, array of entities, entity collection, data source, Cesium3DTileset, point cloud, or imagery layer to view. You can also pass a promise that resolves to one of the previously mentioned types.
  * @param {HeadingPitchRange} [offset] The offset from the center of the entity in the local east-north-up reference frame.
  * @returns {Promise<boolean>} A Promise that resolves to true if the zoom was successful or false if the target is not currently visualized in the scene or the zoom was cancelled.
  */
@@ -1267,7 +1268,7 @@ CesiumWidget.prototype.zoomTo = function (target, offset) {
  * target will be the range. The heading will be determined from the offset. If the heading cannot be
  * determined from the offset, the heading will be north.</p>
  *
- * @param {Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|Promise<Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|VoxelPrimitive>} target The entity, array of entities, entity collection, data source, Cesium3DTileset, point cloud, or imagery layer to view. You can also pass a promise that resolves to one of the previously mentioned types.
+ * @param {Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|Promise<Entity|Entity[]|EntityCollection|DataSource|ImageryLayer|Cesium3DTileset|TimeDynamicPointCloud|VoxelPrimitive|BufferPrimitiveCollection<BufferPrimitive>>} target The entity, array of entities, entity collection, data source, Cesium3DTileset, point cloud, or imagery layer to view. You can also pass a promise that resolves to one of the previously mentioned types.
  * @param {object} [options] Object with the following properties:
  * @param {number} [options.duration=3.0] The duration of the flight in seconds.
  * @param {number} [options.maximumHeight] The maximum height at the peak of the flight.
@@ -1336,7 +1337,8 @@ function zoomToOrFly(that, zoomTarget, options, isFlight) {
     if (
       zoomTarget instanceof Cesium3DTileset ||
       zoomTarget instanceof TimeDynamicPointCloud ||
-      zoomTarget instanceof VoxelPrimitive
+      zoomTarget instanceof VoxelPrimitive ||
+      zoomTarget instanceof BufferPrimitiveCollection
     ) {
       that._zoomTarget = zoomTarget;
       return;
@@ -1439,7 +1441,7 @@ function updateZoomTarget(widget) {
     };
 
     if (widget._zoomIsFlight) {
-      camera.flyToBoundingSphere(target.boundingSphere, options);
+      camera.flyToBoundingSphere(boundingSphere, options);
     } else {
       camera.viewBoundingSphere(boundingSphere, zoomOptions.offset);
       camera.lookAtTransform(Matrix4.IDENTITY);
@@ -1472,6 +1474,11 @@ function updateZoomTarget(widget) {
     return;
   }
 
+  if (target instanceof BufferPrimitiveCollection) {
+    zoomToBoundingSphere(target.boundingVolume);
+    return;
+  }
+
   // If zoomTarget was an ImageryLayer
   if (target instanceof Cartographic) {
     options = {