Browse Source

Fix the bug: when the position property is callbackProperty, use custom material will make the scene broken

tags/4.0.0
syz 1 year ago
parent
commit
d2707456bc
20 changed files with 24 additions and 24 deletions
  1. 1
    1
      src/modules/material/property/circle/CircleBlurMaterialProperty.js
  2. 1
    1
      src/modules/material/property/circle/CircleDiffuseMaterialProperty.js
  3. 1
    1
      src/modules/material/property/circle/CircleFadeMaterialProperty.js
  4. 1
    1
      src/modules/material/property/circle/CirclePulseMaterialProperty.js
  5. 1
    1
      src/modules/material/property/circle/CircleScanMaterialProperty.js
  6. 1
    1
      src/modules/material/property/circle/CircleSpiralMaterialProperty.js
  7. 1
    1
      src/modules/material/property/circle/CircleVaryMaterialProperty.js
  8. 3
    3
      src/modules/material/property/circle/CircleWaveMaterialProperty.js
  9. 1
    1
      src/modules/material/property/ellipsoid/EllipsoidElectricMaterialProperty.js
  10. 1
    1
      src/modules/material/property/ellipsoid/EllipsoidTrailMaterialProperty.js
  11. 1
    1
      src/modules/material/property/polyline/PolylineFlickerMaterialProperty.js
  12. 3
    3
      src/modules/material/property/polyline/PolylineFlowMaterialProperty.js
  13. 1
    1
      src/modules/material/property/polyline/PolylineImageTrailMaterialProperty.js
  14. 1
    1
      src/modules/material/property/polyline/PolylineLightingTrailMaterialProperty.js
  15. 1
    1
      src/modules/material/property/radar/RadarLineMaterialProperty.js
  16. 1
    1
      src/modules/material/property/radar/RadarSweepMaterialProperty.js
  17. 1
    1
      src/modules/material/property/radar/RadarWaveMaterialProperty.js
  18. 1
    1
      src/modules/material/property/wall/WallImageTrailMaterialProperty.js
  19. 1
    1
      src/modules/material/property/wall/WallLineTrailMaterialProperty.js
  20. 1
    1
      src/modules/material/property/wall/WallTrailMaterialProperty.js

+ 1
- 1
src/modules/material/property/circle/CircleBlurMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/circle/CircleDiffuseMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/circle/CircleFadeMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/circle/CirclePulseMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/circle/CircleScanMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/circle/CircleSpiralMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/circle/CircleVaryMaterialProperty.js View File

@@ -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
}


+ 3
- 3
src/modules/material/property/circle/CircleWaveMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/ellipsoid/EllipsoidElectricMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/ellipsoid/EllipsoidTrailMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/polyline/PolylineFlickerMaterialProperty.js View File

@@ -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
}


+ 3
- 3
src/modules/material/property/polyline/PolylineFlowMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/polyline/PolylineImageTrailMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/polyline/PolylineLightingTrailMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/radar/RadarLineMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/radar/RadarSweepMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/radar/RadarWaveMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/wall/WallImageTrailMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/wall/WallLineTrailMaterialProperty.js View File

@@ -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
}


+ 1
- 1
src/modules/material/property/wall/WallTrailMaterialProperty.js View File

@@ -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
}


Loading…
Cancel
Save