Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

old: Texture dots #33

Open
wants to merge 8 commits into
base: gh-pages
Choose a base branch
from
Open

old: Texture dots #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9898573
switching to uniforms
patriciogonzalezvivo Dec 14, 2016
a1b463a
simplifing more by asuming background is always white
patriciogonzalezvivo Dec 14, 2016
e8808f7
using SDF for dots
patriciogonzalezvivo Dec 14, 2016
fddf954
smaller sdf
patriciogonzalezvivo Dec 14, 2016
2111d74
Merge branch 'gh-pages' into turbo_dots
nvkelso Dec 28, 2016
b0f464c
adjust default size of dots and medium dots to match previous setting…
nvkelso Dec 28, 2016
c4e8243
add missing landuse labels
nvkelso Dec 28, 2016
1401527
Revert "add missing landuse labels"
nvkelso Dec 28, 2016
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
Binary file added images/dot-sdf.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
110 changes: 48 additions & 62 deletions refill-style.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,9 @@ global:


textures:
sdf-dot:
url: images/dot-sdf.png

pois:
url: images/[email protected]
filtering: mipmap
Expand Down Expand Up @@ -878,23 +881,26 @@ styles:
return r-0.5;
}
# Drawing Shapes functions
shapes-circle:
sdf-shape:
mix: functions-aastep
shaders:
defines:
PI: 3.14159265358979323846
uniforms:
u_sdf: sdf-dot
u_shape_stroke: 0.15
blocks:
global: |
// get distance field of a Circle
// get distance field of a shape or pattern
// ================================
float circleDF (vec2 st) {
return dot(st,st);
float getSDF (vec2 st) {
return texture2D(u_sdf, st).r;
}
//
// Draw a circle in the middle of the ST space
// ================================
float circle (vec2 st, float radius) {
return 1.-aastep(radius, circleDF(st-vec2(0.5))*PI);

float fill (in float size, in float sdf) {
return 1.-aastep(size, sdf);
}

float stroke (in float size, in float sdf) {
return aastep(size, sdf+u_shape_stroke) - aastep(size, sdf);
}
shapes-rect:
shaders:
Expand Down Expand Up @@ -966,10 +972,14 @@ styles:
}
}
patterns-dots:
mix: [space-tile, tiling-brick, shapes-circle]
mix: [space-tile, tiling-brick, functions-aastep]
shaders:
blocks:
global: |
float circleDF (vec2 st) {
return dot(st,st)*3.03;
}

// Interpolated dot patern between zooms attached to tile coords
float TileDots(float scale, float size) {
// Beginning of the transition
Expand Down Expand Up @@ -1106,60 +1116,33 @@ styles:
color = mix(vec4(color.rgb, 0.4), vec4(0.0), stripes(st*130.))*.8; // transparent stripes

dots:
mix: [space-tile, tiling-tile, shapes-circle]
mix: [space-tile, tiling-tile, sdf-shape]
base: polygons
shaders:
uniforms:
u_pattern_scale: 50.
u_dot_size: .05
defines:
PATTERN_SCALE: 50.0
DOT_SIZE: .1
COLOR1: vec3(1.00,1.00,1.00)
COLOR2: color.rgb
PATTERN_SCALE: u_pattern_scale
DOT_SIZE: u_dot_size
BACKGROUND_COLOR: vec3(1.)
blocks:
color: |
color.rgb = mix(COLOR1, COLOR2, circle(tile(getTileCoords(),PATTERN_SCALE), DOT_SIZE));

dots-medium:
mix: dots
base: polygons
shaders:
defines:
PATTERN_SCALE: 60.0
DOT_SIZE: .25
dots3:
color.rgb = mix(BACKGROUND_COLOR, color.rgb, fill(DOT_SIZE, getSDF(tile(getTileCoords(),PATTERN_SCALE))));
medium-dots:
mix: dots
base: polygons
shaders:
defines:
PATTERN_SCALE: 70.0
DOT_SIZE: .125

park-dots1:
mix: dots
shaders:
defines:
COLOR1: vec3(1.00,1.00,1.00)
COLOR2: color.rgb

medium-dots:
mix: dots-medium
shaders:
defines:
COLOR1: vec3(1.00,1.00,1.00)
COLOR2: color.rgb

uniforms:
u_pattern_scale: 60.
u_dot_size: .16
tiny-dots:
mix: dots3
shaders:
defines:
COLOR1: vec3(1.00,1.00,1.00)
COLOR2: color.rgb

park-dots3:
mix: dots
base: polygons
shaders:
defines:
COLOR1: vec3(1.00,1.00,1.00)
COLOR2: vec3(0.760,0.760,0.760)
uniforms:
u_pattern_scale: 70.
u_dot_size: .125

dots-rev:
base: polygons
Expand Down Expand Up @@ -5985,7 +5968,7 @@ layers:
landuse:
data: { source: mapzen }
draw:
park-dots1:
dots:
order: global.feature_order
visible: false
medium-dots:
Expand Down Expand Up @@ -6038,7 +6021,7 @@ layers:
- not: { operator: [ "United States Forest Service" ] }
- protect_class: ['2','3','5']
draw:
park-dots1:
dots:
interactive: true
color: [0.790,0.790,0.790]
# todo: what is this?
Expand Down Expand Up @@ -6114,7 +6097,7 @@ layers:
- not: { protect_class: ['2','3','5','6'] }
# default for national forests and more?
draw:
park-dots1:
dots:
color: [0.760,0.760,0.760]
visible: true
national_park:
Expand Down Expand Up @@ -6196,7 +6179,8 @@ layers:
filter:
kind: cemetery
draw:
tiny-dots:
medium-dots:
#tiny-dots:
color: [0.890,0.890,0.890]
visible: true
# commercial:
Expand Down Expand Up @@ -6346,7 +6330,8 @@ layers:
filter:
kind: garden
draw:
tiny-dots:
medium-dots:
#tiny-dots:
color: [0.760,0.760,0.760]
visible: true
parking:
Expand All @@ -6371,7 +6356,7 @@ layers:
filter:
kind: [pedestrian,common]
draw:
park-dots1:
dots:
color: [0.950,0.950,0.950]
visible: global.grey1_v
green-stuff:
Expand All @@ -6383,7 +6368,8 @@ layers:
pitch:
filter: { kind: pitch }
draw:
tiny-dots:
medium-dots:
#tiny-dots:
color: [0.90,0.90,0.90]
visible: true
outline:
Expand Down