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 ui scaling

Browse source
This commit is contained in:
RandomityGuy 2022-12-22 23:56:56 +05:30
parent 47bb2de547
commit 5bd410408f
4 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/GuiControl.hx
View file

@ -175,13 +175,13 @@ class GuiControl {
} }
if (this.horizSizing == HorizSizing.Left) { if (this.horizSizing == HorizSizing.Left) {
if (this.parent != null) { if (this.parent != null) {
rect.position.x = parentRect.position.x + parentRect.extent.x - (parent.extent.x - this.position.x * uiScaleFactor); rect.position.x = parentRect.position.x + parentRect.extent.x - (parent.extent.x - this.position.x) * uiScaleFactor;
rect.extent.x *= uiScaleFactor; rect.extent.x *= uiScaleFactor;
} }
} }
if (this.vertSizing == VertSizing.Top) { if (this.vertSizing == VertSizing.Top) {
if (this.parent != null) { if (this.parent != null) {
rect.position.y = parentRect.position.y + parentRect.extent.y - (parent.extent.y - this.position.y * uiScaleFactor); rect.position.y = parentRect.position.y + parentRect.extent.y - (parent.extent.y - this.position.y) * uiScaleFactor;
rect.extent.y *= uiScaleFactor; rect.extent.y *= uiScaleFactor;
} }
} }

3
src/gui/GuiSlider.hx
View file

@ -6,6 +6,7 @@ import hxd.res.Sound;
import hxd.Key; import hxd.Key;
import gui.GuiControl.MouseState; import gui.GuiControl.MouseState;
import src.Util; import src.Util;
import src.Settings;
class GuiSlider extends GuiImage { class GuiSlider extends GuiImage {
public var sliderValue:Float = 0; public var sliderValue:Float = 0;
@ -30,7 +31,7 @@ class GuiSlider extends GuiImage {
slidingSound.pause = true; slidingSound.pause = true;
this.bmp.x = renderRect.position.x + renderRect.extent.x * sliderValue; this.bmp.x = renderRect.position.x + renderRect.extent.x * sliderValue;
this.bmp.x = Util.clamp(this.bmp.x, renderRect.position.x, renderRect.position.x + renderRect.extent.x - bmp.width / 2); this.bmp.x = Util.clamp(this.bmp.x, renderRect.position.x, renderRect.position.x + renderRect.extent.x - bmp.width / 2);
this.bmp.width = this.bmp.tile.width; this.bmp.width = this.bmp.tile.width * Settings.uiScale;
super.update(dt, mouseState); super.update(dt, mouseState);
} }
} }

21
src/gui/PlayGui.hx
View file

