Skip to content

Commit

Permalink
rename 2
Browse files Browse the repository at this point in the history 
Update eventData.test.ts

Update Canvas.ts
  • Loading branch information
@ShaMan123
ShaMan123 committed Nov 3, 2023
1 parent fdb1f0e commit 6e3a2b5
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 28 deletions.
7 changes: 4 additions & 3 deletions src/canvas/Canvas.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -985,6 +985,7 @@ export class Canvas extends SelectableCanvas implements CanvasOptions {
this.discardActiveObject(e);
this.requestRenderAll();
}
// TODO: this is a scene point so it should be renamed
const pointer = this.getScenePoint(e);
this.freeDrawingBrush &&
this.freeDrawingBrush.onMouseDown(pointer, { e, pointer });
Expand Down Expand Up @@ -1347,18 +1348,18 @@ export class Canvas extends SelectableCanvas implements CanvasOptions {
* @param {Event} e Event fired on mousemove
*/
_transformObject(e: TPointerEvent) {
const pointer = this.getScenePoint(e),
const scenePoint = this.getScenePoint(e),
transform = this._currentTransform!,
target = transform.target,
// transform pointer to target's containing coordinate plane
// both pointer and object should agree on every point
localPointer = target.group
? sendPointToPlane(
pointer,
scenePoint,
undefined,
target.group.calcTransformMatrix()
)
: pointer;
: scenePoint;
// seems used only here.
// @TODO: investigate;
transform.reset = false;
Expand Down
4 changes: 2 additions & 2 deletions src/canvas/SelectableCanvas.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ export class SelectableCanvas<EventSpec extends CanvasEvents = CanvasEvents>
* and it remains unchanged from the viewer's perspective.
*
* @example
* const pointInScene = sendPointToPlane(
* const scenePoint = sendPointToPlane(
* this.getViewportPoint(e),
* undefined,
* canvas.viewportTransform
Expand All @@ -862,7 +862,7 @@ export class SelectableCanvas<EventSpec extends CanvasEvents = CanvasEvents>
* however, from the viewer's perspective, the point is changed.
*
* @example
* const pointFromViewport = sendPointToPlane(
* const viewportPoint = sendPointToPlane(
* this.getScenePoint(e),
* canvas.viewportTransform
* );
Expand Down
2 changes: 1 addition & 1 deletion src/canvas/__tests__/eventData.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ describe('Canvas event data', () => {
}
);

test('getPointInScene', () => {
test('getScenePoint', () => {
const canvas = new Canvas(undefined, {
enableRetinaScaling: true,
width: 200,
Expand Down
36 changes: 18 additions & 18 deletions test/unit/brushes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@
QUnit.test('fabric pencil brush draw point', function(assert) {
var brush = new fabric.PencilBrush(canvas);
const e = { target: canvas.upperCanvasEl };
var pointer = canvas.getPointInScene({ ...e, clientX: 10, clientY: 10 });
var pointer = canvas.getScenePoint({ ...e, clientX: 10, clientY: 10 });
brush.onMouseDown(pointer, { e });
var pathData = brush.convertPointsToSVGPath(brush._points);
assert.deepEqual(pathData, parsePath('M 9.999 10 L 10.001 10'), 'path data create a small line that looks like a point');
});
QUnit.test('fabric pencil brush multiple points', function(assert) {
var brush = new fabric.PencilBrush(canvas);
const e = { target: canvas.upperCanvasEl };
var pointer = canvas.getPointInScene({ ...e, clientX: 10, clientY: 10 });
var pointer = canvas.getScenePoint({ ...e, clientX: 10, clientY: 10 });
brush.onMouseDown(pointer, { e });
brush.onMouseMove(pointer, { e });
brush.onMouseMove(pointer, { e });
Expand All @@ -61,9 +61,9 @@
QUnit.test('fabric pencil brush multiple points not discarded', function(assert) {
var brush = new fabric.PencilBrush(canvas);
const e = { target: canvas.upperCanvasEl };
var pointer = canvas.getPointInScene({ ...e, clientX: 10, clientY: 10});
var pointer2 = canvas.getPointInScene({ ...e, clientX: 15, clientY: 15});
var pointer3 = canvas.getPointInScene({ ...e, clientX: 20, clientY: 20});
var pointer = canvas.getScenePoint({ ...e, clientX: 10, clientY: 10});
var pointer2 = canvas.getScenePoint({ ...e, clientX: 15, clientY: 15});
var pointer3 = canvas.getScenePoint({ ...e, clientX: 20, clientY: 20});
brush.onMouseDown(pointer, { e });
brush.onMouseMove(pointer2, { e });
brush.onMouseMove(pointer3, { e });
Expand All @@ -80,11 +80,11 @@
QUnit.test('fabric pencil brush multiple points outside canvas', function(assert) {
var brush = new fabric.PencilBrush(canvas);
const e = { target: canvas.upperCanvasEl };
var pointer = canvas.getPointInScene({ ...e, clientX: 10, clientY: 10});
var pointer2 = canvas.getPointInScene({ ...e, clientX: 15, clientY: 100});
var pointer3 = canvas.getPointInScene({ ...e, clientX: 20, clientY: 160});
var pointer4 = canvas.getPointInScene({ ...e, clientX: 320, clientY: 100});
var pointer5 = canvas.getPointInScene({ ...e, clientX: 100, clientY: 100});
var pointer = canvas.getScenePoint({ ...e, clientX: 10, clientY: 10});
var pointer2 = canvas.getScenePoint({ ...e, clientX: 15, clientY: 100});
var pointer3 = canvas.getScenePoint({ ...e, clientX: 20, clientY: 160});
var pointer4 = canvas.getScenePoint({ ...e, clientX: 320, clientY: 100});
var pointer5 = canvas.getScenePoint({ ...e, clientX: 100, clientY: 100});
brush.onMouseDown(pointer, { e });
brush.onMouseMove(pointer2, { e });
brush.onMouseMove(pointer3, { e });
Expand All @@ -102,11 +102,11 @@
var brush = new fabric.PencilBrush(canvas);
brush.limitedToCanvasSize = true;
const e = { target: canvas.upperCanvasEl };
var pointer = canvas.getPointInScene({ ...e, clientX: 10, clientY: 10});
var pointer2 = canvas.getPointInScene({ ...e, clientX: 15, clientY: 100});
var pointer3 = canvas.getPointInScene({ ...e, clientX: 20, clientY: 160});
var pointer4 = canvas.getPointInScene({ ...e, clientX: 320, clientY: 100});
var pointer5 = canvas.getPointInScene({ ...e, clientX: 100, clientY: 100});
var pointer = canvas.getScenePoint({ ...e, clientX: 10, clientY: 10});
var pointer2 = canvas.getScenePoint({ ...e, clientX: 15, clientY: 100});
var pointer3 = canvas.getScenePoint({ ...e, clientX: 20, clientY: 160});
var pointer4 = canvas.getScenePoint({ ...e, clientX: 320, clientY: 100});
var pointer5 = canvas.getScenePoint({ ...e, clientX: 100, clientY: 100});
brush.onMouseDown(pointer, { e });
brush.onMouseMove(pointer2, { e });
brush.onMouseMove(pointer3, { e });
Expand All @@ -133,9 +133,9 @@
});
var brush = new fabric.PencilBrush(canvas);
const e = { target: canvas.upperCanvasEl };
var pointer = canvas.getPointInScene({ ...e, clientX: 10, clientY: 10});
var pointer2 = canvas.getPointInScene({ ...e, clientX: 15, clientY: 15});
var pointer3 = canvas.getPointInScene({ ...e, clientX: 20, clientY: 20});
var pointer = canvas.getScenePoint({ ...e, clientX: 10, clientY: 10});
var pointer2 = canvas.getScenePoint({ ...e, clientX: 15, clientY: 15});
var pointer3 = canvas.getScenePoint({ ...e, clientX: 20, clientY: 20});
brush.onMouseDown(pointer, { e });
brush.onMouseMove(pointer2, { e });
brush.onMouseMove(pointer3, { e });
Expand Down
8 changes: 4 additions & 4 deletions test/unit/canvas.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2029,7 +2029,7 @@
};
canvas.setActiveObject(rect);
rect.__corner = rect._findTargetCorner(
canvas.getPointFromViewport(eventStub)
canvas.getViewportPoint(eventStub)
);
canvas._setupCurrentTransform(eventStub, rect);
var t = canvas._currentTransform;
Expand All @@ -2045,7 +2045,7 @@
target: canvas.upperCanvasEl
};
rect.__corner = rect._findTargetCorner(
canvas.getPointFromViewport(eventStub)
canvas.getViewportPoint(eventStub)
);
canvas._setupCurrentTransform(eventStub, rect, false);
t = canvas._currentTransform;
Expand All @@ -2056,7 +2056,7 @@

var alreadySelected = true;
rect.__corner = rect._findTargetCorner(
canvas.getPointFromViewport(eventStub)
canvas.getViewportPoint(eventStub)
);
canvas._setupCurrentTransform(eventStub, rect, alreadySelected);
t = canvas._currentTransform;
Expand All @@ -2074,7 +2074,7 @@
shiftKey: true
};
rect.__corner = rect._findTargetCorner(
canvas.getPointFromViewport(eventStub)
canvas.getViewportPoint(eventStub)
);
canvas._setupCurrentTransform(eventStub, rect, alreadySelected);
t = canvas._currentTransform;
Expand Down

0 comments on commit 6e3a2b5

Please sign in to comment.