Merge pull request #94 from VEGO-Engine/helper-functions

Helper functions

include/AssetManager.h

@@ -27,8 +27,14 @@ public:
     void createProjectile(Vector2D pos, Vector2D velocity, int scale, int range, int speed, const char* texturePath, Entity* owner);
     void createPowerup(Vector2D pos, std::function<void (Entity*)> pickupFunc, std::string texturePath);
 
-    Vector2D calculateSpawnPosition();
-    PowerupType calculateType();
+    /*!
+	 * \brief Calculates a random spawn position for an object within a given area
+     * \param size The size (collision box) of the object
+     * \param spawnArea The area within which a spawn position will be calculated
+	 * \returns Spawn Coordinates for the object
+     */
+    Vector2D calculateSpawnPosition(Vector2D size, Vector2D spawnArea);
+    template <typename T> [[deprecated]] T calculateRandomType(int amount);
 
     //texture management
     void addTexture(std::string id, const char* path);

src/AssetManager.cpp

@@ -14,6 +14,7 @@
 #include "Vector2D.h"
 #include "PowerupComponent.h"
 #include <iostream>
+#include <algorithm>
 
 AssetManager::AssetManager(Manager* manager) : man(manager) {}
 
@@ -73,33 +74,39 @@ void AssetManager::createPowerup(Vector2D pos, std::function<void (Entity*)> pic
     powerups.addGroup((size_t)Entity::GroupLabel::POWERUPS);
 }
 
-Vector2D AssetManager::calculateSpawnPosition()
+
+Vector2D AssetManager::calculateSpawnPosition(Vector2D size, Vector2D spawnArea)
 {
     Vector2D spawnPos = Vector2D(-1, -1);
-	bool conflict = false;
-	for (int i = 0; i <= SPAWN_ATTEMPTS; i++)
+
+    for(int i = 0; i <= SPAWN_ATTEMPTS; i++)
     {
-		SDL_Rect spawnRect;
-		spawnRect.h = spawnRect.w = 32;
-		spawnRect.x = rand() % (SCREEN_SIZE_WIDTH - spawnRect.w);
-		spawnRect.y = rand() % (SCREEN_SIZE_HEIGHT - spawnRect.h);
-		conflict = false;
-		for (auto cc : this->man->getGame()->collisionHandler->getColliders({ Entity::GroupLabel::MAPTILES }))
+
+        SDL_Rect spawnRect = {
+                rand() % (int)(spawnArea.x - size.x),
+                rand() % (int)(spawnArea.y - size.y),
+                size.x,
+                size.y
+        };
+
+        std::vector<ColliderComponent*> colliders = this->man->getGame()->collisionHandler->getColliders({Entity::GroupLabel::MAPTILES});
+        bool conflict = std::any_of(colliders.begin(), colliders.end(),
+                                    [&](const auto& cc) {
+                                        return SDL_HasIntersection(&spawnRect, &cc->collider);} );
+
+        if(!conflict)
         {
-			if (SDL_HasIntersection(&spawnRect, &cc->collider) && strcmp(cc->tag, "projectile"))
-			{
-				conflict = true;
+            spawnPos = Vector2D(spawnRect.x, spawnRect.y);
             break;
         }
     }
-		if (conflict) continue;
-		spawnPos = Vector2D(spawnRect.x, spawnRect.y);
-	}
+
     return spawnPos;
 }
 
-PowerupType AssetManager::calculateType()
+template <typename T>
+T AssetManager::calculateRandomType(int amount)
 {
-	PowerupType type = PowerupType(rand() % 3);
+    T type = T(rand() % amount);
     return type;
 }