@kenlify/cesium 1.128.25 → 1.128.26

package/Source/Cesium.js

@@ -1,4 +1,4 @@
-export const VERSION = '1.128.23';
+export const VERSION = '1.128.26';
 export { AutomaticUniforms } from '@cesium/engine';
 export { Buffer } from '@cesium/engine';
 export { BufferUsage } from '@cesium/engine';
@@ -844,32 +844,6 @@ export { _shadersPolylineMaterialAppearanceVS } from '@cesium/engine';
 export { _shadersTexturedMaterialAppearanceFS } from '@cesium/engine';
 export { _shadersTexturedMaterialAppearanceVS } from '@cesium/engine';
 export { _shadersCzmBuiltins } from '@cesium/engine';
-export { _shadersAcesTonemappingStage } from '@cesium/engine';
-export { _shadersAdditiveBlend } from '@cesium/engine';
-export { _shadersAmbientOcclusionGenerate } from '@cesium/engine';
-export { _shadersAmbientOcclusionModulate } from '@cesium/engine';
-export { _shadersBlackAndWhite } from '@cesium/engine';
-export { _shadersBloomComposite } from '@cesium/engine';
-export { _shadersBrightPass } from '@cesium/engine';
-export { _shadersBrightness } from '@cesium/engine';
-export { _shadersCompositeTranslucentClassification } from '@cesium/engine';
-export { _shadersContrastBias } from '@cesium/engine';
-export { _shadersDepthOfField } from '@cesium/engine';
-export { _shadersDepthView } from '@cesium/engine';
-export { _shadersDepthViewPacked } from '@cesium/engine';
-export { _shadersEdgeDetection } from '@cesium/engine';
-export { _shadersFXAA } from '@cesium/engine';
-export { _shadersFilmicTonemapping } from '@cesium/engine';
-export { _shadersGaussianBlur1D } from '@cesium/engine';
-export { _shadersLensFlare } from '@cesium/engine';
-export { _shadersModifiedReinhardTonemapping } from '@cesium/engine';
-export { _shadersNightVision } from '@cesium/engine';
-export { _shadersPassThrough } from '@cesium/engine';
-export { _shadersPassThroughDepth } from '@cesium/engine';
-export { _shadersPbrNeutralTonemapping } from '@cesium/engine';
-export { _shadersPointCloudEyeDomeLighting } from '@cesium/engine';
-export { _shadersReinhardTonemapping } from '@cesium/engine';
-export { _shadersSilhouette } from '@cesium/engine';
 export { _shadersAspectRampMaterial } from '@cesium/engine';
 export { _shadersBumpMapMaterial } from '@cesium/engine';
 export { _shadersCheckerboardMaterial } from '@cesium/engine';
@@ -939,6 +913,32 @@ export { _shadersVoxelVS } from '@cesium/engine';
 export { _shadersconvertUvToBox } from '@cesium/engine';
 export { _shadersconvertUvToCylinder } from '@cesium/engine';
 export { _shadersconvertUvToEllipsoid } from '@cesium/engine';
+export { _shadersAcesTonemappingStage } from '@cesium/engine';
+export { _shadersAdditiveBlend } from '@cesium/engine';
+export { _shadersAmbientOcclusionGenerate } from '@cesium/engine';
+export { _shadersAmbientOcclusionModulate } from '@cesium/engine';
+export { _shadersBlackAndWhite } from '@cesium/engine';
+export { _shadersBloomComposite } from '@cesium/engine';
+export { _shadersBrightPass } from '@cesium/engine';
+export { _shadersBrightness } from '@cesium/engine';
+export { _shadersCompositeTranslucentClassification } from '@cesium/engine';
+export { _shadersContrastBias } from '@cesium/engine';
+export { _shadersDepthOfField } from '@cesium/engine';
+export { _shadersDepthView } from '@cesium/engine';
+export { _shadersDepthViewPacked } from '@cesium/engine';
+export { _shadersEdgeDetection } from '@cesium/engine';
+export { _shadersFXAA } from '@cesium/engine';
+export { _shadersFilmicTonemapping } from '@cesium/engine';
+export { _shadersGaussianBlur1D } from '@cesium/engine';
+export { _shadersLensFlare } from '@cesium/engine';
+export { _shadersModifiedReinhardTonemapping } from '@cesium/engine';
+export { _shadersNightVision } from '@cesium/engine';
+export { _shadersPassThrough } from '@cesium/engine';
+export { _shadersPassThroughDepth } from '@cesium/engine';
+export { _shadersPbrNeutralTonemapping } from '@cesium/engine';
+export { _shadersPointCloudEyeDomeLighting } from '@cesium/engine';
+export { _shadersReinhardTonemapping } from '@cesium/engine';
+export { _shadersSilhouette } from '@cesium/engine';
 export { ForEach } from '@cesium/engine';
 export { addBuffer } from '@cesium/engine';
 export { addDefaults } from '@cesium/engine';
