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

minor fix GraficsComponent and TODO

Browse source
This commit is contained in:
Lev 2024-08-15 10:44:36 +03:00
parent 4084d98021
commit d4996b9dee
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ZoFo/GameCore/GameManagers/AppManager.cs
View file

@ -4,6 +4,7 @@ using System.Linq;
using System.Reflection.Metadata; using System.Reflection.Metadata;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using DangerousD.GameCore.Graphics;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input; using Microsoft.Xna.Framework.Input;
@ -30,6 +31,8 @@ namespace ZoFo.GameCore.GameManagers
public InputManager InputManager; public InputManager InputManager;
public AnimationBuilder animationBuilder{get;set; }
#endregion #endregion
public AppManager() public AppManager()

12
ZoFo/GameCore/ZoFo_grafics/GraphicsComponent.cs
View file

@ -1,6 +1,5 @@
/*using ZoFo.GameCore.GameObjects; using ZoFo.GameCore.GameObjects;
using ZoFo.GameCore.GameManagers; using ZoFo.GameCore.GameManagers;
using ZoFo.GameCore.GameManagers.NetworkManager;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content; using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
@ -85,7 +84,7 @@ namespace ZoFo.GameCore.ZoFo_graphics
animations = new List<AnimationContainer>(); animations = new List<AnimationContainer>();
foreach (var id in animationsId) foreach (var id in animationsId)
{ {
animations.Add(AppManager.Instance.AnimationBuilder.Animations.Find(x => x.Id == id)); animations.Add(AppManager.Instance.animationBuilder.Animations.Find(x => x.Id == id));
if (id == neitralAnimationId) if (id == neitralAnimationId)
{ {
neitralAnimation = animations.Last(); neitralAnimation = animations.Last();
@ -110,6 +109,7 @@ namespace ZoFo.GameCore.ZoFo_graphics
public void StartAnimation(string startedanimationId) public void StartAnimation(string startedanimationId)
{ {
/*
if (AppManager.Instance.multiPlayerStatus != MultiPlayerStatus.SinglePlayer) if (AppManager.Instance.multiPlayerStatus != MultiPlayerStatus.SinglePlayer)
{ {
LivingEntity entity = AppManager.Instance.GameManager.livingEntities.Find(x => x.id == parentId); LivingEntity entity = AppManager.Instance.GameManager.livingEntities.Find(x => x.id == parentId);
@ -118,6 +118,7 @@ namespace ZoFo.GameCore.ZoFo_graphics
AppManager.Instance.NetworkTasks.Add(new NetworkTask(parentId, startedanimationId, Vector2.Zero)); AppManager.Instance.NetworkTasks.Add(new NetworkTask(parentId, startedanimationId, Vector2.Zero));
} }
} }
*/
currentFrame = 0; currentFrame = 0;
currentAnimation = animations.Find(x => x.Id == startedanimationId); currentAnimation = animations.Find(x => x.Id == startedanimationId);
@ -253,6 +254,8 @@ namespace ZoFo.GameCore.ZoFo_graphics
CameraPosition.X -= 200; CameraPosition.X -= 200;
CameraPosition.Y -= 120; CameraPosition.Y -= 120;
// TODO
/*
if (CameraPosition.X > AppManager.Instance.GameManager.CameraBorder.Y - 460) if (CameraPosition.X > AppManager.Instance.GameManager.CameraBorder.Y - 460)
{ {
CameraPosition.X = (int)AppManager.Instance.GameManager.CameraBorder.Y - 460; CameraPosition.X = (int)AppManager.Instance.GameManager.CameraBorder.Y - 460;
@ -270,9 +273,10 @@ namespace ZoFo.GameCore.ZoFo_graphics
{ {
CameraPosition.Y = (int)AppManager.Instance.GameManager.CameraBorder.W - 240; CameraPosition.Y = (int)AppManager.Instance.GameManager.CameraBorder.W - 240;
} }
AppManager.Instance.DebugHUD.Set("CameraPosition", $"{CameraPosition.X}, {CameraPosition.Y}"); AppManager.Instance.DebugHUD.Set("CameraPosition", $"{CameraPosition.X}, {CameraPosition.Y}");
*/
} }
public static Point CameraPosition = new Point(-700, 300); public static Point CameraPosition = new Point(-700, 300);
} }
} }
*/