Added a container, removed CRTP

Author: Martin Pelak

Begin.cpp

@@ -0,0 +1 @@
+#include "Begin.h"

Begin.h

@@ -0,0 +1,12 @@
+#pragma once
+#include "Frame.h"
+
+class Begin : public Frame
+{
+public:
+    void tick(const Time currentTime) override
+    {
+
+    }
+};
+

Bullet.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "GameComponent.h"
 
-class Bullet : public GameComponent<Bullet>
+class Bullet : public GameComponent
 {
 public:
     const Sprite& sprite;
@@ -10,16 +10,21 @@ class Bullet : public GameComponent<Bullet>
         this->size = size;
     }
 
-    void tick(const Time currentTime)
+    void draw()
     {
-        this->position.y -= 4;
-        this->angle += 0.1f;
-
         DrawSprite(sprite, position.x, position.y, size.width, size.height, angle, 0xffffffff);
     }
 
     void setPosition(const Position position)
     {
         this->position = position;
     }
+
+    void tick(const Time currentTime)
+    {
+        this->position.y -= 4;
+        this->angle += 0.1f;
+
+        this->draw();
+    }
 };

Drawable.h

@@ -0,0 +1,8 @@
+#pragma once
+class Drawable
+{
+public:
+    using Time = int;
+    virtual void tick(const Time currentTime) = 0;
+};
+

Enemy.h

@@ -2,7 +2,7 @@
 #include "GameComponent.h"
 #include <numbers>
 
-class Enemy : public GameComponent<Enemy>
+class Enemy : public GameComponent
 {
 private:
 	static int s_seed;
@@ -29,15 +29,20 @@ class Enemy : public GameComponent<Enemy>
 		this->init();
 	}
 
+	void draw()
+	{
+		DrawSprite(sprite, position.x, position.y, size.width, size.height, angle, 0xffffffff);
+	}
+
 	void tick(const Time time)
 	{
 		int dx = 0, dy = 0;
 		const int n1 = time + seed * seed + seed * seed * seed;
 		const int n2 = time + seed + seed * seed + seed * seed * seed * 3;
 		if (((n1 >> 6) & 0x7) == 0x7)
 		{
-			dx += (1 - cos((n1 & 0x7f) / 64.0f * 2.f * std::numbers::pi)) * (20 + ((seed * seed) % 9));
-			dy += (sin((n1 & 0x7f) / 64.0f * 2.f * std::numbers::pi)) * (20 + ((seed * seed) % 9));
+			dx = (1 - cos((n1 & 0x7f) / 64.0f * 2.f * std::numbers::pi)) * (20 + ((seed * seed) % 9));
+			dy = (sin((n1 & 0x7f) / 64.0f * 2.f * std::numbers::pi)) * (20 + ((seed * seed) % 9));
 		}
 
 		if (((n2 >> 8) & 0xf) == 0xf)
@@ -47,6 +52,6 @@ class Enemy : public GameComponent<Enemy>
 
 		this->position = this->basePosition + Position(dx, dy);
 
-		DrawSprite(sprite, position.x, position.y, size.width, size.height, angle, 0xffffffff);
+		this->draw();
 	}
 };

Frame.cpp

@@ -0,0 +1 @@
+#include "Frame.h"

Frame.h

@@ -0,0 +1,7 @@
+#pragma once
+#include "Drawable.h"
+
+class Frame: public Drawable
+{
+};
+

GameComponent.h

@@ -1,4 +1,5 @@
 #pragma once
+#include "Drawable.h"
 #include "Sprite.h"
 
 struct Coordinates
@@ -40,12 +41,10 @@ struct Size
 
 using Position = Coordinates;
 using Delta = Coordinates;
-using Time = int;
 using Angle = float;
 using Seed = int;
 
-template <typename T1>
-class GameComponent
+class GameComponent: public Drawable
 {
 public:
     Coordinates position;
@@ -54,10 +53,5 @@ class GameComponent
     Angle angle{};
 
 public:
-    GameComponent() {};
-    void tick(const Time currentTime)
-    {
-        T1& derived = static_cast<T1&>(*this);
-        derived.tick(currentTime);
-    }
+    virtual void tick(const Time currentTime) = 0;
 };

Player.h

@@ -2,7 +2,7 @@
 #include "GameComponent.h"
 #include <numbers>
 
-class Player :  public GameComponent<Player>
+class Player :  public GameComponent
 {
 public:
     const Sprite& sprite;
@@ -12,16 +12,16 @@ class Player :  public GameComponent<Player>
         this->size = size;
     }
 
-    void tick(const Time time)
-    {
-        this->detectMovement();
-
-        DrawSprite(sprite, position.x, position.y, size.width, size.height, std::numbers::pi + sin(time * 0.1) * 0.1, 0xffffffff);
-    }
-
     void detectMovement() noexcept
     {
         position.x += IsKeyDown(VK_LEFT) ? -7 : IsKeyDown(VK_RIGHT) ? 7 : 0;
         position.y += IsKeyDown(VK_UP) ? -7 : IsKeyDown(VK_DOWN) ? 7 : 0;
     }
+
+    void tick(const Time time) override
+    {
+        this->detectMovement();
+
+        DrawSprite(sprite, position.x, position.y, size.width, size.height, std::numbers::pi + sin(time * 0.1) * 0.1, 0xffffffff);
+    }
 };

