Merge pull request #186 from SUNYunZeng/master

Fix some bugs: when the positions property is callbackProperty, use custom materail will make the scene borken
dvgis · Jun 4, 2024 · 74f0655 · 74f0655
2 parents a05eddc + d270745
commit 74f0655
Show file tree

Hide file tree

Showing 20 changed files with 24 additions and 24 deletions.
diff --git a/src/modules/material/property/circle/CircleBlurMaterialProperty.js b/src/modules/material/property/circle/CircleBlurMaterialProperty.js
@@ -17,7 +17,7 @@ class CircleBlurMaterialProperty extends MaterialProperty {
  getValue(time, result) {
  result = Cesium.defaultValue(result, {})
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/circle/CircleDiffuseMaterialProperty.js b/src/modules/material/property/circle/CircleDiffuseMaterialProperty.js
@@ -17,7 +17,7 @@ class CircleDiffuseMaterialProperty extends MaterialProperty {
  getValue(time, result) {
  result = Cesium.defaultValue(result, {})
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/circle/CircleFadeMaterialProperty.js b/src/modules/material/property/circle/CircleFadeMaterialProperty.js
@@ -19,7 +19,7 @@ class CircleFadeMaterialProperty extends MaterialProperty {
  result = {}
  }
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/circle/CirclePulseMaterialProperty.js b/src/modules/material/property/circle/CirclePulseMaterialProperty.js
@@ -19,7 +19,7 @@ class CirclePulseMaterialProperty extends MaterialProperty {
  result = {}
  }
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/circle/CircleScanMaterialProperty.js b/src/modules/material/property/circle/CircleScanMaterialProperty.js
@@ -19,7 +19,7 @@ class CircleScanMaterialProperty extends MaterialProperty {
  result = {}
  }
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/circle/CircleSpiralMaterialProperty.js b/src/modules/material/property/circle/CircleSpiralMaterialProperty.js
@@ -19,7 +19,7 @@ class CircleSpiralMaterialProperty extends MaterialProperty {
  result = {}
  }
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/circle/CircleVaryMaterialProperty.js b/src/modules/material/property/circle/CircleVaryMaterialProperty.js
@@ -17,7 +17,7 @@ class CircleVaryMaterialProperty extends MaterialProperty {
  getValue(time, result) {
  result = Cesium.defaultValue(result, {})
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/circle/CircleWaveMaterialProperty.js b/src/modules/material/property/circle/CircleWaveMaterialProperty.js
@@ -29,9 +29,9 @@ class CircleWaveMaterialProperty extends MaterialProperty {
  result = {}
  }
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
- result.speed = this._speed
- result.count = this.count
- result.gradient = this.gradient
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
+ result.count = Cesium.Property.getValueOrUndefined(this._count, time)
+ result.gradient = Cesium.Property.getValueOrUndefined(this._gradient, time)
  return result
  }
 

diff --git a/src/modules/material/property/ellipsoid/EllipsoidElectricMaterialProperty.js b/src/modules/material/property/ellipsoid/EllipsoidElectricMaterialProperty.js
@@ -17,7 +17,7 @@ class EllipsoidElectricMaterialProperty extends MaterialProperty {
  getValue(time, result) {
  result = Cesium.defaultValue(result, {})
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/ellipsoid/EllipsoidTrailMaterialProperty.js b/src/modules/material/property/ellipsoid/EllipsoidTrailMaterialProperty.js
@@ -17,7 +17,7 @@ class EllipsoidTrailMaterialProperty extends MaterialProperty {
  getValue(time, result) {
  result = Cesium.defaultValue(result, {})
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/polyline/PolylineFlickerMaterialProperty.js b/src/modules/material/property/polyline/PolylineFlickerMaterialProperty.js
@@ -19,7 +19,7 @@ class PolylineFlickerMaterialProperty extends MaterialProperty {
  result = {}
  }
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/polyline/PolylineFlowMaterialProperty.js b/src/modules/material/property/polyline/PolylineFlowMaterialProperty.js
@@ -25,9 +25,9 @@ class PolylineFlowMaterialProperty extends MaterialProperty {
  result = {}
  }
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
- result.speed = this._speed
- result.percent = this._percent
- result.gradient = this._gradient
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
+ result.percent = Cesium.Property.getValueOrUndefined(this._percent, time)
+ result.gradient = Cesium.Property.getValueOrUndefined(this._gradient, time)
  return result
  }
 

diff --git a/src/modules/material/property/polyline/PolylineImageTrailMaterialProperty.js b/src/modules/material/property/polyline/PolylineImageTrailMaterialProperty.js
@@ -30,7 +30,7 @@ class PolylineImageTrailMaterialProperty extends MaterialProperty {
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
  result.image = Cesium.Property.getValueOrUndefined(this._image, time)
  result.repeat = Cesium.Property.getValueOrUndefined(this._repeat, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/polyline/PolylineLightingTrailMaterialProperty.js b/src/modules/material/property/polyline/PolylineLightingTrailMaterialProperty.js
@@ -24,7 +24,7 @@ class PolylineLightingTrailMaterialProperty extends MaterialProperty {
  }
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
  result.image = Cesium.Property.getValueOrUndefined(this._image, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/radar/RadarLineMaterialProperty.js b/src/modules/material/property/radar/RadarLineMaterialProperty.js
@@ -17,7 +17,7 @@ class RadarLineMaterialProperty extends MaterialProperty {
  getValue(time, result) {
  result = Cesium.defaultValue(result, {})
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/radar/RadarSweepMaterialProperty.js b/src/modules/material/property/radar/RadarSweepMaterialProperty.js
@@ -17,7 +17,7 @@ class RadarSweepMaterialProperty extends MaterialProperty {
  getValue(time, result) {
  result = Cesium.defaultValue(result, {})
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/radar/RadarWaveMaterialProperty.js b/src/modules/material/property/radar/RadarWaveMaterialProperty.js
@@ -17,7 +17,7 @@ class RadarWaveMaterialProperty extends MaterialProperty {
  getValue(time, result) {
  result = Cesium.defaultValue(result, {})
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/wall/WallImageTrailMaterialProperty.js b/src/modules/material/property/wall/WallImageTrailMaterialProperty.js
@@ -28,7 +28,7 @@ class WallImageTrailMaterialProperty extends MaterialProperty {
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
  result.image = Cesium.Property.getValueOrUndefined(this._image, time)
  result.repeat = Cesium.Property.getValueOrUndefined(this._repeat, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/wall/WallLineTrailMaterialProperty.js b/src/modules/material/property/wall/WallLineTrailMaterialProperty.js
@@ -31,7 +31,7 @@ class WallLineTrailMaterialProperty extends MaterialProperty {
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
  result.image = Cesium.Property.getValueOrUndefined(this._image, time)
  result.repeat = Cesium.Property.getValueOrUndefined(this._repeat, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }
 

diff --git a/src/modules/material/property/wall/WallTrailMaterialProperty.js b/src/modules/material/property/wall/WallTrailMaterialProperty.js
@@ -24,7 +24,7 @@ class WallTrailMaterialProperty extends MaterialProperty {
  }
  result.color = Cesium.Property.getValueOrUndefined(this._color, time)
  result.image = Cesium.Property.getValueOrUndefined(this._image, time)
- result.speed = this._speed
+ result.speed = Cesium.Property.getValueOrUndefined(this._speed, time)
  return result
  }