From 9463b217397f7bdb6632ddef97476f54ba4f119e Mon Sep 17 00:00:00 2001 From: huyang Date: Fri, 1 Dec 2023 18:51:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev-demos/features/point/pointFillImage.md | 6 ++++++ packages/layers/src/point/models/radar.ts | 3 --- packages/layers/src/point/shaders/image/fillImage_frag.glsl | 2 -- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dev-demos/features/point/pointFillImage.md b/dev-demos/features/point/pointFillImage.md index 5118412e29..f3514feca5 100644 --- a/dev-demos/features/point/pointFillImage.md +++ b/dev-demos/features/point/pointFillImage.md @@ -1,3 +1,8 @@ +--- +group: + title: 点 + order: 1 +--- ### point - fillImage ```tsx import { PointLayer, Scene } from '@antv/l7'; @@ -9,6 +14,7 @@ export default () => { const scene = new Scene({ id: 'point_fillImage', + // renderer: 'device', map: new GaodeMap({ style: 'light', center: [120, 30], diff --git a/packages/layers/src/point/models/radar.ts b/packages/layers/src/point/models/radar.ts index 60042051d4..f1c58f7b19 100644 --- a/packages/layers/src/point/models/radar.ts +++ b/packages/layers/src/point/models/radar.ts @@ -28,13 +28,10 @@ export default class RadarModel extends BaseModel { } protected getCommonUniformsInfo(): { uniformsArray: number[]; uniformsLength: number; uniformsOption:{[key: string]: any} } { const { - opacity = 1, blend, speed = 1, unit = 'pixel', } = this.layer.getLayerConfig() as IPointLayerStyleOptions; - // const { animateOption = { enable: false } } = - // this.layer.getLayerConfig() as ILayerConfig; const commonOptions = { u_additive: blend === 'additive' ? 1.0 : 0.0, u_size_unit: SizeUnitType[unit] as SizeUnitType, diff --git a/packages/layers/src/point/shaders/image/fillImage_frag.glsl b/packages/layers/src/point/shaders/image/fillImage_frag.glsl index 013e66f21c..7f024606bc 100644 --- a/packages/layers/src/point/shaders/image/fillImage_frag.glsl +++ b/packages/layers/src/point/shaders/image/fillImage_frag.glsl @@ -17,10 +17,8 @@ layout(std140) uniform uBlock { void main() { - vec2 pos = v_Iconuv / u_textSize + v_uv / u_textSize * 64.; outputColor = texture(u_texture, pos); outputColor.a *= v_opacity; - outputColor = filterColor(outputColor); }