Skip to content

Commit

Permalink
fix arc layer shaders (#3487)
Browse files Browse the repository at this point in the history
  • Loading branch information
Pessimistress authored and Andrew Duberstein committed Aug 28, 2019
1 parent a93668e commit 52d32b2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ attribute vec3 positions;
attribute vec4 instanceSourceColors;
attribute vec4 instanceTargetColors;
attribute vec4 instancePositions;
attribute vec4 instancePositions64Low;
attribute vec4 instancePositions64xyLow;
attribute vec3 instancePickingColors;
attribute float instanceWidths;
Expand Down Expand Up @@ -105,8 +105,8 @@ void main(void) {
vec3 currPos = vec3(degrees(interpolate(source, target, angularDist, segmentRatio)), 0.0);
vec3 nextPos = vec3(degrees(interpolate(source, target, angularDist, nextSegmentRatio)), 0.0);
vec2 currPos64Low = mix(instancePositions64Low.xy, instancePositions64Low.zw, segmentRatio);
vec2 nextPos64Low = mix(instancePositions64Low.xy, instancePositions64Low.zw, nextSegmentRatio);
vec2 currPos64Low = mix(instancePositions64xyLow.xy, instancePositions64xyLow.zw, segmentRatio);
vec2 nextPos64Low = mix(instancePositions64xyLow.xy, instancePositions64xyLow.zw, nextSegmentRatio);
vec4 curr = project_position_to_clipspace(currPos, currPos64Low, vec3(0.0), geometry.position);
vec4 next = project_position_to_clipspace(nextPos, nextPos64Low, vec3(0.0));
Expand Down
6 changes: 3 additions & 3 deletions modules/layers/src/arc-layer/arc-layer-vertex.glsl.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ attribute vec3 positions;
attribute vec4 instanceSourceColors;
attribute vec4 instanceTargetColors;
attribute vec4 instancePositions;
attribute vec4 instancePositions64Low;
attribute vec4 instancePositions64xyLow;
attribute vec3 instancePickingColors;
attribute float instanceWidths;
attribute float instanceHeights;
Expand Down Expand Up @@ -82,8 +82,8 @@ void main(void) {
geometry.worldPosition = vec3(instancePositions.xy, 0.0);
geometry.worldPositionAlt = vec3(instancePositions.zw, 0.0);
vec2 source = project_position(geometry.worldPosition, instancePositions64Low.xy).xy;
vec2 target = project_position(geometry.worldPositionAlt, instancePositions64Low.zw).xy;
vec2 source = project_position(geometry.worldPosition, instancePositions64xyLow.xy).xy;
vec2 target = project_position(geometry.worldPositionAlt, instancePositions64xyLow.zw).xy;
float segmentIndex = positions.x;
float segmentRatio = getSegmentRatio(segmentIndex);
Expand Down

0 comments on commit 52d32b2

Please sign in to comment.