mirror of
https://github.com/RandomityGuy/MBHaxe.git
synced 2025-10-30 08:11:25 +00:00
fix scaling?
This commit is contained in:
parent
0dd4927458
commit
5f354108bd
5 changed files with 15 additions and 12 deletions
|
|
@ -45,7 +45,9 @@ class Main extends hxd.App {
|
|||
#if (hl && !android)
|
||||
hl.UI.closeConsole();
|
||||
#end
|
||||
|
||||
#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;
|
||||
s2d.scaleMode = Zoom(zoomRatio);
|
||||
#end
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ class MarbleGame {
|
|||
static var canvas:Canvas;
|
||||
static var instance:MarbleGame;
|
||||
|
||||
static var currentVersion = "1.0.0";
|
||||
static var currentVersion = "1.0.1";
|
||||
|
||||
var world:MarbleWorld;
|
||||
var previewWorld:PreviewWorld;
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ class AchievementPopupDlg extends GuiControl {
|
|||
|
||||
var popup = new GuiImage(ResourceLoader.getResource('data/ui/achievement/${id}.png', ResourceLoader.getImage, this.imageResources).toTile());
|
||||
popup.horizSizing = Center;
|
||||
popup.vertSizing = Bottom;
|
||||
popup.position = new Vector(70, 465);
|
||||
popup.vertSizing = Top;
|
||||
popup.position = new Vector(70, 225);
|
||||
popup.extent = new Vector(477, 90);
|
||||
this.addChild(popup);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import src.MissionList;
|
|||
|
||||
class AchievementsGui extends GuiImage {
|
||||
var innerCtrl:GuiControl;
|
||||
var achievementsWnd:GuiImage;
|
||||
|
||||
public function new(isPause:Bool = false) {
|
||||
var res = ResourceLoader.getImage("data/ui/xbox/BG_fadeOutSoftEdge.png").resource.toTile();
|
||||
|
|
@ -40,12 +41,12 @@ class AchievementsGui extends GuiImage {
|
|||
innerCtrl.vertSizing = Height;
|
||||
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());
|
||||
achievementsWnd.horizSizing = Center;
|
||||
achievementsWnd.vertSizing = Center;
|
||||
achievementsWnd.position = new Vector(25, 58);
|
||||
achievementsWnd.extent = new Vector(600, 480);
|
||||
achievementsWnd.horizSizing = Right;
|
||||
achievementsWnd.vertSizing = Bottom;
|
||||
achievementsWnd.position = new Vector(innerCtrl.extent.x / 2 + 25, innerCtrl.extent.y / 3);
|
||||
achievementsWnd.extent = new Vector(640, 480);
|
||||
innerCtrl.addChild(achievementsWnd);
|
||||
|
||||
function imgLoader(path:String) {
|
||||
|
|
@ -313,6 +314,7 @@ class AchievementsGui extends GuiImage {
|
|||
var subY = 480 - (height - offsetY) * 480 / height;
|
||||
innerCtrl.position = new Vector(offsetX, offsetY);
|
||||
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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,9 +68,9 @@ class EndGameGui extends GuiImage {
|
|||
innerCtrl.addChild(rootTitle);
|
||||
|
||||
endGameWnd = new GuiImage(ResourceLoader.getResource("data/ui/xbox/endGameWindow.png", ResourceLoader.getImage, this.imageResources).toTile());
|
||||
endGameWnd.horizSizing = Left;
|
||||
endGameWnd.vertSizing = Top;
|
||||
endGameWnd.position = new Vector(80 - offsetX, 150 - offsetY);
|
||||
endGameWnd.horizSizing = Right;
|
||||
endGameWnd.vertSizing = Bottom;
|
||||
endGameWnd.position = new Vector(720, 420);
|
||||
endGameWnd.extent = new Vector(336, 150);
|
||||
innerCtrl.addChild(endGameWnd);
|
||||
|
||||
|
|
@ -181,7 +181,6 @@ class EndGameGui extends GuiImage {
|
|||
var subY = 480 - (height - offsetY) * 480 / height;
|
||||
innerCtrl.position = new Vector(offsetX, offsetY);
|
||||
innerCtrl.extent = new Vector(640 - subX, 480 - subY);
|
||||
endGameWnd.position = new Vector(80 - offsetX, 170 - offsetY);
|
||||
|
||||
super.onResize(width, height);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue