From 0d52793c27cf4cbd931908b418b9d26ecad80030 Mon Sep 17 00:00:00 2001 From: tobspr Date: Mon, 28 Sep 2020 12:17:38 +0200 Subject: [PATCH] Minor refactoring --- src/js/core/modal_dialog_forms.js | 2 +- src/js/game/base_item.js | 2 +- src/js/game/items/boolean_item.js | 2 +- src/js/game/items/color_item.js | 2 +- src/js/game/items/shape_item.js | 4 ++-- src/js/game/shape_definition.js | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/js/core/modal_dialog_forms.js b/src/js/core/modal_dialog_forms.js index bead0b4b..58fd2543 100644 --- a/src/js/core/modal_dialog_forms.js +++ b/src/js/core/modal_dialog_forms.js @@ -197,7 +197,7 @@ export class FormElementItemChooser extends FormElement { canvas.width = 128; canvas.height = 128; const context = canvas.getContext("2d"); - item.drawRaw(context, 128); + item.drawFullSizeOnCanvas(context, 128); this.element.appendChild(canvas); const detector = new ClickDetector(canvas, {}); diff --git a/src/js/game/base_item.js b/src/js/game/base_item.js index 570f099d..7271c75f 100644 --- a/src/js/game/base_item.js +++ b/src/js/game/base_item.js @@ -56,7 +56,7 @@ export class BaseItem extends BasicSerializableObject { * @param {CanvasRenderingContext2D} context * @param {number} size */ - drawRaw(context, size) { + drawFullSizeOnCanvas(context, size) { abstract; } diff --git a/src/js/game/items/boolean_item.js b/src/js/game/items/boolean_item.js index 339325fd..4ccd1241 100644 --- a/src/js/game/items/boolean_item.js +++ b/src/js/game/items/boolean_item.js @@ -62,7 +62,7 @@ export class BooleanItem extends BaseItem { * @param {CanvasRenderingContext2D} context * @param {number} size */ - drawRaw(context, size) { + drawFullSizeOnCanvas(context, size) { let sprite; if (this.value) { sprite = Loader.getSprite("sprites/wires/boolean_true.png"); diff --git a/src/js/game/items/color_item.js b/src/js/game/items/color_item.js index a4ed44ad..ab53bbef 100644 --- a/src/js/game/items/color_item.js +++ b/src/js/game/items/color_item.js @@ -52,7 +52,7 @@ export class ColorItem extends BaseItem { * @param {CanvasRenderingContext2D} context * @param {number} size */ - drawRaw(context, size) { + drawFullSizeOnCanvas(context, size) { if (!this.cachedSprite) { this.cachedSprite = Loader.getSprite("sprites/colors/" + this.color + ".png"); } diff --git a/src/js/game/items/shape_item.js b/src/js/game/items/shape_item.js index 20286969..9dbd225a 100644 --- a/src/js/game/items/shape_item.js +++ b/src/js/game/items/shape_item.js @@ -55,8 +55,8 @@ export class ShapeItem extends BaseItem { * @param {CanvasRenderingContext2D} context * @param {number} size */ - drawRaw(context, size) { - this.definition.drawRaw(context, size); + drawFullSizeOnCanvas(context, size) { + this.definition.drawFullSizeOnCanvas(context, size); } /** diff --git a/src/js/game/shape_definition.js b/src/js/game/shape_definition.js index b6e3cf4d..b09d73c5 100644 --- a/src/js/game/shape_definition.js +++ b/src/js/game/shape_definition.js @@ -302,7 +302,7 @@ export class ShapeDefinition extends BasicSerializableObject { * @param {CanvasRenderingContext2D} context * @param {number} size */ - drawRaw(context, size) { + drawFullSizeOnCanvas(context, size) { this.internalGenerateShapeBuffer(null, context, size, size, 1); }