Merge pull request #31 from templatone/development

Development
templatone · May 4, 2022 · 9892a2e · 9892a2e
2 parents faba7c6 + 34736f1
commit 9892a2e
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 27 deletions.
diff --git a/dist/main.js.map b/dist/main.js.map
diff --git a/dist/renderables/ImageObject.js b/dist/renderables/ImageObject.js
@@ -42,7 +42,7 @@ export class ImageObject {
         else {
             Shadow.clear(renderingLayer);
         }
-        ctx.moveTo(-t.origin.x * pxs, -t.origin.y * pxs);
+        ctx.translate(-t.origin.x * pxs, -t.origin.y * pxs);
         ctx.drawImage(this.source, 0, 0, this.width * pxs, this.height * pxs);
         renderingLayer.resetMatrix();
         ctx.globalAlpha = 1;

diff --git a/dist/renderables/VideoObject.js b/dist/renderables/VideoObject.js
@@ -52,7 +52,7 @@ export class VideoObject {
         else {
             Shadow.clear(renderingLayer);
         }
-        ctx.moveTo(-t.origin.x * pxs, -t.origin.y * pxs);
+        ctx.translate(-t.origin.x * pxs, -t.origin.y * pxs);
         ctx.drawImage(this.source, 0, 0, this.width * pxs, this.height * pxs);
         renderingLayer.resetMatrix();
         ctx.globalAlpha = 1;

diff --git a/dist/renderables/geometries/Geometry.d.ts b/dist/renderables/geometries/Geometry.d.ts
@@ -9,9 +9,8 @@ declare type GetBoundingBoxType = {
     (transform: Transform): IBoundingBox;
 };
 export declare abstract class Geometry implements IGeometry {
+    #private;
     transform: Transform;
-    private _drawWithoutMatrixManipulation;
-    private _getBoundingBox;
     constructor(draw: DrawWithoutMatrixManipulationType, getBoundingBox: GetBoundingBoxType);
     contructMatrix(renderingLayer: IRenderingLayer): void;
     destructMatrix(renderingLayer: IRenderingLayer): void;

diff --git a/dist/renderables/geometries/Geometry.js b/dist/renderables/geometries/Geometry.js
@@ -1,11 +1,11 @@
 import { Transform } from "../../properties/mod";
 export class Geometry {
     transform = new Transform();
-    _drawWithoutMatrixManipulation;
-    _getBoundingBox;
+    #drawWithoutMatrixManipulation;
+    #getBoundingBox;
     constructor(draw, getBoundingBox) {
-        this._drawWithoutMatrixManipulation = draw;
-        this._getBoundingBox = getBoundingBox;
+        this.#drawWithoutMatrixManipulation = draw;
+        this.#getBoundingBox = getBoundingBox;
     }
     contructMatrix(renderingLayer) {
         const t = this.transform;
@@ -18,14 +18,14 @@ export class Geometry {
         const ctx = renderingLayer.getRenderingContext();
         const pxs = renderingLayer.pixelScale;
         const t = this.transform;
-        this._drawWithoutMatrixManipulation(ctx, pxs, t);
+        this.#drawWithoutMatrixManipulation(ctx, pxs, t);
     }
     draw(renderingLayer) {
         this.contructMatrix(renderingLayer);
         this.drawWithoutMatrixManipulation(renderingLayer);
         this.destructMatrix(renderingLayer);
     }
     getBoundingBox(renderingLayer) {
-        return this._getBoundingBox(this.transform);
+        return this.#getBoundingBox(this.transform);
     }
 }
diff --git a/dist/renderables/geometries/RectangleGeometry.js b/dist/renderables/geometries/RectangleGeometry.js
@@ -4,20 +4,20 @@ export class RectangleGeometry extends Geometry {
     width;
     height;
     constructor(width, height) {
-        const d = (ctx, pxs, t) => {
+        const draw = (ctx, pxs, t) => {
             const width = this.width > 0 ? this.width : 0;
             const height = this.height > 0 ? this.height : 0;
             ctx.beginPath();
             ctx.rect(-t.origin.x * pxs, -t.origin.y * pxs, width * pxs, height * pxs);
             ctx.closePath();
         };
-        const b = (t) => {
+        const getBoundingBox = (t) => {
             return {
                 origin: t.origin.clone(),
                 size: new Vector(this.width, this.height),
             };
         };
-        super(d, b);
+        super(draw, getBoundingBox);
         this.width = width;
         this.height = height;
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@templatone/kreslo",
-  "version": "4.2.0-beta.2",
+  "version": "4.2.0-beta.3",
   "description": "Objective oriented typescript library for rendering 2d graphics.",
   "keywords": [
     "canvas",

diff --git a/src/renderables/ImageObject.ts b/src/renderables/ImageObject.ts
@@ -55,7 +55,6 @@ export class ImageObject implements IObject, IRenderable, IVisible, IClonable<Im
         const pxs = renderingLayer.pixelScale;
 
         const t = this.transform;
-
         renderingLayer.setMatrixToTransform(t);
 
         ctx.globalAlpha = Numbers.limit(this.opacity, 0, 1);
@@ -66,7 +65,7 @@ export class ImageObject implements IObject, IRenderable, IVisible, IClonable<Im
             Shadow.clear(renderingLayer);
         }
 
-        ctx.moveTo(-t.origin.x * pxs, -t.origin.y * pxs);
+        ctx.translate(-t.origin.x * pxs, -t.origin.y * pxs);
         ctx.drawImage(this.source, 0, 0, this.width * pxs, this.height * pxs);
 
         renderingLayer.resetMatrix();

diff --git a/src/renderables/VideoObject.ts b/src/renderables/VideoObject.ts
@@ -83,7 +83,7 @@ export class VideoObject implements IObject, IRenderable, IVisible, IClonable<Vi
             Shadow.clear(renderingLayer);
         }
 
-        ctx.moveTo(-t.origin.x * pxs, -t.origin.y * pxs);
+        ctx.translate(-t.origin.x * pxs, -t.origin.y * pxs);
         ctx.drawImage(this.source, 0, 0, this.width * pxs, this.height * pxs);
 
         renderingLayer.resetMatrix();

diff --git a/src/renderables/geometries/Geometry.ts b/src/renderables/geometries/Geometry.ts
@@ -17,13 +17,13 @@ export abstract class Geometry implements IGeometry {
 
     transform: Transform = new Transform();
 
-    private _drawWithoutMatrixManipulation: DrawWithoutMatrixManipulationType;
-    private _getBoundingBox: GetBoundingBoxType;
+    #drawWithoutMatrixManipulation: DrawWithoutMatrixManipulationType;
+    #getBoundingBox: GetBoundingBoxType;
 
 
     constructor(draw: DrawWithoutMatrixManipulationType, getBoundingBox: GetBoundingBoxType) {
-        this._drawWithoutMatrixManipulation = draw;
-        this._getBoundingBox = getBoundingBox;
+        this.#drawWithoutMatrixManipulation = draw;
+        this.#getBoundingBox = getBoundingBox;
     }
 
 
@@ -44,8 +44,7 @@ export abstract class Geometry implements IGeometry {
         const pxs = renderingLayer.pixelScale;
 
         const t = this.transform;
-
-        this._drawWithoutMatrixManipulation(ctx, pxs, t);
+        this.#drawWithoutMatrixManipulation(ctx, pxs, t);
     }
 
 
@@ -57,7 +56,7 @@ export abstract class Geometry implements IGeometry {
 
 
     getBoundingBox(renderingLayer: IRenderingLayer): IBoundingBox {
-        return this._getBoundingBox(this.transform);
+        return this.#getBoundingBox(this.transform);
     }
 
 }
diff --git a/src/renderables/geometries/RectangleGeometry.ts b/src/renderables/geometries/RectangleGeometry.ts
@@ -12,7 +12,7 @@ export class RectangleGeometry extends Geometry implements IClonable<RectangleGe
 
 
     constructor(width: number, height: number) {
-        const d = (ctx: CanvasRenderingContext2D, pxs: number, t: Transform) => {
+        const draw = (ctx: CanvasRenderingContext2D, pxs: number, t: Transform) => {
             const width = this.width > 0 ? this.width : 0;
             const height = this.height > 0 ? this.height : 0;
 
@@ -26,14 +26,14 @@ export class RectangleGeometry extends Geometry implements IClonable<RectangleGe
             ctx.closePath();
         }
 
-        const b = (t: Transform): IBoundingBox => {
+        const getBoundingBox = (t: Transform): IBoundingBox => {
             return {
                 origin: t.origin.clone(),
                 size: new Vector(this.width, this.height),
             }
         }
 
-        super(d, b);
+        super(draw, getBoundingBox);
 
         this.width = width;
         this.height = height;