Pack left and right normal angles into one vec2 in `computeECAAQuadPosition`
This commit is contained in:
parent
7e0d003a95
commit
801c25305f
|
@ -240,11 +240,10 @@ bool computeECAAQuadPosition(out vec2 outPosition,
|
|||
mat4 globalTransform,
|
||||
vec4 hints,
|
||||
vec4 bounds,
|
||||
float leftNormalAngle,
|
||||
float rightNormalAngle,
|
||||
vec2 normalAngles,
|
||||
vec2 emboldenAmount) {
|
||||
leftPosition = computeECAAPosition(leftPosition,
|
||||
leftNormalAngle,
|
||||
normalAngles.x,
|
||||
emboldenAmount,
|
||||
hints,
|
||||
localTransformST,
|
||||
|
@ -252,7 +251,7 @@ bool computeECAAQuadPosition(out vec2 outPosition,
|
|||
globalTransform,
|
||||
framebufferSize);
|
||||
rightPosition = computeECAAPosition(rightPosition,
|
||||
rightNormalAngle,
|
||||
normalAngles.y,
|
||||
emboldenAmount,
|
||||
hints,
|
||||
localTransformST,
|
||||
|
|
|
@ -37,9 +37,8 @@ void main() {
|
|||
vec2 controlPointPosition = aControlPointPosition;
|
||||
vec2 rightPosition = aRightPosition;
|
||||
int pathID = int(aPathID);
|
||||
float leftNormalAngle = aNormalAngles.x;
|
||||
vec2 leftRightNormalAngles = aNormalAngles.xz;
|
||||
float controlPointNormalAngle = aNormalAngles.y;
|
||||
float rightNormalAngle = aNormalAngles.z;
|
||||
|
||||
vec2 pathTransformExt;
|
||||
vec4 pathTransformST = fetchPathAffineTransform(pathTransformExt,
|
||||
|
@ -64,8 +63,7 @@ void main() {
|
|||
uTransform,
|
||||
uHints,
|
||||
bounds,
|
||||
leftNormalAngle,
|
||||
rightNormalAngle,
|
||||
leftRightNormalAngles,
|
||||
uEmboldenAmount)) {
|
||||
controlPointPosition = computeECAAPosition(controlPointPosition,
|
||||
controlPointNormalAngle,
|
||||
|
|
|
@ -35,8 +35,7 @@ void main() {
|
|||
vec2 leftPosition = aLeftPosition;
|
||||
vec2 rightPosition = aRightPosition;
|
||||
int pathID = int(aPathID);
|
||||
float leftNormalAngle = aLeftNormalAngle;
|
||||
float rightNormalAngle = aRightNormalAngle;
|
||||
vec2 leftRightNormalAngles = vec2(aLeftNormalAngle, aRightNormalAngle);
|
||||
|
||||
vec2 pathTransformExt;
|
||||
vec4 pathTransformST = fetchPathAffineTransform(pathTransformExt,
|
||||
|
@ -61,8 +60,7 @@ void main() {
|
|||
uTransform,
|
||||
uHints,
|
||||
bounds,
|
||||
leftNormalAngle,
|
||||
rightNormalAngle,
|
||||
leftRightNormalAngles,
|
||||
uEmboldenAmount);
|
||||
|
||||
float depth = convertPathIndexToViewportDepthValue(pathID);
|
||||
|
|
Loading…
Reference in New Issue