From 6c13f42a909a20123879bb14a3d08f44c0856ace Mon Sep 17 00:00:00 2001 From: cosmonaut Date: Sat, 1 May 2021 16:03:20 -0700 Subject: [PATCH] some tutorial fixes --- content/concepts/renderer.md | 2 +- content/pong/draw_paddle/texture_renderer.md | 6 ++--- content/pong/polish/paddle_bounce.md | 28 +++++++++----------- content/pong/polish/title.md | 4 +-- content/pong/polish/win_condition.md | 2 +- content/pong/scoring/center_line.md | 2 +- content/pong/scoring/display_scaling.md | 2 +- content/pong/scoring/drawing_score.md | 2 +- 8 files changed, 22 insertions(+), 26 deletions(-) diff --git a/content/concepts/renderer.md b/content/concepts/renderer.md index 319160b..81c4039 100644 --- a/content/concepts/renderer.md +++ b/content/concepts/renderer.md @@ -32,7 +32,7 @@ namespace MyGame.Renderers this.gridSize = 16; } - public override void Render() + public override void Render(double dt, double alpha) { if (SomeComponent() && SomeComponent()) { diff --git a/content/pong/draw_paddle/texture_renderer.md b/content/pong/draw_paddle/texture_renderer.md index a6123cf..45e9013 100644 --- a/content/pong/draw_paddle/texture_renderer.md +++ b/content/pong/draw_paddle/texture_renderer.md @@ -18,7 +18,7 @@ namespace PongFE.Renderers { public class Texture2DRenderer : Renderer { - public override void Render() + public override void Render(double dt, double alpha) { } @@ -59,13 +59,14 @@ namespace PongFE.Renderers _spriteBatch = spriteBatch; } - public override void Render() + public override void Render(double dt, double alpha) { SpriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied); foreach (ref readonly var entity in ReadEntities()) { ref readonly var positionComponent = ref GetComponent(entity); + ref readonly var textureComponent = ref GetComponent(entity); _spriteBatch.Draw( textureComponent.Texture, @@ -129,7 +130,6 @@ Now we can rewrite our SpriteBatch draw call: using PongFE.Extensions; ... - _spriteBatch.Draw( textureComponent.Texture, positionComponent.Position.ToXNAVector(), diff --git a/content/pong/polish/paddle_bounce.md b/content/pong/polish/paddle_bounce.md index b3fb1b9..da71210 100644 --- a/content/pong/polish/paddle_bounce.md +++ b/content/pong/polish/paddle_bounce.md @@ -98,23 +98,19 @@ Remove Width and Height from Texture2DComponent, and add a ScaleComponent in bot Then, in **Texture2DRenderer.cs** we can do: ```cs - public override void Render(Entity entity, in Texture2DComponent textureComponent) - { - ref readonly var positionComponent = ref GetComponent(entity); - ref readonly var scaleComponent = ref GetComponent(entity); + ref readonly var scaleComponent = ref GetComponent(entity); - _spriteBatch.Draw( - textureComponent.Texture, - positionComponent.Position.ToXNAVector(), - null, - Color.White, - 0, - Vector2.Zero, - new Vector2(scaleComponent.Width, scaleComponent.Height), - SpriteEffects.None, - 0 - ); - } + _spriteBatch.Draw( + textureComponent.Texture, + positionComponent.Position.ToXNAVector(), + null, + Color.White, + 0, + Vector2.Zero, + new Vector2(scaleComponent.Width, scaleComponent.Height), + SpriteEffects.None, + 0 + ); ``` Now, in **PongFE/Engines/AngledBounceEngine.cs**: diff --git a/content/pong/polish/title.md b/content/pong/polish/title.md index 9ba4310..653af1c 100644 --- a/content/pong/polish/title.md +++ b/content/pong/polish/title.md @@ -185,7 +185,7 @@ namespace PongFE.Renderers InstructionFont = instructionFont; } - public override void Render() + public override void Render(double dt, double alpha) { ref readonly var gameStateComponent = ref ReadComponent(); ref readonly var playAreaComponent = ref ReadComponent(); @@ -215,7 +215,7 @@ namespace PongFE.Renderers And let's tweak the *CenterLineRenderer.Render* method a bit. ```cs -public override void Render() +public override void Render(double dt, double alpha) { ref readonly var gameStateComponent = ref ReadComponent(); diff --git a/content/pong/polish/win_condition.md b/content/pong/polish/win_condition.md index 27f1f3f..93c8865 100644 --- a/content/pong/polish/win_condition.md +++ b/content/pong/polish/win_condition.md @@ -102,7 +102,7 @@ namespace PongFE.Renderers SpriteBatch = spriteBatch; } - public override void Render() + public override void Render(double dt, double alpha) { SpriteBatch.Begin(SpriteSortMode.Deferred, BlendState.Nonpremultiplied); diff --git a/content/pong/scoring/center_line.md b/content/pong/scoring/center_line.md index 72cdc27..26896b0 100644 --- a/content/pong/scoring/center_line.md +++ b/content/pong/scoring/center_line.md @@ -30,7 +30,7 @@ namespace PongFE.Renderers WhitePixel = whitePixel; } - public override void Render() + public override void Render(double dt, double alpha) { ref readonly var playAreaComponent = ref ReadComponent(); diff --git a/content/pong/scoring/display_scaling.md b/content/pong/scoring/display_scaling.md index d861bf7..d1908ef 100644 --- a/content/pong/scoring/display_scaling.md +++ b/content/pong/scoring/display_scaling.md @@ -82,7 +82,7 @@ Go through the rest of **PongFEGame.cs** and replace the magic values 1280 and 7 Let's revise our **ScoreRenderer** too. ```cs - public override void Render() + public override void Render(double dt, double alpha) { int? playerOneScore = null; int? playerTwoScore = null; diff --git a/content/pong/scoring/drawing_score.md b/content/pong/scoring/drawing_score.md index 9d57e54..8451b3a 100644 --- a/content/pong/scoring/drawing_score.md +++ b/content/pong/scoring/drawing_score.md @@ -148,7 +148,7 @@ namespace PongFE.Renderers Font = font; } - public override void Render() + public override void Render(double dt, double alpha) { int? playerOneScore = null; int? playerTwoScore = null;