thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2026-01-06 23:32:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix radar

Browse source
This commit is contained in:
RandomityGuy 2024-05-28 20:54:50 +05:30
parent 8b94ddb3b8
commit 32efaaa2b6
2 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Radar.hx
View file

@ -19,7 +19,7 @@ class Radar {
var g:Graphics; var g:Graphics;
var marbleNameTexts:Array<h2d.Text>; var marbleNameTexts:Map<Marble, h2d.Text>;
public var ellipseScreenFraction = new Vector(0.79, 0.9); public var ellipseScreenFraction = new Vector(0.79, 0.9);
public var fullArrowLength = 60.0; public var fullArrowLength = 60.0;
@ -62,7 +62,7 @@ class Radar {
renderArrow(@:privateAccess level.endPad.getAbsPos().getPosition(), 0xE6E6E6); renderArrow(@:privateAccess level.endPad.getAbsPos().getPosition(), 0xE6E6E6);
} }
var fadeDistance = level.scene.camera.zFar * 0.1; var fadeDistance = level.scene.camera.zFar * 0.1;
for (marbleName in marbleNameTexts) { for (marble => marbleName in marbleNameTexts) {
if (marbleName != null) if (marbleName != null)
marbleName.alpha = 0; marbleName.alpha = 0;
} }
@ -429,30 +429,24 @@ class Radar {
} }
function renderName(pos:Vector, marble:Marble, opacity:Float) { function renderName(pos:Vector, marble:Marble, opacity:Float) {
var marbleId = @:privateAccess marble.connection.getMarbleId(); if (!marbleNameTexts.exists(marble)) {
while (marbleNameTexts.length <= marbleId)
marbleNameTexts.push(null);
if (marbleNameTexts[marbleId] == null) {
var arialb14fontdata = ResourceLoader.getFileEntry("data/font/Arial Bold.fnt"); var arialb14fontdata = ResourceLoader.getFileEntry("data/font/Arial Bold.fnt");
var arialb14b = new BitmapFont(arialb14fontdata.entry); var arialb14b = new BitmapFont(arialb14fontdata.entry);
@:privateAccess arialb14b.loader = ResourceLoader.loader; @:privateAccess arialb14b.loader = ResourceLoader.loader;
var arialBold14 = arialb14b.toSdfFont(cast 16 * Settings.uiScale, MultiChannel); var arialBold14 = arialb14b.toSdfFont(cast 16 * Settings.uiScale, MultiChannel);
var txt = new h2d.Text(arialBold14, scene2d);
marbleNameTexts[marbleId] = new h2d.Text(arialBold14, scene2d); marbleNameTexts.set(marble, txt);
marbleNameTexts[marbleId].textColor = 0xFFFF00; txt.textColor = 0xFFFF00;
} }
var textObj = marbleNameTexts[marbleId]; var textObj = marbleNameTexts.get(marble);
textObj.text = @:privateAccess marble.connection.getName(); textObj.text = @:privateAccess marble.connection.getName();
textObj.setPosition(pos.x - textObj.textWidth / 2, pos.y - textObj.textHeight); textObj.setPosition(pos.x - textObj.textWidth / 2, pos.y - textObj.textHeight);
textObj.alpha = opacity; textObj.alpha = opacity;
} }
function dontRenderName(marble:Marble) { function dontRenderName(marble:Marble) {
var marbleId = @:privateAccess marble.connection.getMarbleId(); if (marbleNameTexts.exists(marble)) {
while (marbleNameTexts.length <= marbleId) marbleNameTexts.get(marble).alpha = 0;
marbleNameTexts.push(null);
if (marbleNameTexts[marbleId] != null) {
marbleNameTexts[marbleId].alpha = 0;
} }
} }
} }

2
src/shapes/MegaMarble.hx
View file

@ -43,7 +43,7 @@ class MegaMarble extends PowerUp {
public function use(marble:Marble, timeState:TimeState) { public function use(marble:Marble, timeState:TimeState) {
marble.enableMegaMarble(timeState); marble.enableMegaMarble(timeState);
var boost = marble.currentUp.multiply(5); var boost = marble.currentUp.multiply(5 / marble.getMass());
marble.velocity.load(marble.velocity.add(boost)); marble.velocity.load(marble.velocity.add(boost));
this.level.deselectPowerUp(marble); this.level.deselectPowerUp(marble);
if (this.level.marble == marble && @:privateAccess !marble.isNetUpdate) if (this.level.marble == marble && @:privateAccess !marble.isNetUpdate)