Skip to content

Plotly issue 3232 min #16

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

Closed
archmoj wants to merge 7 commits into from
Closed

Plotly issue 3232 min #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
98e8007
added package lock
archmoj Dec 10, 2018
8a8b9cf
removed unavailable demo link
archmoj Dec 10, 2018
7bb6ef0
simplified the shader and removed unused function
archmoj Dec 10, 2018
22c2184
disabled palette to fix issue 3232
archmoj Dec 10, 2018
66d4399
enabled palette for max 256 colors
archmoj Dec 12, 2018
39382a1
bug fix plotly issue 3232
archmoj Dec 12, 2018
1cb7d93
upgrade dependencies to latest and glslify to be at 6.3.1
archmoj Dec 12, 2018
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
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ design
instances
*node_modules
*.psd
package-lock.json
docs
gh-pages
dist
27 changes: 9 additions & 18 deletions marker-vert.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,21 @@ const float maxSize = 100.;
const float borderLevel = .5;

varying vec4 fragColor, fragBorderColor;
varying float fragPointSize, fragBorderRadius,
fragWidth, fragBorderColorLevel, fragColorLevel;
varying float fragPointSize, fragBorderRadius, fragWidth, fragBorderColorLevel, fragColorLevel;

bool isDirect = (paletteSize.x < 1.);

vec2 paletteCoord(float id) {
return vec2(
(mod(id, paletteSize.x) + .5) / paletteSize.x,
(floor(id / paletteSize.x) + .5) / paletteSize.y
);
}
vec2 paletteCoord(vec2 id) {
return vec2(
(id.x + .5) / paletteSize.x,
(id.y + .5) / paletteSize.y
);
}
vec4 getColor(vec4 id) {
// zero-palette means we deal with direct buffer
if (paletteSize.x == 0.) return id / 255.;
return texture2D(palette, paletteCoord(id.xy));
return isDirect ? id / 255. : texture2D(palette,
vec2(
(id.x + .5) / paletteSize.x,
(id.y + .5) / paletteSize.y
)
);
}

void main() {
if (isActive == 0.) return;
if (isActive < 1.) return;

vec2 position = vec2(x, y);
vec2 positionFract = vec2(xFract, yFract);
Expand Down
Loading