10690917279

Committed 03 Sep 2024 09:29PM UTC coverage: 91.797% (+0.1%) from 91.695%

Build # 10690917279

Build Type

Pull #9130

github

Committed by

web-flow

Commit Message

Merge d3a545704 into afe6c3272

Pull Request Pull Request #9130: GPU Aggregation: Support *ScaleType and *Percentile props

Run Details

6739 of 7372 branches covered (91.41%)

Branch coverage included in aggregate %.

511 of 522 new or added lines in 11 files covered. (97.89%)

2 existing lines in 2 files now uncovered.

54908 of 59784 relevant lines covered (91.84%)

14683.88 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

97.4

/modules/aggregation-layers/src/grid-layer/grid-cell-layer.ts

// deck.gl
// SPDX-License-Identifier: MIT
// Copyright (c) vis.gl contributors

import {Texture} from '@luma.gl/core';
import {UpdateParameters, Color} from '@deck.gl/core';
import {ColumnLayer} from '@deck.gl/layers';
import {CubeGeometry} from '@luma.gl/engine';
import {createColorRangeTexture, updateColorRangeTexture} from '../common/utils/color-utils';
import vs from './grid-cell-layer-vertex.glsl';
import {GridProps, gridUniforms} from './grid-layer-uniforms';
import type {ScaleType} from '../common/types';

/** Proprties added by GridCellLayer. */
type GridCellLayerProps = {
  cellSizeCommon: [number, number];
  cellOriginCommon: [number, number];
  colorDomain: [number, number];
  colorCutoff: [number, number] | null;
  colorRange: Color[];
  colorScaleType: ScaleType;
  elevationDomain: [number, number];
  elevationCutoff: [number, number] | null;
  elevationRange: [number, number];
};

export class GridCellLayer<ExtraPropsT extends {} = {}> extends ColumnLayer<
  null,
  ExtraPropsT & Required<GridCellLayerProps>
> {
  static layerName = 'GridCellLayer';

  state!: ColumnLayer['state'] & {
    colorTexture: Texture;
  };

  getShaders() {
    const shaders = super.getShaders();
    shaders.modules.push(gridUniforms);
    return {...shaders, vs};
  }

  initializeState() {
    super.initializeState();

    const attributeManager = this.getAttributeManager()!;
    attributeManager.remove([
      'instanceElevations',
      'instanceFillColors',
      'instanceLineColors',
      'instanceStrokeWidths'
    ]);
    attributeManager.addInstanced({
      instancePositions: {
        size: 2,
        type: 'float32',
        accessor: 'getBin'
      },
      instanceColorValues: {
        size: 1,
        type: 'float32',
        accessor: 'getColorValue'
      },
      instanceElevationValues: {
        size: 1,
        type: 'float32',
        accessor: 'getElevationValue'
      }
    });
  }

  updateState(params: UpdateParameters<this>) {
    super.updateState(params);

    const {props, oldProps} = params;
    const model = this.state.fillModel!;

    if (oldProps.colorRange !== props.colorRange) {
      this.state.colorTexture?.destroy();
      this.state.colorTexture = createColorRangeTexture(
        this.context.device,
        props.colorRange,
        props.colorScaleType
      );
      const gridProps: Partial<GridProps> = {colorRange: this.state.colorTexture};
      model.shaderInputs.setProps({grid: gridProps});
    } else if (oldProps.colorScaleType !== props.colorScaleType) {
      updateColorRangeTexture(this.state.colorTexture, props.colorScaleType);
    }
  }

  finalizeState(context) {
    super.finalizeState(context);

    this.state.colorTexture?.destroy();
  }

  protected _updateGeometry() {
    const geometry = new CubeGeometry();
    this.state.fillModel!.setGeometry(geometry);
  }

  draw({uniforms}) {
    const {
      cellOriginCommon,
      cellSizeCommon,
      elevationRange,
      elevationScale,
      extruded,
      coverage,
      colorDomain,
      elevationDomain
    } = this.props;
    const colorCutoff = this.props.colorCutoff || [-Infinity, Infinity];
    const elevationCutoff = this.props.elevationCutoff || [-Infinity, Infinity];
    const fillModel = this.state.fillModel!;

    const gridProps: Omit<GridProps, 'colorRange'> = {
      colorDomain: [
        Math.max(colorDomain[0], colorCutoff[0]), // instanceColorValue that maps to colorRange[0]
        Math.min(colorDomain[1], colorCutoff[1]), // instanceColorValue that maps to colorRange[colorRange.length - 1]
        Math.max(colorDomain[0] - 1, colorCutoff[0]), // hide cell if instanceColorValue is less than this
        Math.min(colorDomain[1] + 1, colorCutoff[1]) // hide cell if instanceColorValue is greater than this
      ],
      elevationDomain: [
        Math.max(elevationDomain[0], elevationCutoff[0]), // instanceElevationValue that maps to elevationRange[0]
        Math.min(elevationDomain[1], elevationCutoff[1]), // instanceElevationValue that maps to elevationRange[elevationRange.length - 1]
        Math.max(elevationDomain[0] - 1, elevationCutoff[0]), // hide cell if instanceElevationValue is less than this
        Math.min(elevationDomain[1] + 1, elevationCutoff[1]) // hide cell if instanceElevationValue is greater than this
      ],
      elevationRange: [elevationRange[0] * elevationScale, elevationRange[1] * elevationScale],
      originCommon: cellOriginCommon,
      sizeCommon: cellSizeCommon
    };
    fillModel.shaderInputs.setProps({
      column: {extruded, coverage},
      grid: gridProps
    });
    fillModel.draw(this.context.renderPass);
  }
}

