Rebuild

Author: stevenjoezhang

build/drag.d.ts

@@ -0,0 +1,2 @@
+declare function registerDrag(): void;
+export default registerDrag;

build/drag.js

@@ -0,0 +1,43 @@
+function registerDrag() {
+    var element = document.getElementById('waifu');
+    var canvas = document.getElementById('live2d');
+    if (!element || !canvas)
+        return;
+    var winWidth = window.innerWidth, winHeight = window.innerHeight;
+    var imgWidth = element.offsetWidth, imgHeight = element.offsetHeight;
+    element.addEventListener('mousedown', function (event) {
+        if (event.button === 2) {
+            return;
+        }
+        if (event.target !== canvas)
+            return;
+        event.preventDefault();
+        var _offsetX = event.offsetX, _offsetY = event.offsetY;
+        document.onmousemove = function (event) {
+            var _x = event.clientX, _y = event.clientY;
+            var _left = _x - _offsetX, _top = _y - _offsetY;
+            if (_top < 0) {
+                _top = 0;
+            }
+            else if (_top >= winHeight - imgHeight) {
+                _top = winHeight - imgHeight;
+            }
+            if (_left < 0) {
+                _left = 0;
+            }
+            else if (_left >= winWidth - imgWidth) {
+                _left = winWidth - imgWidth;
+            }
+            element.style.top = _top + 'px';
+            element.style.left = _left + 'px';
+        };
+        document.onmouseup = function () {
+            document.onmousemove = null;
+        };
+    });
+    window.onresize = function () {
+        winWidth = window.innerWidth;
+        winHeight = window.innerHeight;
+    };
+}
+export default registerDrag;

build/index.d.ts

@@ -0,0 +1,8 @@
+export { default as registerDrag } from './drag.js';
+export { default as logger, LogLevel } from './logger.js';
+export { default as Model } from './live2d/index.js';
+export { default as tools } from './tools.js';
+export * from './message.js';
+export * from './model.js';
+export * from './utils.js';
+export * from './widget.js';

build/index.js

@@ -0,0 +1,8 @@
+export { default as registerDrag } from './drag.js';
+export { default as logger } from './logger.js';
+export { default as Model } from './live2d/index.js';
+export { default as tools } from './tools.js';
+export * from './message.js';
+export * from './model.js';
+export * from './utils.js';
+export * from './widget.js';

build/init-widget.d.ts

@@ -1,7 +1,5 @@
 export default LAppDefine;
 declare namespace LAppDefine {
-    let DEBUG_LOG: boolean;
-    let DEBUG_MOUSE_LOG: boolean;
     let VIEW_MAX_SCALE: number;
     let VIEW_MIN_SCALE: number;
     let VIEW_LOGICAL_LEFT: number;

build/live2d/LAppDefine.d.ts

@@ -1,6 +1,4 @@
 var LAppDefine = {
-    DEBUG_LOG: true,
-    DEBUG_MOUSE_LOG: false,
     VIEW_MAX_SCALE: 2,
     VIEW_MIN_SCALE: 0.8,
     VIEW_LOGICAL_LEFT: -1,

build/live2d/LAppDefine.js

@@ -5,6 +5,7 @@ declare class LAppLive2DManager {
     getModel(): LAppModel | null;
     releaseModel(gl: any): void;
     changeModel(gl: any, modelSettingPath: any): Promise<any>;
+    changeModelWithJSON(gl: any, modelSettingPath: any, modelSetting: any): Promise<void>;
     setDrag(x: any, y: any): void;
     maxScaleEvent(): void;
     minScaleEvent(): void;

build/live2d/LAppLive2DManager.d.ts

@@ -38,6 +38,7 @@ import { Live2DFramework } from './Live2DFramework';
 import LAppModel from './LAppModel';
 import PlatformManager from './PlatformManager';
 import LAppDefine from './LAppDefine';
+import logger from '../logger';
 var LAppLive2DManager = (function () {
     function LAppLive2DManager() {
         this.model = null;
@@ -76,38 +77,57 @@ var LAppLive2DManager = (function () {
             });
         });
     };
+    LAppLive2DManager.prototype.changeModelWithJSON = function (gl, modelSettingPath, modelSetting) {
+        return __awaiter(this, void 0, void 0, function () {
+            var oldModel, newModel;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (this.reloading)
+                            return [2];
+                        this.reloading = true;
+                        oldModel = this.model;
+                        newModel = new LAppModel();
+                        return [4, newModel.loadModelSetting(modelSettingPath, modelSetting)];
+                    case 1:
+                        _a.sent();
+                        if (oldModel) {
+                            oldModel.release(gl);
+                        }
+                        this.model = newModel;
+                        this.reloading = false;
+                        return [2];
+                }
+            });
+        });
+    };
     LAppLive2DManager.prototype.setDrag = function (x, y) {
         if (this.model) {
             this.model.setDrag(x, y);
         }
     };
     LAppLive2DManager.prototype.maxScaleEvent = function () {
-        if (LAppDefine.DEBUG_LOG)
-            console.log('Max scale event.');
+        logger.trace('Max scale event.');
         if (this.model) {
             this.model.startRandomMotion(LAppDefine.MOTION_GROUP_PINCH_IN, LAppDefine.PRIORITY_NORMAL);
         }
     };
     LAppLive2DManager.prototype.minScaleEvent = function () {
-        if (LAppDefine.DEBUG_LOG)
-            console.log('Min scale event.');
+        logger.trace('Min scale event.');
         if (this.model) {
             this.model.startRandomMotion(LAppDefine.MOTION_GROUP_PINCH_OUT, LAppDefine.PRIORITY_NORMAL);
         }
     };
     LAppLive2DManager.prototype.tapEvent = function (x, y) {
-        if (LAppDefine.DEBUG_LOG)
-            console.log('tapEvent view x:' + x + ' y:' + y);
+        logger.trace('tapEvent view x:' + x + ' y:' + y);
         if (!this.model)
             return false;
         if (this.model.hitTest(LAppDefine.HIT_AREA_HEAD, x, y)) {
-            if (LAppDefine.DEBUG_LOG)
-                console.log('Tap face.');
+            logger.trace('Tap face.');
             this.model.setRandomExpression();
         }
         else if (this.model.hitTest(LAppDefine.HIT_AREA_BODY, x, y)) {
-            if (LAppDefine.DEBUG_LOG)
-                console.log('Tap body.');
+            logger.trace('Tap body.');
             this.model.startRandomMotion(LAppDefine.MOTION_GROUP_TAP_BODY, LAppDefine.PRIORITY_NORMAL);
         }
         return true;

build/live2d/LAppLive2DManager.js

@@ -3,6 +3,8 @@ declare class LAppModel extends L2DBaseModel {
     modelHomeDir: string;
     modelSetting: ModelSettingJson | null;
     tmpMatrix: any[];
+    loadJSON(callback: any): void;
+    loadModelSetting(modelSettingPath: any, modelSetting: any): Promise<void>;
     load(gl: any, modelSettingPath: any, callback: any): void;
     release(gl: any): void;
     preloadMotionGroup(name: any): void;