线贴图 速度相同 切换有问题
This commit is contained in:
@ -335,9 +335,13 @@ class PolylineObject extends Base {
|
||||
this._elms.lineWidth.forEach(item => {
|
||||
item.value = this.options.width
|
||||
})
|
||||
this.entity &&
|
||||
this.entity.polyline &&
|
||||
(this.entity.polyline.width = this.options.width)
|
||||
if (this.entity && this.entity.polyline) {
|
||||
this.entity.polyline.width = this.entity.polyline.width + v - this.entity.polyline.oriWidth
|
||||
this.entity.polyline.oriWidth = this.options.width
|
||||
}
|
||||
// this.entity &&
|
||||
// this.entity.polyline &&
|
||||
// (this.entity.polyline.width = this.options.width) && (this.entity.polyline.oriWidth = this.options.width)
|
||||
}
|
||||
|
||||
get lineType() {
|
||||
@ -1316,6 +1320,7 @@ class PolylineObject extends Base {
|
||||
zIndex: that.sdk._entityZIndex
|
||||
}
|
||||
})
|
||||
that.entity.polyline.oriWidth = that.options.width
|
||||
that.sdk._entityZIndex++
|
||||
PolylineObject.createLabel(that)
|
||||
// that.entity.polyline.positionsLngLat = positions
|
||||
|
@ -12,7 +12,7 @@ function LineTexture() {
|
||||
this.image = options.image || "";
|
||||
this.color = new Cesium.Color.fromCssColorString(options.color || "rgba(255,255,255,1)");
|
||||
this.speed = options.speed != undefined ? options.speed : 1.0;
|
||||
this.repeat = options.repeat || 1.0;
|
||||
this.repeat = options.repeat || new Cesium.Cartesian2(1.0, 1.0);
|
||||
}
|
||||
|
||||
get isConstant() {
|
||||
@ -52,7 +52,7 @@ function LineTexture() {
|
||||
result.repeat = Cesium.Property.getValueOrDefault(
|
||||
this._repeat,
|
||||
time,
|
||||
1.0,
|
||||
new Cesium.Cartesian2(1.0, 1.0),
|
||||
result.repeat
|
||||
);
|
||||
result.frameNumber = Cesium.getTimestamp();
|
||||
@ -85,14 +85,14 @@ function LineTexture() {
|
||||
uniform vec4 color;
|
||||
uniform sampler2D image;
|
||||
uniform float speed;
|
||||
uniform float repeat;
|
||||
// uniform float repeat;
|
||||
czm_material czm_getMaterial(czm_materialInput materialInput)
|
||||
{
|
||||
czm_material material = czm_getDefaultMaterial(materialInput);
|
||||
vec2 st = materialInput.st;
|
||||
st.s *= repeat; // 关键:通过repeat控制纹理密度
|
||||
st.s *= repeat.x; // 关键:通过repeat控制纹理密度
|
||||
// vec4 colorImage = texture2D(image, vec2(fract(st.s + speed*czm_frameNumber* 0.01), st.t));
|
||||
vec4 colorImage = speed==0.0?texture2D(image, vec2(fract(st.s), st.t)):texture2D(image, vec2(fract(st.s + frameNumber / 1000.0 / speed * repeat ), st.t));
|
||||
vec4 colorImage = speed==0.0?texture2D(image, vec2(fract(st.s), st.t)):texture2D(image, vec2(fract(st.s + frameNumber / 1000.0 / speed * repeat.x / repeat.y ), st.t));
|
||||
material.alpha = colorImage.a * color.a;
|
||||
material.diffuse = color.rgb;
|
||||
return material;
|
||||
@ -106,7 +106,7 @@ function LineTexture() {
|
||||
uniforms: {
|
||||
color: new Cesium.Color(1.0, 1.0, 1.0, 1.0),
|
||||
image: '',
|
||||
repeat: 1.0,
|
||||
repeat: new Cesium.Cartesian2(1.0, 1.0),
|
||||
speed: 1.0,
|
||||
frameNumber: Cesium.getTimestamp(),
|
||||
uTime: 1
|
||||
|
@ -585,8 +585,6 @@ class Tools {
|
||||
getMaterial(color = '#2ab0c2', type = 0, entity = null, newParam = {}) {
|
||||
let material = ''
|
||||
|
||||
|
||||
|
||||
switch (Number(type)) {
|
||||
|
||||
case 1: //虚线
|
||||
@ -645,8 +643,18 @@ class Tools {
|
||||
space: newParam.space,
|
||||
speed: newParam.speed
|
||||
}
|
||||
let arr = [7, 8, 9, 10, 11]
|
||||
let arr = {
|
||||
'7': 10,
|
||||
'8': 3,
|
||||
'9': 4,
|
||||
'10': 4,
|
||||
'11': 4,
|
||||
'12': 2
|
||||
}
|
||||
param.speed = newParam.rotate ? param.speed : 0 - param.speed
|
||||
console.log(entity.polyline.oriWidth, arr[type + ''], type, 'oriWidth')
|
||||
entity.polyline.width = entity.polyline.oriWidth + arr[type + '']
|
||||
|
||||
this.getFlowTexture(this, param, entity)
|
||||
|
||||
break
|
||||
@ -683,6 +691,8 @@ class Tools {
|
||||
|
||||
// let repeat = getRepeat()
|
||||
// }, false)
|
||||
entity.polyline.material.oriRepeat = undefined
|
||||
entity.polyline.material.oriSpeed = undefined
|
||||
entity.polyline.material = new Cesium.LineTextureMaterialProperty(
|
||||
{
|
||||
color: options.color,
|
||||
@ -696,8 +706,8 @@ class Tools {
|
||||
var positions = positionProperty.getValue(that.sdk.viewer.clock.currentTime);
|
||||
|
||||
if (!Cesium.defined(positions)) {
|
||||
// return new Cesium.Cartesian2(1.0, 1.0);
|
||||
return 1.0;
|
||||
return new Cesium.Cartesian2(1.0, 1.0);
|
||||
// return 1.0;
|
||||
}
|
||||
|
||||
var distance = 0;
|
||||
@ -721,14 +731,21 @@ class Tools {
|
||||
var groundResolution = that.sdk.viewer.scene.camera.getPixelSize(boundingSphere, drawingBufferWidth, drawingBufferHeight)
|
||||
// repeatX *= groundResolution / cameraHeight / ((myImg.width / myImg.height * 5) + 1);
|
||||
repeatX *= groundResolution / cameraHeight / (options.space * (canvasEle.width / canvasEle.height * 5) + 1);
|
||||
let speed
|
||||
if (entity.polyline.material.oriRepeat) {
|
||||
speed = repeatX / entity.polyline.material.oriRepeat
|
||||
} else {
|
||||
entity.polyline.material.oriRepeat = repeatX
|
||||
}
|
||||
// if (repeatX < 3) {
|
||||
// repeatX = 3
|
||||
// }
|
||||
// return new Cesium.Cartesian2(repeatX, 1.0);
|
||||
return repeatX;
|
||||
return new Cesium.Cartesian2(repeatX, speed || 1.0);
|
||||
// return repeatX;
|
||||
})
|
||||
}
|
||||
)
|
||||
entity.polyline.material.oriSpeed = options.speed
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user