mirror of
https://github.com/RandomityGuy/MBHaxe.git
synced 2025-10-30 08:11:25 +00:00
js 2
This commit is contained in:
parent
cbd54a9bd6
commit
d82b49eefc
15 changed files with 43 additions and 26 deletions
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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") {
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue