pixi-live2d-display-advanced 1.0.0 → 1.0.1

package/dist/cubism2.es.js

@@ -78,7 +78,7 @@ const config = {
   preserveExpressionOnMotion: true,
   cubism4: CubismConfig
 };
-const VERSION = "v1.0.0";
+const VERSION = "v1.0.1";
 const logger = {
   log(tag, ...messages) {
     if (config.logLevel <= config.LOG_LEVEL_VERBOSE) {
@@ -6158,8 +6158,8 @@ class Live2DEyeBlink {
     __publicField(this, "openingDuration", 150);
     __publicField(this, "eyeState", 0);
     __publicField(this, "eyeParamValue", 1);
-    __publicField(this, "closedTimer", 0);
-    __publicField(this, "nextBlinkTimeLeft", this.blinkInterval);
+    __publicField(this, "timer", 0);
+    __publicField(this, "nextBlinkTime", this.blinkInterval + rand(0, 2e3));
     this.coreModel = coreModel;
     this.leftParam = coreModel.getParamIndex("PARAM_EYE_L_OPEN");
     this.rightParam = coreModel.getParamIndex("PARAM_EYE_R_OPEN");
@@ -6172,22 +6172,22 @@ class Live2DEyeBlink {
   update(dt) {
     switch (this.eyeState) {
       case 0:
-        this.nextBlinkTimeLeft -= dt;
-        if (this.nextBlinkTimeLeft < 0) {
+        this.timer += dt;
+        if (this.timer >= this.nextBlinkTime) {
+          this.timer = 0;
           this.eyeState = 1;
-          this.nextBlinkTimeLeft = this.blinkInterval + this.closingDuration + this.closedDuration + this.openingDuration + rand(0, 2e3);
         }
         break;
       case 1:
-        this.setEyeParams(this.eyeParamValue + dt / this.closingDuration);
+        this.setEyeParams(this.eyeParamValue - dt / this.closingDuration);
         if (this.eyeParamValue <= 0) {
           this.eyeState = 2;
-          this.closedTimer = 0;
+          this.timer = 0;
         }
         break;
       case 2:
-        this.closedTimer += dt;
-        if (this.closedTimer >= this.closedDuration) {
+        this.timer += dt;
+        if (this.timer >= this.closedDuration) {
           this.eyeState = 3;
         }
         break;
@@ -6195,7 +6195,10 @@ class Live2DEyeBlink {
         this.setEyeParams(this.eyeParamValue + dt / this.openingDuration);
         if (this.eyeParamValue >= 1) {
           this.eyeState = 0;
+          this.timer = 0;
+          this.nextBlinkTime = this.blinkInterval + rand(0, 2e3);
         }
+        break;
     }
   }
 }
@@ -6247,6 +6250,8 @@ class Cubism2InternalModel extends InternalModel {
      */
     __publicField(this, "disableCulling", false);
     __publicField(this, "hasDrawn", false);
+    // TODO: It needs to reforged in future
+    __publicField(this, "autoBlink", true);
     this.coreModel = coreModel;
     this.settings = settings;
     this.options = Object.assign({}, { breathDepth: 1 }, options);
@@ -6364,6 +6369,9 @@ class Cubism2InternalModel extends InternalModel {
     }
     return super.hitTest(x, y);
   }
+  setAutoBlinkEnable(enable) {
+    this.autoBlink = enable;
+  }
   update(dt, now) {
     var _a, _b, _c, _d;
     super.update(dt, now);
@@ -6371,7 +6379,7 @@ class Cubism2InternalModel extends InternalModel {
     const motionUpdated = this.updateMotions(model, now);
     model.saveParam();
     (_a = this.motionManager.expressionManager) == null ? void 0 : _a.update(model, now);
-    if (!motionUpdated) {
+    if (!motionUpdated && this.autoBlink) {
       (_b = this.eyeBlink) == null ? void 0 : _b.update(dt);
     }
     this.updateFocus();

package/dist/cubism2.js

@@ -79,7 +79,7 @@ var __async = (__this, __arguments, generator) => {
     preserveExpressionOnMotion: true,
     cubism4: CubismConfig
   };
-  const VERSION = "v1.0.0";
+  const VERSION = "v1.0.1";
   const logger = {
     log(tag, ...messages) {
       if (config.logLevel <= config.LOG_LEVEL_VERBOSE) {
@@ -6159,8 +6159,8 @@ var __async = (__this, __arguments, generator) => {
       __publicField(this, "openingDuration", 150);
       __publicField(this, "eyeState", 0);
       __publicField(this, "eyeParamValue", 1);
-      __publicField(this, "closedTimer", 0);
-      __publicField(this, "nextBlinkTimeLeft", this.blinkInterval);
+      __publicField(this, "timer", 0);
+      __publicField(this, "nextBlinkTime", this.blinkInterval + rand(0, 2e3));
       this.coreModel = coreModel;
       this.leftParam = coreModel.getParamIndex("PARAM_EYE_L_OPEN");
       this.rightParam = coreModel.getParamIndex("PARAM_EYE_R_OPEN");
@@ -6173,22 +6173,22 @@ var __async = (__this, __arguments, generator) => {
     update(dt) {
       switch (this.eyeState) {
         case 0:
-          this.nextBlinkTimeLeft -= dt;
-          if (this.nextBlinkTimeLeft < 0) {
+          this.timer += dt;
+          if (this.timer >= this.nextBlinkTime) {
+            this.timer = 0;
             this.eyeState = 1;
-            this.nextBlinkTimeLeft = this.blinkInterval + this.closingDuration + this.closedDuration + this.openingDuration + rand(0, 2e3);
           }
           break;
         case 1:
-          this.setEyeParams(this.eyeParamValue + dt / this.closingDuration);
+          this.setEyeParams(this.eyeParamValue - dt / this.closingDuration);
           if (this.eyeParamValue <= 0) {
             this.eyeState = 2;
-            this.closedTimer = 0;
+            this.timer = 0;
           }
           break;
         case 2:
-          this.closedTimer += dt;
-          if (this.closedTimer >= this.closedDuration) {
+          this.timer += dt;
+          if (this.timer >= this.closedDuration) {
             this.eyeState = 3;
           }
           break;
@@ -6196,7 +6196,10 @@ var __async = (__this, __arguments, generator) => {
           this.setEyeParams(this.eyeParamValue + dt / this.openingDuration);
           if (this.eyeParamValue >= 1) {
             this.eyeState = 0;
+            this.timer = 0;
+            this.nextBlinkTime = this.blinkInterval + rand(0, 2e3);
           }
+          break;
       }
     }
   }
@@ -6248,6 +6251,8 @@ var __async = (__this, __arguments, generator) => {
        */
       __publicField(this, "disableCulling", false);
       __publicField(this, "hasDrawn", false);
+      // TODO: It needs to reforged in future
+      __publicField(this, "autoBlink", true);
       this.coreModel = coreModel;
       this.settings = settings;
       this.options = Object.assign({}, { breathDepth: 1 }, options);
@@ -6365,6 +6370,9 @@ var __async = (__this, __arguments, generator) => {
       }
       return super.hitTest(x, y);
     }
+    setAutoBlinkEnable(enable) {
+      this.autoBlink = enable;
+    }
     update(dt, now) {
       var _a, _b, _c, _d;
       super.update(dt, now);
@@ -6372,7 +6380,7 @@ var __async = (__this, __arguments, generator) => {
       const motionUpdated = this.updateMotions(model, now);
       model.saveParam();
       (_a = this.motionManager.expressionManager) == null ? void 0 : _a.update(model, now);
-      if (!motionUpdated) {
+      if (!motionUpdated && this.autoBlink) {
         (_b = this.eyeBlink) == null ? void 0 : _b.update(dt);
       }
       this.updateFocus();