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

Fix inheritance

Browse source
This commit is contained in:
Mootfrost777 2024-08-18 10:53:42 +03:00
parent 5a7fc98597
commit be0d38bb95
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ZoFo/GameCore/GameObjects/Entities/EntittyForAnimationTests.cs
View file

@ -12,7 +12,7 @@ namespace ZoFo.GameCore.GameObjects.Entities
{ {
//public override GraphicsComponent graphicsComponent { get; } = new GraphicsComponent(new List<string> { "тут пишите название анимации" }, "сдублируйте " + //public override GraphicsComponent graphicsComponent { get; } = new GraphicsComponent(new List<string> { "тут пишите название анимации" }, "сдублируйте " +
public override AnimatedGraphicsComponent graphicsComponent { get; } = new(new List<string> { "player_running_top_rotate" }, "player_running_top_rotate"); public override GraphicsComponent graphicsComponent { get; } = new AnimatedGraphicsComponent(new List<string> { "player_running_top_rotate" }, "player_running_top_rotate");
public EntittyForAnimationTests(Vector2 position) : base(position) public EntittyForAnimationTests(Vector2 position) : base(position)
{ {
graphicsComponent.ObjectDrawRectangle = new Rectangle(0,0,16*12, 16 * 16); graphicsComponent.ObjectDrawRectangle = new Rectangle(0,0,16*12, 16 * 16);

2
ZoFo/GameCore/GameObjects/Entities/LivingEntities/LivingEntity.cs
View file

@ -21,7 +21,7 @@ public class LivingEntity : Entity
inputManager = new InputManager(); inputManager = new InputManager();
} }
public override AnimatedGraphicsComponent graphicsComponent { get; } = null; public override GraphicsComponent graphicsComponent { get; } = null;
#region Server side #region Server side
/*public override void Update() /*public override void Update()

4
ZoFo/GameCore/GameObjects/Entities/LivingEntities/Player/Player.cs
View file

@ -20,12 +20,12 @@ public class Player : LivingEntity
public bool IsTryingToShoot { get; set; } public bool IsTryingToShoot { get; set; }
private float speed; private float speed;
private int health; private int health;
public override AnimatedGraphicsComponent graphicsComponent { get; } = new AnimatedGraphicsComponent(new List<string> { "player_running_top_rotate" }, "player_running_top_rotate", new Rectangle(0,0,100,100)); public override GraphicsComponent graphicsComponent { get; } = new AnimatedGraphicsComponent(new List<string> { "player_running_top_rotate" }, "player_running_top_rotate");
public Player(Vector2 position) : base(position) public Player(Vector2 position) : base(position)
{ {
//InputWeaponRotation = new Vector2(0, 0); //InputWeaponRotation = new Vector2(0, 0);
//InputPlayerRotation = new Vector2(0, 0); //InputPlayerRotation = new Vector2(0, 0);
graphicsComponent.ObjectDrawRectangle = new Rectangle(0, 0, 100, 100);
collisionComponent.stopRectangle = new Rectangle(0, 0, 100, 100); collisionComponent.stopRectangle = new Rectangle(0, 0, 100, 100);
} }

2
ZoFo/GameCore/Graphics/AnimatedGraphicsComponent.cs
View file

@ -202,7 +202,6 @@ namespace ZoFo.GameCore.Graphics
public override void Draw(Rectangle destinationRectangle, SpriteBatch _spriteBatch) public override void Draw(Rectangle destinationRectangle, SpriteBatch _spriteBatch)
{ {
DebugHUD.Instance.Log($"{destinationRectangle.Width} : {destinationRectangle.Height}");
Texture2D texture = textures[texturesNames.FindIndex(x => x == currentAnimation.TextureName)]; Texture2D texture = textures[texturesNames.FindIndex(x => x == currentAnimation.TextureName)];
float scale; float scale;
@ -226,7 +225,6 @@ namespace ZoFo.GameCore.Graphics
destinationRectangle = Scaling(destinationRectangle); destinationRectangle = Scaling(destinationRectangle);
_spriteBatch.Draw(texture, _spriteBatch.Draw(texture,
destinationRectangle, sourceRectangle, Color.White); destinationRectangle, sourceRectangle, Color.White);
DebugHUD.Instance.Log(texture.Name);
} }
public override void Draw(Rectangle destinationRectangle, SpriteBatch _spriteBatch, Rectangle sourceRectangle) public override void Draw(Rectangle destinationRectangle, SpriteBatch _spriteBatch, Rectangle sourceRectangle)

3
ZoFo/GameCore/Server.cs
View file

@ -99,6 +99,9 @@ namespace ZoFo.GameCore
AppManager.Instance.server.RegisterGameObject(new EntittyForAnimationTests(new Vector2(40, 40))); AppManager.Instance.server.RegisterGameObject(new EntittyForAnimationTests(new Vector2(40, 40)));
AppManager.Instance.server.RegisterGameObject(new Player(new Vector2(140, 140))); AppManager.Instance.server.RegisterGameObject(new Player(new Vector2(140, 140)));
AppManager.Instance.server.RegisterGameObject(new Player(new Vector2(300, 140)));
AppManager.Instance.server.RegisterGameObject(new Player(new Vector2(450, 140)));
AppManager.Instance.server.RegisterGameObject(new Player(new Vector2(140, 140)));
} }
/// <summary> /// <summary>