@@ -963,52 +963,6 @@ export { removeUnusedElements } from '@cesium/engine';
 export { updateAccessorComponentTypes } from '@cesium/engine';
 export { updateVersion } from '@cesium/engine';
 export { usesExtension } from '@cesium/engine';
-export { _shadersdegreesPerRadian } from '@cesium/engine';
-export { _shadersdepthRange } from '@cesium/engine';
-export { _shadersepsilon1 } from '@cesium/engine';
-export { _shadersepsilon2 } from '@cesium/engine';
-export { _shadersepsilon3 } from '@cesium/engine';
-export { _shadersepsilon4 } from '@cesium/engine';
-export { _shadersepsilon5 } from '@cesium/engine';
-export { _shadersepsilon6 } from '@cesium/engine';
-export { _shadersepsilon7 } from '@cesium/engine';
-export { _shadersinfinity } from '@cesium/engine';
-export { _shadersoneOverPi } from '@cesium/engine';
-export { _shadersoneOverTwoPi } from '@cesium/engine';
-export { _shaderspassCesium3DTile } from '@cesium/engine';
-export { _shaderspassCesium3DTileClassification } from '@cesium/engine';
-export { _shaderspassCesium3DTileClassificationIgnoreShow } from '@cesium/engine';
-export { _shaderspassClassification } from '@cesium/engine';
-export { _shaderspassCompute } from '@cesium/engine';
-export { _shaderspassEnvironment } from '@cesium/engine';
-export { _shaderspassGlobe } from '@cesium/engine';
-export { _shaderspassOpaque } from '@cesium/engine';
-export { _shaderspassOverlay } from '@cesium/engine';
-export { _shaderspassTerrainClassification } from '@cesium/engine';
-export { _shaderspassTranslucent } from '@cesium/engine';
-export { _shaderspassVoxels } from '@cesium/engine';
-export { _shaderspi } from '@cesium/engine';
-export { _shaderspiOverFour } from '@cesium/engine';
-export { _shaderspiOverSix } from '@cesium/engine';
-export { _shaderspiOverThree } from '@cesium/engine';
-export { _shaderspiOverTwo } from '@cesium/engine';
-export { _shadersradiansPerDegree } from '@cesium/engine';
-export { _shaderssceneMode2D } from '@cesium/engine';
-export { _shaderssceneMode3D } from '@cesium/engine';
-export { _shaderssceneModeColumbusView } from '@cesium/engine';
-export { _shaderssceneModeMorphing } from '@cesium/engine';
-export { _shaderssolarRadius } from '@cesium/engine';
-export { _shadersthreePiOver2 } from '@cesium/engine';
-export { _shaderstwoPi } from '@cesium/engine';
-export { _shaderswebMercatorMaxLatitude } from '@cesium/engine';
-export { _shadersdepthRangeStruct } from '@cesium/engine';
-export { _shadersmaterial } from '@cesium/engine';
-export { _shadersmaterialInput } from '@cesium/engine';
-export { _shadersmodelMaterial } from '@cesium/engine';
-export { _shadersmodelVertexOutput } from '@cesium/engine';
-export { _shadersray } from '@cesium/engine';
-export { _shadersraySegment } from '@cesium/engine';
-export { _shadersshadowParameters } from '@cesium/engine';
 export { AlphaPipelineStage } from '@cesium/engine';
 export { AtmospherePipelineStage } from '@cesium/engine';
 export { B3dmLoader } from '@cesium/engine';
@@ -1082,6 +1036,52 @@ export { VaryingType } from '@cesium/engine';
 export { VerticalExaggerationPipelineStage } from '@cesium/engine';
 export { WireframePipelineStage } from '@cesium/engine';
 export { pickModel } from '@cesium/engine';
