thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-10-30 08:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

js 2

Browse source
This commit is contained in:
RandomityGuy 2021-07-08 17:53:15 +05:30
parent cbd54a9bd6
commit d82b49eefc
15 changed files with 43 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/DifBuilder.hx
View file

@ -224,6 +224,10 @@ class DifBuilder {
tex = tex.split('/')[1]; tex = tex.split('/')[1];
} }
#if js
path = StringTools.replace(path, "data/", "");
#end
if (ResourceLoader.fileSystem.exists(Path.directory(path) + "/" + tex + ".jpg")) { if (ResourceLoader.fileSystem.exists(Path.directory(path) + "/" + tex + ".jpg")) {
return true; return true;
} }
@ -299,7 +303,7 @@ class DifBuilder {
var material:Material; var material:Material;
var texture:Texture; var texture:Texture;
if (canFindTex(grp)) { if (canFindTex(grp)) {
texture = ResourceLoader.loader.load(tex(grp)).toImage().toTexture(); texture = ResourceLoader.getFileEntry(tex(grp)).toImage().toTexture();
texture.wrap = Wrap.Repeat; texture.wrap = Wrap.Repeat;
material = h3d.mat.Material.create(texture); material = h3d.mat.Material.create(texture);
} else { } else {

2
src/Marble.hx
View file

@ -181,7 +181,7 @@ class Marble extends GameObject {
super(); super();
var geom = Sphere.defaultUnitSphere(); var geom = Sphere.defaultUnitSphere();
geom.addUVs(); 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); var marbleMaterial = Material.create(marbleTexture);
marbleMaterial.shadows = false; marbleMaterial.shadows = false;
marbleMaterial.castShadows = true; marbleMaterial.castShadows = true;

5
src/MissionList.hx
View file

@ -17,7 +17,12 @@ class MissionList {
if (_build) if (_build)
return; return;
function parseDifficulty(difficulty:String) { function parseDifficulty(difficulty:String) {
#if hl
var difficultyFiles = ResourceLoader.fileSystem.dir("data/missions/" + difficulty); var difficultyFiles = ResourceLoader.fileSystem.dir("data/missions/" + difficulty);
#end
#if js
var difficultyFiles = ResourceLoader.fileSystem.dir("missions/" + difficulty);
#end
var difficultyMissions = []; var difficultyMissions = [];
for (file in difficultyFiles) { for (file in difficultyFiles) {
if (file.extension == "mis") { if (file.extension == "mis") {

7
src/ResourceLoader.hx
View file

@ -132,11 +132,11 @@ class ResourceLoader {
return null; return null;
} }
public static function getFile(path:String) { public static function getFileEntry(path:String) {
#if js #if js
path = StringTools.replace(path, "data/", ""); path = StringTools.replace(path, "data/", "");
#end #end
var file = fileSystem.get(path); var file = loader.load(path);
return file; return file;
} }
@ -149,6 +149,9 @@ class ResourceLoader {
} }
public static function getFullNamesOf(path:String) { 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 files = fileSystem.dir(Path.directory(path)); // FileSystem.readDirectory(Path.directory(path));
var names = []; var names = [];
var fname = Path.withoutDirectory(path).toLowerCase(); var fname = Path.withoutDirectory(path).toLowerCase();

5
src/Sky.hx
View file

@ -43,11 +43,16 @@ class Sky extends Object {
env.compute(); env.compute();
// var renderer = cast(level.scene.renderer, h3d.scene.pbr.Renderer); // var renderer = cast(level.scene.renderer, h3d.scene.pbr.Renderer);
var shad = new Skybox(texture); var shad = new Skybox(texture);
#if js
skyMesh.material.mainPass.addShader(shad); skyMesh.material.mainPass.addShader(shad);
#end
// skyMesh.material.shadows = false; // skyMesh.material.shadows = false;
} }
function createSkyboxCubeTextured(dmlPath:String) { function createSkyboxCubeTextured(dmlPath:String) {
#if js
dmlPath = StringTools.replace(dmlPath, "data/", "");
#end
if (ResourceLoader.fileSystem.exists(dmlPath)) { if (ResourceLoader.fileSystem.exists(dmlPath)) {
var dmlFile = ResourceLoader.fileSystem.get(dmlPath).getText(); var dmlFile = ResourceLoader.fileSystem.get(dmlPath).getText();
var dmlDirectory = Path.directory(dmlPath); var dmlDirectory = Path.directory(dmlPath);

8
src/gui/EndGameGui.hx
View file

@ -51,19 +51,19 @@ class EndGameGui extends GuiControl {
restartButton.extent = new Vector(104, 48); restartButton.extent = new Vector(104, 48);
restartButton.pressedAction = restartFunc; 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); var arial14 = new BitmapFont(arial14fontdata.entry);
@:privateAccess arial14.loader = ResourceLoader.loader; @: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); var domcasual32 = new BitmapFont(domcasual32fontdata.entry);
@:privateAccess domcasual32.loader = ResourceLoader.loader; @: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); var expo50 = new BitmapFont(expo50fontdata.entry);
@:privateAccess expo50.loader = ResourceLoader.loader; @: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); var expo32 = new BitmapFont(expo32fontdata.entry);
@:privateAccess expo32.loader = ResourceLoader.loader; @:privateAccess expo32.loader = ResourceLoader.loader;

8
src/gui/EnterNameDlg.hx
View file

@ -21,19 +21,19 @@ class EnterNameDlg extends GuiControl {
return [normal, hover, pressed]; 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); var arial14 = new BitmapFont(arial14fontdata.entry);
@:privateAccess arial14.loader = ResourceLoader.loader; @: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); var domcasual32 = new BitmapFont(domcasual32fontdata.entry);
@:privateAccess domcasual32.loader = ResourceLoader.loader; @: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); var expo50 = new BitmapFont(expo50fontdata.entry);
@:privateAccess expo50.loader = ResourceLoader.loader; @: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); var expo32 = new BitmapFont(expo32fontdata.entry);
@:privateAccess expo32.loader = ResourceLoader.loader; @:privateAccess expo32.loader = ResourceLoader.loader;

2
src/gui/ExitGameDlg.hx
View file

@ -26,7 +26,7 @@ class ExitGameDlg extends GuiControl {
dialogImg.position = new Vector(134, 148); dialogImg.position = new Vector(134, 148);
dialogImg.extent = new Vector(388, 186); 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); var domcasual32 = new BitmapFont(domcasual32fontdata.entry);
@:privateAccess domcasual32.loader = ResourceLoader.loader; @:privateAccess domcasual32.loader = ResourceLoader.loader;

8
src/gui/HelpCreditsGui.hx
View file

@ -79,19 +79,19 @@ class HelpCreditsGui extends GuiImage {
helpWindow.extent = new Vector(549, 338); helpWindow.extent = new Vector(549, 338);
helpGui.addChild(helpWindow); 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); var arial14 = new BitmapFont(arial14fontdata.entry);
@:privateAccess arial14.loader = ResourceLoader.loader; @: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); var domcasual32 = new BitmapFont(domcasual32fontdata.entry);
@:privateAccess domcasual32.loader = ResourceLoader.loader; @: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); var expo50 = new BitmapFont(expo50fontdata.entry);
@:privateAccess expo50.loader = ResourceLoader.loader; @: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); var expo32 = new BitmapFont(expo32fontdata.entry);
@:privateAccess expo32.loader = ResourceLoader.loader; @:privateAccess expo32.loader = ResourceLoader.loader;

2
src/gui/MainMenuGui.hx
View file

@ -9,7 +9,7 @@ import src.ResourceLoader;
class MainMenuGui extends GuiImage { class MainMenuGui extends GuiImage {
public function new() { public function new() {
super(ResourceLoader.getImage("data/ui/background.jpg").toTile()); 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); var bfont = new BitmapFont(fontdata.entry);
@:privateAccess bfont.loader = ResourceLoader.loader; @:privateAccess bfont.loader = ResourceLoader.loader;

2
src/gui/MessageBoxYesNoDlg.hx
View file

@ -13,7 +13,7 @@ class MessageBoxYesNoDlg extends GuiControl {
this.position = new Vector(); this.position = new Vector();
this.extent = new Vector(640, 480); 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); var domcasual24 = new BitmapFont(domcasual24fontdata.entry);
@:privateAccess domcasual24.loader = ResourceLoader.loader; @:privateAccess domcasual24.loader = ResourceLoader.loader;

2
src/gui/OptionsDlg.hx
View file

@ -19,7 +19,7 @@ class OptionsDlg extends GuiImage {
this.position = new Vector(); this.position = new Vector();
this.extent = new Vector(640, 480); 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); var arial14 = new BitmapFont(arial14fontdata.entry);
@:privateAccess arial14.loader = ResourceLoader.loader; @:privateAccess arial14.loader = ResourceLoader.loader;

2
src/gui/PlayGui.hx
View file

@ -270,7 +270,7 @@ class PlayGui {
} }
function initTexts() { 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); var bfont = new BitmapFont(fontdata.entry);
@:privateAccess bfont.loader = ResourceLoader.loader; @:privateAccess bfont.loader = ResourceLoader.loader;

8
src/gui/PlayMissionGui.hx
View file

@ -111,19 +111,19 @@ class PlayMissionGui extends GuiImage {
levelWnd.extent = new Vector(258, 194); levelWnd.extent = new Vector(258, 194);
pmPreview.addChild(levelWnd); 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); var domcasual24 = new BitmapFont(domcasual24fontdata.entry);
@:privateAccess domcasual24.loader = ResourceLoader.loader; @: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); var domcasual32 = new BitmapFont(domcasual32fontdata.entry);
@:privateAccess domcasual32.loader = ResourceLoader.loader; @: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); var arial14 = new BitmapFont(arial14fontdata.entry);
@:privateAccess arial14.loader = ResourceLoader.loader; @: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); var arialBold14 = new BitmapFont(arialBold14fontdata.entry);
@:privateAccess arialBold14.loader = ResourceLoader.loader; @:privateAccess arialBold14.loader = ResourceLoader.loader;
// TODO texts // TODO texts

2
src/gui/RemapDlg.hx
View file

@ -23,7 +23,7 @@ class RemapDlg extends GuiControl {
remapDlg.extent = new Vector(300, 161); remapDlg.extent = new Vector(300, 161);
this.addChild(remapDlg); 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); var domcasual24 = new BitmapFont(domcasual24fontdata.entry);
@:privateAccess domcasual24.loader = ResourceLoader.loader; @:privateAccess domcasual24.loader = ResourceLoader.loader;