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

Merge branch 'ServerBranch' of github.com:progtime-net/ZoFo into ServerBranch

Browse source
This commit is contained in:
rawer470 2024-08-16 15:20:16 +03:00
commit 786286494a
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ZoFo/GameCore/GameObjects/MapObjects/MapObject.cs
View file

@ -10,13 +10,13 @@ using ZoFo.GameCore.ZoFo_graphics;
namespace ZoFo.GameCore.GameObjects.MapObjects
{
internal class MapObject : GameObject
public class MapObject : GameObject
{
public virtual bool IsColliderOn { get; protected set; } = true;
private Rectangle _sourceRectangle;
protected override GraphicsComponent graphicsComponent => new("tiles");
public MapObject(Vector2 position, Vector2 size, Rectangle sourceRectangle) : base(position)
public MapObject(Vector2 position, Vector2 size, Rectangle sourceRectangle, string textureName) : base(position)
{
_sourceRectangle = sourceRectangle;
graphicsComponent.ObjectDrawRectangle = new Rectangle(0,0, (int)size.X, (int)size.Y);

8
ZoFo/GameCore/GameObjects/MapObjects/StopObjects/StopObject.cs
View file

@ -1,13 +1,15 @@
using Microsoft.Xna.Framework;
using System;
using ZoFo.GameCore.GameManagers.CollisionManager;
using ZoFo.GameCore.ZoFo_graphics;
namespace ZoFo.GameCore.GameObjects.MapObjects.StopObjects;
public abstract class StopObject : GameObject
public class StopObject : MapObject
{
protected StopObject(Vector2 position) : base(position)
CollisionComponent collisionComponent;
protected StopObject(Vector2 position, Vector2 size, Rectangle sourceRectangle) : base(position, size, sourceRectangle)
{
//TODO
}
}