Fix pattern attributes vertex layout #9482
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,12 @@ | ||
| // @flow | ||
| import {createLayout} from '../../util/struct_array'; | ||
|
|
||
| const patternAttributes = createLayout([ | ||
| // [tl.x, tl.y, br.x, br.y] | ||
| {name: 'a_pattern_from', components: 4, type: 'Uint16'}, | ||
| {name: 'a_pattern_to', components: 4, type: 'Uint16'}, | ||
| {name: 'a_pixel_ratio_from', components: 1, type: 'Uint8'}, | ||
| {name: 'a_pixel_ratio_to', components: 1, type: 'Uint8'}, | ||
| ]); | ||
|
|
||
| export default patternAttributes; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ import {register} from '../util/web_worker_transfer'; | |
| import {PossiblyEvaluatedPropertyValue} from '../style/properties'; | ||
| import {StructArrayLayout1f4, StructArrayLayout2f8, StructArrayLayout4f16, PatternLayoutArray} from './array_types'; | ||
| import {clamp} from '../util/util'; | ||
| import patternAttributes from './bucket/pattern_attributes'; | ||
| import EvaluationParameters from '../style/evaluation_parameters'; | ||
| import FeaturePositionMap from './feature_position_map'; | ||
| import { | ||
|
|
@@ -312,20 +312,13 @@ class CrossFadedCompositeBinder implements AttributeBinder { | |
| zoomOutPaintVertexBuffer: ?VertexBuffer; | ||
| paintVertexAttributes: Array<StructArrayMember>; | ||
|
|
||
| constructor(expression: CompositeExpression, type: string, useIntegerZoom: boolean, zoom: number, PaintVertexArray: Class<StructArray>, layerId: string) { | ||
| this.expression = expression; | ||
| this.type = type; | ||
| this.useIntegerZoom = useIntegerZoom; | ||
| this.zoom = zoom; | ||
| this.layerId = layerId; | ||
|
|
||
| this.zoomInPaintVertexArray = new PaintVertexArray(); | ||
| this.zoomOutPaintVertexArray = new PaintVertexArray(); | ||
| } | ||
|
|
@@ -371,8 +364,8 @@ class CrossFadedCompositeBinder implements AttributeBinder { | |
|
|
||
| upload(context: Context) { | ||
| if (this.zoomInPaintVertexArray && this.zoomInPaintVertexArray.arrayBuffer && this.zoomOutPaintVertexArray && this.zoomOutPaintVertexArray.arrayBuffer) { | ||
| this.zoomInPaintVertexBuffer = context.createVertexBuffer(this.zoomInPaintVertexArray, patternAttributes.members, this.expression.isStateDependent); | ||
| this.zoomOutPaintVertexBuffer = context.createVertexBuffer(this.zoomOutPaintVertexArray, patternAttributes.members, this.expression.isStateDependent); | ||
|
There was a problem hiding this comment. Isn't this hard-coding though? are patterns the only kind of cross faded composite attributes? There was a problem hiding this comment. Yes they are the only type at this time, we don't emplace any other vertices in this layout so we can make it explicit https://github.com/mapbox/mapbox-gl-js/blob/b238b15f64e00540c29d0ec3d2065861aa90d1f9/src/data/program_configuration.js#L357_L368. We could leave a note to prevent programmer error if this gets extended. Were there any other case you were thinking of? There was a problem hiding this comment. How about cross-referencing from a lookup table? We could either update the lookup table by hand, or codegen it in There was a problem hiding this comment. Logging offline discussion: we decided on going the simple way for the time being to cut out extra logic. |
||
| } | ||
| } | ||
|
|
||
|
|
@@ -438,7 +431,7 @@ export default class ProgramConfiguration { | |
| } else if (expression.kind === 'source' || isCrossFaded) { | ||
| const StructArrayLayout = layoutType(property, type, 'source'); | ||
| this.binders[property] = isCrossFaded ? | ||
| new CrossFadedCompositeBinder(expression, type, useIntegerZoom, zoom, StructArrayLayout, layer.id) : | ||
| new SourceExpressionBinder(expression, names, type, StructArrayLayout); | ||
| keys.push(`/a_${property}`); | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| { | ||
| "version": 8, | ||
| "metadata": { | ||
| "test": { | ||
| "height": 256, | ||
| "width": 256, | ||
| "pixelRatio": 1, | ||
| "operations": [ | ||
| [ | ||
| "wait" | ||
| ], | ||
| [ | ||
| "addImage", | ||
| "pattern", | ||
| "./image/marker.png", | ||
| { | ||
| "pixelRatio": 2 | ||
| } | ||
| ], | ||
| [ | ||
| "wait" | ||
| ], | ||
| [ | ||
| "addSource", | ||
| "geojson", | ||
| { | ||
| "type": "geojson", | ||
| "data": { | ||
| "type": "FeatureCollection", | ||
| "features": [ | ||
| { | ||
| "type": "Feature", | ||
| "properties": { | ||
| "height": 10 | ||
| }, | ||
| "geometry": { | ||
| "type": "Polygon", | ||
| "coordinates": [ | ||
| [ | ||
| [ | ||
| -0.0001, | ||
| -0.0001 | ||
| ], | ||
| [ | ||
| -0.0001, | ||
| 0.0001 | ||
| ], | ||
| [ | ||
| 0.0001, | ||
| 0.0001 | ||
| ], | ||
| [ | ||
| 0.0001, | ||
| -0.0001 | ||
| ], | ||
| [ | ||
| -0.0001, | ||
| -0.0001 | ||
| ] | ||
| ] | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ], | ||
| [ | ||
| "wait" | ||
| ], | ||
| [ | ||
| "addLayer", | ||
| { | ||
| "id": "extrusion", | ||
| "type": "fill-extrusion", | ||
| "source": "geojson", | ||
| "paint": { | ||
| "fill-extrusion-pattern": { | ||
| "property": "height", | ||
| "type": "interval", | ||
| "stops": [[0, "pattern"]] | ||
| }, | ||
| "fill-extrusion-height": 10 | ||
| } | ||
| } | ||
| ], | ||
| [ | ||
| "wait" | ||
| ] | ||
| ] | ||
| } | ||
| }, | ||
| "pitch": 60, | ||
| "zoom": 19, | ||
| "sources": {}, | ||
| "layers": [] | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The issue lies here, instead of using
0, we need to usepatternAttributes.memberswhich has the correct offsets and sizes.