feat(config): new config

Author: xiazeyu

src/SettingsTip.txt

@@ -5,14 +5,6 @@
 */
 
 var cDefine = {
-  // above are output log settings
-  DEBUG_LOG : false, // false, output events
-  DEBUG_MOUSE_LOG : false, // false, output mouse tracking
-  // These two commented definitions havn't been achieved yet.
-  // #63
-  // DEBUG_DRAW_HIT_AREA : false, // # 63
-  // DEBUG_DRAW_ALPHA_MODEL : false, // #63
-
   // 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

src/cDefine.js

@@ -14,7 +14,7 @@
   DrawDataID,
   BaseDataID,
   ParamID
-} from './lib/live2d.core';*/
+} from './lib/live2d.min';*/
 import './lib/live2d.min.js';
 import { createCanvas, initCanvas } from "./lib/canvasManager";
 import { device } from 'current-device';
@@ -41,6 +41,7 @@ let opacityHover = 1;
 
 export default () => {
   console.log('Finally!~');
+  Live2D.init();
 /*
     headPos = typeof iHeadPos === 'undefined' ? 0.5 : iHeadPos;
     opacityDefault = typeof iOpacityDefault === 'undefined' ? 0.7 : iOpacityDefault;

src/cLive2DApp.js

@@ -4,6 +4,8 @@
 // Celebrate for the 3.0 version! //
 ////////////////////////////////////
 
+// Created by xiazeyu.
+
 /**
  * @description The entry file
  */
@@ -12,32 +14,31 @@
 
 import device from 'current-device';
 import config from './lib/configManager.js';
+
 /**
  * The public entry point
  * @param  {Object} userConfig User's config
  */
 
-function getWebPackPublicPath(){
-  let runtimePublicPath;
-  __webpack_public_path__ = runtimePublicPath;
-}
-
 export function init(userConfig){
+
   if (process.env.NODE_ENV === 'development') {
-    console.log('Hey that, you are now in DEV.');
-  }/*
+    console.log('Hey that, you are now in DEV MODE.');
+  }
   try{
-    config.checkConfig(userConfig);
+    config.applyConfig(userConfig);
   }catch(err){
     console.error(err);
   }
-  config.applyConfig(userConfig);
+
   if((!config.options.mobile.show)&&(device.mobile())){
     return;
-  }*/
+  }
+
   import(/* webpackMode: "lazy" */ './cLive2DApp').then(_ => {
     _.default();
   }).catch(err => {
     console.error(err);
   });
+
 }

src/index.js

@@ -1,52 +1,49 @@
-// Modified by xiazeyu.
+// Created by xiazeyu.
 
 /**
  * @description The container of configeration.
  */
 
 
-class Config{
-  constructor(
-    modelPath, modelWidth, modelHeight,
-    modelScaling, AASetting, mobileShow,
-    mobileScaling, position, horizontalOffset,
-    verticalOffset, horizontalHeadPos, verticalHeadPos,
-    opacityDefault, opacityHover, canvasID,
-    divID,
-    ){};
-}
-
-/**
- * default options
- * @type {Object}
- * @param {[type]} [varname] [description]
- */
-
-const defaultOptions = {
-  modelPath: 'https://raw.githubusercontent.com/EYHN/hexo-helper-live2d/master/assets/z16/z16.model.json',
-  modelWidth: 150,
-  modelHeight: 300,
-  modelScaling: 1,
-  AASetting: 2,
-  mobileShow: true,
-  mobileScaling: 0.5,
-  position: 'right',
-  horizontalOffset: 0,
-  verticalOffset: -20,
-  horizontalHeadPos: 0.5,
-  verticalHeadPos: 0.618,
-  opacityDefault: 0.7,
-  opacityHover: 0.1,
-  canvasID: 'live2DCanvas',
-  divID: 'hexo-helper-live2d'
-}
-
 let currConfig = {};
 
-function checkUserConfig(inUserConfig){
-      if(( this.position != 'left' ) && ( this.position != 'right' )){
-      console.error('L2D: Invalid position setting');
-    }
+const defaultOptions = {
+  model: {
+    jsonPath: '',
+    hHeadPos: 0.5, // horizontalHeadPos
+    vHeadPos: 0.618, // verticalHeadPos
+    myDefine: {},
+  },
+  display: {
+    AA: 2, // antialiasing Grade 抗锯齿等级
+    widght: 150,
+    height: 300,
+    scale: 1,
+    position: 'right',
+    hOffset: 0, // horizontalOffset
+    vOffset: -20, // verticalOffset
+  },
+  mobile: {
+    show: true,
+    scale: 0.5,
+    motion: false,
+  },
+  name: {
+    canvas: 'live2dcanvas',
+    div: 'live2d-widget',
+  },
+  react: {
+    opacityDefault: 0.7,
+    opacityOnHover: 0.2,
+    myFunc: () => {console.log('(undefined) ┑(￣Д ￣)┍');},
+    messageFunc: () => {console.log('(undefined) ┑(￣Д ￣)┍');},
+  },
+  debug: {
+    log: false,
+    mouseLog: false,
+    mouseFunc: () => {console.log('(undefined) ┑(￣Д ￣)┍');}, // only works when debug.mouseLog is on
+  },
+  checked: false,
 }
 
 function applyConfig(inUserConfig){
@@ -58,7 +55,12 @@ function applyConfig(inUserConfig){
   );
 }
 
-export {/*
+function checkUserConfig(inUserConfig){
+      if(( this.position != 'left' ) && ( this.position != 'right' )){
+      console.error('L2D: Invalid position setting');
+    }
+}
+export {
   applyConfig,
-  currConfig,*/
+  currConfig,
 }

src/lib/configManager.js

@@ -1,6 +1,5 @@
 /**
- * @description Shimming for Live2D core library
- * https://doc.webpack-china.org/guides/shimming/
+ * @description Fix global expose for Live2D core library
  */
 
 

src/lib/live2d.core.js

@@ -84,7 +84,7 @@ module.exports = env => {return{
           options: {
             minimize: true,
           },
-      }],
+        }],
       },
     ]
   },