From 62118e131ad0152f632e5d763001b21f3376147e Mon Sep 17 00:00:00 2001
From: xiazeyu_2011 <xiazeyu_2011@126.com>
Date: Mon, 1 Jan 2018 22:04:06 +0800
Subject: [PATCH] feat: config

update config structure
---
 src/cLive2DApp.js        |  4 ++--
 src/index.js             |  6 +++---
 src/lib/configManager.js | 18 ++++++------------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/cLive2DApp.js b/src/cLive2DApp.js
index da6b966..3c0cb96 100644
--- a/src/cLive2DApp.js
+++ b/src/cLive2DApp.js
@@ -16,6 +16,7 @@
   ParamID
 } from './lib/live2d.min';*/
 import './lib/live2d.min.js';
+import { config }from './lib/configManager.js';
 import { createCanvas, initCanvas } from "./lib/canvasManager";
 import { device } from 'current-device';
 import { L2DTargetPoint, L2DViewMatrix, L2DMatrix44 } from "./lib/Live2DFramework";
@@ -40,8 +41,7 @@ let opacityDefault = 0.7;
 let opacityHover = 1;
 
 export default () => {
-  console.log('Finally!~');
-  Live2D.init();
+  console.log(config);
 /*
     headPos = typeof iHeadPos === 'undefined' ? 0.5 : iHeadPos;
     opacityDefault = typeof iOpacityDefault === 'undefined' ? 0.7 : iOpacityDefault;
diff --git a/src/index.js b/src/index.js
index 33a83c6..8012238 100644
--- a/src/index.js
+++ b/src/index.js
@@ -13,7 +13,7 @@
 'use strict';
 
 import device from 'current-device';
-import config from './lib/configManager.js';
+import { config, applyConfig }from './lib/configManager.js';
 
 /**
  * The public entry point
@@ -26,12 +26,12 @@ export function init(userConfig){
     console.log('Hey that, you are now in DEV MODE.');
   }
   try{
-    config.applyConfig(userConfig);
+    applyConfig(userConfig);
   }catch(err){
     console.error(err);
   }
 
-  if((!config.options.mobile.show)&&(device.mobile())){
+  if((!config.mobile.show)&&(device.mobile())){
     return;
   }
 
diff --git a/src/lib/configManager.js b/src/lib/configManager.js
index 89c740f..1e6b7bc 100644
--- a/src/lib/configManager.js
+++ b/src/lib/configManager.js
@@ -41,26 +41,20 @@ const defaultOptions = {
   debug: {
     log: false,
     mouseLog: false,
-    mouseFunc: () => {console.log('(undefined) ┑(￣Д ￣)┍');}, // only works when debug.mouseLog is on
+    mouseFunc: (x, y) => {console.log(`MouseFunc: ${x},${x}`);}, // only works when debug.mouseLog is on
   },
-  checked: false,
+  checked: true,
 }
 
 function applyConfig(inUserConfig){
-  checkUserConfig(inUserConfig);
-  currConfig = Object.assign(
-    {},
-    defaultOptions,
-    inUserConfign,
-  );
+  if (!!!inUserConfig.checked) checkUserConfig(inUserConfig);
+  // TBD.
 }
 
 function checkUserConfig(inUserConfig){
-      if(( this.position != 'left' ) && ( this.position != 'right' )){
-      console.error('L2D: Invalid position setting');
-    }
+  // TBD.
 }
 export {
   applyConfig,
-  currConfig,
+  currConfig as config,
 }