17a44f3 · elk · git.iko.soy

on master help sign in

Change the names of line caps and joins.

17a44f3evancz13 years ago

runtime/Render/Collage.js+6−3

@@ -63,11 +63,13 @@ function customLineHelp(ctx, style, path) {

64function drawLine(ctx, style, path) {

65 ctx.lineWidth = style.width;

66+ var cap = style.cap.ctor;

66− ctx.lineCap = style.cap.ctor.toLowerCase();

67+ ctx.lineCap = cap === 'Flat' ? 'butt' :

68+ cap === 'Round' ? 'round' : 'square';

67 var join = style.join.ctor;

69 var join = style.join.ctor;

68 ctx.lineJoin = join === 'Smooth' ? 'round' :

70 ctx.lineJoin = join === 'Smooth' ? 'round' :

69 join === 'Sharp' ? 'miter' : 'bevel';

71 join === 'Sharp' ? 'miter' : 'bevel';

70− ctx.miterLimit = style.miterLimit;

72+ ctx.miterLimit = style.join._0 || 10;

71 ctx.strokeStyle = extract(style.color);

73 ctx.strokeStyle = extract(style.color);

72 return line(ctx, style, path);

74 return line(ctx, style, path);

73}

75}

@@ -155,7 +157,8 @@ function formToMatrix(form) {

155 var matrix = A6( Matrix.matrix, scale, 0, 0, scale, scale * form.x, scale * form.y );

157 var matrix = A6( Matrix.matrix, scale, 0, 0, scale, scale * form.x, scale * form.y );

156

158

157 var theta = form.theta

159 var theta = form.theta

160+ if (theta !== 0)

158− if (theta !== 0) matrix = A2( Matrix.rotate, theta, matrix );

161+ matrix = A2( Matrix.multiply, Matrix.rotation(theta), matrix );

159

162

160 return matrix;

163 return matrix;

161}

164}