mumuki-puzzle-runner 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0524959e5526b6f764f91b27d939eaf1869fc21a6aa4682d052d216dea0807f2'
-  data.tar.gz: 41cd6df65522b8039cfb933c785f392f1c44f23e40b49b06ff8d1b2859506fe8
+  metadata.gz: 5da4e03efe5edbeb4e6eadfaf79f5d37e4f5bea50127a26e91c5f6d2cedb2438
+  data.tar.gz: f0eeb8f873165d98ecfcc04854aa4fb781d4753fc4350bcfed90fd24c184744b
 SHA512:
-  metadata.gz: 6ec608fc1f4162f6664e14b3f3b623602d400a366ffb7f6e66d40df9d9719a65853063692bff98a300c7d9485d297f524d7b0b8a42c7a3a33e3528f02cac3fe4
-  data.tar.gz: fd403eb6301bdc0dd39f53b4b9fd315b654608cd575076d702f23074e3efde98785202765c879d72be76125f060d2410db619ca7fa7cebc0c71c530878adb88e
+  metadata.gz: c98b0e5f9fe633c8fb0587b3c948ce0a6d6d79b80619befc28bc4c583578be596b1d8d2d9f61fddbb3241a320424b602af417fca96827c632a9537342d2a62e9
+  data.tar.gz: f40b2c76b102651f25ca76eda5b82d24f6cb037e92efcbd68299d634ec8a4f8a22477f4639893b780f6e8f44e790761189c43c12a925a5421f8e33416b3273af

data/lib/public/css/muzzle-editor.css

@@ -1,4 +1,13 @@
 .mu-kids-state-image img {
-  width: 90%;
+  height: 100%;
+  width: auto;
   padding: 30px;
 }
+
+.mu-kids-state.mu-state-initial {
+  width: 100%;
+}
+
+.mu-kids-exercise-workspace.muzzle-simple .mu-kids-submit-button {
+  display: none;
+}

data/lib/public/js/muzzle-editor.js