@ -243,8 +243,9 @@ class PlayGui {
} }
public function initCenterText() { public function initCenterText() {
RSGOCenterText.x = scene2d.width / 2 - RSGOCenterText.frames[0].width / 2; RSGOCenterText.x = scene2d.width / 2 - RSGOCenterText.frames[0].width * Settings.uiScale / 2;
RSGOCenterText.y = scene2d.height * 0.3; // - RSGOCenterText.frames[0].height / 2; RSGOCenterText.y = scene2d.height * 0.3; // - RSGOCenterText.frames[0].height / 2;
RSGOCenterText.setScale(Settings.uiScale);
} }
public function setCenterText(identifier:String) { public function setCenterText(identifier:String) {
@ -253,19 +254,19 @@ class PlayGui {
} else if (identifier == 'ready') { } else if (identifier == 'ready') {
this.RSGOCenterText.visible = true; this.RSGOCenterText.visible = true;
this.RSGOCenterText.currentFrame = 0; this.RSGOCenterText.currentFrame = 0;
RSGOCenterText.x = scene2d.width / 2 - RSGOCenterText.frames[0].width / 2; RSGOCenterText.x = scene2d.width / 2 - RSGOCenterText.frames[0].width * Settings.uiScale / 2;
} else if (identifier == 'set') { } else if (identifier == 'set') {
this.RSGOCenterText.visible = true; this.RSGOCenterText.visible = true;
this.RSGOCenterText.currentFrame = 1; this.RSGOCenterText.currentFrame = 1;
RSGOCenterText.x = scene2d.width / 2 - RSGOCenterText.frames[1].width / 2; RSGOCenterText.x = scene2d.width / 2 - RSGOCenterText.frames[1].width * Settings.uiScale / 2;
} else if (identifier == 'go') { } else if (identifier == 'go') {
this.RSGOCenterText.visible = true; this.RSGOCenterText.visible = true;
this.RSGOCenterText.currentFrame = 2; this.RSGOCenterText.currentFrame = 2;
RSGOCenterText.x = scene2d.width / 2 - RSGOCenterText.frames[2].width / 2; RSGOCenterText.x = scene2d.width / 2 - RSGOCenterText.frames[2].width * Settings.uiScale / 2;
} else if (identifier == 'outofbounds') { } else if (identifier == 'outofbounds') {
this.RSGOCenterText.visible = true; this.RSGOCenterText.visible = true;
this.RSGOCenterText.currentFrame = 3; this.RSGOCenterText.currentFrame = 3;
RSGOCenterText.x = scene2d.width / 2 - RSGOCenterText.frames[3].width / 2; RSGOCenterText.x = scene2d.width / 2 - RSGOCenterText.frames[3].width * Settings.uiScale / 2;
} }
} }
@ -300,8 +301,9 @@ class PlayGui {
gemImageSceneTarget.depthBuffer = new DepthBuffer(60, 60); gemImageSceneTarget.depthBuffer = new DepthBuffer(60, 60);
gemImageSceneTargetBitmap = new Bitmap(Tile.fromTexture(gemImageSceneTarget), scene2d); gemImageSceneTargetBitmap = new Bitmap(Tile.fromTexture(gemImageSceneTarget), scene2d);
gemImageSceneTargetBitmap.x = -8; gemImageSceneTargetBitmap.x = -8 * Settings.uiScale;
gemImageSceneTargetBitmap.y = -8; gemImageSceneTargetBitmap.y = -8 * Settings.uiScale;
gemImageSceneTargetBitmap.setScale(Settings.uiScale);
// gemImageSceneTargetBitmap.blendMode = None; // gemImageSceneTargetBitmap.blendMode = None;
// gemImageSceneTargetBitmap.addShader(new ColorKey()); // gemImageSceneTargetBitmap.addShader(new ColorKey());
@ -354,8 +356,9 @@ class PlayGui {
powerupImageSceneTarget.depthBuffer = new DepthBuffer(68, 67); powerupImageSceneTarget.depthBuffer = new DepthBuffer(68, 67);
powerupImageSceneTargetBitmap = new Bitmap(Tile.fromTexture(powerupImageSceneTarget), scene2d); powerupImageSceneTargetBitmap = new Bitmap(Tile.fromTexture(powerupImageSceneTarget), scene2d);
powerupImageSceneTargetBitmap.x = scene2d.width - 88; powerupImageSceneTargetBitmap.x = scene2d.width - 88 * Settings.uiScale;
powerupImageSceneTargetBitmap.y = 18; powerupImageSceneTargetBitmap.y = 18 * Settings.uiScale;
powerupImageSceneTargetBitmap.setScale(Settings.uiScale);
} }
function initTexts() { function initTexts() {

2
src/gui/PlayMissionGui.hx
View file

@ -397,7 +397,7 @@ class PlayMissionGui extends GuiImage {
pmDifficultyTopC.addChild(pmDifficultyTopCTab); pmDifficultyTopC.addChild(pmDifficultyTopCTab);
var pmDifficultyTopC2 = new GuiControl(); var pmDifficultyTopC2 = new GuiControl();
pmDifficultyTopC2.horizSizing = Relative; pmDifficultyTopC2.horizSizing = Left;
pmDifficultyTopC2.vertSizing = Bottom; pmDifficultyTopC2.vertSizing = Bottom;
pmDifficultyTopC2.position = new Vector(293, 0); pmDifficultyTopC2.position = new Vector(293, 0);
pmDifficultyTopC2.extent = new Vector(243, 45); pmDifficultyTopC2.extent = new Vector(243, 45);