+export { _shadersdegreesPerRadian } from '@cesium/engine';
+export { _shadersdepthRange } from '@cesium/engine';
+export { _shadersepsilon1 } from '@cesium/engine';
+export { _shadersepsilon2 } from '@cesium/engine';
+export { _shadersepsilon3 } from '@cesium/engine';
+export { _shadersepsilon4 } from '@cesium/engine';
+export { _shadersepsilon5 } from '@cesium/engine';
+export { _shadersepsilon6 } from '@cesium/engine';
+export { _shadersepsilon7 } from '@cesium/engine';
+export { _shadersinfinity } from '@cesium/engine';
+export { _shadersoneOverPi } from '@cesium/engine';
+export { _shadersoneOverTwoPi } from '@cesium/engine';
+export { _shaderspassCesium3DTile } from '@cesium/engine';
+export { _shaderspassCesium3DTileClassification } from '@cesium/engine';
+export { _shaderspassCesium3DTileClassificationIgnoreShow } from '@cesium/engine';
+export { _shaderspassClassification } from '@cesium/engine';
+export { _shaderspassCompute } from '@cesium/engine';
+export { _shaderspassEnvironment } from '@cesium/engine';
+export { _shaderspassGlobe } from '@cesium/engine';
+export { _shaderspassOpaque } from '@cesium/engine';
+export { _shaderspassOverlay } from '@cesium/engine';
+export { _shaderspassTerrainClassification } from '@cesium/engine';
+export { _shaderspassTranslucent } from '@cesium/engine';
+export { _shaderspassVoxels } from '@cesium/engine';
+export { _shaderspi } from '@cesium/engine';
+export { _shaderspiOverFour } from '@cesium/engine';
+export { _shaderspiOverSix } from '@cesium/engine';
+export { _shaderspiOverThree } from '@cesium/engine';
+export { _shaderspiOverTwo } from '@cesium/engine';
+export { _shadersradiansPerDegree } from '@cesium/engine';
+export { _shaderssceneMode2D } from '@cesium/engine';
+export { _shaderssceneMode3D } from '@cesium/engine';
+export { _shaderssceneModeColumbusView } from '@cesium/engine';
+export { _shaderssceneModeMorphing } from '@cesium/engine';
+export { _shaderssolarRadius } from '@cesium/engine';
+export { _shadersthreePiOver2 } from '@cesium/engine';
+export { _shaderstwoPi } from '@cesium/engine';
+export { _shaderswebMercatorMaxLatitude } from '@cesium/engine';
+export { _shadersdepthRangeStruct } from '@cesium/engine';
+export { _shadersmaterial } from '@cesium/engine';
+export { _shadersmaterialInput } from '@cesium/engine';
+export { _shadersmodelMaterial } from '@cesium/engine';
+export { _shadersmodelVertexOutput } from '@cesium/engine';
+export { _shadersray } from '@cesium/engine';
+export { _shadersraySegment } from '@cesium/engine';
+export { _shadersshadowParameters } from '@cesium/engine';
 export { _shadersHSBToRGB } from '@cesium/engine';
 export { _shadersHSLToRGB } from '@cesium/engine';
 export { _shadersRGBToHSB } from '@cesium/engine';
@@ -1194,48 +1194,48 @@ export { createCommand } from '@cesium/widgets';
 export { subscribeAndEvaluate } from '@cesium/widgets';
 export { Animation } from '@cesium/widgets';
 export { AnimationViewModel } from '@cesium/widgets';
+export { Cesium3DTilesInspector } from '@cesium/widgets';
+export { Cesium3DTilesInspectorViewModel } from '@cesium/widgets';
 export { CesiumInspector } from '@cesium/widgets';
 export { CesiumInspectorViewModel } from '@cesium/widgets';
-export { BaseLayerPicker } from '@cesium/widgets';
-export { BaseLayerPickerViewModel } from '@cesium/widgets';
-export { ProviderViewModel } from '@cesium/widgets';
-export { createDefaultImageryProviderViewModels } from '@cesium/widgets';
-export { createDefaultTerrainProviderViewModels } from '@cesium/widgets';
 export { FullscreenButton } from '@cesium/widgets';
 export { FullscreenButtonViewModel } from '@cesium/widgets';
+export { Geocoder } from '@cesium/widgets';
+export { GeocoderViewModel } from '@cesium/widgets';
 export { HomeButton } from '@cesium/widgets';
 export { HomeButtonViewModel } from '@cesium/widgets';
 export { I3SBuildingSceneLayerExplorer } from '@cesium/widgets';
 export { I3SBuildingSceneLayerExplorerViewModel } from '@cesium/widgets';
-export { Geocoder } from '@cesium/widgets';
-export { GeocoderViewModel } from '@cesium/widgets';
-export { NavigationHelpButton } from '@cesium/widgets';
-export { NavigationHelpButtonViewModel } from '@cesium/widgets';
 export { InfoBox } from '@cesium/widgets';
 export { InfoBoxViewModel } from '@cesium/widgets';
