10250194146

Committed 05 Aug 2024 01:57PM UTC coverage: 89.274% (-0.03%) from 89.303%

Build # 10250194146

Build Type

push

github

Committed by

web-flow

Commit Message

HeatmapLayer UBO (#9071)

Run Details

6536 of 7178 branches covered (91.06%)

Branch coverage included in aggregate %.

111 of 161 new or added lines in 9 files covered. (68.94%)

1 existing line in 1 file now uncovered.

54673 of 61385 relevant lines covered (89.07%)

6299.75 hits per line

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

58.76

/modules/aggregation-layers/src/heatmap-layer/triangle-layer.ts

// Copyright (c) 2015 - 2019 Uber Technologies, Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

import type {Buffer, Device, Texture} from '@luma.gl/core';
import {Model} from '@luma.gl/engine';
import {Layer, LayerContext, project32} from '@deck.gl/core';
import vs from './triangle-layer-vertex.glsl';
import fs from './triangle-layer-fragment.glsl';
import {TriangleProps, triangleUniforms} from './triangle-layer-uniforms';

type _TriangleLayerProps = {
  data: {attributes: {positions: Buffer; texCoords: Buffer}};
  colorDomain: [number, number];
  aggregationMode: number;
  threshold: number;
  intensity: number;
  vertexCount: number;
  colorTexture: Texture;
  maxTexture: Texture;
  weightsTexture: Texture;
};

export default class TriangleLayer extends Layer<_TriangleLayerProps> {
  static layerName = 'TriangleLayer';

  state!: {
    model: Model;
    positions: Buffer;
    texCoords: Buffer;
  };

  getShaders() {
    return super.getShaders({vs, fs, modules: [project32, triangleUniforms]});
  }

  initializeState({device}: LayerContext): void {
    this.setState({model: this._getModel(device)});
  }

  _getModel(device: Device): Model {
    const {vertexCount, data} = this.props;

    return new Model(device, {
      ...this.getShaders(),
      id: this.props.id,
      attributes: data.attributes,
      bufferLayout: [
        {name: 'positions', format: 'float32x3'},
        {name: 'texCoords', format: 'float32x2'}
      ],
      topology: 'triangle-strip',
      vertexCount
    });
  }

  draw(): void {
    const {model} = this.state;
    const {
      aggregationMode,
      colorDomain,
      intensity,
      threshold,
      colorTexture,
      maxTexture,
      weightsTexture
    } = this.props;
    const triangleProps: TriangleProps = {
      aggregationMode,
      colorDomain,
      intensity,
      threshold,
      colorTexture,
      maxTexture,
      weightsTexture
    };
    model.shaderInputs.setProps({triangle: triangleProps});
    model.draw(this.context.renderPass);
  }
}

1	// Copyright (c) 2015 - 2019 Uber Technologies, Inc.	1✔
2	//	1✔
3	// Permission is hereby granted, free of charge, to any person obtaining a copy	1✔
4	// of this software and associated documentation files (the "Software"), to deal	1✔
5	// in the Software without restriction, including without limitation the rights	1✔
6	// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell	1✔
7	// copies of the Software, and to permit persons to whom the Software is	1✔
8	// furnished to do so, subject to the following conditions:	1✔
9	//	1✔
10	// The above copyright notice and this permission notice shall be included in	1✔
11	// all copies or substantial portions of the Software.	1✔
12	//	1✔
13	// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR	1✔
14	// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,	1✔
15	// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE	1✔
16	// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER	1✔
17	// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,	1✔
18	// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN	1✔
19	// THE SOFTWARE.	1✔
20		1✔
21	import type {Buffer, Device, Texture} from '@luma.gl/core';	1✔
22	import {Model} from '@luma.gl/engine';	1✔
23	import {Layer, LayerContext, project32} from '@deck.gl/core';	1✔
24	import vs from './triangle-layer-vertex.glsl';	1✔
25	import fs from './triangle-layer-fragment.glsl';	1✔
26	import {TriangleProps, triangleUniforms} from './triangle-layer-uniforms';	1✔
27		1✔
28	type _TriangleLayerProps = {	1✔
29	data: {attributes: {positions: Buffer; texCoords: Buffer}};	1✔
30	colorDomain: [number, number];	1✔
31	aggregationMode: number;	1✔
32	threshold: number;	1✔
33	intensity: number;	1✔
34	vertexCount: number;	1✔
35	colorTexture: Texture;	1✔
36	maxTexture: Texture;	1✔
37	weightsTexture: Texture;	1✔
38	};	1✔
39		1✔
40	export default class TriangleLayer extends Layer<_TriangleLayerProps> {	1✔
41	static layerName = 'TriangleLayer';	1✔
42		1✔
43	state!: {	1✔
44	model: Model;	1✔
45	positions: Buffer;	1✔
46	texCoords: Buffer;	1✔
47	};	1✔
48		1✔
49	getShaders() {	1✔
NEW 50	return super.getShaders({vs, fs, modules: [project32, triangleUniforms]});	×
51	}	×
52		1✔
53	initializeState({device}: LayerContext): void {	1✔
54	this.setState({model: this._getModel(device)});	×
55	}	×
56		1✔
57	_getModel(device: Device): Model {	1✔
NEW 58	const {vertexCount, data} = this.props;	×
59		×
60	return new Model(device, {	×
61	...this.getShaders(),	×
62	id: this.props.id,	×
63	attributes: data.attributes,	×
64	bufferLayout: [	×
65	{name: 'positions', format: 'float32x3'},	×
66	{name: 'texCoords', format: 'float32x2'}	×
67	],	×
68	topology: 'triangle-strip',	×
69	vertexCount	×
70	});	×
71	}	×
72		1✔
73	draw(): void {	1✔
74	const {model} = this.state;	×
NEW 75	const {	×
NEW 76	aggregationMode,	×
NEW 77	colorDomain,	×
78	intensity,	×
79	threshold,	×
NEW 80	colorTexture,	×
NEW 81	maxTexture,	×
NEW 82	weightsTexture	×
NEW 83	} = this.props;	×
NEW 84	const triangleProps: TriangleProps = {	×
85	aggregationMode,	×
NEW 86	colorDomain,	×
NEW 87	intensity,	×
NEW 88	threshold,	×
NEW 89	colorTexture,	×
NEW 90	maxTexture,	×
NEW 91	weightsTexture	×
NEW 92	};	×
NEW 93	model.shaderInputs.setProps({triangle: triangleProps});	×
94	model.draw(this.context.renderPass);	×
95	}	×
96	}	1✔

visgl / deck.gl / 10250194146

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