src/PlatformManager.js
/**
*
@@ -59,9 +73,8 @@
* @desc A library that provide basic IO and json function
*/
-
-import { getContext } from "./webGLContext";
-import { Live2DModelWebGL } from "./live2d.core";
+import { currWebGL } from './elementMgr';
+import { Live2DModelWebGL } from "./lib/live2d.core";
//============================================================
@@ -76,7 +89,7 @@
* @param null
* @returns {Structure} PlatformManager
*/
-export default function PlatformManager()
+export function PlatformManager()
{
}
@@ -181,7 +194,7 @@
// var thisRef = this;
loadedImage.onload = function() {
// create texture
- var gl = getContext();
+ var gl = currWebGL;
var texture = gl.createTexture();
if (!texture){ console.error("Failed to generate gl texture name."); return -1; }
diff --git a/ghpages/docs/file/src/_cDefine.js.html b/ghpages/docs/file/src/cDefine.js.html
similarity index 62%
rename from ghpages/docs/file/src/_cDefine.js.html
rename to ghpages/docs/file/src/cDefine.js.html
index 24f6aa5..d32d557 100644
--- a/ghpages/docs/file/src/_cDefine.js.html
+++ b/ghpages/docs/file/src/cDefine.js.html
@@ -3,7 +3,7 @@
- src/_cDefine.js | live2d-widget.js
+ src/cDefine.js | live2d-widget.js
@@ -30,20 +30,34 @@
src/_cDefine.js
+
src/cDefine.js
// Modified by xiazeyu.
/**
diff --git a/ghpages/docs/file/src/cLive2DApp.js.html b/ghpages/docs/file/src/cLive2DApp.js.html
index cb33939..822eb59 100644
--- a/ghpages/docs/file/src/cLive2DApp.js.html
+++ b/ghpages/docs/file/src/cLive2DApp.js.html
@@ -30,15 +30,29 @@
@@ -49,32 +63,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";
+import cDefine from "./cDefine";
-const live2DMgr = new cManager();
let isDrawStart = false;
-let canvas = null;
let dragMgr = null;
let viewMatrix = null;
let projMatrix = null;
@@ -85,10 +96,8 @@
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
@@ -99,13 +108,8 @@
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 ratio = height / width;
+ let ratio = config.display.height / config.display.width;
let left = cDefine.VIEW_LOGICAL_LEFT;
let right = cDefine.VIEW_LOGICAL_RIGHT;
let bottom = -ratio;
@@ -121,13 +125,11 @@
cDefine.VIEW_LOGICAL_MAX_TOP);
projMatrix = new L2DMatrix44();
- projMatrix.multScale(1, (width / height));
+ projMatrix.multScale(1, (config.display.width / config.display.height));
deviceToScreen = new L2DMatrix44();
- // deviceToScreen.multTranslate(-width / 2.0, -height / 2.0); // old codes
- // deviceToScreen.multScale(2 / width, -2 / width); // old codes
- deviceToScreen.multTranslate(-sWidth / 2.0, -sHeight / 2.0); // #32
- deviceToScreen.multScale(2 / sWidth, -2 / sHeight); // #32
+ deviceToScreen.multTranslate(-config.display.width / 2.0, -config.display.height / 2.0); // #32
+ deviceToScreen.multScale(2 / config.display.width, -2 / config.display.height); // #32
Live2D.setGL(currWebGL);
@@ -139,8 +141,7 @@
function initEvent(){/*
- canvas = document.getElementById(canvasId);
- if (canvas.addEventListener) {
+ if (currCanvas.addEventListener) {
window.addEventListener("click", mouseEvent);
window.addEventListener("mousedown", mouseEvent);
window.addEventListener("mousemove", mouseEvent);
@@ -163,7 +164,7 @@
window.webkitRequestAnimationFrame ||
window.msRequestAnimationFrame;
- requestAnimationFrame(tick, canvas);
+ requestAnimationFrame(tick, currCanvas);
})();
}
}
@@ -307,7 +308,7 @@
{
drag = true;
- let rect = canvas.getBoundingClientRect();
+ let rect = currCanvas.getBoundingClientRect();
let sx = transformScreenX(event.clientX - rect.left);
let sy = transformScreenY(event.clientY - rect.top);
@@ -334,7 +335,7 @@
{
drag = true;
- let rect = canvas.getBoundingClientRect();
+ let rect = currCanvas.getBoundingClientRect();
let sx = transformScreenX(event.clientX - rect.left);
let sy = transformScreenY(event.clientY - rect.top);
@@ -359,7 +360,7 @@
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/ghpages/docs/file/src/_cManager.js.html b/ghpages/docs/file/src/cManager.js.html
similarity index 64%
rename from ghpages/docs/file/src/_cManager.js.html
rename to ghpages/docs/file/src/cManager.js.html
index ab23412..3b76716 100644
--- a/ghpages/docs/file/src/_cManager.js.html
+++ b/ghpages/docs/file/src/cManager.js.html
@@ -3,7 +3,7 @@
-
src/_cManager.js | live2d-widget.js
+
src/cManager.js | live2d-widget.js
@@ -30,26 +30,40 @@
src/_cManager.js
+
src/cManager.js
import { Live2DFramework } from "./lib/Live2DFramework";
-import PlatformManager from "./lib/PlatformManager";
+import { PlatformManager } from "./lib/PlatformManager";
import { cModel } from "./cModel";
import { cDefine } from "./cDefine";
-export default function cManager() {
+function cManager() {
// console.log("--> cManager()");
this.models = [];
@@ -144,6 +158,10 @@
return true;
};
+
+export{
+ cManager,
+}
diff --git a/ghpages/docs/file/src/_cModel.js.html b/ghpages/docs/file/src/cModel.js.html
similarity index 84%
rename from ghpages/docs/file/src/_cModel.js.html
rename to ghpages/docs/file/src/cModel.js.html
index 343ae1e..1e77409 100644
--- a/ghpages/docs/file/src/_cModel.js.html
+++ b/ghpages/docs/file/src/cModel.js.html
@@ -3,7 +3,7 @@
-
src/_cModel.js | live2d-widget.js
+
src/cModel.js | live2d-widget.js
@@ -30,20 +30,34 @@
src/_cModel.js
+
src/cModel.js
import { Live2DFramework, L2DBaseModel, L2DEyeBlink } from "./lib/Live2DFramework";
import { ModelSettingJson } from "./utils/ModelSettingJson";
import { MatrixStack } from "./utils/MatrixStack";
diff --git a/ghpages/docs/file/src/config/configMgr.js.html b/ghpages/docs/file/src/config/configMgr.js.html
index 728a20a..791c1da 100644
--- a/ghpages/docs/file/src/config/configMgr.js.html
+++ b/ghpages/docs/file/src/config/configMgr.js.html
@@ -30,15 +30,29 @@
diff --git a/ghpages/docs/file/src/config/configValidater.js.html b/ghpages/docs/file/src/config/configValidater.js.html
index d666e0d..a9f6868 100644
--- a/ghpages/docs/file/src/config/configValidater.js.html
+++ b/ghpages/docs/file/src/config/configValidater.js.html
@@ -30,15 +30,29 @@
diff --git a/ghpages/docs/file/src/elementManager.js.html b/ghpages/docs/file/src/elementManager.js.html
deleted file mode 100644
index 5b65a8d..0000000
--- a/ghpages/docs/file/src/elementManager.js.html
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
src/elementManager.js
-
/**
- * @description The container and manager for all the DOM and WebGL emelents.
- */
-
-
-import { config } from './config/configMgr';
-import htmlTemplate from './tmplate/innerHTML';
-
-/**
- * The current WebGL element
- * @type {RenderingContext}
- */
-
-let currWebGL = undefined;
-
-/**
- * The current canvas element
- * @type {DOMString}
- */
-
-let currCanvas;
-
-/**
- * Create the canvas and styles using DOM
- * @return {null}
- */
-
-function createElement(){
-
- let newElem = document.createElement('div');
- newElem.id = config.name.div;
- newElem.innerHTML = htmlTemplate(config);
- document.body.appendChild(newElem);
- currCanvas = document.getElementById(config.name.canvas);
- initWebGL();
-
-}
-
-/**
- * Find and set the current WebGL element to the container
- * @return {null}
- */
-
-function initWebGL(){
-
- var NAMES = ['webgl2', 'webgl', 'experimental-webgl2', 'experimental-webgl', 'webkit-3d', 'moz-webgl'];
- for(let i = 0; i < NAMES.length; i++){
- try{
- let ctx = currCanvas.getContext(NAMES[i], {
- alpha: true,
- antialias: true,
- premultipliedAlpha: true,
- failIfMajorPerformanceCaveat: false,
- });
- if(ctx) currWebGL = ctx;
- }catch(e){}
- }
- if(!gl){
- console.error('Live2D widgets: Failed to create WebGL context.');
- if(!window.WebGLRenderingContext){
- console.error('Your browser may not support WebGL, check https://get.webgl.org/ for futher information.');
- }
- return;
- }
-};
-
-
-export{
- createElement,
- currWebGL,
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ghpages/docs/file/src/elementMgr.js.html b/ghpages/docs/file/src/elementMgr.js.html
index eb7b770..9bac077 100644
--- a/ghpages/docs/file/src/elementMgr.js.html
+++ b/ghpages/docs/file/src/elementMgr.js.html
@@ -30,15 +30,29 @@