-export { ProjectionPicker } from '@cesium/widgets';
-export { ProjectionPickerViewModel } from '@cesium/widgets';
+export { BaseLayerPicker } from '@cesium/widgets';
+export { BaseLayerPickerViewModel } from '@cesium/widgets';
+export { ProviderViewModel } from '@cesium/widgets';
+export { createDefaultImageryProviderViewModels } from '@cesium/widgets';
+export { createDefaultTerrainProviderViewModels } from '@cesium/widgets';
 export { PerformanceWatchdog } from '@cesium/widgets';
 export { PerformanceWatchdogViewModel } from '@cesium/widgets';
-export { Cesium3DTilesInspector } from '@cesium/widgets';
-export { Cesium3DTilesInspectorViewModel } from '@cesium/widgets';
+export { NavigationHelpButton } from '@cesium/widgets';
+export { NavigationHelpButtonViewModel } from '@cesium/widgets';
+export { ProjectionPicker } from '@cesium/widgets';
+export { ProjectionPickerViewModel } from '@cesium/widgets';
 export { SceneModePicker } from '@cesium/widgets';
 export { SceneModePickerViewModel } from '@cesium/widgets';
+export { Timeline } from '@cesium/widgets';
+export { TimelineHighlightRange } from '@cesium/widgets';
+export { TimelineTrack } from '@cesium/widgets';
 export { SelectionIndicator } from '@cesium/widgets';
 export { SelectionIndicatorViewModel } from '@cesium/widgets';
 export { knockout_3_5_1 } from '@cesium/widgets';
 export { knockout_es5 } from '@cesium/widgets';
 export { knockout } from '@cesium/widgets';
-export { Timeline } from '@cesium/widgets';
-export { TimelineHighlightRange } from '@cesium/widgets';
-export { TimelineTrack } from '@cesium/widgets';
-export { VRButton } from '@cesium/widgets';
-export { VRButtonViewModel } from '@cesium/widgets';
 export { Viewer } from '@cesium/widgets';
 export { viewerCesium3DTilesInspectorMixin } from '@cesium/widgets';
 export { viewerCesiumInspectorMixin } from '@cesium/widgets';
 export { viewerDragDropMixin } from '@cesium/widgets';
 export { viewerPerformanceWatchdogMixin } from '@cesium/widgets';
 export { viewerVoxelInspectorMixin } from '@cesium/widgets';
+export { VRButton } from '@cesium/widgets';
+export { VRButtonViewModel } from '@cesium/widgets';
 export { VoxelInspector } from '@cesium/widgets';
 export { VoxelInspectorViewModel } from '@cesium/widgets';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenlify/cesium",
-  "version": "1.128.25",
+  "version": "1.128.26",
   "description": "CesiumJS is a JavaScript library for creating 3D globes and 2D maps in a web browser without a plugin.",
   "homepage": "http://cesium.com/cesiumjs/",
   "license": "Apache-2.0",

package/patches/engine/Source/Core/taskProcessor.patch.js

@@ -20,9 +20,9 @@ function defaultValue(value, defaultValue) {
   return value !== undefined ? value : defaultValue
 }
 