1	// deck.gl	1✔
2	// SPDX-License-Identifier: MIT	1✔
3	// Copyright (c) vis.gl contributors	1✔
4		1✔
5	import {Texture} from '@luma.gl/core';	1✔
6	import {UpdateParameters, Color} from '@deck.gl/core';	1✔
7	import {ColumnLayer} from '@deck.gl/layers';	1✔
8	import {CubeGeometry} from '@luma.gl/engine';	1✔
9	import {createColorRangeTexture, updateColorRangeTexture} from '../common/utils/color-utils';	1✔
10	import vs from './grid-cell-layer-vertex.glsl';	1✔
11	import {GridProps, gridUniforms} from './grid-layer-uniforms';	1✔
12	import type {ScaleType} from '../common/types';	1✔
13		1✔
14	/** Proprties added by GridCellLayer. */	1✔
15	type GridCellLayerProps = {	1✔
16	cellSizeCommon: [number, number];	1✔
17	cellOriginCommon: [number, number];	1✔
18	colorDomain: [number, number];	1✔
19	colorCutoff: [number, number] \| null;	1✔
20	colorRange: Color[];	1✔
21	colorScaleType: ScaleType;	1✔
22	elevationDomain: [number, number];	1✔
23	elevationCutoff: [number, number] \| null;	1✔
24	elevationRange: [number, number];	1✔
25	};	1✔
26		1✔
27	export class GridCellLayer<ExtraPropsT extends {} = {}> extends ColumnLayer<	1✔
28	null,	1✔
29	ExtraPropsT & Required<GridCellLayerProps>	1✔
30	> {	1✔
31	static layerName = 'GridCellLayer';	1✔
32		1✔
33	state!: ColumnLayer['state'] & {	1✔
34	colorTexture: Texture;	1✔
35	};	1✔
36		1✔
37	getShaders() {	1✔
38	const shaders = super.getShaders();	11✔
39	shaders.modules.push(gridUniforms);	11✔
40	return {...shaders, vs};	11✔
41	}	11✔
42		1✔
43	initializeState() {	1✔
44	super.initializeState();	11✔
45		11✔
46	const attributeManager = this.getAttributeManager()!;	11✔
47	attributeManager.remove([	11✔
48	'instanceElevations',	11✔
49	'instanceFillColors',	11✔
50	'instanceLineColors',	11✔
51	'instanceStrokeWidths'	11✔
52	]);	11✔
53	attributeManager.addInstanced({	11✔
54	instancePositions: {	11✔
55	size: 2,	11✔
56	type: 'float32',	11✔
57	accessor: 'getBin'	11✔
58	},	11✔
59	instanceColorValues: {	11✔
60	size: 1,	11✔
61	type: 'float32',	11✔
62	accessor: 'getColorValue'	11✔
63	},	11✔
64	instanceElevationValues: {	11✔
65	size: 1,	11✔
66	type: 'float32',	11✔
67	accessor: 'getElevationValue'	11✔
68	}	11✔
69	});	11✔
70	}	11✔
71		1✔
72	updateState(params: UpdateParameters<this>) {	1✔
73	super.updateState(params);	42✔
74		42✔
75	const {props, oldProps} = params;	42✔
76	const model = this.state.fillModel!;	42✔
77		42✔
78	if (oldProps.colorRange !== props.colorRange) {	42✔
79	this.state.colorTexture?.destroy();	11!
80	this.state.colorTexture = createColorRangeTexture(	11✔
81	this.context.device,	11✔
82	props.colorRange,	11✔
83	props.colorScaleType	11✔
84	);	11✔
85	const gridProps: Partial<GridProps> = {colorRange: this.state.colorTexture};	11✔
86	model.shaderInputs.setProps({grid: gridProps});	11✔
87	} else if (oldProps.colorScaleType !== props.colorScaleType) {	42!
NEW 88	updateColorRangeTexture(this.state.colorTexture, props.colorScaleType);	×
UNCOV 89	}	×
90	}	42✔
91		1✔
92	finalizeState(context) {	1✔
93	super.finalizeState(context);	11✔
94		11✔
95	this.state.colorTexture?.destroy();	11✔
96	}	11✔
97		1✔
98	protected _updateGeometry() {	1✔
99	const geometry = new CubeGeometry();	13✔
100	this.state.fillModel!.setGeometry(geometry);	13✔
101	}	13✔
102		1✔
103	draw({uniforms}) {	1✔
104	const {	57✔
105	cellOriginCommon,	57✔
106	cellSizeCommon,	57✔
107	elevationRange,	57✔
108	elevationScale,	57✔
109	extruded,	57✔
110	coverage,	57✔
111	colorDomain,	57✔
112	elevationDomain	57✔
113	} = this.props;	57✔
114	const colorCutoff = this.props.colorCutoff \|\| [-Infinity, Infinity];	57✔
115	const elevationCutoff = this.props.elevationCutoff \|\| [-Infinity, Infinity];	57✔
116	const fillModel = this.state.fillModel!;	57✔
117		57✔
118	const gridProps: Omit<GridProps, 'colorRange'> = {	57✔
119	colorDomain: [	57✔
120	Math.max(colorDomain[0], colorCutoff[0]), // instanceColorValue that maps to colorRange[0]	57✔
121	Math.min(colorDomain[1], colorCutoff[1]), // instanceColorValue that maps to colorRange[colorRange.length - 1]	57✔
122	Math.max(colorDomain[0] - 1, colorCutoff[0]), // hide cell if instanceColorValue is less than this	57✔
123	Math.min(colorDomain[1] + 1, colorCutoff[1]) // hide cell if instanceColorValue is greater than this	57✔
124	],	57✔
125	elevationDomain: [	57✔
126	Math.max(elevationDomain[0], elevationCutoff[0]), // instanceElevationValue that maps to elevationRange[0]	57✔
127	Math.min(elevationDomain[1], elevationCutoff[1]), // instanceElevationValue that maps to elevationRange[elevationRange.length - 1]	57✔
128	Math.max(elevationDomain[0] - 1, elevationCutoff[0]), // hide cell if instanceElevationValue is less than this	57✔
129	Math.min(elevationDomain[1] + 1, elevationCutoff[1]) // hide cell if instanceElevationValue is greater than this	57✔
130	],	57✔
131	elevationRange: [elevationRange[0] * elevationScale, elevationRange[1] * elevationScale],	57✔
132	originCommon: cellOriginCommon,	57✔
133	sizeCommon: cellSizeCommon	57✔
134	};	57✔
135	fillModel.shaderInputs.setProps({	57✔
136	column: {extruded, coverage},	57✔
137	grid: gridProps	57✔
138	});	57✔
139	fillModel.draw(this.context.renderPass);	57✔
140	}	57✔
141	}	1✔

visgl / deck.gl / 10690917279

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous