From d4e96c66a87202008b00f7ee9d656537fd5c22c9 Mon Sep 17 00:00:00 2001 From: firebingo Date: Mon, 13 May 2019 13:16:40 -0700 Subject: [PATCH] Removed webpack for gulp again because its simpler for a project this size. --- Css/main.css | 2 +- Js/Audio.js | 8 +- Js/Common.js | 3 - Js/Main.js | 40 +- Js/Player.js | 6 - Js/Shaders.js | 6 - Js/TextFunctions.js | 2 - Js/Translations | 2 +- Js/UtageParse.js | 28 +- Player.html | 37 +- README.md | 3 +- gulpfile.js | 130 + package-lock.json | 22975 ++++++++++++++++-------------------------- package.json | 31 +- webpack.config.js | 117 - 15 files changed, 9062 insertions(+), 14328 deletions(-) create mode 100644 gulpfile.js delete mode 100644 webpack.config.js diff --git a/Css/main.css b/Css/main.css index b393e69..ce7cb89 100644 --- a/Css/main.css +++ b/Css/main.css @@ -39,7 +39,7 @@ src: url(../Fonts/Orbitron Medium.woff2) format('woff'); } -@font-face { +/*@font-face { font-family: PTSans; src: url(../Fonts/PTSans.woff2) format('woff'); } diff --git a/Js/Audio.js b/Js/Audio.js index 6891a09..bb1c33b 100644 --- a/Js/Audio.js +++ b/Js/Audio.js @@ -1,7 +1,5 @@ //(Math.exp(x)-1)/(Math.E-1) -import bgmLoopData from './BgmLoop.json'; - class bufferLoader { constructor(context, soundMap, callback) { this.context = context; @@ -96,8 +94,8 @@ class audioController { source.buffer = this.loader.bufferList[sound]; source.loop = false; if(type === "bgm") { - if(bgmLoopData[this.utage.soundInfo[sound].origFileName]) { - let loop = bgmLoopData[this.utage.soundInfo[sound].origFileName]; + if(this.utage.bgmLoopData[this.utage.soundInfo[sound].origFileName]) { + let loop = this.utage.bgmLoopData[this.utage.soundInfo[sound].origFileName]; source.loopStart = loop["loop_start"]["seconds"]; source.loopEnd = loop["loop_end"]["seconds"]; source.loop = true; @@ -184,5 +182,3 @@ class audioController { this.sources = {}; } } - -export { audioController }; diff --git a/Js/Common.js b/Js/Common.js index 9f639e4..34c1220 100644 --- a/Js/Common.js +++ b/Js/Common.js @@ -334,10 +334,7 @@ class commonFunctions { if(props[i] == " ") { break; } retval.color += props[i]; } - //retval.color = retval.color; } return retval; } } - -export { rootUrl, baseDimensions, screenRatio, commonFunctions }; diff --git a/Js/Main.js b/Js/Main.js index 8c35060..15036e8 100644 --- a/Js/Main.js +++ b/Js/Main.js @@ -1,17 +1,5 @@ 'use strict'; -/* global PIXI */ -import 'Pixi'; -import { Player } from './Player.js'; -import { audioController } from './Audio.js'; -import { baseDimensions, commonFunctions } from './Common.js'; -import { UtageInfo } from './UtageParse.js'; -import { TextFunctions } from './TextFunctions.js'; -import { Shaders } from './Shaders.js'; - -import '../Css/generic.min.css'; -import '../Css/main.css'; - const pixiApp = { app: new PIXI.Application(baseDimensions), loader: PIXI.loader @@ -227,9 +215,9 @@ function missionDropDownChanged(event) { ${chapterSelect} `; document.getElementById("click-catcher").style.cssText = 'display: flex;'; @@ -436,7 +424,7 @@ function openHelpModal(event) { YameteTomete Discord
All Symphogear content belongs to its respective owners
`; @@ -511,24 +499,4 @@ function onWindowResize(event, delay = 400) { player.updateResolution(res); document.getElementById('app-container').style.cssText = `width: ${res.width}px; height: ${res.height}px;`; }, delay); -} - -export { - onBodyLoaded, - onBodyKey, - toggleMute, - onVolumeChange, - missionDropDownChanged, - languageChanged, - toggleFullscreen, - onMainClick, - openHelpModal, - playFromQuery, - skipClicked, - hideUiClicked, - dialogScrollUp, - dialogScrollDown, - closeMissionModal, - missionChanged, - closeModal -}; +} \ No newline at end of file diff --git a/Js/Player.js b/Js/Player.js index 872ac84..d7858cc 100644 --- a/Js/Player.js +++ b/Js/Player.js @@ -1,9 +1,5 @@ 'use strict'; -/* global PIXI */ -import 'Pixi'; -import { baseDimensions, commonFunctions } from './Common.js'; - class Player { constructor(pixi, utage, text, audio, shaderscript) { this.pixi = pixi; @@ -1401,5 +1397,3 @@ class Player { }); } } - -export { Player }; diff --git a/Js/Shaders.js b/Js/Shaders.js index 95372ad..f47f88e 100644 --- a/Js/Shaders.js +++ b/Js/Shaders.js @@ -1,9 +1,5 @@ //http://glslsandbox.com/e#39992.0 -/* global PIXI */ -import 'Pixi'; -import { baseDimensions } from './Common.js'; - class Shaders { constructor() { this.leftToRightFadeShader = ` @@ -205,5 +201,3 @@ class Shaders { } } } - -export { Shaders }; diff --git a/Js/TextFunctions.js b/Js/TextFunctions.js index 4c7df82..36485b2 100644 --- a/Js/TextFunctions.js +++ b/Js/TextFunctions.js @@ -191,5 +191,3 @@ class TextFunctions { this.lineHeight = -1; } } - -export { TextFunctions }; diff --git a/Js/Translations b/Js/Translations index dc15df9..c472de2 160000 --- a/Js/Translations +++ b/Js/Translations @@ -1 +1 @@ -Subproject commit dc15df970a33c34dd53654fb77ce775ee9e3f051 +Subproject commit c472de2e64186cbd4b802dafbdd171efb7985d78 diff --git a/Js/UtageParse.js b/Js/UtageParse.js index dafd060..d24ac73 100644 --- a/Js/UtageParse.js +++ b/Js/UtageParse.js @@ -1,8 +1,6 @@ //http://madnesslabo.net/utage/?page_id=4448&lang=en 'use strict'; -import { commonFunctions } from './Common.js'; - class UtageInfo { constructor() { this.currentPlayingFile = []; @@ -34,16 +32,16 @@ class UtageInfo { //commonFunctions.getFileText(`${this.rootDirectory}XDUData/Utage/Diva/Settings/Scenario.tsv`), commonFunctions.getFileText(`${this.rootDirectory}XDUData/Utage/Diva/Settings/Sound.tsv`), //4 commonFunctions.getFileText(`${this.rootDirectory}XDUData/Utage/Diva/Settings/Texture.tsv`), //5 - //commonFunctions.getFileJson(`${this.rootDirectory}Js/BgmLoop.json`), - commonFunctions.getFileJson(`${this.rootDirectory}Js/Translations/XduMissionsCustom.json`), //6 - commonFunctions.getFileText(`${this.rootDirectory}CustomData/Utage/Diva/Settings/CustomCharacter.tsv`), //7 - commonFunctions.getFileText(`${this.rootDirectory}CustomData/Utage/Diva/Settings/CustomSound.tsv`), //8 - commonFunctions.getFileText(`${this.rootDirectory}CustomData/Utage/Diva/Settings/CustomTexture.tsv`), //9 - commonFunctions.getFileText(`${this.rootDirectory}XDUData/Utage/Diva/Scenario/Macro.tsv`), //10 + commonFunctions.getFileJson(`${this.rootDirectory}Js/BgmLoop.json`), //6 + commonFunctions.getFileJson(`${this.rootDirectory}Js/Translations/XduMissionsCustom.json`), //7 + commonFunctions.getFileText(`${this.rootDirectory}CustomData/Utage/Diva/Settings/CustomCharacter.tsv`), //8 + commonFunctions.getFileText(`${this.rootDirectory}CustomData/Utage/Diva/Settings/CustomSound.tsv`), //9 + commonFunctions.getFileText(`${this.rootDirectory}CustomData/Utage/Diva/Settings/CustomTexture.tsv`), //10 + commonFunctions.getFileText(`${this.rootDirectory}XDUData/Utage/Diva/Scenario/Macro.tsv`), //11 ]; Promise.all(promises) .then((success) => { - this.groupMissions(success[0], success[6]); + this.groupMissions(success[0], success[7]); this.missionsList = Object.keys(this.groupedMissions).map((k) => { return {Name: this.groupedMissions[k].Name, MstId: this.groupedMissions[k].MstId}; }); @@ -54,11 +52,11 @@ class UtageInfo { //this.parseParamInfo(success[4]); this.parseSoundInfo(success[4]); this.parseTextureInfo(success[5]); - //this.bgmLoopData = success[6]; - this.parseCharacterInfo(success[7], true); - this.parseSoundInfo(success[8], true); - this.parseTextureInfo(success[9], true); - this.parseMacroFile(success[10]); + this.bgmLoopData = success[6]; + this.parseCharacterInfo(success[8], true); + this.parseSoundInfo(success[9], true); + this.parseTextureInfo(success[10], true); + this.parseMacroFile(success[11]); resolve(); }, (failure) => { reject(failure); @@ -395,5 +393,3 @@ class UtageInfo { this.translationsInner = {}; } } - -export { UtageInfo }; diff --git a/Player.html b/Player.html index 250ae1b..150113e 100644 --- a/Player.html +++ b/Player.html @@ -5,19 +5,18 @@ - + + - + - + --> +

Loading Utage Data...

Loading Page Data...

@@ -26,33 +25,33 @@
Now Playing: None
- 🔊 - + 🔊 +
- - - ? + + + ?
-
+
-
➕
+
➕
- +