Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/shaders/symbol.vertex.glsl
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ struct SymbolPaintProperties {
struct PropertyType {
/// Whether the property is data-driven and has value in data-driven block or constant uniform.
bool isDataDriven;
/// Whether the property is zoom-dependent and has two values that need to be interpolated between zooms.
/// Whether the property is zoom-dependent and has two values that need to be interpolated between zooms.
bool isZoomDependent;
/// Local offset within the data-driven block (in dwords).
///
Expand Down Expand Up @@ -419,7 +419,7 @@ void main() {
float size;

// When rendering appearances, we use a_size_max to store the size
if (a_apperance == USING_APPEARANCE) {
if (a_appearance == USING_APPEARANCE) {
size = a_size_max / 128.0;
} else if (!u_is_size_zoom_constant && !u_is_size_feature_constant) {
size = mix(a_size_min, a_size_max, u_size_t) / 128.0;
Expand Down Expand Up @@ -539,8 +539,8 @@ void main() {

#ifdef DEPTH_OCCLUSION
float depth_occlusion = occlusionFadeMultiSample(projected_point);
float depth_occlusion_multplier = mix(occlusion_opacity, 1.0, depth_occlusion);
out_fade_opacity *= depth_occlusion_multplier;
float depth_occlusion_multiplier = mix(occlusion_opacity, 1.0, depth_occlusion);
out_fade_opacity *= depth_occlusion_multiplier;
#endif

#ifdef OCCLUSION_QUERIES
Expand Down
2 changes: 1 addition & 1 deletion src/style-spec/expression/definitions/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class Config implements Expression {
serialize(): SerializedExpression {
const res = ["config", this.key];
if (this.scope) {
res.concat(this.scope);
res.push(this.scope);
}
return res;
}
Expand Down
Loading