arcanumcube 0.1.2 → 0.1.3

package/dist/esm/arcanumcube.module.js

@@ -690,7 +690,7 @@ var standardSkin = {
   cube: {
     material: () => {
       return new THREE.MeshStandardMaterial({
-        color: 1118481,
+        color: 3092271,
         metalness: 0.8,
         roughness: 0.4
       });
@@ -1351,6 +1351,8 @@ var WebGLArcanumCube = class extends ArcanumCube {
   _tweens;
   /** light at the center of cube */
   _coreLights;
+  /** status of locking the twist */
+  _lockTwist;
   constructor(options) {
     super(options);
     this._config = {
@@ -1362,7 +1364,6 @@ var WebGLArcanumCube = class extends ArcanumCube {
       gap: 0.01,
       enableShadow: false,
       skin: DefaultSkin,
-      autoReset: true,
       enableCoreLight: false,
       coreLightColor: 33023,
       coreLightIntensity: 30,
@@ -1377,6 +1378,7 @@ var WebGLArcanumCube = class extends ArcanumCube {
     this._cancelDragDeg = 15;
     this._tweens = new TWEEN.Group();
     this._coreLights = [];
+    this._lockTwist = false;
     if (options) {
       Object.assign(this._config, options);
     }
@@ -1473,8 +1475,14 @@ var WebGLArcanumCube = class extends ArcanumCube {
     }
     await this.init();
   }
+  lockTwist(flag) {
+    this._lockTwist = flag;
+  }
+  isTwisting() {
+    return this._tweens.getAll().length > 0;
+  }
   reset(duration = 1800) {
-    if (this._tweens.getAll().length > 0) return;
+    if (this._lockTwist || this.isTwisting()) return;
     if (this._selectedCube) this.deselectCube();
     if (this._selectedSticker) this.deselectSticker();
     this._twistGroup = void 0;
@@ -1661,7 +1669,7 @@ var WebGLArcanumCube = class extends ArcanumCube {
     return twistGroup;
   }
   dragTwist(twist, rad) {
-    if (this._tweens.getAll().length > 0) return;
+    if (this._lockTwist || this.isTwisting()) return;
     if (!this._draggingTwist || this._draggingTwist.twist != twist) {
       this._draggingTwist = {
         twist,
@@ -1676,7 +1684,7 @@ var WebGLArcanumCube = class extends ArcanumCube {
     this._draggingTwist.group.quaternion.copy(q);
   }
   dragTwistEnd() {
-    if (this._tweens.getAll().length > 0) return;
+    if (this._lockTwist || this.isTwisting()) return;
     if (this._draggingTwist) {
       const deg = this._draggingTwist.rad * 180 / Math.PI;
       if (deg > this._cancelDragDeg) {
@@ -1698,8 +1706,8 @@ var WebGLArcanumCube = class extends ArcanumCube {
   // twisting(複数回対応)
   // durationを0にするとTweenなしとなる
   tweenTwist(twist, reverse = false, duration = 500, cancel = false, options) {
-    if (this._tweens.getAll().length > 0) return;
-    if (options == null) options = this._config.twistOptions;
+    if (this._lockTwist || this.isTwisting()) return;
+    options = { ...this._config.twistOptions, ...options };
     if (duration === 0) {
       if (Array.isArray(twist)) {
         if (twist.length == 0) return;
@@ -1806,7 +1814,9 @@ var WebGLArcanumCube = class extends ArcanumCube {
       this._tweens.remove(tween);
       options.onTwisted && options.onTwisted(this, twist, 1, 1);
       options.onComplete && options.onComplete(this);
-      if (this._config.autoReset && this.isSolved()) this.reset(0);
+      if (options.onSolved && this.isSolved()) {
+        options.onSolved(this);
+      }
     });
     return tween;
   }