@@ -3,7 +3,7 @@ ElmRuntime.Render.Collage = function() {
33'use strict';
44
55var Render = ElmRuntime.use(ElmRuntime.Render.Element);
6−var Matrix = Elm.Matrix2D({});
6+var Transform = Elm.Transform2D({});
77var Utils = ElmRuntime.use(ElmRuntime.Render.Utils);
88var newElement = Utils.newElement,
99 extract = Utils.extract, fromList = Utils.fromList,
@@ -158,23 +158,23 @@ function renderForm(redo, ctx, form) {
158158
159159function formToMatrix(form) {
160160 var scale = form.scale;
161− var matrix = A6( Matrix.matrix, scale, 0, 0, scale, form.x, form.y );
161+ var matrix = A6( Transform.matrix, scale, 0, 0, scale, form.x, form.y );
162162
163163 var theta = form.theta
164164 if (theta !== 0)
165− matrix = A2( Matrix.multiply, matrix, Matrix.rotation(theta) );
165+ matrix = A2( Transform.multiply, matrix, Transform.rotation(theta) );
166166
167167 return matrix;
168168}
169169
170170function makeTransform(w, h, form, matrices) {
171171 var props = form.form._0.props;
172− var m = A6( Matrix.matrix, 1, 0, 0, 1,
172+ var m = A6( Transform.matrix, 1, 0, 0, 1,
173173 (w - props.width)/2,
174174 (h - props.height)/2 );
175175 var len = matrices.length;
176− for (var i = 0; i < len; ++i) { m = A2( Matrix.multiply, m, matrices[i] ); }
177− m = A2( Matrix.multiply, m, formToMatrix(form) );
176+ for (var i = 0; i < len; ++i) { m = A2( Transform.multiply, m, matrices[i] ); }
177+ m = A2( Transform.multiply, m, formToMatrix(form) );
178178
179179 return 'matrix(' + m[0] + ',' + m[3] + ',' +
180180 (-m[1]) + ',' + (-m[4]) + ',' +
@@ -220,7 +220,7 @@ function stepper(forms) {
220220 var f = out.form;
221221 if (f.ctor === 'FGroup') {
222222 ps.unshift(stepperHelp(f._1));
223− var m = A2(Matrix.multiply, f._0, formToMatrix(out));
223+ var m = A2(Transform.multiply, f._0, formToMatrix(out));
224224 ctx.save();
225225 ctx.transform(m[0], m[3], m[1], m[4], m[2], m[5]);
226226 matrices.push(m);