Shihuidev (#933)

* feat: 修改简单线体层的 shape 参数

* feat: change simple lint type
This commit is contained in:
YiQianYao 2022-01-14 00:37:10 +08:00 committed by GitHub
parent 815d0aff19
commit 3325c55f15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 7 deletions

View File

@ -338,7 +338,7 @@ img.onload = function() {
const layer = new LineLayer({}) const layer = new LineLayer({})
.source(geoData) .source(geoData)
.size(1) .size(1)
.shape('simpleline') .shape('simple')
.color('rgb(22, 119, 255)') .color('rgb(22, 119, 255)')
.style({ .style({
vertexHeightScale: 2000, vertexHeightScale: 2000,

View File

@ -29,7 +29,7 @@ export default class LineLayer extends BaseLayer<ILineLayerStyleOptions> {
const type = this.getModelType(); const type = this.getModelType();
const defaultConfig = { const defaultConfig = {
line: {}, line: {},
simpleline: {}, simple: {},
wall: {}, wall: {},
arc3d: { blend: 'additive' }, arc3d: { blend: 'additive' },
arc: { blend: 'additive' }, arc: { blend: 'additive' },

View File

@ -12,7 +12,7 @@ export type LineModelType =
| 'arc3d' | 'arc3d'
| 'greatcircle' | 'greatcircle'
| 'wall' | 'wall'
| 'simpleline' | 'simple'
| 'line'; | 'line';
const LineModels: { [key in LineModelType]: any } = { const LineModels: { [key in LineModelType]: any } = {
@ -22,7 +22,7 @@ const LineModels: { [key in LineModelType]: any } = {
greatcircle: GreatCircleModel, greatcircle: GreatCircleModel,
wall: LineWallModel, wall: LineWallModel,
line: LineModel, line: LineModel,
simpleline: SimpleLineModel, simple: SimpleLineModel,
}; };
export default LineModels; export default LineModels;

View File

@ -97,7 +97,7 @@ export default class SimpleLineModel extends BaseModel {
public buildModels(): IModel[] { public buildModels(): IModel[] {
return [ return [
this.layer.buildLayerModel({ this.layer.buildLayerModel({
moduleName: 'line', moduleName: 'simpleline',
vertexShader: line_vert, vertexShader: line_vert,
fragmentShader: line_frag, fragmentShader: line_frag,
triangulation: SimpleLineTriangulation, triangulation: SimpleLineTriangulation,

View File

@ -343,7 +343,7 @@ export default class GridTile extends React.Component {
const layer = new LineLayer({}) const layer = new LineLayer({})
.source(geoData) .source(geoData)
.size(1) .size(1)
.shape('simpleline') .shape('simple')
.color('rgb(22, 119, 255)') .color('rgb(22, 119, 255)')
.style({ .style({
vertexHeightScale: 2000, vertexHeightScale: 2000,

View File

@ -295,7 +295,7 @@ export default class GridTile2 extends React.Component {
const layer = new LineLayer({}) const layer = new LineLayer({})
.source(geoData) .source(geoData)
.size(1) .size(1)
.shape('simpleline') .shape('simple')
.color('rgb(22, 119, 255)') .color('rgb(22, 119, 255)')
.style({ .style({
vertexHeightScale: 2000, vertexHeightScale: 2000,