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

fixed physics

Browse source
This commit is contained in:
SergoDobro 2023-08-16 15:46:12 +03:00
parent 5a5a24dffd
commit 9e3c0f09ad
6 changed files with 41 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DangerousD/GameCore/GameObjects/GameObject.cs
View file

@ -48,12 +48,12 @@ namespace DangerousD.GameCore
GraphicsComponent.Update(); GraphicsComponent.Update();
} }
//static Texture2D debugTexture; public static Texture2D debugTexture;
public virtual void Draw(SpriteBatch spriteBatch) public virtual void Draw(SpriteBatch spriteBatch)
{ {
GraphicsComponent.DrawAnimation(Rectangle, spriteBatch); GraphicsComponent.DrawAnimation(Rectangle, spriteBatch);
//debug //debug
//spriteBatch.Draw(debugTexture, Rectangle, Color.White); // spriteBatch.Draw(debugTexture, Rectangle, Color.White);
} }
} }
} }

12
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs
View file

@ -48,14 +48,14 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
{ {
if (isGoRight) if (isGoRight)
{ {
GraphicsComponent.StopAnimation(); if (GraphicsComponent.GetCurrentAnimation != "ZombieRightAttack")
GraphicsComponent.StartAnimation("ZombieRightAttack"); GraphicsComponent.StartAnimation("ZombieRightAttack");
AppManager.Instance.GameManager.players[0].Death(name); AppManager.Instance.GameManager.players[0].Death(name);
} }
else if (!isGoRight) else if (!isGoRight)
{ {
GraphicsComponent.StopAnimation(); if (GraphicsComponent.GetCurrentAnimation != "ZombieLeftAttack")
GraphicsComponent.StartAnimation("ZombieLeftAttack"); GraphicsComponent.StartAnimation("ZombieLeftAttack");
AppManager.Instance.GameManager.players[0].Death(name); AppManager.Instance.GameManager.players[0].Death(name);
} }
} }
@ -72,14 +72,14 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
{ {
if (GraphicsComponent.GetCurrentAnimation != "ZombieMoveRight") if (GraphicsComponent.GetCurrentAnimation != "ZombieMoveRight")
GraphicsComponent.StartAnimation("ZombieMoveRight"); GraphicsComponent.StartAnimation("ZombieMoveRight");
velocity = new Vector2(monster_speed, 0); velocity.X = monster_speed;
} }
else if (!isGoRight) else if (!isGoRight)
{ {
if(GraphicsComponent.GetCurrentAnimation != "ZombieMoveLeft") if(GraphicsComponent.GetCurrentAnimation != "ZombieMoveLeft")
GraphicsComponent.StartAnimation("ZombieMoveLeft"); GraphicsComponent.StartAnimation("ZombieMoveLeft");
velocity = new Vector2(-monster_speed, 0); velocity.X = -monster_speed;
} }
} }

2
DangerousD/GameCore/GameObjects/LivingEntity.cs
View file

@ -9,7 +9,7 @@ public abstract class LivingEntity : Entity
public Vector2 acceleration; public Vector2 acceleration;
public LivingEntity(Vector2 position) : base(position) public LivingEntity(Vector2 position) : base(position)
{ {
acceleration = new Vector2(0, 10); acceleration = new Vector2(0, 30);
} }
public void SetPosition(Vector2 position) { targetPosition = position; _pos = position; } //TODO befrend targetpos and physics engine public void SetPosition(Vector2 position) { targetPosition = position; _pos = position; } //TODO befrend targetpos and physics engine

4
DangerousD/GameCore/Levels/Level1.cs
View file

