mirror of https://gitee.com/antv-l7/antv-l7
fix: hightlight opacity
This commit is contained in:
parent
c9961f54b2
commit
2c002abf53
|
@ -16,11 +16,11 @@ vec4 filterHighlightColor(vec4 color) {
|
|||
if (selected) {
|
||||
vec4 highLightColor = u_HighlightColor * COLOR_SCALE;
|
||||
|
||||
float highLightAlpha = highLightColor.a;
|
||||
float highLightRatio = highLightAlpha / (highLightAlpha + color.a * (1.0 - highLightAlpha));
|
||||
// float highLightAlpha = highLightColor.a;
|
||||
// float highLightRatio = highLightAlpha / (highLightAlpha + color.a * (1.0 - highLightAlpha));
|
||||
|
||||
vec3 resultRGB = mix(color.rgb, highLightColor.rgb, highLightRatio);
|
||||
return vec4(resultRGB, color.a);
|
||||
// vec3 resultRGB = mix(color.rgb, highLightColor.rgb, highLightRatio);
|
||||
return highLightColor;
|
||||
} else {
|
||||
return color;
|
||||
}
|
||||
|
|
|
@ -1,10 +1,12 @@
|
|||
import { storiesOf } from '@storybook/react';
|
||||
import * as React from 'react';
|
||||
import MultiPolygon from './components/multiPolygon';
|
||||
import MultiLine from './components/multiLine';
|
||||
import MultiPolygon from './components/multiPolygon';
|
||||
import UpdatePolygon from './components/updatedata';
|
||||
// @ts-ignore
|
||||
import notes from './Map.md';
|
||||
// @ts-ignore
|
||||
storiesOf('数据', module)
|
||||
.add('multiPolygon', () => <MultiPolygon />, {})
|
||||
.add('updatePolygon', () => <UpdatePolygon />, {})
|
||||
.add('MultiLine', () => <MultiLine />, {});
|
||||
|
|
|
@ -0,0 +1,86 @@
|
|||
import { LineLayer, PolygonLayer, Scene } from '@antv/l7';
|
||||
import { GaodeMap } from '@antv/l7-maps';
|
||||
import * as React from 'react';
|
||||
|
||||
function convertRGB2Hex(rgb: number[]) {
|
||||
return (
|
||||
'#' + rgb.map((r) => ('0' + Math.floor(r).toString(16)).slice(-2)).join('')
|
||||
);
|
||||
}
|
||||
|
||||
export default class UpdatePolygon extends React.Component {
|
||||
private gui: dat.GUI;
|
||||
private $stats: Node;
|
||||
private scene: Scene;
|
||||
|
||||
public componentWillUnmount() {
|
||||
this.scene.destroy();
|
||||
}
|
||||
|
||||
public async componentDidMount() {
|
||||
const scene = new Scene({
|
||||
id: 'map',
|
||||
map: new GaodeMap({
|
||||
style: 'dark',
|
||||
center: [104.288144, 31.239692],
|
||||
zoom: 4.4,
|
||||
}),
|
||||
});
|
||||
|
||||
scene.on('loaded', async () => {
|
||||
// https://gw.alipayobjects.com/os/basement_prod/0d2f0113-f48b-4db9-8adc-a3937243d5a3.json
|
||||
const response = await fetch(
|
||||
'https://gw.alipayobjects.com/os/rmsportal/JToMOWvicvJOISZFCkEI.json',
|
||||
);
|
||||
const data = await response.json();
|
||||
const highlightLayer = new PolygonLayer({})
|
||||
.source({
|
||||
type: 'FeatureCollection',
|
||||
features: [],
|
||||
})
|
||||
.shape('fill')
|
||||
.color('red'); // 20% 透明度;
|
||||
const polygonLayer = new PolygonLayer({})
|
||||
.source(data)
|
||||
.shape('fill')
|
||||
.color('rgba(255,255,255,0.2)') // 20% 透明度
|
||||
.select({
|
||||
color: 'red', // 选中后的颜色同样会有透明度
|
||||
})
|
||||
.style({
|
||||
opacity: 1,
|
||||
});
|
||||
// polygonLayer.on('click', (e) => {
|
||||
// highlightLayer.setData({
|
||||
// type: 'FeatureCollection',
|
||||
// features: [e.feature],
|
||||
// });
|
||||
// });
|
||||
const lineLayer = new LineLayer({})
|
||||
.source(data)
|
||||
.shape('line')
|
||||
.size(1)
|
||||
.color('#0ffbc4');
|
||||
|
||||
scene.addLayer(polygonLayer);
|
||||
scene.addLayer(highlightLayer);
|
||||
scene.addLayer(lineLayer);
|
||||
this.scene = scene;
|
||||
});
|
||||
}
|
||||
|
||||
public render() {
|
||||
return (
|
||||
<div
|
||||
id="map"
|
||||
style={{
|
||||
position: 'absolute',
|
||||
top: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
}}
|
||||
/>
|
||||
);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue