progtime/ZoFo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Development' into Collision

Browse source
This commit is contained in:
SergoDobro 2024-08-17 23:19:25 +03:00 • committed by GitHub
commit 409fac0679
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs
View file

@ -12,7 +12,7 @@ using ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player;
namespace ZoFo.GameCore.GameManagers.CollisionManager
{
public class CollisionComponent
{
{
//==КОНСТРУКТОР==
public CollisionComponent(GameObject gameObject)
{
@ -20,7 +20,7 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager
this.gameObject = gameObject;
hasCollision = false;
this.isTrigger = false;
}
}
public CollisionComponent(GameObject gameObject, bool hasCollision = false, Rectangle? collisionRectangle = null, bool isTrigger = false, Rectangle? triggerRectangle = null)
{
@ -43,6 +43,7 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager
public GameObject gameObject { get; set; }
bool doesStop;
bool hasCollision;
public Rectangle stopRectangle;
@ -64,7 +65,6 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager
public event EventHandler<CollisionComponent> OnCollision;
}
}

1
ZoFo/GameCore/Server.cs
View file

@ -111,7 +111,6 @@ namespace ZoFo.GameCore
networkManager.CloseConnection();
}
public CollisionManager collisionManager;
private List<GameObject> gameObjects = new List<GameObject>();
private List<Entity> entities; //entity
public void Update(GameTime gameTime)