Remove absolute paths

Popov72 · Nov 18, 2019 · c942b18 · c942b18
1 parent 8766107
commit c942b18
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 34 deletions.
diff --git a/babylonJS/public/TRN.html b/babylonJS/public/TRN.html
@@ -25,11 +25,6 @@
         <script src="lib/pako/pako_inflate.js"></script>
 
         <script src='dist/trn_babylon.js' defer></script>
-
-        <style type="text/css" media="all">@import "/resources/css/panel.css?ver=3";</style>
-        <style type="text/css" media="all">@import "/resources/css/progressbar.css";</style>
-        <style type="text/css" media="all">@import "/resources/css/help.css?ver=2";</style>
-        <style type="text/css" media="all">@import "/resources/css/cccontrol.css?ver=1";</style>
     </head>
 
     <body>

diff --git a/babylonJS/src/Behaviour/ParticleSystem.ts b/babylonJS/src/Behaviour/ParticleSystem.ts
@@ -56,7 +56,7 @@ export class ParticleSystem extends Behaviour {
             }
         }
 
-        const promise = fetch(`/resources/particle/${pname}.json`).then((response) => {
+        const promise = fetch(`${this.gameData.relpath}resources/particle/${pname}.json`).then((response) => {
             if (response.ok) {
                 response.json().then((json) => {
                     positions.forEach((obj, idx) => {

diff --git a/babylonJS/src/ShaderManager.ts b/babylonJS/src/ShaderManager.ts
@@ -9,8 +9,8 @@ export class ShaderManager extends ShaderManagerBase {
 
     protected _uniforms: Map<string, Set<string>>;
 
-    constructor() {
-        super();
+    constructor(dirPath?: string) {
+        super(dirPath);
 
         this._uniforms = new Map();
     }

diff --git a/babylonJS/src/TRN.ts b/babylonJS/src/TRN.ts
@@ -2,6 +2,7 @@ import {
     Engine as BEngine
 } from "babylonjs";
 
+import Browser from "../../src/Utils/Browser";
 import Engine from "../../src/Proxy/Engine";
 import { IMesh } from "../../src/Proxy/IMesh";
 import { IScene } from "../../src/Proxy/IScene";
@@ -18,11 +19,13 @@ import SceneParser from "./SceneParser";
 
 declare var glMatrix: any;
 
+const relPath = Browser.QueryString.relpath || "";
+
 glMatrix.glMatrix.setMatrixArrayType(Array);
 
 const canvas = document.createElement("canvas"),
       engine = new BEngine(canvas, true),
-      shdMgr = new ShaderManager();
+      shdMgr = new ShaderManager(relPath + "resources/shader/");
 
 Engine.registerFunctions({
     "makeNode":         (name?: string, scene?: IScene) => new Node(undefined, name, scene as Scene),

diff --git a/index.html b/index.html
@@ -179,7 +179,7 @@
             }
             jQuery('#levels').html(js.join(''));
         } else {
-            fetch('/resources/level/TRLevels.xml').then((response) => {
+            fetch('resources/level/TRLevels.xml').then((response) => {
                 response.text().then((txt) => {
                     const root = jQuery.parseXML(txt);
                     var levels = jQuery(root).find('game[id="' + game + '"] > levels > level');
@@ -228,7 +228,7 @@
                 if (gamepath == 'TR4Cut') {
                     gamepath = 'TR4';
                 }
-                let url = engine + '/public/TRN.html?engine=' + engine + '&trgame=' + game + '&level=' + gamepath.toLowerCase() + '/' + level + '&autostart=' + (type == 'cutscene' ? '0' : '1');
+                let url = engine + '/public/TRN.html?relpath=../../&engine=' + engine + '&trgame=' + game + '&level=' + gamepath.toLowerCase() + '/' + level + '&autostart=' + (type == 'cutscene' ? '0' : '1');
                 if (game == 'TR4Cut') {
                     url += '&cutscene=' + ot.attr('cindex');
                 }

diff --git a/src/Behaviour/CutScene.ts b/src/Behaviour/CutScene.ts
@@ -163,7 +163,7 @@ export class CutScene extends Behaviour {
         } else {
             promises.push(...this.helper.prepareLevel(this.confMgr.trversion, this.confMgr.levelName as string, 0, []));
             promises.push(
-                Misc.loadSoundAsync(this.sceneData.soundPath + this.sceneData.levelShortFileNameNoExt.toUpperCase()).then((ret: any) => {
+                Misc.loadSoundAsync(this.gameData.relpath + this.sceneData.soundPath + this.sceneData.levelShortFileNameNoExt.toUpperCase()).then((ret: any) => {
                     if (!ret || ret.code < 0) {
                         console.log('Error decoding sound data for cutscene.');
                     } else {

diff --git a/src/Behaviour/CutSceneControl.ts b/src/Behaviour/CutSceneControl.ts
@@ -28,7 +28,8 @@ export default class CutSceneControl {
     }
 
     public init() {
-        return fetch('/resources/template/cccontrol.html').then((response) => {
+        jQuery(`<style type="text/css" media="all">@import "${this._gameData.relpath}resources/css/cccontrol.css";</style>`).appendTo(jQuery(document.body));
+        return fetch(this._gameData.relpath + 'resources/template/cccontrol.html').then((response) => {
             return response.text().then((html) => {
                 jQuery(document.body).append(html);
             });

diff --git a/src/Behaviour/CutSceneTR4.ts b/src/Behaviour/CutSceneTR4.ts
@@ -15,6 +15,7 @@ declare var glMatrix: any;
 
 export default class CutSceneTR4 {
 
+    private gameData:   IGameData;
     private sceneData:  any;
     private objMgr:     ObjectManager;
     private scene:      IScene;
@@ -24,6 +25,7 @@ export default class CutSceneTR4 {
     private lara:       IMesh;
 
     constructor(gameData: IGameData, cutscene: CutSceneData, helper: CutSceneHelper, lara: IMesh) {
+        this.gameData = gameData;
         this.sceneData = gameData.sceneData;
         this.objMgr = gameData.objMgr;
         this.confMgr = gameData.confMgr;
@@ -34,7 +36,7 @@ export default class CutSceneTR4 {
     }
 
     public makeTR4Cutscene(icutscene: number): Promise<any> {
-        return fetch('/resources/level/tr4/TR4_cutscenes/cut' + icutscene + '.json').then((response) => {
+        return fetch(this.gameData.relpath + 'resources/level/tr4/TR4_cutscenes/cut' + icutscene + '.json').then((response) => {
             return response.json().then((data) => {
                 const cutscene: Array<any> = [];
 
@@ -45,9 +47,9 @@ export default class CutSceneTR4 {
 
                 // get the sound for this cut scene
                 if (cutscene[0].info.audio) {
-                    soundPromise = Misc.loadSoundAsync(this.sceneData.soundPath + cutscene[0].info.audio + '.aac').then((ret: any) => {
-                        if (ret.code < 0) {
-                            console.log('Error decoding sound data for cutscene.');
+                    soundPromise = Misc.loadSoundAsync(this.gameData.relpath + this.sceneData.soundPath + cutscene[0].info.audio + '.aac').then((ret: any) => {
+                        if (!ret || ret.code < 0) {
+                            console.log('Error decoding sound data for cutscene.', ret);
                         } else {
                             this.cutscene.sound = ret.sound;
                             this.cutscene.soundbuffer = ret.soundbuffer;
@@ -57,7 +59,7 @@ export default class CutSceneTR4 {
 
                 if (cutscene[0].index == 1) {
                     // we play cutscene 1 followed by cutscene 2, so need to retrieve data for cutscene 2
-                    return fetch('/resources/level/tr4/TR4_cutscenes/cut' + (icutscene + 1) + '.json').then((response) => {
+                    return fetch(this.gameData.relpath + 'resources/level/tr4/TR4_cutscenes/cut' + (icutscene + 1) + '.json').then((response) => {
                         return response.json().then((data) => {
                             cutscene.push(data);
                             cutscene[1].index = icutscene + 1;

diff --git a/src/Loading/LevelConverter.ts b/src/Loading/LevelConverter.ts
@@ -1243,7 +1243,7 @@ export default class LevelConverter {
             "out" : this.confMgr.globalColor('water > colorout')
         };
         this.sc.data.rversion = this.sc.data.trlevel.rversion;
-        this.sc.data.soundPath = "/resources/sound/" + this.sc.data.rversion.toLowerCase() + "/";
+        this.sc.data.soundPath = "resources/sound/" + this.sc.data.rversion.toLowerCase() + "/";
 
         this.helper = new LevelConverterHelper(this.sc, this.objects);
 

diff --git a/src/Main.ts b/src/Main.ts
@@ -9,6 +9,7 @@ import Play from "./Player/Play";
 import { ConfigManager } from "./ConfigManager";
 
 const showTiles = false;
+const relPath = Browser.QueryString.relpath || "";
 
 function setContainerDimensions() {
     if (!showTiles) {
@@ -48,19 +49,20 @@ jQuery(document).on('keydown', function(event) {
 });
 
 function loadAndPlayLevel(level: string | any) {
-    const progressbar = new ProgressBar(document.getElementById('container') as Element);
+    const progressbar = new ProgressBar(document.getElementById('container') as Element, relPath);
 
     progressbar.show();
 
-    fetch('/resources/level/TRLevels.xml').then((response) => {
+    fetch(relPath + 'resources/level/TRLevels.xml').then((response) => {
         response.text().then((txt) => {
             const confMgr = new ConfigManager(jQuery.parseXML(txt));
 
             MasterLoader.loadLevel(level, confMgr).then((res) => {
                 if (!showTiles) {
                     const play = new Play(document.getElementById('container') as Element);
                     (window as any).play = play;
-                    fetch('/resources/template/help.html').then((response) => {
+                    jQuery(`<style type="text/css" media="all">@import "${relPath}resources/css/help.css";</style>`).appendTo(jQuery(document.body));
+                    fetch(relPath + 'resources/template/help.html').then((response) => {
                         response.text().then((html) => {
                             jQuery(html).appendTo(document.body);
                         });
@@ -124,7 +126,7 @@ function handleFileSelect(evt: Event) {
 }
 
 if (Browser.QueryString.level) {
-    loadAndPlayLevel('/resources/level/' + Browser.QueryString.level);
+    loadAndPlayLevel(relPath + 'resources/level/' + Browser.QueryString.level);
 } else {
     jQuery('body').prepend('<input type="file" id="files" multiple="multiple" _style="display: none" />');
 

diff --git a/src/Player/IGameData.ts b/src/Player/IGameData.ts
@@ -12,6 +12,7 @@ import { SystemLight } from "./SystemLight";
 import Play from "./Play";
 
 export default interface IGameData {
+    "relpath":          string;
     "play":             Play;
 
     "curFrame":         number;

diff --git a/src/Player/Play.ts b/src/Player/Play.ts
@@ -32,6 +32,7 @@ export default class Play {
 
     constructor(container: Element) {
         this.gameData = {
+            "relpath": Browser.QueryString.relpath || "/",
             "play": this,
 
             "curFrame": 0,

diff --git a/src/ShaderManager.ts b/src/ShaderManager.ts
@@ -16,8 +16,8 @@ export class ShaderManager {
     protected _level: RawLevel;
     protected _globalLightsInFragment: boolean;
 
-    constructor() {
-        this._fpath = '/resources/shader/';
+    constructor(dirPath?: string) {
+        this._fpath = dirPath || 'resources/shader/';
         this._fileCache = {};
         this._level = <any>null;
         this._globalLightsInFragment = true;

diff --git a/src/Utils/Panel.ts b/src/Utils/Panel.ts
@@ -15,7 +15,8 @@ export class Panel {
         this._renderer = renderer;
         this._show = false;
 
-        fetch('/resources/template/panel.html').then((response) => {
+        jQuery(`<style type="text/css" media="all">@import "${gameData.relpath}resources/css/panel.css?ver=3";</style>`).appendTo(domElement);
+        fetch(gameData.relpath + 'resources/template/panel.html').then((response) => {
             response.text().then((html) => {
                 this._elem = jQuery(html);
                 this._elem.appendTo(domElement);

diff --git a/src/Utils/ProgressBar.ts b/src/Utils/ProgressBar.ts
@@ -5,12 +5,13 @@ export class ProgressBar {
     protected _showStart:   boolean;
     protected _callback:    any;
 
-    constructor(domElement: Element) {
+    constructor(domElement: Element, relpath: string = "") {
         this._elem = jQuery('');
         this._show = false;
         this._showStart = false;
 
-        fetch('/resources/template/progressbar.html').then((response) => {
+        jQuery(`<style type="text/css" media="all">@import "${relpath}resources/css/progressbar.css";</style>`).appendTo(domElement);
+        fetch(relpath + 'resources/template/progressbar.html').then((response) => {
             response.text().then((html) => {
                 this._elem = jQuery(html);
                 this._elem.appendTo(domElement);

diff --git a/threeJS/public/TRN.html b/threeJS/public/TRN.html
@@ -25,11 +25,6 @@
         <script src="lib/pako/pako_inflate.js"></script>
 
         <script src='dist/trn_three.js' defer></script>
-
-        <style type="text/css" media="all">@import "/resources/css/panel.css?ver=3";</style>
-        <style type="text/css" media="all">@import "/resources/css/progressbar.css";</style>
-        <style type="text/css" media="all">@import "/resources/css/help.css?ver=2";</style>
-        <style type="text/css" media="all">@import "/resources/css/cccontrol.css?ver=1";</style>
     </head>
 
 	<body>

diff --git a/threeJS/src/TRN.ts b/threeJS/src/TRN.ts
@@ -1,3 +1,4 @@
+import Browser from "../../src/Utils/Browser";
 import Engine from "../../src/Proxy/Engine";
 import { IMesh } from "../../src/Proxy/IMesh";
 import { ShaderManager } from "../../src/ShaderManager";
@@ -12,9 +13,11 @@ import SceneParser from "./SceneParser";
 
 declare var glMatrix: any;
 
+const relPath = Browser.QueryString.relpath || "";
+
 glMatrix.glMatrix.setMatrixArrayType(Array);
 
-const shdMgr = new ShaderManager();
+const shdMgr = new ShaderManager(relPath + "resources/shader/");
 
 Engine.registerFunctions({
     "makeNode":         () => new Node(),