Sprite.h

@@ -20,7 +20,7 @@ class Sprite
 };
 
 // Sprites is a singleton class
-// It loads letters (a-z), numbers (0-9), invaders (littele and big) and the bullet
+// It loads letters (a-z), numbers (0-9), invaders (little and big) and the bullet
 class Sprites
 {
 private:

Text.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "GameComponent.h"
-class Text : public GameComponent<Text>
+class Text : public GameComponent
 {
 private:
     std::string_view text;

leet.vcxproj

@@ -100,8 +100,11 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="Begin.cpp" />
     <ClCompile Include="Bullet.cpp" />
+    <ClCompile Include="Drawable.cpp" />
     <ClCompile Include="Enemy.cpp" />
+    <ClCompile Include="Frame.cpp" />
     <ClCompile Include="GameComponent.cpp" />
     <ClCompile Include="lib\leetlib.cpp" />
     <ClCompile Include="main.cpp" />
@@ -110,8 +113,11 @@
     <ClCompile Include="Text.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="Begin.h" />
     <ClInclude Include="Bullet.h" />
+    <ClInclude Include="Drawable.h" />
     <ClInclude Include="Enemy.h" />
+    <ClInclude Include="Frame.h" />
     <ClInclude Include="GameComponent.h" />
     <ClInclude Include="lib\leetlib.h" />
     <ClInclude Include="Player.h" />

leet.vcxproj.filters

@@ -11,6 +11,9 @@
     <Filter Include="Source Files\GameComponents">
       <UniqueIdentifier>{f081bdaa-a4b6-4044-9881-c8e39f123edf}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\Frames">
+      <UniqueIdentifier>{1728aaa0-800d-46c9-b9c6-5b87818ec57b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
@@ -37,6 +40,15 @@
     <ClCompile Include="Text.cpp">
       <Filter>Source Files\GameComponents</Filter>
     </ClCompile>
+    <ClCompile Include="Begin.cpp">
+      <Filter>Source Files\Frames</Filter>
+    </ClCompile>
+    <ClCompile Include="Frame.cpp">
+      <Filter>Source Files\Frames</Filter>
+    </ClCompile>
+    <ClCompile Include="Drawable.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="lib\leetlib.h">
@@ -60,5 +72,14 @@
     <ClInclude Include="Text.h">
       <Filter>Source Files\GameComponents</Filter>
     </ClInclude>
+    <ClInclude Include="Begin.h">
+      <Filter>Source Files\Frames</Filter>
+    </ClInclude>
+    <ClInclude Include="Frame.h">
+      <Filter>Source Files\Frames</Filter>
+    </ClInclude>
+    <ClInclude Include="Drawable.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

main.cpp

@@ -1,14 +1,57 @@
 #include "lib/leetlib.h"
-#include <math.h>
 #include <algorithm>
+#include <deque>
+#include <math.h>
 
 #include "Bullet.h"
 #include "Enemy.h"
+#include "GameComponent.h"
 #include "Player.h"
 #include "Sprite.h"
-#include "GameComponent.h"
 #include "Text.h"
 
+template <typename T>
+class Container : public std::deque<T>
+{
+	using iterator = typename std::deque<T>::iterator;
+	using size_type = typename std::deque<T>::size_type;
+	using parent = std::deque<T>;
+
+public:
+	Container(const size_type count, const T& value)
+	{
+		for (size_type i = 0; i < count; ++i)
+		{
+			parent::push_back(value);
+		}
+	}
+
+	iterator begin() noexcept
+	{
+		return parent::begin();
+	}
+
+	iterator end() noexcept
+	{
+		return parent::end();
+	}
+
+	void next(iterator& iterator)
+	{
+		iterator = std::next(iterator);
+		if (iterator == parent::end())
+		{
+			iterator = parent::begin();
+		}
+	}
+
+	template<class... Args>
+	T& emplace_back(Args&&... args)
+	{
+		return parent::emplace_back(std::forward<Args>(args)...);
+	}
+};
+
 void Game()
 {
 	Sprites& sprites = Sprites::getSprites();
@@ -17,13 +60,13 @@ void Game()
 	Player player = { sprites.player, Position(400, 550), Size(50, 50) };
 
 	// 10 bullets
-	std::vector<Bullet> bullets = { 10, { sprites.bullet, Size(10, 10) } };
+	Container<Bullet> bullets = { 10, { sprites.bullet, Size(10, 10) } };
 
 	// 50 enemies
-	std::vector<Enemy> enemies = { 50, { sprites.enemy } };
+	Container<Enemy> enemies = { 50, { sprites.enemy } };
 
 	// Title
-	Text header = { "space invaders 2d", sprites.alphabet, Position{80, 30} };
+	Text header = { "space invaders 2d", sprites.alphabet, Position(80, 30) };
 
 	int time = 0;
 	auto bulletToFire = bullets.begin();
@@ -50,11 +93,7 @@ void Game()
 			if (counter == 0)
 			{
 				bulletToFire->setPosition(player.position);
-				++bulletToFire;
-				if (bulletToFire == bullets.end())
-				{
-					bulletToFire = bullets.begin();
-				}
+				bullets.next(bulletToFire);
 
 				counter = 15;
 			}