fix bags in entity and add ZoFo_grafics with bag
This commit is contained in:
parent
1f54391527
commit
09dff14367
4 changed files with 341 additions and 0 deletions
|
@ -1,5 +1,6 @@
|
|||
using System;
|
||||
using ZoFo.GameCore.GameObjects;
|
||||
using Microsoft.Xna.Framework.Content;
|
||||
|
||||
namespace ZoFo.GameCore.GameObjects;
|
||||
public class Entity : GameObject
|
||||
|
|
30
ZoFo/GameCore/ZoFo_grafics/AnimationBuilder.cs
Normal file
30
ZoFo/GameCore/ZoFo_grafics/AnimationBuilder.cs
Normal file
|
@ -0,0 +1,30 @@
|
|||
/*using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.IO;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace DangerousD.GameCore.Graphics
|
||||
{
|
||||
public class AnimationBuilder
|
||||
{
|
||||
public List<AnimationContainer> Animations { get; private set; }
|
||||
public void LoadAnimations()
|
||||
{
|
||||
Animations = new List<AnimationContainer>();
|
||||
string[] animationFilesNames = Directory.GetFiles("../../../Content/animations");
|
||||
|
||||
StreamReader reader;
|
||||
foreach (var fileName in animationFilesNames)
|
||||
{
|
||||
reader = new StreamReader(fileName);
|
||||
string json = reader.ReadToEnd();
|
||||
AnimationContainer animation = JsonConvert.DeserializeObject<AnimationContainer>(json);
|
||||
Animations.Add(animation);
|
||||
reader.Close();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
33
ZoFo/GameCore/ZoFo_grafics/AnimationContainer.cs
Normal file
33
ZoFo/GameCore/ZoFo_grafics/AnimationContainer.cs
Normal file
|
@ -0,0 +1,33 @@
|
|||
/*using Microsoft.Xna.Framework;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace DangerousD.GameCore.Graphics
|
||||
{
|
||||
[Serializable]
|
||||
public class AnimationContainer
|
||||
{
|
||||
[JsonProperty("id")]
|
||||
public string Id { get; set; }
|
||||
[JsonProperty("textureName")]
|
||||
public string TextureName { get; set; }
|
||||
[JsonProperty("startSpriteRectangle")]
|
||||
public Rectangle StartSpriteRectangle { get; set; }
|
||||
[JsonProperty("frameSecond")]
|
||||
public List<Tuple<int, int>> FrameTime { get; set; }
|
||||
[JsonProperty("textureFrameInterval")]
|
||||
public int TextureFrameInterval { get; set; }
|
||||
[JsonProperty("framesCount")]
|
||||
public int FramesCount { get; set; }
|
||||
[JsonProperty("isCycle")]
|
||||
public bool IsCycle { get; set; }
|
||||
[JsonProperty("offset")]
|
||||
public Vector2 Offset { get; set; }
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
*/
|
277
ZoFo/GameCore/ZoFo_grafics/GraphicsComponent.cs
Normal file
277
ZoFo/GameCore/ZoFo_grafics/GraphicsComponent.cs
Normal file
|
@ -0,0 +1,277 @@
|
|||
/*using ZoFo.GameCore.GameObjects;
|
||||
using ZoFo.GameCore.Managers;
|
||||
using ZoFo.GameCore.Network;
|
||||
using Microsoft.Xna.Framework;
|
||||
using Microsoft.Xna.Framework.Content;
|
||||
using Microsoft.Xna.Framework.Graphics;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
using System.Text;
|
||||
|
||||
namespace DangerousD.GameCore.Graphics
|
||||
{
|
||||
|
||||
public class GraphicsComponent
|
||||
{
|
||||
public event Action<string> actionOfAnimationEnd;
|
||||
private List<AnimationContainer> animations;
|
||||
private List<Texture2D> textures;
|
||||
private List<string> texturesNames;
|
||||
private AnimationContainer currentAnimation;
|
||||
static public int scaling = 4;
|
||||
public int parentId;
|
||||
public AnimationContainer CurrentAnimation
|
||||
{
|
||||
get
|
||||
{
|
||||
return currentAnimation;
|
||||
}
|
||||
}
|
||||
public string LastAnimation { get; set; }
|
||||
public string GetCurrentAnimation
|
||||
{
|
||||
get { return currentAnimation.Id; }
|
||||
}
|
||||
|
||||
private AnimationContainer neitralAnimation;
|
||||
//private SpriteBatch _spriteBatch;
|
||||
|
||||
private int currentFrame;
|
||||
public int CurrentFrame
|
||||
{
|
||||
get
|
||||
{
|
||||
return currentFrame;
|
||||
}
|
||||
}
|
||||
private int interval;
|
||||
private int lastInterval;
|
||||
private Rectangle sourceRectangle;
|
||||
public GraphicsComponent(List<string> animationsId, string neitralAnimationId)
|
||||
{
|
||||
//this._spriteBatch = _spriteBatch;
|
||||
currentFrame = 0;
|
||||
lastInterval = 1;
|
||||
LoadAnimations(animationsId, neitralAnimationId);
|
||||
currentAnimation = neitralAnimation;
|
||||
SetInterval();
|
||||
buildSourceRectangle();
|
||||
}
|
||||
|
||||
public GraphicsComponent(string textureName)
|
||||
{
|
||||
animations = new List<AnimationContainer>();
|
||||
textures = new List<Texture2D>();
|
||||
var texture = AppManager.Instance.Content.Load<Texture2D>(textureName);
|
||||
textures.Add(texture);
|
||||
AnimationContainer animationContainer = new AnimationContainer();
|
||||
animationContainer.StartSpriteRectangle = new Rectangle(0, 0, texture.Width, texture.Height);
|
||||
animationContainer.TextureFrameInterval = 0;
|
||||
animationContainer.TextureName = texture.Name;
|
||||
animationContainer.IsCycle = true;
|
||||
animationContainer.FramesCount = 1;
|
||||
animationContainer.FrameTime = new List<Tuple<int, int>>() { new Tuple<int, int>(0, 10) };
|
||||
animationContainer.Id = texture.Name;
|
||||
currentAnimation = animationContainer;
|
||||
neitralAnimation = animationContainer;
|
||||
animations.Add(animationContainer);
|
||||
}
|
||||
|
||||
private void LoadAnimations(List<string> animationsId, string neitralAnimationId)
|
||||
{
|
||||
animations = new List<AnimationContainer>();
|
||||
foreach (var id in animationsId)
|
||||
{
|
||||
animations.Add(AppManager.Instance.AnimationBuilder.Animations.Find(x => x.Id == id));
|
||||
if (id == neitralAnimationId)
|
||||
{
|
||||
neitralAnimation = animations.Last();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void LoadContent()
|
||||
{
|
||||
textures = new List<Texture2D>();
|
||||
texturesNames = new List<string>();
|
||||
|
||||
foreach (var animation in animations)
|
||||
{
|
||||
if (!texturesNames.Contains(animation.TextureName))
|
||||
{
|
||||
texturesNames.Add(animation.TextureName);
|
||||
textures.Add(AppManager.Instance.Content.Load<Texture2D>(animation.TextureName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void StartAnimation(string startedanimationId)
|
||||
{
|
||||
if (AppManager.Instance.multiPlayerStatus != MultiPlayerStatus.SinglePlayer)
|
||||
{
|
||||
LivingEntity entity = AppManager.Instance.GameManager.livingEntities.Find(x => x.id == parentId);
|
||||
if (((entity is Player) || AppManager.Instance.multiPlayerStatus == MultiPlayerStatus.Host) && startedanimationId != GetCurrentAnimation)
|
||||
{
|
||||
AppManager.Instance.NetworkTasks.Add(new NetworkTask(parentId, startedanimationId, Vector2.Zero));
|
||||
}
|
||||
}
|
||||
currentFrame = 0;
|
||||
currentAnimation = animations.Find(x => x.Id == startedanimationId);
|
||||
|
||||
buildSourceRectangle();
|
||||
SetInterval();
|
||||
}
|
||||
|
||||
public void StopAnimation()
|
||||
{
|
||||
currentFrame = 0;
|
||||
interval = 0;
|
||||
currentAnimation = neitralAnimation;
|
||||
buildSourceRectangle();
|
||||
SetInterval();
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
if (interval == 0)
|
||||
{
|
||||
currentFrame++;
|
||||
if (currentAnimation.FramesCount <= currentFrame)
|
||||
{
|
||||
if (!currentAnimation.IsCycle)
|
||||
{
|
||||
if (actionOfAnimationEnd != null)
|
||||
{
|
||||
actionOfAnimationEnd(currentAnimation.Id);
|
||||
}
|
||||
currentAnimation = neitralAnimation;
|
||||
|
||||
}
|
||||
|
||||
currentFrame = 0;
|
||||
|
||||
}
|
||||
|
||||
buildSourceRectangle();
|
||||
SetInterval();
|
||||
}
|
||||
|
||||
interval--;
|
||||
}
|
||||
|
||||
public void DrawAnimation(Rectangle destinationRectangle, SpriteBatch _spriteBatch)
|
||||
{
|
||||
Texture2D texture = textures[texturesNames.FindIndex(x => x == currentAnimation.TextureName)];
|
||||
float scale;
|
||||
if (currentAnimation.Offset.X != 0)
|
||||
{
|
||||
destinationRectangle.X -= (int)currentAnimation.Offset.X;
|
||||
scale = destinationRectangle.Height / sourceRectangle.Height;
|
||||
destinationRectangle.Width = (int)(sourceRectangle.Width * scale);
|
||||
|
||||
}
|
||||
else if (currentAnimation.Offset.Y != 0)
|
||||
{
|
||||
destinationRectangle.Y -= (int)currentAnimation.Offset.Y;
|
||||
scale = destinationRectangle.Width / sourceRectangle.Width;
|
||||
destinationRectangle.Height = (int)(sourceRectangle.Height * scale);
|
||||
}
|
||||
|
||||
destinationRectangle.X -= CameraPosition.X;
|
||||
destinationRectangle.Y -= CameraPosition.Y;
|
||||
|
||||
destinationRectangle = Scaling(destinationRectangle);
|
||||
_spriteBatch.Draw(texture,
|
||||
destinationRectangle, sourceRectangle, Color.White);
|
||||
}
|
||||
public void DrawAnimation(Rectangle destinationRectangle, SpriteBatch _spriteBatch, Rectangle sourceRectangle)
|
||||
{
|
||||
Texture2D texture = textures[texturesNames.FindIndex(x => x == currentAnimation.TextureName)];
|
||||
float scale;
|
||||
if (currentAnimation.Offset.X != 0)
|
||||
{
|
||||
destinationRectangle.X -= (int)currentAnimation.Offset.X;
|
||||
scale = destinationRectangle.Height / sourceRectangle.Height;
|
||||
destinationRectangle.Width = (int)(sourceRectangle.Width * scale);
|
||||
|
||||
}
|
||||
else if (currentAnimation.Offset.Y != 0)
|
||||
{
|
||||
destinationRectangle.Y -= (int)currentAnimation.Offset.Y;
|
||||
scale = destinationRectangle.Width / sourceRectangle.Width;
|
||||
destinationRectangle.Height = (int)(sourceRectangle.Height * scale);
|
||||
}
|
||||
|
||||
destinationRectangle.X -= CameraPosition.X;
|
||||
destinationRectangle.Y -= CameraPosition.Y;
|
||||
|
||||
destinationRectangle = Scaling(destinationRectangle);
|
||||
_spriteBatch.Draw(texture,
|
||||
destinationRectangle, sourceRectangle, Color.White);
|
||||
}
|
||||
private Rectangle Scaling(Rectangle destinationRectangle)
|
||||
{
|
||||
destinationRectangle.X *= scaling;
|
||||
destinationRectangle.Y *= scaling;
|
||||
destinationRectangle.Width *= scaling;
|
||||
destinationRectangle.Height *= scaling;
|
||||
return destinationRectangle;
|
||||
}
|
||||
private void buildSourceRectangle()
|
||||
{
|
||||
sourceRectangle = new Rectangle();
|
||||
if (currentAnimation == null)
|
||||
{
|
||||
currentAnimation = neitralAnimation;
|
||||
}
|
||||
sourceRectangle.X = currentAnimation.StartSpriteRectangle.X + currentFrame *
|
||||
(currentAnimation.StartSpriteRectangle.Width + currentAnimation.TextureFrameInterval);
|
||||
sourceRectangle.Y = currentAnimation.StartSpriteRectangle.Y;
|
||||
sourceRectangle.Height = currentAnimation.StartSpriteRectangle.Height;
|
||||
sourceRectangle.Width = currentAnimation.StartSpriteRectangle.Width;
|
||||
}
|
||||
|
||||
private void SetInterval()
|
||||
{
|
||||
Tuple<int, int> i = currentAnimation.FrameTime.Find(x => x.Item1 == currentFrame);
|
||||
if (i != null)
|
||||
{
|
||||
interval = i.Item2;
|
||||
lastInterval = interval;
|
||||
}
|
||||
else
|
||||
{
|
||||
interval = lastInterval;
|
||||
}
|
||||
}
|
||||
public static void SetCameraPosition(Vector2 playerPosition)
|
||||
{
|
||||
CameraPosition = (playerPosition).ToPoint();
|
||||
CameraPosition.X -= 200;
|
||||
CameraPosition.Y -= 120;
|
||||
|
||||
if (CameraPosition.X > AppManager.Instance.GameManager.CameraBorder.Y - 460)
|
||||
{
|
||||
CameraPosition.X = (int)AppManager.Instance.GameManager.CameraBorder.Y - 460;
|
||||
}
|
||||
|
||||
if (CameraPosition.Y < AppManager.Instance.GameManager.CameraBorder.Z)
|
||||
{
|
||||
CameraPosition.Y = (int)AppManager.Instance.GameManager.CameraBorder.Z;
|
||||
}
|
||||
if (CameraPosition.X < AppManager.Instance.GameManager.CameraBorder.X)
|
||||
{
|
||||
CameraPosition.X = (int)AppManager.Instance.GameManager.CameraBorder.X;
|
||||
}
|
||||
if (CameraPosition.Y > AppManager.Instance.GameManager.CameraBorder.W - 240)
|
||||
{
|
||||
CameraPosition.Y = (int)AppManager.Instance.GameManager.CameraBorder.W - 240;
|
||||
}
|
||||
AppManager.Instance.DebugHUD.Set("CameraPosition", $"{CameraPosition.X}, {CameraPosition.Y}");
|
||||
}
|
||||
public static Point CameraPosition = new Point(-700, 300);
|
||||
}
|
||||
}
|
||||
*/
|
Loading…
Add table
Reference in a new issue