Merge pull request #82 from VEGO-Engine/#81-zindex

Added z-Index based render order

include/Component.h

@@ -9,7 +9,6 @@ public:
 
 	virtual void init() {}
 	virtual void update() {}
-	virtual void draw() {}
 
 	virtual ~Component() = default;
 };

include/Entity.h

@@ -42,7 +42,6 @@ public:
 		manager(mManager) { };
 
 	void update() const;
-	void draw() const;
 
 	bool isActive() const { return this->active; }
 	void destroy() {

include/GameInternal.h

@@ -9,6 +9,7 @@
 #include "Manager.h"
 #include "Vector2D.h"
 #include "Entity.h"
+#include "RenderManager.h"
 
 typedef std::function<void()> gamefunction;
 
@@ -42,8 +43,8 @@ public:
     /* static */ TextureManager* textureManager;
     /* static */ SoundManager* soundManager;
 
-    // moved globals
     Manager manager;
+    RenderManager renderManager;
     Map* map; // game specific, might not be needed for all types of games
 
 	std::vector<Entity*>& tiles;

include/Manager.h

@@ -16,7 +16,6 @@ public:
 	Manager(GameInternal* game) : game(game) {};
 	
 	void update();
-	void draw();
 	void refresh();
 
 	void addToGroup(Entity* mEntity, Group mGroup);

include/RenderManager.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <vector>
+
+#include "RenderObject.h"
+
+class RenderManager {
+public:
+	RenderManager() {};
+
+	/*
+	 * Remove an object from the list of objects to be rendered
+	 * \param renderObject The object to be removed
+	 * \sa RenderObject
+	 */
+	void remove(RenderObject* obj);
+	/*
+	 * Add an object to be rendered
+	 * \param renderObject The object to be rendered
+	 * \sa RenderObject
+ 	 */
+	void add(RenderObject* obj);
+
+	void renderAll(); //!< Render all objects. If the list has been modified, sorts it based on z-index first
+
+private:
+	std::vector<RenderObject*> renderObjects;
+	bool isSorted;
+};

include/RenderObject.h

@@ -0,0 +1,27 @@
+#pragma once
+
+class RenderManager;
+
+class RenderObject
+{
+public:
+	virtual void draw() = 0;
+
+	RenderObject(int zIndex, RenderManager& renderManager);
+	~RenderObject();
+
+	int getZIndex() { return this->zIndex; };
+
+	//! Comparitor to compare two ptr based on z-index
+	struct ZIndexComparator {
+		bool operator()(RenderObject const *lhs, RenderObject const *rhs ) const {
+    		return lhs->zIndex < rhs->zIndex;
+		}
+	};
+
+private:
+	int zIndex = 0;
+
+protected:
+	RenderManager& renderManager;
+};

include/SpriteComponent.h

@@ -8,10 +8,11 @@
 #include "AnimationHandler.h"
 #include "Component.h"
 #include "Direction.h"
+#include "RenderObject.h"
 
 class TransformComponent;
 
-class SpriteComponent : public Component
+class SpriteComponent : public Component, public RenderObject
 {
 public:
 	int animationIndex = 0;
@@ -31,13 +32,13 @@ private:
 	bool flipped = false;
 
 public:
-	SpriteComponent() = default;
+	SpriteComponent(const char* path, int zIndex);
-	SpriteComponent(const char* path);
 	SpriteComponent(
 		const char* path,
 		bool isAnimated,
 		std::map<std::string, std::unique_ptr<Animation>>* animationList,
-		std::string defaultAnimation);
+		std::string defaultAnimation,
+		int zIndex);
 	~SpriteComponent();
 
 	void setTexture(const char* path);

include/VEGO.h

@@ -0,0 +1,9 @@
+#include "GameInternal.h"
+
+namespace vego {
+	extern GameInternal* game;
+}
+
+inline GameInternal& VEGO_Game() {
+	return *vego::game;
+};

src/AssetManager.cpp

@@ -50,7 +50,7 @@ void AssetManager::createProjectile(Vector2D pos, Vector2D velocity, int scale,
 
     auto& projectile(man->addEntity());
     projectile.addComponent<TransformComponent>(pos.x, pos.y, 32, 32, scale); //32x32 is standard size for objects
-    projectile.addComponent<SpriteComponent>(texturePath);
+    projectile.addComponent<SpriteComponent>(texturePath, 4);
     projectile.addComponent<ProjectileComponent>(range, speed, velocity, owner);
     projectile.addComponent<ColliderComponent>("projectile", 0.6f);
     projectile.addGroup((size_t)Entity::GroupLabel::PROJECTILE);
@@ -62,7 +62,7 @@ void AssetManager::createPowerup(Vector2D pos, std::function<void (Entity*)> pic
     powerups.addComponent<TransformComponent>(pos.x, pos.y, 32, 32, 1); //32x32 is standard size for objects
 
     try {
-        powerups.addComponent<SpriteComponent>(texturePath.c_str());
+        powerups.addComponent<SpriteComponent>(texturePath.c_str(), 3);
     }
     catch (std::runtime_error e) {
         std::cout << e.what() << std::endl;

src/Entity.cpp

@@ -9,11 +9,6 @@ void Entity::update() const
 	for (auto const& c : components) c->update();
 }
 
-void Entity::draw() const
-{
-	for (auto const& c : components) c->draw();
-}
-
 bool Entity::hasGroup(Group mGroup)
 {
 	return groupBitSet[mGroup];

src/GameInternal.cpp

@@ -4,6 +4,7 @@
 
 #include "CollisionHandler.h"
 #include "AssetManager.h"
+#include "RenderManager.h"
 #include "SoundManager.h"
 #include "TileComponent.h"
 #include "Direction.h"
@@ -18,6 +19,7 @@
 
 GameInternal::GameInternal() :
 	manager(this),
+	renderManager(),
 	tiles(manager.getGroup((size_t)Entity::GroupLabel::MAPTILES)),
 	players(manager.getGroup((size_t)Entity::GroupLabel::PLAYERS)),
 	projectiles(manager.getGroup((size_t)Entity::GroupLabel::PROJECTILE)),
@@ -169,21 +171,7 @@ void GameInternal::update()
 void GameInternal::render()
 {
 	SDL_RenderClear(renderer);
-	for (auto& t : tiles)
+	this->renderManager.renderAll();
-		t->draw();
-
-	for (auto& p : powerups)
-		p->draw();
-
-	for (auto& p : players)
-		p->draw();
-
-	for (auto& p : projectiles)
-		p->draw();
-
-	for (auto& h : hearts)
-		h->draw();
-
 	SDL_RenderPresent(renderer);
 }
 

src/Manager.cpp

@@ -6,11 +6,6 @@
 #include "Constants.h"
 #include "Entity.h"
 
-void Manager::draw()
-{
-	for (auto& e : entities) e->draw();
-}
-
 void Manager::refresh()
 {
 	for (auto i(0u); i < MAX_GROUPS; i++)

src/RenderManager.cpp

@@ -0,0 +1,24 @@
+#include "RenderManager.h"
+#include "RenderObject.h"
+#include <algorithm>
+
+void RenderManager::renderAll()
+{
+	if (!this->isSorted) {
+		std::ranges::sort(this->renderObjects, RenderObject::ZIndexComparator());
+	}
+	for (RenderObject* obj : this->renderObjects) {
+		obj->draw();
+	}
+}
+
+void RenderManager::add(RenderObject* renderObject) {
+	this->renderObjects.emplace_back(renderObject);
+	this->isSorted = false;
+}
+
+void RenderManager::remove(RenderObject* renderObject)
+{
+	this->renderObjects.erase(std::remove(this->renderObjects.begin(), this->renderObjects.end(), renderObject), this->renderObjects.end());
+	this->isSorted = false;
+}

src/RenderObject.cpp

@@ -0,0 +1,10 @@
+#include "RenderObject.h"
+#include "RenderManager.h"
+
+RenderObject::RenderObject(int zIndex, RenderManager& renderManager) : zIndex(zIndex), renderManager(renderManager) {
+	renderManager.add(this);
+}
+
+RenderObject::~RenderObject() { 
+	this->renderManager.remove(this);
+}

src/SpriteComponent.cpp

@@ -6,13 +6,16 @@
 
 #include "AnimationHandler.h"
 #include "Direction.h"
+#include "ProjectileComponent.h"
+#include "RenderObject.h"
 #include "TextureManager.h"
 #include "Entity.h"
 #include "TransformComponent.h"
 #include "GameInternal.h"
 #include "Manager.h"
+#include "VEGO.h"
 
-SpriteComponent::SpriteComponent(const char* path)
+SpriteComponent::SpriteComponent(const char* path, int zIndex) : RenderObject(zIndex, VEGO_Game().renderManager)
 {
 	this->texturePath = path;
 }
@@ -21,7 +24,8 @@ SpriteComponent::SpriteComponent(
 	const char* path,
 	bool isAnimated,
 	std::map<std::string, std::unique_ptr<Animation>>* animationMap,
-	std::string defaultAnimation)
+	std::string defaultAnimation,
+	int zIndex) : RenderObject(zIndex, VEGO_Game().renderManager)
 {
 	animated = isAnimated;
 
@@ -36,7 +40,7 @@ SpriteComponent::~SpriteComponent() {}
 
 void SpriteComponent::setTexture(const char* path)
 {
-	this->texture = this->entity->getManager().getGame()->textureManager->loadTexture(path);
+	this->texture = VEGO_Game().textureManager->loadTexture(path);
 }
 
 void SpriteComponent::init()
@@ -68,7 +72,7 @@ void SpriteComponent::update()
 
 void SpriteComponent::draw()
 {
-	this->entity->getManager().getGame()->textureManager->draw(this->entity->getManager().getGame()->renderer, this->texture, this->srcRect, this->destRect, this->animated && this->flipped);
+	this->entity->getManager().getGame()->textureManager->draw(VEGO_Game().renderer, this->texture, this->srcRect, this->destRect, this->animated && this->flipped);
 }
 
 void SpriteComponent::playAnimation(std::string type)

src/TileComponent.cpp

@@ -31,7 +31,7 @@ void TileComponent::init()
 	this->entity->addComponent<TransformComponent>(this->tileRect.x, this->tileRect.y, this->tileRect.w, this->tileRect.h, 1);
 	this->transform = &entity->getComponent<TransformComponent>();
 
-	this->entity->addComponent<SpriteComponent>(this->path);
+	this->entity->addComponent<SpriteComponent>(this->path, 0);
 	this->sprite = &entity->getComponent<SpriteComponent>();
 }
 

src/TransformComponent.cpp

@@ -72,7 +72,7 @@ void TransformComponent::modifySpeed(int8_t modifier)
 
 void TransformComponent::setPositionAfterCollision(Vector2D& positionChange)
 {
-	std::initializer_list colliders = { Entity::GroupLabel::MAPTILES, Entity::GroupLabel::COLLIDERS };
+	std::initializer_list<Entity::GroupLabel> colliders = { Entity::GroupLabel::MAPTILES, Entity::GroupLabel::COLLIDERS };
 	IntersectionBitSet intersections =
 		(CollisionHandler::getIntersectionWithBounds(entity, Vector2D(positionChange.x, 0)) |
 			(this->entity->getManager()

src/main.cpp

@@ -1,11 +1,12 @@
 #include <iostream>
 #include <ctime>
 
+#include "VEGO.h"
 #include "Entity.h"
 #include "GameInternal.h"
 #include "Constants.h"
 
-GameInternal* game = nullptr;
+GameInternal* vego::game = nullptr;
 
 int main(int argc, char* argv[])
 {
@@ -17,15 +18,15 @@ int main(int argc, char* argv[])
 	Uint32 frameStart;
 	int frameTime;
 
-	game = new GameInternal();
+	vego::game = new GameInternal();
 
-	game->init("No_Name_Chicken_Game", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, SCREEN_SIZE_WIDTH, SCREEN_SIZE_HEIGHT, false);
+	vego::game->init("No_Name_Chicken_Game", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, SCREEN_SIZE_WIDTH, SCREEN_SIZE_HEIGHT, false);
-        while (game->isRunning()) {
+        while (vego::game->isRunning()) {
             frameStart = SDL_GetTicks();
 
-            game->handleEvents();
+            vego::game->handleEvents();
-            game->update();
+            vego::game->update();
-            game->render();
+            vego::game->render();
 
             frameTime = SDL_GetTicks() - frameStart;
 
@@ -34,7 +35,7 @@ int main(int argc, char* argv[])
             }
         }
 
-    game->clean();
+    vego::game->clean();
 
 	return 0;
 }