wgge 0.1.27 → 0.1.29

package/core/model/value/FloatValue.js

@@ -2,6 +2,10 @@ import IntValue from "./IntValue";
 
 export default class FloatValue extends IntValue {
 
+	/**
+	 *
+	 * @return Number
+	 */
 	round() {
 		return Math.round(this.get());
 	}

package/core/model/value/IntValue.js

@@ -2,6 +2,14 @@ import DirtyValue from "./DirtyValue";
 
 export default class IntValue extends DirtyValue {
 
+	/**
+	 *
+	 * @return Number
+	 */
+	get() {
+		return super.get();
+	}
+
 	set(value) {
 		if (value === null || value === undefined || value === '') {
 			super.set(Number.NaN);
@@ -17,4 +25,8 @@ export default class IntValue extends DirtyValue {
 	increase(num) {
 		this.set(this.get() + num);
 	}
+
+	multiply(num) {
+		this.set(this.get() * num);
+	}
 }

package/core/renderer/canvas/CanvasRenderer.js

@@ -19,14 +19,26 @@ export default class CanvasRenderer extends RendererBase {
 
 	}
 
-	activateInternal() {
+	activate() {
 		this.context2d = this.canvas.getContext('2d');
+
+		super.activate();
 	}
 
-	deactivateInternal() {
+	deactivate() {
+		super.deactivate();
+
 		this.context2d = null;
 	}
 
+	checkContext() {
+		const ok = (this.context2d !== null);
+		if (!ok) {
+			console.error('No context to draw!');
+		}
+		return ok;
+	}
+
 	/**
 	 *
 	 * @param {Vector2} start
@@ -34,6 +46,7 @@ export default class CanvasRenderer extends RendererBase {
 	 * @param {CanvasGradient|string} fill
 	 */
 	drawRect(start, size, fill = 'black') {
+		if (!this.checkContext()) return;
 		const end = start.add(size);
 		this.context2d.fillStyle = fill;
 		this.context2d.fillRect(start.x, start.y, end.x, end.y);
@@ -48,6 +61,7 @@ export default class CanvasRenderer extends RendererBase {
 	 * @param {[[Number, string|color]]} stops
 	 */
 	drawGradient(start, size, gradientStart, gradientSize, stops) {
+		if (!this.checkContext()) return;
 		const gradientEnd = gradientStart.add(gradientSize);
 		const grd = this.context2d.createLinearGradient(gradientStart.x, gradientStart.y, gradientEnd.x, gradientEnd.y);
 		stops.forEach((s) => {
@@ -73,6 +87,7 @@ export default class CanvasRenderer extends RendererBase {
 		startAngle = 0,
 		endAngle = 2 * Math.PI
 	) {
+		if (!this.checkContext()) return;
 		this.context2d.beginPath();
 		this.context2d.fillStyle = (fill) ? fill : 'transparent';
 		this.context2d.strokeStyle = stroke ? stroke.color ? stroke.color : 'orange' : 'transparent';
@@ -94,9 +109,20 @@ export default class CanvasRenderer extends RendererBase {
 	}
 
 	drawImage(image, drawStart, drawEnd, imageStart, imageEnd, opacity = 1, clear = true) {
-		if (!(image && this.context2d)) return;
+		if (!(image && this.checkContext())) return;
 		if (clear) this.context2d.clearRect(drawStart.x, drawStart.y, drawEnd.x, drawEnd.y);
 		this.context2d.globalAlpha = opacity;
+		console.log(
+			'drawing to canvas',
+			imageStart.x,
+			imageStart.y,
+			imageEnd.x,
+			imageEnd.y,
+			drawStart.x,
+			drawStart.y,
+			drawEnd.x,
+			drawEnd.y
+		);
 		this.context2d.drawImage(
 			image,
 			imageStart.x,

package/core/renderer/canvas/ImageViewRenderer.js

@@ -17,7 +17,7 @@ export default class ImageViewRenderer extends DomRenderer {
 	}
 
 	activateInternal() {
-		this.canvas = DOMHelper.createElement(this.dom, 'canvas');
+		this.canvas = DOMHelper.createElement(this.dom, 'canvas', 'image-view-canvas');
 		this.addChild(new ImageCanvasRenderer(this.game, this.model, this.canvas));
 
 		this.updateSize();

package/game/resources/image/ImageViewModel.js

@@ -73,6 +73,9 @@ export default class ImageViewModel extends ObjectModel {
 		this.viewSize.addEventListener('change', () => this.updateCoordinates());
 		this.actualZoom.addEventListener('change', () => this.updateCoordinates());
 		this.image.size.addEventListener('change', () => this.updateCoordinates());
+
+		this.updateOpacity();
+		this.updateZoom();
 	}
 
 	updateOpacity() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wgge",
-	"version": "0.1.27",
+	"version": "0.1.29",
 	"description": "Web GL Game Engine",
 	"main": "index.js",
 	"dependencies": {