AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 11:35:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor code cleanup

Browse Source
This commit is contained in:
UnknownShadow200 2018-07-08 21:53:13 +10:00
parent 6cdcbe9480
commit 7ca1e00fcd
4 changed files with 94 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ClassicalSharp/2D/Screens/ChatScreen.cs
View File

@ -182,14 +182,15 @@ namespace ClassicalSharp.Gui.Screens {
static FastColour backColour = new FastColour(0, 0, 0, 127); static FastColour backColour = new FastColour(0, 0, 0, 127);
public void RenderBackground() { public void RenderBackground() {
int usedHeight = normalChat.GetUsedHeight(); int chatHeight = normalChat.GetUsedHeight();
int y = normalChat.Y + normalChat.Height - usedHeight - 5; int x = normalChat.X;
int x = normalChat.X - 5; int y = normalChat.Y + normalChat.Height - chatHeight;
int width = Math.Max(clientStatus.Width, normalChat.Width) + 10;
int boxHeight = usedHeight + clientStatus.GetUsedHeight(); int width = Math.Max(clientStatus.Width, normalChat.Width) + 10;
if (boxHeight > 0) { int height = chatHeight + clientStatus.GetUsedHeight();
game.Graphics.Draw2DQuad(x, y, width, boxHeight + 10, backColour);
if (height > 0) {
game.Graphics.Draw2DQuad(x - 5, y - 5, width + 10, height + 10, backColour);
} }
} }

2
ClassicalSharp/Math/Physics/IntersectionUtils.cs
View File

@ -72,7 +72,7 @@ namespace ClassicalSharp.Physics {
t0 = tmin; t0 = tmin;
t1 = tmax; t1 = tmax;
return t0 >= 0; return tmin >= 0;
} }
} }
} }

2
src/Client/Physics.c
View File

@ -120,7 +120,7 @@ bool Intersection_RayIntersectsBox(Vector3 origin, Vector3 dir, Vector3 min, Vec
if (tzmax < tmax) tmax = tzmax; if (tzmax < tmax) tmax = tzmax;
*t0 = tmin; *t1 = tmax; *t0 = tmin; *t1 = tmax;
return *t0 >= 0; return tmin >= 0.0f;
} }

13
src/Client/Screens.c
View File

@ -846,14 +846,15 @@ static void ChatScreen_CheckOtherStatuses(ChatScreen* screen) {
static void ChatScreen_RenderBackground(ChatScreen* screen) { static void ChatScreen_RenderBackground(ChatScreen* screen) {
Int32 usedHeight = TextGroupWidget_UsedHeight(&screen->Chat); Int32 usedHeight = TextGroupWidget_UsedHeight(&screen->Chat);
Int32 y = screen->Chat.Y + screen->Chat.Height - usedHeight - 5; Int32 x = screen->Chat.X;
Int32 x = screen->Chat.X - 5; Int32 y = screen->Chat.Y + screen->Chat.Height - usedHeight;
Int32 width = max(screen->ClientStatus.Width, screen->Chat.Width) + 10;
Int32 boxHeight = usedHeight + TextGroupWidget_UsedHeight(&screen->ClientStatus); Int32 width = max(screen->ClientStatus.Width, screen->Chat.Width);
if (boxHeight > 0) { Int32 height = usedHeight + TextGroupWidget_UsedHeight(&screen->ClientStatus);
if (height > 0) {
PackedCol backCol = PACKEDCOL_CONST(0, 0, 0, 127); PackedCol backCol = PACKEDCOL_CONST(0, 0, 0, 127);
GfxCommon_Draw2DFlat(x, y, width, boxHeight + 10, backCol); GfxCommon_Draw2DFlat(x - 5, y - 5, width + 10, height + 10, backCol);
} }
} }