Skip to content

Rev bounds #8

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

Merged
merged 5 commits into from
Oct 16, 2018
Merged

Rev bounds #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b649f8f
adjust scales to handle negative cases, fix for reversed bounds
archmoj Oct 1, 2018
da56cdc
refactoring if statement
archmoj Oct 5, 2018
6a4d678
using glslify for out-of-bound function
archmoj Oct 8, 2018
127d893
using npm new module glsl-out-of-range v 1.0.1
archmoj Oct 15, 2018
d413bf3
using glsl-out-of-range v. 1.0.2 from a plotly repo
archmoj Oct 15, 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
11 changes: 5 additions & 6 deletions lib/draw-fragment.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
precision mediump float;

#pragma glslify: outOfRange = require(glsl-out-of-range)

uniform vec3 fragClipBounds[2];
uniform float opacity;

Expand All @@ -8,10 +10,7 @@ varying vec4 pickId;
varying vec3 dataCoordinate;

void main() {
if(any(lessThan(dataCoordinate, fragClipBounds[0])) ||
any(greaterThan(dataCoordinate, fragClipBounds[1])) ) {
discard;
} else {
gl_FragColor = interpColor * opacity;
}
if (outOfRange(fragClipBounds[0], fragClipBounds[1], dataCoordinate)) discard;

gl_FragColor = interpColor * opacity;
}
7 changes: 5 additions & 2 deletions lib/orthographic.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
precision mediump float;

#pragma glslify: outOfRange = require(glsl-out-of-range)

attribute vec3 position;
attribute vec4 color;
attribute vec2 glyph;
Expand All @@ -16,7 +18,8 @@ varying vec4 pickId;
varying vec3 dataCoordinate;

void main() {
if(any(lessThan(position, clipBounds[0])) || any(greaterThan(position, clipBounds[1]))) {
if (outOfRange(clipBounds[0], clipBounds[1], position)) {

gl_Position = vec4(0,0,0,0);
} else {
float scale = pixelRatio;
Expand All @@ -28,7 +31,7 @@ void main() {
vec4 viewPosition = view * worldPosition;
vec4 clipPosition = projection * viewPosition;
clipPosition /= clipPosition.w;

gl_Position = clipPosition + vec4(screenSize * scale * vec2(glyph.x, -glyph.y), 0.0, 0.0);
interpColor = color;
pickId = id;
Expand Down
9 changes: 5 additions & 4 deletions lib/perspective.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
precision mediump float;

#pragma glslify: outOfRange = require(glsl-out-of-range)

attribute vec3 position;
attribute vec4 color;
attribute vec2 glyph;
attribute vec4 id;


uniform vec4 highlightId;
uniform float highlightScale;
uniform mat4 model, view, projection;
Expand All @@ -16,8 +17,8 @@ varying vec4 pickId;
varying vec3 dataCoordinate;

void main() {
if(any(lessThan(position, clipBounds[0])) ||
any(greaterThan(position, clipBounds[1])) ) {
if (outOfRange(clipBounds[0], clipBounds[1], position)) {

gl_Position = vec4(0,0,0,0);
} else {
float scale = 1.0;
Expand All @@ -29,7 +30,7 @@ void main() {
vec4 viewPosition = view * worldPosition;
viewPosition = viewPosition / viewPosition.w;
vec4 clipPosition = projection * (viewPosition + scale * vec4(glyph.x, -glyph.y, 0, 0));

gl_Position = clipPosition;
interpColor = color;
pickId = id;
Expand Down
11 changes: 5 additions & 6 deletions lib/pick-fragment.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
precision mediump float;

#pragma glslify: outOfRange = require(glsl-out-of-range)

uniform vec3 fragClipBounds[2];
uniform float pickGroup;

varying vec4 pickId;
varying vec3 dataCoordinate;

void main() {
if(any(lessThan(dataCoordinate, fragClipBounds[0])) ||
any(greaterThan(dataCoordinate, fragClipBounds[1])) ) {
discard;
} else {
gl_FragColor = vec4(pickGroup, pickId.bgr);
}
if (outOfRange(fragClipBounds[0], fragClipBounds[1], dataCoordinate)) discard;

gl_FragColor = vec4(pickGroup, pickId.bgr);
}
6 changes: 4 additions & 2 deletions lib/projection.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
precision mediump float;

#pragma glslify: outOfRange = require(glsl-out-of-range)

attribute vec3 position;
attribute vec4 color;
attribute vec2 glyph;
Expand All @@ -18,8 +20,8 @@ varying vec4 pickId;
varying vec3 dataCoordinate;

void main() {
if(any(lessThan(position, clipBounds[0])) ||
any(greaterThan(position, clipBounds[1])) ) {
if (outOfRange(clipBounds[0], clipBounds[1], position)) {

gl_Position = vec4(0,0,0,0);
} else {
float lscale = pixelRatio * scale;
Expand Down
Loading