semicolin/sneak
semicolin/sneak
1
1
Fork 0
Code Issues 7 Releases Wiki Activity

Player.Update now takes a float which is the model time elapsed.

Browse Source 
Player.Draw doesn't depend on time elapsed any more.

GitOrigin-RevId: 3396f85f61c8ee430fda8986770663f561538294
This commit is contained in:
Colin McMillen 2020-01-24 18:36:55 -05:00
parent 83839c92ac
commit 87100eaa67
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Shared/Player.cs
View File

@ -22,6 +22,7 @@ namespace SemiColinGames {
private double swordSwingTime = 0; private double swordSwingTime = 0;
private double jumpTime = 0; private double jumpTime = 0;
private float ySpeed = 0; private float ySpeed = 0;
private float totalModelTime = 0;
public Player(Texture2D texture) { public Player(Texture2D texture) {
this.texture = texture; this.texture = texture;
@ -33,9 +34,10 @@ namespace SemiColinGames {
return new Rectangle(position.X - spriteWidth, position.Y - 7, spriteWidth * 2, 26); return new Rectangle(position.X - spriteWidth, position.Y - 7, spriteWidth * 2, 26);
} }
public void Update(GameTime time, History<Input> input, List<Rectangle> collisionTargets) { public void Update(float modelTime, History<Input> input, List<Rectangle> collisionTargets) {
totalModelTime += modelTime;
Point oldPosition = position; Point oldPosition = position;
Vector2 movement = HandleInput(time, input); Vector2 movement = HandleInput(modelTime, input);
position = new Point((int) (oldPosition.X + movement.X), (int) (oldPosition.Y + movement.Y)); position = new Point((int) (oldPosition.X + movement.X), (int) (oldPosition.Y + movement.Y));
Rectangle oldBbox = Bbox(oldPosition); Rectangle oldBbox = Bbox(oldPosition);
@ -106,9 +108,9 @@ namespace SemiColinGames {
} }
// Returns the desired (dx, dy) for the player to move this frame. // Returns the desired (dx, dy) for the player to move this frame.
Vector2 HandleInput(GameTime time, History<Input> input) { Vector2 HandleInput(float modelTime, History<Input> input) {
Vector2 result = new Vector2(); Vector2 result = new Vector2();
result.X = (int) (input[0].Motion.X * moveSpeed * time.ElapsedGameTime.TotalSeconds); result.X = (int) (input[0].Motion.X * moveSpeed * modelTime);
if (input[0].Jump && !input[1].Jump && jumps > 0) { if (input[0].Jump && !input[1].Jump && jumps > 0) {
jumpTime = 0.3; jumpTime = 0.3;
@ -120,15 +122,15 @@ namespace SemiColinGames {
swordSwingTime = 0.3; swordSwingTime = 0.3;
} }
result.Y = ySpeed * (float) time.ElapsedGameTime.TotalSeconds; result.Y = ySpeed * modelTime;
ySpeed += gravity * (float) time.ElapsedGameTime.TotalSeconds; ySpeed += gravity * modelTime;
jumpTime -= time.ElapsedGameTime.TotalSeconds; jumpTime -= modelTime;
swordSwingTime -= time.ElapsedGameTime.TotalSeconds; swordSwingTime -= modelTime;
return result; return result;
} }
private int SpriteIndex(Pose pose, GameTime time) { private int SpriteIndex(Pose pose) {
int frameNum = (time.TotalGameTime.Milliseconds / 125) % 4; int frameNum = ((int) (totalModelTime * 1000) / 125) % 4;
if (frameNum == 3) { if (frameNum == 3) {
frameNum = 1; frameNum = 1;
} }
@ -161,8 +163,8 @@ namespace SemiColinGames {
} }
} }
public void Draw(SpriteBatch spriteBatch, Camera camera, GameTime time) { public void Draw(SpriteBatch spriteBatch, Camera camera) {
int index = SpriteIndex(pose, time); int index = SpriteIndex(pose);
Rectangle textureSource = new Rectangle(index * spriteSize, 0, spriteSize, spriteSize); Rectangle textureSource = new Rectangle(index * spriteSize, 0, spriteSize, spriteSize);
Vector2 spriteCenter = new Vector2(spriteSize / 2, spriteSize / 2); Vector2 spriteCenter = new Vector2(spriteSize / 2, spriteSize / 2);
SpriteEffects effect = facing == Facing.Right ? SpriteEffects effect = facing == Facing.Right ?

5
Shared/SneakGame.cs
View File

@ -86,8 +86,9 @@ namespace SemiColinGames {
} }
if (!paused) { if (!paused) {
float modelTime = (float) gameTime.ElapsedGameTime.TotalSeconds;
List<Rectangle> collisionTargets = world.CollisionTargets(); List<Rectangle> collisionTargets = world.CollisionTargets();
player.Update(gameTime, input, collisionTargets); player.Update(modelTime, input, collisionTargets);
camera.Update(player.Position); camera.Update(player.Position);
} }
@ -122,7 +123,7 @@ namespace SemiColinGames {
spriteBatch.Draw(grasslandBg1, bgTarget, bgSource, Color.White); spriteBatch.Draw(grasslandBg1, bgTarget, bgSource, Color.White);
// Draw player. // Draw player.
player.Draw(spriteBatch, camera, gameTime); player.Draw(spriteBatch, camera);
// Draw foreground tiles. // Draw foreground tiles.
world.Draw(spriteBatch, camera); world.Draw(spriteBatch, camera);