thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2026-04-27 13:11:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix this

Browse source
This commit is contained in:
RandomityGuy 2023-07-15 14:34:51 +05:30
parent 4241792a1e
commit b10f071d87
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/CameraController.hx
View file

@ -27,6 +27,7 @@ import h3d.Vector;
import hxsl.Types.Matrix; import hxsl.Types.Matrix;
import h3d.scene.Scene; import h3d.scene.Scene;
import src.Gamepad; import src.Gamepad;
import src.MarbleGame;
enum CameraMode { enum CameraMode {
FreeOrbit; FreeOrbit;
@ -237,7 +238,9 @@ class CameraController extends Object {
deltaX = deltaNew; deltaX = deltaNew;
// Center the pitch // Center the pitch
if (!Settings.controlsSettings.alwaysFreeLook && !Key.isDown(Settings.controlsSettings.freelook)) { if (!Settings.controlsSettings.alwaysFreeLook
&& !Key.isDown(Settings.controlsSettings.freelook)
&& !MarbleGame.instance.touchInput.cameraInput.pressed) {
var rescaledY = deltaY; var rescaledY = deltaY;
if (rescaledY <= 0.0) if (rescaledY <= 0.0)
rescaledY = 0.4 - rescaledY * -0.75; rescaledY = 0.4 - rescaledY * -0.75;

3
src/gui/GuiConsoleScrollCtrl.hx
View file

@ -147,7 +147,7 @@ class GuiConsoleScrollCtrl extends GuiControl {
public override function render(scene2d:Scene) { public override function render(scene2d:Scene) {
this.dirty = true; this.dirty = true;
this.scrollTrack.position = new Vector(extent.x - 18 * Settings.uiScale, 0); this.scrollTrack.position = new Vector(extent.x - 18, 0);
this.scrollTrack.extent = new Vector(18, this.extent.y); this.scrollTrack.extent = new Vector(18, this.extent.y);
scrollUpButton.position = new Vector(this.extent.x - 18, 0); scrollUpButton.position = new Vector(this.extent.x - 18, 0);
@ -180,7 +180,6 @@ class GuiConsoleScrollCtrl extends GuiControl {
var scrollBarYSize = (renderRect.extent.y * renderRect.extent.y / (maxScrollY * Settings.uiScale)); var scrollBarYSize = (renderRect.extent.y * renderRect.extent.y / (maxScrollY * Settings.uiScale));
var scrollYOld = scrollY; var scrollYOld = scrollY;
this.scrollTrack.bmp.scaleY = renderRect.extent.y;
this.scrollY = Util.clamp(scrollY, 0, renderRect.extent.y - scrollBarYSize * Settings.uiScale); this.scrollY = Util.clamp(scrollY, 0, renderRect.extent.y - scrollBarYSize * Settings.uiScale);
scrollBarYSize = Math.max(scrollBarYSize, 13); scrollBarYSize = Math.max(scrollBarYSize, 13);

3
src/touch/CameraInput.hx
View file

@ -13,6 +13,7 @@ class CameraInput {
var identifier:Int = -1; var identifier:Int = -1;
public var enabled = false; public var enabled = false;
public var pressed = false;
var added = false; var added = false;
@ -35,8 +36,6 @@ class CameraInput {
this.collider.horizSizing = Width; this.collider.horizSizing = Width;
this.collider.vertSizing = Height; this.collider.vertSizing = Height;
var pressed = false;
var prevMouse = new Vector(0, 0); var prevMouse = new Vector(0, 0);
interactive.onPush = (e) -> { interactive.onPush = (e) -> {
e.propagate = true; e.propagate = true;

2
src/touch/TouchInput.hx
View file

@ -34,7 +34,7 @@ class TouchEventState {
} }
class TouchInput { class TouchInput {
var cameraInput:CameraInput; public var cameraInput:CameraInput;
public var movementInput:MovementInput; public var movementInput:MovementInput;