@@ -1,5 +1,13 @@
 // @ts-nocheck
 $(() => {
+  function register(event, callback) {
+    const _event = Muzzle[event];
+    Muzzle[event] = (...args) => {
+      callback(...args);
+      _event(...args);
+    }
+  }
+
   // ================
   // Muzzle rendering
   // ================
@@ -29,39 +37,44 @@ $(() => {
 
   // Requiered to actually bind Muzzle's submit to
   // mumuki's solution processing
-  const _onSubmit = Muzzle.onSubmit;
-  Muzzle.onSubmit = (submission) => {
+  register('onSubmit', (submission) => {
     mumuki.submission.processSolution(submission);
-    _onSubmit(submission);
-  }
+  });
 
   // ===========
   // Kids config
   // ===========
 
-  // Required to make scaler work
   mumuki.kids.registerStateScaler(($state, fullMargin, preferredWidth, preferredHeight) => {
-    // nothing
-    // no state scaling needed
+    //  no manul image scalling. Leave it to css
   });
+
   mumuki.kids.registerBlocksAreaScaler(($blocks) => {
-    const maxSize = $('.mu-kids-exercise').height() - $('.mu-kids-exercise-description').height();
-    Muzzle.scale($blocks.width(), Math.min($blocks.height(), maxSize));
+    const maxHeight = $('.mu-kids-exercise').height() - $('.mu-kids-exercise-description').height();
+    Muzzle.scale($blocks.width(), Math.min($blocks.height(), maxHeight));
   });
 
   Muzzle.manualScale = true;
 
+  // ====================
+  // Submit button hiding
+  // ====================
+
+  register('onReady', () => {
+    if (Muzzle.simple) {
+      $('.mu-kids-exercise-workspace').addClass('muzzle-simple');
+    }
+  });
+
   // ==============
   // Assets loading
   // ==============
 
-  const _onReady = Muzzle.onReady;
-  Muzzle.onReady = () => {
+  register('onReady', () => {
     mumuki.assetsLoadedFor('editor');
     // although layout assets
     // are actually loaded before this script, puzzle runner is not aimed
     // to be used without a custom editor
     mumuki.assetsLoadedFor('layout');
-    _onReady();
-  };
+  });
 });

data/lib/public/js/muzzle.js

@@ -136,7 +136,17 @@ class MuzzleCanvas {
      *
      * @type {string}
      */
-    this.previousSolutionContent = null
+    this.previousSolutionContent = null;
+
+    /**
+     * Whether the current puzzle can be solved in very few tries.
+     *
+     * Set null for automatic configuration of this property. Basic puzzles will be considered
+     * basic and match puzzles will be considered non-basic.
+     *
+     * @type {boolean}
+     */
+    this.simple = null;
 
     /**
      * Callback to be executed when submitting puzzle.
@@ -167,7 +177,7 @@ class MuzzleCanvas {
       width: this.canvasWidth,
       height: this.canvasHeight,
       pieceSize: pieceSize,
-      proximity: pieceSize.x / 5,
+      proximity: Math.min(pieceSize.x, pieceSize.y) / 5,
       borderFill: this.borderFill === null ? headbreaker.Vector.divide(pieceSize, 10) : this.borderFill,
       strokeWidth: this.strokeWidth,
       lineSoftness: 0.18
@@ -228,6 +238,10 @@ class MuzzleCanvas {
       this.aspectRatio = x / y;
     }
 
+    if (this.simple === null) {
+      this.simple = true;
+    }
+
     /**
      * @todo take all container size
      **/
@@ -389,11 +403,11 @@ class MuzzleCanvas {
     this._canvas.onValid(() => {
       setTimeout(() => this.onValid(), 0);
     });
-    this._setupScaler();
+    this._setUpScaler();
     this.ready();
   }
 
-  _setupScaler() {
+  _setUpScaler() {
     if (this.manualScale) return;
 
     ['resize', 'load'].forEach((event) => {
@@ -405,10 +419,39 @@ class MuzzleCanvas {
   }
 
   scale(width, height) {
-    if (this.fixedDimensions) return;
+    if (this.fixedDimensions || !this.canvas) return;
+    const factor = this.optimalScaleFactor(width, height);
     this.canvas.resize(width, height);
-    this.canvas.scale(this.optimalScaleFactor(width, height));
+    this.canvas.scale(factor);
     this.canvas.redraw();
+    this.focus();
+  }
+
+  focus() {
+    const stage = this.canvas['__konvaLayer__'].getStage();
+
+    const area = headbreaker.Vector.divide(headbreaker.vector(stage.width(), stage.height()), stage.scaleX());
+    const realDiameter = (() => {
+      const [xs, ys] = this.coordinates;
+
+      const minX = Math.min(...xs);
+      const minY = Math.min(...ys);
+
+      const maxX = Math.max(...xs);
+      const maxY = Math.max(...ys);
+
+      return headbreaker.Vector.plus(headbreaker.vector(maxX - minX, maxY - minY), this.canvas.puzzle.pieceDiameter);
+    })();
+    const diff = headbreaker.Vector.minus(area, realDiameter);
+    const semi = headbreaker.Vector.divide(diff, -2);
+
+    stage.setOffset(semi);
+    stage.draw();
+  }
+
+  get coordinates() {
+    const points = this.canvas.puzzle.points;
+    return [points.map(([x, _y]) => x), points.map(([_x, y]) => y)];
   }
 
   optimalScaleFactor(width, height) {
@@ -422,6 +465,7 @@ class MuzzleCanvas {
    */
   ready() {
     this.loadPreviousSolution();
+    this.resetCoordinates();
     this.draw();
     this.onReady();
   }
@@ -447,6 +491,7 @@ class MuzzleCanvas {
    */
   loadSolution(solution) {
     this.canvas.puzzle.relocateTo(solution.positions);
+    this.canvas.puzzle.autoconnect();
   }
 
   /**
@@ -463,6 +508,13 @@ class MuzzleCanvas {
     }
   }
 
+  resetCoordinates() {
+    const [xs, ys] = this.coordinates;
+    const minX = Math.min(...xs);
+    const minY = Math.min(...ys);
+    this.canvas.puzzle.translate(-minX, -minY);
+  }
+
   // ==========
   // Submitting
   // ==========

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module PuzzleVersionHook
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-puzzle-runner
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit