mirror/StrawberryBF
1
0
Fork 0
mirror of https://github.com/MaddyThorson/StrawberryBF.git synced 2025-12-15 13:27:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Collision condition order change. Entity Component getters. Calc.RoundToInt

Browse Source
This commit is contained in:
Maddy Thorson
2021-02-06 18:36:56 -08:00
parent 86b05c648b
commit 0b39478d1b
4 changed files with 35 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Core/Scene.bf
View File

@ -204,7 +204,7 @@ namespace Strawberry
public T First<T>(Point point, delegate bool(T) condition) where T : Component, IHasHitbox
{
for (T c in componentTracker[typeof(T)])
if (condition(c) && c.Hitbox.Check(point))
if (c.Hitbox.Check(point) && condition(c))
return c as T;
return null;
}
@ -220,7 +220,7 @@ namespace Strawberry
public T First<T>(Rect rect, delegate bool(T) condition) where T : Component, IHasHitbox
{
for (T c in componentTracker[typeof(T)])
if (condition(c) && c.Hitbox.Check(rect))
if (c.Hitbox.Check(rect) && condition(c))
return c as T;
return null;
}
@ -251,7 +251,7 @@ namespace Strawberry
public List<T> All<T>(Point point, List<T> into, delegate bool(T) condition) where T : Component, IHasHitbox
{
for (T c in componentTracker[typeof(T)])
if (condition(c) && c.Hitbox.Check(point))
if (c.Hitbox.Check(point) && condition(c))
into.Add(c as T);
return into;
}
@ -259,7 +259,7 @@ namespace Strawberry
public List<T> All<T>(Rect rect, List<T> into, delegate bool(T) condition) where T : Component, IHasHitbox
{
for (T c in componentTracker[typeof(T)])
if (condition(c) && c.Hitbox.Check(rect))
if (c.Hitbox.Check(rect) && condition(c))
into.Add(c as T);
return into;
}