@ -12,8 +12,8 @@ namespace DangerousD.GameCore.Levels
{ {
new Player(new Vector2(0,0)); new Player(new Vector2(0,0));
var Zombie = new Zombie(new Vector2(256, 128)); var Zombie = new Zombie(new Vector2(300, 64));
var Frank = new Frank(new Vector2(384, 128)); var Frank = new Frank(new Vector2(100, 64));
new GrassBlock(new Vector2(0, 224)); new GrassBlock(new Vector2(0, 224));
for (int i = 0; i < 50; i++) for (int i = 0; i < 50; i++)

3
DangerousD/GameCore/Managers/AppManager.cs
View file

@ -53,7 +53,8 @@ namespace DangerousD.GameCore
_spriteBatch = new SpriteBatch(GraphicsDevice); _spriteBatch = new SpriteBatch(GraphicsDevice);
MenuGUI.LoadContent(); MenuGUI.LoadContent();
LoginGUI.LoadContent(); LoginGUI.LoadContent();
//GameObject.te GameObject.debugTexture = new Texture2D(GraphicsDevice, 1, 1);
GameObject.debugTexture.SetData<Color>(new Color[] { new Color(1, 0,0,0.25f) });
} }
protected override void Update(GameTime gameTime) protected override void Update(GameTime gameTime)

38
DangerousD/GameCore/Managers/PhysicsManager.cs
View file

@ -40,26 +40,35 @@ namespace DangerousD.GameCore.Managers
{ {
var currentEntity = livingEntities[i]; var currentEntity = livingEntities[i];
Rectangle oldRect = currentEntity.Rectangle; Rectangle oldRect = currentEntity.Rectangle;
bool isXNormalise = true;
bool isYNormalise = true;
oldRect.Offset((int)currentEntity.velocity.X / 2, 0); oldRect.Offset((int)currentEntity.velocity.X / 2, 0);
for (int j = 0; j < mapObjects.Count; j++) for (int j = 0; j < mapObjects.Count; j++)
{ {
if (oldRect.Intersects(mapObjects[j].Rectangle)) if (oldRect.Intersects(mapObjects[j].Rectangle))
{ {
isXNormalise = false;
oldRect.Offset(-(int)currentEntity.velocity.X / 2, 0); oldRect.Offset(-(int)currentEntity.velocity.X / 2, 0);
break; break;
} }
} }
oldRect.Offset((int)currentEntity.velocity.X / 2, 0); if (isXNormalise)
for (int j = 0; j < mapObjects.Count; j++)
{ {
if (oldRect.Intersects(mapObjects[j].Rectangle)) oldRect.Offset((int)currentEntity.velocity.X / 2, 0);
for (int j = 0; j < mapObjects.Count; j++)
{ {
oldRect.Offset(-(int)currentEntity.velocity.X / 2, 0); if (oldRect.Intersects(mapObjects[j].Rectangle))
break; {
isXNormalise = false;
oldRect.Offset(-(int)currentEntity.velocity.X / 2, 0);
break;
}
} }
} }
if (!isXNormalise)
currentEntity.velocity.X = 0;
oldRect.Offset(0, (int)currentEntity.velocity.Y/2); oldRect.Offset(0, (int)currentEntity.velocity.Y/2);
@ -67,19 +76,26 @@ namespace DangerousD.GameCore.Managers
{ {
if (oldRect.Intersects(mapObjects[j].Rectangle)) if (oldRect.Intersects(mapObjects[j].Rectangle))
{ {
isYNormalise = false;
oldRect.Offset(0, -(int)currentEntity.velocity.Y / 2); oldRect.Offset(0, -(int)currentEntity.velocity.Y / 2);
break; break;
} }
} }
oldRect.Offset(0, (int)currentEntity.velocity.Y / 2); if (isYNormalise)
for (int j = 0; j < mapObjects.Count; j++)
{ {
if (oldRect.Intersects(mapObjects[j].Rectangle)) oldRect.Offset(0, (int)currentEntity.velocity.Y / 2);
for (int j = 0; j < mapObjects.Count; j++)
{ {
oldRect.Offset(0, -(int)currentEntity.velocity.Y / 2); if (oldRect.Intersects(mapObjects[j].Rectangle))
break; {
isYNormalise = false;
oldRect.Offset(0, -(int)currentEntity.velocity.Y / 2);
break;
}
} }
} }
if (!isYNormalise)
currentEntity.velocity.Y = 0;
currentEntity.SetPosition(new Vector2(oldRect.X, oldRect.Y)); currentEntity.SetPosition(new Vector2(oldRect.X, oldRect.Y));
} }