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

fix scaling?

Browse source
This commit is contained in:
RandomityGuy 2023-07-23 23:06:23 +05:30
parent 3fcaee56dc
commit 8cf3b1f67f
5 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Main.hx
View file

@ -47,7 +47,9 @@ class Main extends hxd.App {
#if (hl && !android) #if (hl && !android)
hl.UI.closeConsole(); hl.UI.closeConsole();
#end #end
#if js #if js
Window.getInstance().useScreenPixels = false;
var zoomRatio = Util.isTouchDevice() ? js.Browser.window.screen.height * js.Browser.window.devicePixelRatio / 768 : js.Browser.window.devicePixelRatio; // js.Browser.window.devicePixelRatio; var zoomRatio = Util.isTouchDevice() ? js.Browser.window.screen.height * js.Browser.window.devicePixelRatio / 768 : js.Browser.window.devicePixelRatio; // js.Browser.window.devicePixelRatio;
s2d.scaleMode = Zoom(zoomRatio); s2d.scaleMode = Zoom(zoomRatio);
#end #end

2
src/MarbleGame.hx
View file

@ -33,7 +33,7 @@ class MarbleGame {
static var canvas:Canvas; static var canvas:Canvas;
static var instance:MarbleGame; static var instance:MarbleGame;
static var currentVersion = "1.0.0"; static var currentVersion = "1.0.1";
var world:MarbleWorld; var world:MarbleWorld;
var previewWorld:PreviewWorld; var previewWorld:PreviewWorld;

4
src/gui/AchievementPopupDlg.hx
View file

@ -18,8 +18,8 @@ class AchievementPopupDlg extends GuiControl {
var popup = new GuiImage(ResourceLoader.getResource('data/ui/achievement/${id}.png', ResourceLoader.getImage, this.imageResources).toTile()); var popup = new GuiImage(ResourceLoader.getResource('data/ui/achievement/${id}.png', ResourceLoader.getImage, this.imageResources).toTile());
popup.horizSizing = Center; popup.horizSizing = Center;
popup.vertSizing = Bottom; popup.vertSizing = Top;
popup.position = new Vector(70, 465); popup.position = new Vector(70, 225);
popup.extent = new Vector(477, 90); popup.extent = new Vector(477, 90);
this.addChild(popup); this.addChild(popup);
} }

12
src/gui/AchievementsGui.hx
View file

@ -10,6 +10,7 @@ import src.MissionList;
class AchievementsGui extends GuiImage { class AchievementsGui extends GuiImage {
var innerCtrl:GuiControl; var innerCtrl:GuiControl;
var achievementsWnd:GuiImage;
public function new(isPause:Bool = false) { public function new(isPause:Bool = false) {
var res = ResourceLoader.getImage("data/ui/xbox/BG_fadeOutSoftEdge.png").resource.toTile(); var res = ResourceLoader.getImage("data/ui/xbox/BG_fadeOutSoftEdge.png").resource.toTile();
@ -45,12 +46,12 @@ class AchievementsGui extends GuiImage {
innerCtrl.vertSizing = Height; innerCtrl.vertSizing = Height;
this.addChild(innerCtrl); this.addChild(innerCtrl);
var achievementsWnd = new GuiImage(ResourceLoader.getResource("data/ui/xbox/achievementWindow.png", ResourceLoader.getImage, this.imageResources) achievementsWnd = new GuiImage(ResourceLoader.getResource("data/ui/xbox/achievementWindow.png", ResourceLoader.getImage, this.imageResources)
.toTile()); .toTile());
achievementsWnd.horizSizing = Center; achievementsWnd.horizSizing = Right;
achievementsWnd.vertSizing = Center; achievementsWnd.vertSizing = Bottom;
achievementsWnd.position = new Vector(25, 58); achievementsWnd.position = new Vector(innerCtrl.extent.x / 2 + 25, innerCtrl.extent.y / 3);
achievementsWnd.extent = new Vector(600, 480); achievementsWnd.extent = new Vector(640, 480);
innerCtrl.addChild(achievementsWnd); innerCtrl.addChild(achievementsWnd);
function imgLoader(path:String) { function imgLoader(path:String) {
@ -318,6 +319,7 @@ class AchievementsGui extends GuiImage {
var subY = 480 - (height - offsetY) * 480 / height; var subY = 480 - (height - offsetY) * 480 / height;
innerCtrl.position = new Vector(offsetX, offsetY); innerCtrl.position = new Vector(offsetX, offsetY);
innerCtrl.extent = new Vector(640 - subX, 480 - subY); innerCtrl.extent = new Vector(640 - subX, 480 - subY);
achievementsWnd.position = new Vector(innerCtrl.extent.x / 2 + 25, innerCtrl.extent.y / 3);
super.onResize(width, height); super.onResize(width, height);
} }

7
src/gui/EndGameGui.hx
View file

@ -73,9 +73,9 @@ class EndGameGui extends GuiImage {
innerCtrl.addChild(rootTitle); innerCtrl.addChild(rootTitle);
endGameWnd = new GuiImage(ResourceLoader.getResource("data/ui/xbox/endGameWindow.png", ResourceLoader.getImage, this.imageResources).toTile()); endGameWnd = new GuiImage(ResourceLoader.getResource("data/ui/xbox/endGameWindow.png", ResourceLoader.getImage, this.imageResources).toTile());
endGameWnd.horizSizing = Left; endGameWnd.horizSizing = Right;
endGameWnd.vertSizing = Top; endGameWnd.vertSizing = Bottom;
endGameWnd.position = new Vector(80 - offsetX, 150 - offsetY); endGameWnd.position = new Vector(720, 420);
endGameWnd.extent = new Vector(336, 150); endGameWnd.extent = new Vector(336, 150);
innerCtrl.addChild(endGameWnd); innerCtrl.addChild(endGameWnd);
@ -186,7 +186,6 @@ class EndGameGui extends GuiImage {
var subY = 480 - (height - offsetY) * 480 / height; var subY = 480 - (height - offsetY) * 480 / height;
innerCtrl.position = new Vector(offsetX, offsetY); innerCtrl.position = new Vector(offsetX, offsetY);
innerCtrl.extent = new Vector(640 - subX, 480 - subY); innerCtrl.extent = new Vector(640 - subX, 480 - subY);
endGameWnd.position = new Vector(80 - offsetX, 170 - offsetY);
super.onResize(width, height); super.onResize(width, height);
} }