From d82b49eefc9827ceb3f19103859d6c5f1661012c Mon Sep 17 00:00:00 2001 From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com> Date: Thu, 8 Jul 2021 17:53:15 +0530 Subject: [PATCH] js 2 --- src/DifBuilder.hx | 6 +++++- src/Marble.hx | 2 +- src/MissionList.hx | 5 +++++ src/ResourceLoader.hx | 7 +++++-- src/Sky.hx | 5 +++++ src/gui/EndGameGui.hx | 8 ++++---- src/gui/EnterNameDlg.hx | 8 ++++---- src/gui/ExitGameDlg.hx | 2 +- src/gui/HelpCreditsGui.hx | 8 ++++---- src/gui/MainMenuGui.hx | 2 +- src/gui/MessageBoxYesNoDlg.hx | 2 +- src/gui/OptionsDlg.hx | 2 +- src/gui/PlayGui.hx | 2 +- src/gui/PlayMissionGui.hx | 8 ++++---- src/gui/RemapDlg.hx | 2 +- 15 files changed, 43 insertions(+), 26 deletions(-) diff --git a/src/DifBuilder.hx b/src/DifBuilder.hx index 7948451c..a3a6af47 100644 --- a/src/DifBuilder.hx +++ b/src/DifBuilder.hx @@ -224,6 +224,10 @@ class DifBuilder { tex = tex.split('/')[1]; } + #if js + path = StringTools.replace(path, "data/", ""); + #end + if (ResourceLoader.fileSystem.exists(Path.directory(path) + "/" + tex + ".jpg")) { return true; } @@ -299,7 +303,7 @@ class DifBuilder { var material:Material; var texture:Texture; if (canFindTex(grp)) { - texture = ResourceLoader.loader.load(tex(grp)).toImage().toTexture(); + texture = ResourceLoader.getFileEntry(tex(grp)).toImage().toTexture(); texture.wrap = Wrap.Repeat; material = h3d.mat.Material.create(texture); } else { diff --git a/src/Marble.hx b/src/Marble.hx index 1cddd7dc..9fb09b0a 100644 --- a/src/Marble.hx +++ b/src/Marble.hx @@ -181,7 +181,7 @@ class Marble extends GameObject { super(); var geom = Sphere.defaultUnitSphere(); geom.addUVs(); - var marbleTexture = ResourceLoader.loader.load("data/shapes/balls/base.marble.png").toTexture(); + var marbleTexture = ResourceLoader.getFileEntry("data/shapes/balls/base.marble.png").toTexture(); var marbleMaterial = Material.create(marbleTexture); marbleMaterial.shadows = false; marbleMaterial.castShadows = true; diff --git a/src/MissionList.hx b/src/MissionList.hx index e33851cb..8395c29a 100644 --- a/src/MissionList.hx +++ b/src/MissionList.hx @@ -17,7 +17,12 @@ class MissionList { if (_build) return; function parseDifficulty(difficulty:String) { + #if hl var difficultyFiles = ResourceLoader.fileSystem.dir("data/missions/" + difficulty); + #end + #if js + var difficultyFiles = ResourceLoader.fileSystem.dir("missions/" + difficulty); + #end var difficultyMissions = []; for (file in difficultyFiles) { if (file.extension == "mis") { diff --git a/src/ResourceLoader.hx b/src/ResourceLoader.hx index b78036c2..2fc1d887 100644 --- a/src/ResourceLoader.hx +++ b/src/ResourceLoader.hx @@ -132,11 +132,11 @@ class ResourceLoader { return null; } - public static function getFile(path:String) { + public static function getFileEntry(path:String) { #if js path = StringTools.replace(path, "data/", ""); #end - var file = fileSystem.get(path); + var file = loader.load(path); return file; } @@ -149,6 +149,9 @@ class ResourceLoader { } public static function getFullNamesOf(path:String) { + #if js + path = StringTools.replace(path, "data/", ""); + #end var files = fileSystem.dir(Path.directory(path)); // FileSystem.readDirectory(Path.directory(path)); var names = []; var fname = Path.withoutDirectory(path).toLowerCase(); diff --git a/src/Sky.hx b/src/Sky.hx index 4801adad..3b4e6cb0 100644 --- a/src/Sky.hx +++ b/src/Sky.hx @@ -43,11 +43,16 @@ class Sky extends Object { env.compute(); // var renderer = cast(level.scene.renderer, h3d.scene.pbr.Renderer); var shad = new Skybox(texture); + #if js skyMesh.material.mainPass.addShader(shad); + #end // skyMesh.material.shadows = false; } function createSkyboxCubeTextured(dmlPath:String) { + #if js + dmlPath = StringTools.replace(dmlPath, "data/", ""); + #end if (ResourceLoader.fileSystem.exists(dmlPath)) { var dmlFile = ResourceLoader.fileSystem.get(dmlPath).getText(); var dmlDirectory = Path.directory(dmlPath); diff --git a/src/gui/EndGameGui.hx b/src/gui/EndGameGui.hx index 8f0f80ea..c9728c92 100644 --- a/src/gui/EndGameGui.hx +++ b/src/gui/EndGameGui.hx @@ -51,19 +51,19 @@ class EndGameGui extends GuiControl { restartButton.extent = new Vector(104, 48); restartButton.pressedAction = restartFunc; - var arial14fontdata = ResourceLoader.loader.load("data/font/Arial14.fnt"); + var arial14fontdata = ResourceLoader.getFileEntry("data/font/Arial14.fnt"); var arial14 = new BitmapFont(arial14fontdata.entry); @:privateAccess arial14.loader = ResourceLoader.loader; - var domcasual32fontdata = ResourceLoader.loader.load("data/font/DomCasual32px.fnt"); + var domcasual32fontdata = ResourceLoader.getFileEntry("data/font/DomCasual32px.fnt"); var domcasual32 = new BitmapFont(domcasual32fontdata.entry); @:privateAccess domcasual32.loader = ResourceLoader.loader; - var expo50fontdata = ResourceLoader.loader.load("data/font/Expo50.fnt"); + var expo50fontdata = ResourceLoader.getFileEntry("data/font/Expo50.fnt"); var expo50 = new BitmapFont(expo50fontdata.entry); @:privateAccess expo50.loader = ResourceLoader.loader; - var expo32fontdata = ResourceLoader.loader.load("data/font/Expo32.fnt"); + var expo32fontdata = ResourceLoader.getFileEntry("data/font/Expo32.fnt"); var expo32 = new BitmapFont(expo32fontdata.entry); @:privateAccess expo32.loader = ResourceLoader.loader; diff --git a/src/gui/EnterNameDlg.hx b/src/gui/EnterNameDlg.hx index e5dadc6c..c0bd1017 100644 --- a/src/gui/EnterNameDlg.hx +++ b/src/gui/EnterNameDlg.hx @@ -21,19 +21,19 @@ class EnterNameDlg extends GuiControl { return [normal, hover, pressed]; } - var arial14fontdata = ResourceLoader.loader.load("data/font/Arial14.fnt"); + var arial14fontdata = ResourceLoader.getFileEntry("data/font/Arial14.fnt"); var arial14 = new BitmapFont(arial14fontdata.entry); @:privateAccess arial14.loader = ResourceLoader.loader; - var domcasual32fontdata = ResourceLoader.loader.load("data/font/DomCasual32px.fnt"); + var domcasual32fontdata = ResourceLoader.getFileEntry("data/font/DomCasual32px.fnt"); var domcasual32 = new BitmapFont(domcasual32fontdata.entry); @:privateAccess domcasual32.loader = ResourceLoader.loader; - var expo50fontdata = ResourceLoader.loader.load("data/font/Expo50.fnt"); + var expo50fontdata = ResourceLoader.getFileEntry("data/font/Expo50.fnt"); var expo50 = new BitmapFont(expo50fontdata.entry); @:privateAccess expo50.loader = ResourceLoader.loader; - var expo32fontdata = ResourceLoader.loader.load("data/font/Expo32.fnt"); + var expo32fontdata = ResourceLoader.getFileEntry("data/font/Expo32.fnt"); var expo32 = new BitmapFont(expo32fontdata.entry); @:privateAccess expo32.loader = ResourceLoader.loader; diff --git a/src/gui/ExitGameDlg.hx b/src/gui/ExitGameDlg.hx index d7589fbf..d79743fd 100644 --- a/src/gui/ExitGameDlg.hx +++ b/src/gui/ExitGameDlg.hx @@ -26,7 +26,7 @@ class ExitGameDlg extends GuiControl { dialogImg.position = new Vector(134, 148); dialogImg.extent = new Vector(388, 186); - var domcasual32fontdata = ResourceLoader.loader.load("data/font/DomCasual32px.fnt"); + var domcasual32fontdata = ResourceLoader.getFileEntry("data/font/DomCasual32px.fnt"); var domcasual32 = new BitmapFont(domcasual32fontdata.entry); @:privateAccess domcasual32.loader = ResourceLoader.loader; diff --git a/src/gui/HelpCreditsGui.hx b/src/gui/HelpCreditsGui.hx index 971be231..0cdd74cd 100644 --- a/src/gui/HelpCreditsGui.hx +++ b/src/gui/HelpCreditsGui.hx @@ -79,19 +79,19 @@ class HelpCreditsGui extends GuiImage { helpWindow.extent = new Vector(549, 338); helpGui.addChild(helpWindow); - var arial14fontdata = ResourceLoader.loader.load("data/font/Arial14.fnt"); + var arial14fontdata = ResourceLoader.getFileEntry("data/font/Arial14.fnt"); var arial14 = new BitmapFont(arial14fontdata.entry); @:privateAccess arial14.loader = ResourceLoader.loader; - var domcasual32fontdata = ResourceLoader.loader.load("data/font/DomCasual32px.fnt"); + var domcasual32fontdata = ResourceLoader.getFileEntry("data/font/DomCasual32px.fnt"); var domcasual32 = new BitmapFont(domcasual32fontdata.entry); @:privateAccess domcasual32.loader = ResourceLoader.loader; - var expo50fontdata = ResourceLoader.loader.load("data/font/Expo50.fnt"); + var expo50fontdata = ResourceLoader.getFileEntry("data/font/Expo50.fnt"); var expo50 = new BitmapFont(expo50fontdata.entry); @:privateAccess expo50.loader = ResourceLoader.loader; - var expo32fontdata = ResourceLoader.loader.load("data/font/Expo32.fnt"); + var expo32fontdata = ResourceLoader.getFileEntry("data/font/Expo32.fnt"); var expo32 = new BitmapFont(expo32fontdata.entry); @:privateAccess expo32.loader = ResourceLoader.loader; diff --git a/src/gui/MainMenuGui.hx b/src/gui/MainMenuGui.hx index b6ea9fdf..b4545dd9 100644 --- a/src/gui/MainMenuGui.hx +++ b/src/gui/MainMenuGui.hx @@ -9,7 +9,7 @@ import src.ResourceLoader; class MainMenuGui extends GuiImage { public function new() { super(ResourceLoader.getImage("data/ui/background.jpg").toTile()); - var fontdata = ResourceLoader.loader.load("data/font/DomCasual32px.fnt"); + var fontdata = ResourceLoader.getFileEntry("data/font/DomCasual32px.fnt"); var bfont = new BitmapFont(fontdata.entry); @:privateAccess bfont.loader = ResourceLoader.loader; diff --git a/src/gui/MessageBoxYesNoDlg.hx b/src/gui/MessageBoxYesNoDlg.hx index 3c385767..64e8015d 100644 --- a/src/gui/MessageBoxYesNoDlg.hx +++ b/src/gui/MessageBoxYesNoDlg.hx @@ -13,7 +13,7 @@ class MessageBoxYesNoDlg extends GuiControl { this.position = new Vector(); this.extent = new Vector(640, 480); - var domcasual24fontdata = ResourceLoader.loader.load("data/font/DomCasual24px.fnt"); + var domcasual24fontdata = ResourceLoader.getFileEntry("data/font/DomCasual24px.fnt"); var domcasual24 = new BitmapFont(domcasual24fontdata.entry); @:privateAccess domcasual24.loader = ResourceLoader.loader; diff --git a/src/gui/OptionsDlg.hx b/src/gui/OptionsDlg.hx index 9d51b57b..903bf700 100644 --- a/src/gui/OptionsDlg.hx +++ b/src/gui/OptionsDlg.hx @@ -19,7 +19,7 @@ class OptionsDlg extends GuiImage { this.position = new Vector(); this.extent = new Vector(640, 480); - var arial14fontdata = ResourceLoader.loader.load("data/font/Arial14.fnt"); + var arial14fontdata = ResourceLoader.getFileEntry("data/font/Arial14.fnt"); var arial14 = new BitmapFont(arial14fontdata.entry); @:privateAccess arial14.loader = ResourceLoader.loader; diff --git a/src/gui/PlayGui.hx b/src/gui/PlayGui.hx index c9c49c2b..b6a5b998 100644 --- a/src/gui/PlayGui.hx +++ b/src/gui/PlayGui.hx @@ -270,7 +270,7 @@ class PlayGui { } function initTexts() { - var fontdata = ResourceLoader.loader.load("data/font/DomCasual32px.fnt"); + var fontdata = ResourceLoader.getFileEntry("data/font/DomCasual32px.fnt"); var bfont = new BitmapFont(fontdata.entry); @:privateAccess bfont.loader = ResourceLoader.loader; diff --git a/src/gui/PlayMissionGui.hx b/src/gui/PlayMissionGui.hx index 62b2f0a6..15e09b06 100644 --- a/src/gui/PlayMissionGui.hx +++ b/src/gui/PlayMissionGui.hx @@ -111,19 +111,19 @@ class PlayMissionGui extends GuiImage { levelWnd.extent = new Vector(258, 194); pmPreview.addChild(levelWnd); - var domcasual24fontdata = ResourceLoader.loader.load("data/font/DomCasual24px.fnt"); + var domcasual24fontdata = ResourceLoader.getFileEntry("data/font/DomCasual24px.fnt"); var domcasual24 = new BitmapFont(domcasual24fontdata.entry); @:privateAccess domcasual24.loader = ResourceLoader.loader; - var domcasual32fontdata = ResourceLoader.loader.load("data/font/DomCasual32px.fnt"); + var domcasual32fontdata = ResourceLoader.getFileEntry("data/font/DomCasual32px.fnt"); var domcasual32 = new BitmapFont(domcasual32fontdata.entry); @:privateAccess domcasual32.loader = ResourceLoader.loader; - var arial14fontdata = ResourceLoader.loader.load("data/font/Arial14.fnt"); + var arial14fontdata = ResourceLoader.getFileEntry("data/font/Arial14.fnt"); var arial14 = new BitmapFont(arial14fontdata.entry); @:privateAccess arial14.loader = ResourceLoader.loader; - var arialBold14fontdata = ResourceLoader.loader.load("data/font/ArialBold14px.fnt"); + var arialBold14fontdata = ResourceLoader.getFileEntry("data/font/ArialBold14px.fnt"); var arialBold14 = new BitmapFont(arialBold14fontdata.entry); @:privateAccess arialBold14.loader = ResourceLoader.loader; // TODO texts diff --git a/src/gui/RemapDlg.hx b/src/gui/RemapDlg.hx index f056dad4..a3f45a71 100644 --- a/src/gui/RemapDlg.hx +++ b/src/gui/RemapDlg.hx @@ -23,7 +23,7 @@ class RemapDlg extends GuiControl { remapDlg.extent = new Vector(300, 161); this.addChild(remapDlg); - var domcasual24fontdata = ResourceLoader.loader.load("data/font/DomCasual24px.fnt"); + var domcasual24fontdata = ResourceLoader.getFileEntry("data/font/DomCasual24px.fnt"); var domcasual24 = new BitmapFont(domcasual24fontdata.entry); @:privateAccess domcasual24.loader = ResourceLoader.loader;