From 8c668b13fd75fbb1899f75de67976d2008d387a3 Mon Sep 17 00:00:00 2001 From: xiazeyu_2011 Date: Sat, 13 Jan 2018 21:01:57 +0800 Subject: [PATCH] feat: almost --- src/PlatformManager | 0 ..._PlatformManager.js => PlatformManager.js} | 0 src/cDefine | 0 src/{_cDefine.js => cDefine.js} | 0 src/cLive2DApp.js | 61 ++++++++----------- src/cManager | 0 src/{_cManager.js => cManager.js} | 6 +- src/cModel | 0 src/{_cModel.js => cModel.js} | 0 src/lib/Live2DFramework | 0 ..._Live2DFramework.js => Live2DFramework.js} | 30 ++++----- src/utils/MatrixStack | 0 .../_MatrixStack.js => utils/MatrixStack.js} | 0 src/utils/ModelSettingJson | 0 .../ModelSettingJson.js} | 0 15 files changed, 45 insertions(+), 52 deletions(-) create mode 100644 src/PlatformManager rename src/{_PlatformManager.js => PlatformManager.js} (100%) create mode 100644 src/cDefine rename src/{_cDefine.js => cDefine.js} (100%) create mode 100644 src/cManager rename src/{_cManager.js => cManager.js} (97%) create mode 100644 src/cModel rename src/{_cModel.js => cModel.js} (100%) create mode 100644 src/lib/Live2DFramework rename src/lib/{_Live2DFramework.js => Live2DFramework.js} (99%) create mode 100644 src/utils/MatrixStack rename src/{_utils/_MatrixStack.js => utils/MatrixStack.js} (100%) create mode 100644 src/utils/ModelSettingJson rename src/{_utils/_ModelSettingJson.js => utils/ModelSettingJson.js} (100%) diff --git a/src/PlatformManager b/src/PlatformManager new file mode 100644 index 0000000..e69de29 diff --git a/src/_PlatformManager.js b/src/PlatformManager.js similarity index 100% rename from src/_PlatformManager.js rename to src/PlatformManager.js diff --git a/src/cDefine b/src/cDefine new file mode 100644 index 0000000..e69de29 diff --git a/src/_cDefine.js b/src/cDefine.js similarity index 100% rename from src/_cDefine.js rename to src/cDefine.js diff --git a/src/cLive2DApp.js b/src/cLive2DApp.js index 0d4daf8..d5fd89c 100644 --- a/src/cLive2DApp.js +++ b/src/cLive2DApp.js @@ -3,32 +3,29 @@ */ -import { - UtSystem, - UtDebug, - LDTransform, - LDGL, - Live2D, - Live2DModelWebGL, - Live2DModelJS, - Live2DMotion, - MotionQueueManager, - PhysicsHair, - AMotion, - PartsDataID, - DrawDataID, - BaseDataID, - ParamID -} from './lib/live2d.core';/* -import { device } from 'current-device'; +import { config } from './config/configMgr'; +import { createElement, currWebGL } from './elementMgr'; +import { UtSystem, + UtDebug, + LDTransform, + LDGL, + Live2D, + Live2DModelWebGL, + Live2DModelJS, + Live2DMotion, + MotionQueueManager, + PhysicsHair, + AMotion, + PartsDataID, + DrawDataID, + BaseDataID, + ParamID } from './lib/live2d.core'; import { L2DTargetPoint, L2DViewMatrix, L2DMatrix44 } from "./lib/Live2DFramework"; -import cManager from "./cManager"; +import { cManager } from "./cManager"; import { MatrixStack } from "./utils/MatrixStack"; import { cDefine } from "./cDefine"; -const live2DMgr = new cManager(); let isDrawStart = false; -let canvas = null; let dragMgr = null; let viewMatrix = null; let projMatrix = null; @@ -39,10 +36,8 @@ let lastMouseY = 0; let headPos = 0.5; let opacityDefault = 0.7; let opacityHover = 1; -*/ -import { config } from './config/configMgr'; -import { createElement, currWebGL } from './elementMgr'; + /** * Main function of live2d-widget @@ -53,12 +48,7 @@ export default () => { createElement(); - let width = canvas.width; - let height = canvas.height; - let sWidth = parseInt(canvas.style.width); - let sHeight = parseInt(canvas.style.height); - - dragMgr = new L2DTargetPoint(); + let dragMgr = new L2DTargetPoint(); let ratio = height / width; let left = cDefine.VIEW_LOGICAL_LEFT; let right = cDefine.VIEW_LOGICAL_RIGHT; @@ -93,8 +83,7 @@ export default () => { function initEvent(){/* - canvas = document.getElementById(canvasId); - if (canvas.addEventListener) { + if (currCanvas.addEventListener) { window.addEventListener("click", mouseEvent); window.addEventListener("mousedown", mouseEvent); window.addEventListener("mousemove", mouseEvent); @@ -117,7 +106,7 @@ function startDraw() { window.webkitRequestAnimationFrame || window.msRequestAnimationFrame; - requestAnimationFrame(tick, canvas); + requestAnimationFrame(tick, currCanvas); })(); } } @@ -261,7 +250,7 @@ function modelTurnHead(event) { drag = true; - let rect = canvas.getBoundingClientRect(); + let rect = currCanvas.getBoundingClientRect(); let sx = transformScreenX(event.clientX - rect.left); let sy = transformScreenY(event.clientY - rect.top); @@ -288,7 +277,7 @@ function modelTapEvent(event) { drag = true; - let rect = canvas.getBoundingClientRect(); + let rect = currCanvas.getBoundingClientRect(); let sx = transformScreenX(event.clientX - rect.left); let sy = transformScreenY(event.clientY - rect.top); @@ -313,7 +302,7 @@ function modelTapEvent(event) function followPointer(event) { - let rect = canvas.getBoundingClientRect(); + let rect = currCanvas.getBoundingClientRect(); let sx = transformScreenX(event.clientX - rect.left); let sy = transformScreenY(event.clientY - rect.top); diff --git a/src/cManager b/src/cManager new file mode 100644 index 0000000..e69de29 diff --git a/src/_cManager.js b/src/cManager.js similarity index 97% rename from src/_cManager.js rename to src/cManager.js index a971a60..b2e47a9 100644 --- a/src/_cManager.js +++ b/src/cManager.js @@ -3,7 +3,7 @@ import PlatformManager from "./lib/PlatformManager"; import { cModel } from "./cModel"; import { cDefine } from "./cDefine"; -export default function cManager() { +function cManager() { // console.log("--> cManager()"); this.models = []; @@ -98,3 +98,7 @@ cManager.prototype.tapEvent = function (x, y) { return true; }; + +export{ + cManager, +} diff --git a/src/cModel b/src/cModel new file mode 100644 index 0000000..e69de29 diff --git a/src/_cModel.js b/src/cModel.js similarity index 100% rename from src/_cModel.js rename to src/cModel.js diff --git a/src/lib/Live2DFramework b/src/lib/Live2DFramework new file mode 100644 index 0000000..e69de29 diff --git a/src/lib/_Live2DFramework.js b/src/lib/Live2DFramework.js similarity index 99% rename from src/lib/_Live2DFramework.js rename to src/lib/Live2DFramework.js index a96b74f..b2d7b0f 100644 --- a/src/lib/_Live2DFramework.js +++ b/src/lib/Live2DFramework.js @@ -1373,19 +1373,19 @@ Live2DFramework.setPlatformManager = function (platformManager /*IPlatformManage Live2DFramework.platformManager = platformManager; } -module.exports = { - L2DTargetPoint: L2DTargetPoint, - Live2DFramework: Live2DFramework, - L2DViewMatrix: L2DViewMatrix, - L2DPose: L2DPose, - L2DPartsParam: L2DPartsParam, - L2DPhysics: L2DPhysics, - L2DMotionManager: L2DMotionManager, - L2DModelMatrix: L2DModelMatrix, - L2DMatrix44: L2DMatrix44, - EYE_STATE: EYE_STATE, - L2DEyeBlink: L2DEyeBlink, - L2DExpressionParam: L2DExpressionParam, - L2DExpressionMotion: L2DExpressionMotion, - L2DBaseModel: L2DBaseModel +export{ + L2DTargetPoint, + Live2DFramework, + L2DViewMatrix, + L2DPose, + L2DPartsParam, + L2DPhysics, + L2DMotionManager, + L2DModelMatrix, + L2DMatrix44, + EYE_STATE, + L2DEyeBlink, + L2DExpressionParam, + L2DExpressionMotion, + L2DBaseModel, } diff --git a/src/utils/MatrixStack b/src/utils/MatrixStack new file mode 100644 index 0000000..e69de29 diff --git a/src/_utils/_MatrixStack.js b/src/utils/MatrixStack.js similarity index 100% rename from src/_utils/_MatrixStack.js rename to src/utils/MatrixStack.js diff --git a/src/utils/ModelSettingJson b/src/utils/ModelSettingJson new file mode 100644 index 0000000..e69de29 diff --git a/src/_utils/_ModelSettingJson.js b/src/utils/ModelSettingJson.js similarity index 100% rename from src/_utils/_ModelSettingJson.js rename to src/utils/ModelSettingJson.js