feat: FINALLY USEABLE (basically)

by the way, we fixed journey-ad/live2d_src#1 and journey-ad/live2d_src#3 , thanks for your great work!
xiazeyu · Aug 26, 2018 · 4f6200a · 4f6200a
1 parent 7caba30
commit 4f6200a
Show file tree

Hide file tree

Showing 23 changed files with 78 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,9 @@ Add the Sseexxyyy live2d to your webpages!
 
 [TOC]
 
-Demo: [TBD.](javascript:void(0);)
+Demo: [Still working, but you can have a look~](https://xiazeyu.github.io/live2d-widget.js/dev.html)
+
+Docs(including APIs): [Click me!](https://xiazeyu.github.io/live2d-widget.js/)
 
 Online generator: [TBD.](javascript:void(0);)
 

diff --git a/dev.html b/dev.html
@@ -8,5 +8,8 @@
  </head>
  <body>
  <script src="dev/clL2D.min.js"></script>
+ <script type="text/javascript">
+ initL2Dwidget();
+ </script>
  </body>
 </html>
diff --git a/lib/clL2D.0.min.js b/lib/clL2D.0.min.js
diff --git a/lib/clL2D.0.min.js.map b/lib/clL2D.0.min.js.map
diff --git a/lib/clL2D.min.js b/lib/clL2D.min.js
diff --git a/lib/clL2D.min.js.map b/lib/clL2D.min.js.map
diff --git a/lib/stats.html b/lib/stats.html
diff --git a/src/PlatformManager.js b/src/PlatformManager.js
@@ -127,6 +127,11 @@ PlatformManager.prototype.loadTexture = function(model/*ALive2DModel*/, no/*
 {
  // load textures
  var loadedImage = new Image();
+ // Thanks to @mashirozx & @fghrsh
+ // Issues:
+ // @https:/journey-ad/live2d_src/issues/1
+ // @https:/journey-ad/live2d_src/issues/3
+ loadedImage.crossOrigin = 'Anonymous';
  loadedImage.src = path;
  loadedImage.onload = onload;
  loadedImage.onerror = onerror;

diff --git a/src/PlatformManager → src/PlatformManager_ b/src/PlatformManager → src/PlatformManager_
diff --git a/src/cDefine.js b/src/cDefine.js
@@ -4,7 +4,7 @@
 * @desc The definitions of values releated to model react
 */
 
-var cDefine = {
+export const cDefine = {
  // above are viewMatrix value settings
  VIEW_LOGICAL_LEFT : -1, // -1, the left abscissa of viewMatrix
  VIEW_LOGICAL_RIGHT : 1, // 1, the right abscissa of viewMatrix
@@ -33,5 +33,3 @@ var cDefine = {
  HIT_AREA_HEAD : "head",
  HIT_AREA_BODY : "body"
 };
-
-module.exports = cDefine;
diff --git a/src/cDefine → src/cDefine_ b/src/cDefine → src/cDefine_
diff --git a/src/cLive2DApp.js b/src/cLive2DApp.js
@@ -4,7 +4,7 @@
 
 
 import { config } from './config/configMgr';
-import { createElement, currWebGL } from './elementMgr';
+import { createElement, currWebGL, currCanvas } from './elementMgr';
 import { UtSystem,
  UtDebug,
  LDTransform,
@@ -23,8 +23,9 @@ import { UtSystem,
 import { L2DTargetPoint, L2DViewMatrix, L2DMatrix44 } from "./lib/Live2DFramework";
 import { cManager } from "./cManager";
 import { MatrixStack } from "./utils/MatrixStack";
-import cDefine from "./cDefine";
+import { cDefine } from "./cDefine";
 
+let live2DMgr = new cManager();
 let isDrawStart = false;
 let dragMgr = null;
 let viewMatrix = null;

diff --git a/src/cManager.js b/src/cManager.js
@@ -1,5 +1,5 @@
 import { Live2DFramework } from "./lib/Live2DFramework";
-import { PlatformManager } from "./lib/PlatformManager";
+import { PlatformManager } from "./PlatformManager";
 import { cModel } from "./cModel";
 import { cDefine } from "./cDefine";
 
@@ -10,8 +10,7 @@ function cManager() {
  this.count = -1;
  this.reloadFlg = false;
 
- Live2D.init();
- Live2DFramework.setPlatformManager(new PlatformManager);
+ Live2DFramework.setPlatformManager(new PlatformManager());
 
 }
 

diff --git a/src/cManager → src/cManager_ b/src/cManager → src/cManager_
diff --git a/src/cModel.js b/src/cModel.js
@@ -2,13 +2,27 @@ import { Live2DFramework, L2DBaseModel, L2DEyeBlink } from "./lib/Live2DFramewor
 import { ModelSettingJson } from "./utils/ModelSettingJson";
 import { MatrixStack } from "./utils/MatrixStack";
 import { cDefine } from "./cDefine";
-
+import { UtSystem,/*
+ UtDebug,
+ LDTransform,
+ LDGL,
+ Live2D,
+ Live2DModelWebGL,
+ Live2DModelJS,
+ Live2DMotion,
+ MotionQueueManager,
+ PhysicsHair,
+ AMotion,
+ PartsDataID,
+ DrawDataID,
+ BaseDataID,
+ ParamID*/ } from './lib/live2d.core';
 //============================================================
 //============================================================
 // class cModel extends L2DBaseModel
 //============================================================
 //============================================================
-export default function cModel()
+export function cModel()
 {
  //L2DBaseModel.apply(this, arguments);
  L2DBaseModel.prototype.constructor.call(this);

diff --git a/src/cModel → src/cModel_ b/src/cModel → src/cModel_
diff --git a/src/elementMgr.js b/src/elementMgr.js
@@ -27,6 +27,11 @@ let currCanvas;
 
 function createElement(){
 
+ let e = document.getElementById(config.name.div)
+ if (e !== null){
+ document.body.removeChild(e);
+ }
+
  let newElem = document.createElement('div');
  newElem.id = config.name.div;
  newElem.innerHTML = htmlTemplate;
@@ -84,4 +89,5 @@ function initWebGL(){
 export{
  createElement,
  currWebGL,
+ currCanvas,
 }
diff --git a/src/lib/Live2DFramework.js b/src/lib/Live2DFramework.js
@@ -18,6 +18,22 @@
 * @desc Basic functions releated to model react
 */
 
+import { UtSystem,
+ UtDebug,
+ LDTransform,
+ LDGL,
+ Live2D,
+ Live2DModelWebGL,
+ Live2DModelJS,
+ Live2DMotion,
+ MotionQueueManager,
+ PhysicsHair,
+ AMotion,
+ PartsDataID,
+ DrawDataID,
+ BaseDataID,
+ ParamID } from './live2d.core';
+
 //============================================================
 //============================================================
 // class L2DBaseModel
@@ -1142,7 +1158,7 @@ function L2DTargetPoint() {
 }
 
 //============================================================
-L2DTargetPoint.FRAME_RATE = 30;
+L2DTargetPoint.FRAME_RATE = 60;
 
 //============================================================
 // L2DTargetPoint # set()
@@ -1374,18 +1390,18 @@ Live2DFramework.setPlatformManager = function (platformManager /*IPlatformManage
 }
 
 export{
-  L2DTargetPoint,
-  Live2DFramework,
-  L2DViewMatrix,
-  L2DPose,
-  L2DPartsParam,
-  L2DPhysics,
-  L2DMotionManager,
-  L2DModelMatrix,
-  L2DMatrix44,
-  EYE_STATE,
-  L2DEyeBlink,
-  L2DExpressionParam,
-  L2DExpressionMotion,
-  L2DBaseModel,
+ L2DTargetPoint,
+ Live2DFramework,
+ L2DViewMatrix,
+ L2DPose,
+ L2DPartsParam,
+ L2DPhysics,
+ L2DMotionManager,
+ L2DModelMatrix,
+ L2DMatrix44,
+ EYE_STATE,
+ L2DEyeBlink,
+ L2DExpressionParam,
+ L2DExpressionMotion,
+ L2DBaseModel,
 }
diff --git a/src/lib/Live2DFramework → src/lib/Live2DFramework_ b/src/lib/Live2DFramework → src/lib/Live2DFramework_
diff --git a/src/utils/MatrixStack.js b/src/utils/MatrixStack.js
@@ -18,7 +18,7 @@
 * @desc A matrix stack releated to draw the model
 */
 
-function MatrixStack() {}
+export function MatrixStack() {}
 
 MatrixStack.matrixStack = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
 MatrixStack.depth = 0;
@@ -132,5 +132,3 @@ MatrixStack.multMatrix = function(matNew)
  thisRef.currentMatrix[i] = thisRef.tmp[i];
  }
 }
-
-module.exports = MatrixStack;
diff --git a/src/utils/MatrixStack → src/utils/MatrixStack_ b/src/utils/MatrixStack → src/utils/MatrixStack_
diff --git a/src/utils/ModelSettingJson.js b/src/utils/ModelSettingJson.js
@@ -12,7 +12,7 @@ import { Live2DFramework } from "../lib/Live2DFramework"
 * @param null
 * @returns {Structure} ModelSettingJson
 */
-export default function ModelSettingJson()
+export function ModelSettingJson()
 { // Define the index in the json file.
  this.NAME = "name";
  this.ID = "id";

diff --git a/src/utils/ModelSettingJson → src/utils/ModelSettingJson_ b/src/utils/ModelSettingJson → src/utils/ModelSettingJson_