-function canTransferArrayBuffer() {
+function canTransferArrayBufferPatched() {
   if (!defined(TaskProcessor._canTransferArrayBuffer)) {
-    const worker = createWorker('transferTypedArrayTest')
+    const worker = createWorkerPatched('transferTypedArrayTest')
     worker.postMessage = defaultValue(worker.webkitPostMessage, worker.postMessage)
 
     const value = 99
@@ -64,7 +64,7 @@ function canTransferArrayBuffer() {
 
 const taskCompletedEvent = new Event()
 
-function urlFromScript(script) {
+function urlFromScriptPatched(script) {
   let blob
   try {
     blob = new Blob([script], {
@@ -85,7 +85,7 @@ function urlFromScript(script) {
   return URL.createObjectURL(blob)
 }
 
-function createWorker(url) {
+function createWorkerPatched(url) {
   const uri = new Uri(url)
   const isUri = uri.scheme().length !== 0 && uri.fragment().length === 0
   const moduleID = url.replace(/\.js$/, '')
@@ -109,7 +109,7 @@ function createWorker(url) {
   if (crossOriginUrl) {
     // To load cross-origin, create a shim worker from a blob URL
     const script = `import "${crossOriginUrl}";`
-    workerPath = urlFromScript(script)
+    workerPath = urlFromScriptPatched(script)
     options.type = 'module'
     return new Worker(workerPath, options)
   }
@@ -118,10 +118,10 @@ function createWorker(url) {
   if (!isUri && typeof CESIUM_WORKERS !== 'undefined') {
     // If the workers are embedded, create a shim worker from the embedded script data
     const script = `
-      importScripts("${urlFromScript(CESIUM_WORKERS)}");
+      importScripts("${urlFromScriptPatched(CESIUM_WORKERS)}");
       CesiumWorkers["${moduleID}"]();
     `
-    workerPath = urlFromScript(script)
+    workerPath = urlFromScriptPatched(script)
     return new Worker(workerPath, options)
   }
 
@@ -141,7 +141,7 @@ function createWorker(url) {
 }
 
 // eslint-disable-next-line no-unused-vars
-async function getWebAssemblyLoaderConfig(processor, wasmOptions) {
+async function getWebAssemblyLoaderConfigPatched(processor, wasmOptions) {
   const config = {
     modulePath: undefined,
     wasmBinaryFile: undefined,
@@ -202,8 +202,8 @@ const createOnmessageHandler = (worker, id, resolve, reject) => {
 }
 
 const emptyTransferableObjectArray = []
-async function runTask(processor, parameters, transferableObjects) {
-  const canTransfer = await Promise.resolve(canTransferArrayBuffer())
+async function runTaskPatched(processor, parameters, transferableObjects) {
+  const canTransfer = await Promise.resolve(canTransferArrayBufferPatched())
   if (!defined(transferableObjects)) {
     transferableObjects = emptyTransferableObjectArray
   } else if (!canTransfer) {
@@ -242,11 +242,11 @@ async function runTask(processor, parameters, transferableObjects) {
   return promise
 }
 
-async function scheduleTask(processor, parameters, transferableObjects) {
+async function scheduleTaskPatched(processor, parameters, transferableObjects) {
   ++processor._activeTasks
 
   try {
-    const result = await runTask(processor, parameters, transferableObjects)
+    const result = await runTaskPatched(processor, parameters, transferableObjects)
     --processor._activeTasks
     return result
   } catch (error) {
@@ -283,14 +283,14 @@ async function scheduleTask(processor, parameters, transferableObjects) {
  */
 TaskProcessor.prototype.scheduleTask = function (parameters, transferableObjects) {
   if (!defined(this._worker)) {
-    this._worker = createWorker(this._workerPath)
+    this._worker = createWorkerPatched(this._workerPath)
   }
 
   if (this._activeTasks >= this._maximumActiveTasks) {
     return undefined
   }
 
-  return scheduleTask(this, parameters, transferableObjects)
+  return scheduleTaskPatched(this, parameters, transferableObjects)
 }
 
 /**

package/patches/engine/Source/Core/tileAvailability.patch.js

@@ -12,7 +12,8 @@ function rectangleContainsPosition(potentialContainer, positionToTest) {
   )
 }
 
-function findMaxLevelFromNode(stopNode, node, position) {
+// Patched version of findMaxLevelFromNode with different logic
+function findMaxLevelFromNodePatched(stopNode, node, position) {
   let maxLevel = 0
   let found = false
   while (!found) {
@@ -22,16 +23,16 @@ function findMaxLevelFromNode(stopNode, node, position) {
     const se = node._se && rectangleContainsPosition(node._se.extent, position)
     if (Number(nw) + Number(ne) + Number(sw) + Number(se) > 1) {
       if (nw) {
-        maxLevel = Math.max(maxLevel, findMaxLevelFromNode(node, node._nw, position))
+        maxLevel = Math.max(maxLevel, findMaxLevelFromNodePatched(node, node._nw, position))
       }
       if (ne) {
-        maxLevel = Math.max(maxLevel, findMaxLevelFromNode(node, node._ne, position))
+        maxLevel = Math.max(maxLevel, findMaxLevelFromNodePatched(node, node._ne, position))
       }
       if (sw) {
-        maxLevel = Math.max(maxLevel, findMaxLevelFromNode(node, node._sw, position))
+        maxLevel = Math.max(maxLevel, findMaxLevelFromNodePatched(node, node._sw, position))
       }
       if (se) {
-        maxLevel = Math.max(maxLevel, findMaxLevelFromNode(node, node._se, position))
+        maxLevel = Math.max(maxLevel, findMaxLevelFromNodePatched(node, node._se, position))
       }
       break
     } else if (nw) {
@@ -60,6 +61,7 @@ function findMaxLevelFromNode(stopNode, node, position) {
   return maxLevel
 }
 
+// Overwrite the prototype method to use our patched findMaxLevelFromNode
 TileAvailability.prototype.computeMaximumLevelAtPosition = function (position) {
   let node
   // @ts-ignore
@@ -72,5 +74,5 @@ TileAvailability.prototype.computeMaximumLevelAtPosition = function (position) {
   if (!defined(node)) {
     return -1
   }
-  return findMaxLevelFromNode(undefined, node, position)
+  return findMaxLevelFromNodePatched(undefined, node, position)
 }