+
+
+ ;
+// [IntersectionBitSet]
class CollisionHandler
{
@@ -47,6 +53,20 @@ public:
std::initializer_list const& teamLabels = {},
bool negateTeam = false);
+ /*!
+ *
+ * \brief Tests entity against all entities with the specified labels for a collision
+ * \details Tests the given entity against every other entity with the specified labels for intersections between their collison boxes.
+ * If the primary entity has no ColliderComponent, the equivalent of no collision is returned immediately, other entities are skipped
+ * if they don't have a ColliderComponent
+ * \param entity The primary entity to check against. Return values will be relative to this entity
+ * \param posMod Modifier to apply toposition before checking collisions.
+ * \param groupLabels Entities need to have at least one listed GroupLabels to get checked against
+ * \param teamLabels Entities need to have one of the specified TeamLabels to get checked against
+ * \param negateTeam If set to true, entities will only be checked against if they **don't** have one of the specified TeamLabels
+ * \see ColliderComponent
+ *
+ */
template
T getAnyIntersection(
Entity* entity,
diff --git a/include/Entity.h b/include/Entity.h
index 82ed6a5..3b9536e 100644
--- a/include/Entity.h
+++ b/include/Entity.h
@@ -16,36 +16,61 @@ using ComponentBitSet = std::bitset;
using GroupBitSet = std::bitset;
using ComponentArray = std::array;
+/*!
+ *
+ * \brief Main class for any object in game, stores associations, labeling and components
+ * \details The entity class is the primary class each object in the game needs to use. Add components to assign functionality.
+ *
+ * \todo More detailed description
+ * \todo Some functions in entity class are only supposed to be called in specific context, which might be valid uses for `friend` keyword. Example: Entity() should only be called from Manager::addEntity(). Verify each functions intended use/scope.
+ *
+ */
class Entity
{
public:
-/*! TODO */
+ /*!
+ * \brief Used for rendering order (last is highest) or retrieving entities of group
+ * \todo Label used in singular entity shouldn't use plural
+ * \todo HEARTS are rendered above POWERUPS, missleading order
+ * \todo PROJECTILE are rendered above POWERUPS, missleading order
+ * \todo Generalize HEARTS as UI or similar
+ */
enum class GroupLabel
{
- MAPTILES,
- PLAYERS,
- ENEMIES,
- COLLIDERS,
- PROJECTILE,
- HEARTS,
- POWERUPS
+ MAPTILES, //!< Entity using TileComponent
+ PLAYERS, //!< Primary entity in player controll
+ ENEMIES, //!< \deprecated All players now grouped as Entity::PLAYERS
+ COLLIDERS, //!< Fixed collider entity, e.g. a wall
+ PROJECTILE, //!< \todo Document
+ HEARTS, //!< \todo Document
+ POWERUPS //!< \todo Document
};
+ /*!
+ * \brief Allows grouping entities by team association for hits, win conditions, etc.
+ */
enum class TeamLabel
{
- NONE, //!< No team
+ NONE, //!< No team, should be skipped in any checks
BLUE, //!< Team blue
RED //!< Team red
};
+ /*!
+ * \todo Document
+ */
explicit Entity(Manager& mManager) :
manager(mManager) { };
- void update() const;
+ void update() const; //!< Call each frame to update all components
+ //! Call after update to render components.
+ //! \sa SpriteComponent::draw()
void draw() const;
- bool isActive() const { return this->active; }
+ bool isActive() const { return this->active; } //!< \sa destroy()
+ //! Mark for destruction for Manager::refresh() and disables collision
+ //! \sa ColliderComponent
void destroy() {
this->active = false;
if (this->hasComponent()) {
@@ -53,21 +78,26 @@ public:
}
}
- bool hasGroup(Group mGroup);
- void addGroup(Group mGroup);
- void delGroup(Group mGroup);
+ bool hasGroup(Group mGroup); //!< \sa GroupLabel
+ void addGroup(Group mGroup); //!< \sa GroupLabel
+ void delGroup(Group mGroup); //!< \sa GroupLabel
+ //! \returns bitset with true on position GroupLabel if the entity belongs to group
+ //! \sa GroupLabel
std::bitset getGroupBitSet();
- void setTeam(TeamLabel teamLabel);
- TeamLabel getTeam();
+ void setTeam(TeamLabel teamLabel); //!< \sa TeamLabel
+ TeamLabel getTeam(); //!< \sa TeamLabel
+ //! \sa Manager
Manager& getManager() { return manager; };
- template bool hasComponent() const
+ template bool hasComponent() const //! \sa Component
{
return componentBitSet[getComponentTypeID()];
}
+ //! \brief Adds specified type as component and calls Component::init()
+ //! \param mArgs Constructor arguments of component
template T& addComponent(TArgs&&...mArgs)
{
T* c(new T(std::forward(mArgs)...));
@@ -82,7 +112,7 @@ public:
return *c;
};
- template T& getComponent() const
+ template T& getComponent() const //! \returns Component of type T
{
auto ptr(componentArray[getComponentTypeID()]);
return *static_cast(ptr);
diff --git a/include/Manager.h b/include/Manager.h
index 61a1c45..1e2fff7 100644
--- a/include/Manager.h
+++ b/include/Manager.h
@@ -7,22 +7,33 @@
#include "Constants.h"
#include "Entity.h"
+/*!
+ *
+ * \brief Is responsible for managing all entities
+ * \details The manager class handles update and draw calls collectively for all entities, and provides functionality to get all or a subset of all entities
+ * \sa Entity
+ * \sa Entity::GroupLabel
+ * \sa Entity::TeamLabel
+ *
+ */
class Manager
{
public:
- void update();
- void draw();
+ void update(); //!< \sa Entity::update()
+ void draw(); //!< \sa Entity::draw()
+ //! Disables all functionality of entities marked for destruction
+ //! \sa Entity::destroy()
void refresh();
- void addToGroup(Entity* mEntity, Group mGroup);
- std::vector& getGroup(Group mGroup);
+ void addToGroup(Entity* mEntity, Group mGroup); //!< \todo `friend` to Entity
+ std::vector& getGroup(Group mGroup); //!< \returns std::vector containing all entities in group Entity::GroupLabel
- void addToTeam(Entity* mEntity, Team mTeam);
- std::vector& getTeam(Team mTeam);
+ void addToTeam(Entity* mEntity, Team mTeam); //!< \todo `friend` to Entity
+ std::vector& getTeam(Team mTeam); //!< \returns std::vector containing all entities in team Entity::TeamLabel
- std::vector getAll();
+ std::vector getAll(); //!< \returns std::vector containing all entities
- Entity& addEntity();
+ Entity& addEntity(); //!< Creates and returns a new, empty entity
private:
std::vector> entities;
diff --git a/include/TransformComponent.h b/include/TransformComponent.h
index e57d747..43e6cdc 100644
--- a/include/TransformComponent.h
+++ b/include/TransformComponent.h
@@ -23,6 +23,7 @@ public:
TransformComponent(float x, float y, int w, int h, int scale);
void init() override;
+ /*! TODO: document usage of collision handler */
void update() override;
void modifySpeed(int8_t modifier);
};
diff --git a/src/CollisionHandler.cpp b/src/CollisionHandler.cpp
index 2ca742a..07c5f2c 100644
--- a/src/CollisionHandler.cpp
+++ b/src/CollisionHandler.cpp
@@ -115,6 +115,17 @@ std::vector CollisionHandler::getColliders(
return colliders;
}
+/*!
+ *
+ * \details Refer to getAnyIntersection() for more details
+ * \return A bitset of intersections, describing the directions of intersection. Position `Direction` in bitset true if edge in that direction collides
+ * \see Direction
+ * \see IntersectionBitSet
+ * \snippet CollisionHandler.h IntersectionBitSet
+ * \details Example usage for IntersectionBitSet (TransformComponent::update()):
+ * \snippet{trimleft} TransformComponent.cpp getAnyIntersection example code
+ *
+ */
template<>
IntersectionBitSet CollisionHandler::getAnyIntersection(
Entity* entity,
@@ -123,6 +134,7 @@ IntersectionBitSet CollisionHandler::getAnyIntersection(
std::initializer_list const& teamLabels,
bool negateTeam)
{
+ if (!entity->hasComponent()) return std::bitset();
IntersectionBitSet intersections;
for (auto& collider : getColliders(groupLabels, teamLabels)) {
intersections |= getIntersection(entity, collider->entity, posMod);
@@ -130,6 +142,13 @@ IntersectionBitSet CollisionHandler::getAnyIntersection(
return intersections;
};
+/*!
+ *
+ * \details Refer to getAnyIntersection() for more details
+ * \return The first entity with collision found
+ * \see Entity
+ *
+ */
template<>
Entity* CollisionHandler::getAnyIntersection(
Entity* entity,
@@ -138,6 +157,7 @@ Entity* CollisionHandler::getAnyIntersection(
std::initializer_list const& teamLabels,
bool negateTeam)
{
+ if (!entity->hasComponent()) return nullptr;
for (auto& collider : getColliders(groupLabels, teamLabels)) {
SDL_Rect rect = entity->getComponent().collider + posMod;
if (SDL_HasIntersection(&rect, &collider->collider)) {
@@ -145,4 +165,28 @@ Entity* CollisionHandler::getAnyIntersection(
}
}
return nullptr;
+};
+
+/*!
+ *
+ * \details Refer to getAnyIntersection() for more details
+ * \return True if any collision was found, otherwise false
+ *
+ */
+template<>
+bool CollisionHandler::getAnyIntersection(
+ Entity* entity,
+ Vector2D posMod,
+ std::initializer_list const& groupLabels,
+ std::initializer_list const& teamLabels,
+ bool negateTeam)
+{
+ if (!entity->hasComponent()) return false;
+ for (auto& collider : getColliders(groupLabels, teamLabels)) {
+ SDL_Rect rect = entity->getComponent().collider + posMod;
+ if (SDL_HasIntersection(&rect, &collider->collider)) {
+ return true;
+ }
+ }
+ return false;
};
\ No newline at end of file
diff --git a/src/TransformComponent.cpp b/src/TransformComponent.cpp
index 0556ca2..43407fa 100644
--- a/src/TransformComponent.cpp
+++ b/src/TransformComponent.cpp
@@ -63,6 +63,8 @@ void TransformComponent::update()
// TODO: move to separate functions
if (this->entity->hasGroup((size_t)Entity::GroupLabel::PLAYERS)) {
+
+ // [getAnyIntersection example code]
IntersectionBitSet intersections =
(CollisionHandler::getIntersectionWithBounds(entity, Vector2D(positionChange.x, 0)) |
(Game::collisionHandler->getAnyIntersection(entity, Vector2D(positionChange.x, 0), { Entity::GroupLabel::MAPTILES, Entity::GroupLabel::COLLIDERS })) &
@@ -76,6 +78,7 @@ void TransformComponent::update()
if (intersections.test((size_t)Direction::UP) || intersections.test((size_t)Direction::DOWN))
positionChange.y = 0;
+ // [getAnyIntersection example code]
}
position += positionChange;
+
+
+
+
+
+
\ No newline at end of file
diff --git a/engine.sublime-project b/engine.sublime-project
new file mode 100644
index 0000000..1466f8e
--- /dev/null
+++ b/engine.sublime-project
@@ -0,0 +1,49 @@
+{
+ "folders":
+ [
+ {
+ "path": "."
+ }
+ ],
+ "settings":
+ {
+ "tab_size": 4
+ },
+ "build_systems": [
+ {
+ "name": "Build engine",
+ "shell_cmd": "cmake --build build",
+ "working_dir": "$project_path",
+ "variants": [
+ {
+ "name": "Debug",
+ "shell_cmd": "cmake -DCMAKE_BUILD_TYPE=Debug build && cmake --build build",
+ },
+ {
+ "name": "Release",
+ "shell_cmd": "cmake -DCMAKE_BUILD_TYPE=Release build && cmake --build build",
+ },
+ ]
+ },
+ {
+ "name": "Generate CMake",
+ "shell_cmd": "cmake -S . -B build",
+ "working_dir": "$project_path",
+ },
+ {
+ "name": "Doxygen",
+ "shell_cmd": "xdg-open $project_path/docs/html/index.html",
+ "working_dir": "$project_path",
+ "variants": [
+ {
+ "name": "Build image",
+ "shell_cmd": "docker build -t vego_engine-docker $project_path/docs/docker",
+ },
+ {
+ "name": "Generate documentation",
+ "shell_cmd": "docker run --rm -v \"$project_path:/source\" -v \"$project_path/docs:/output\" -v \"$project_path/docs/Doxyfile:/Doxyfile\" vego_engine-docker",
+ },
+ ]
+ }
+ ]
+}
diff --git a/include/CollisionHandler.h b/include/CollisionHandler.h
index 1fdba31..04aafbf 100644
--- a/include/CollisionHandler.h
+++ b/include/CollisionHandler.h
@@ -1,5 +1,9 @@
#pragma once
+//! \file CollisionHandler.h
+//! \file CollisionHandler.cpp
+//! \file TransformComponent.cpp
+
#include "ColliderComponent.h"
#include "Constants.h"
#include "Entity.h"
@@ -17,9 +21,11 @@
class ColliderComponent;
class Entity;
+// [IntersectionBitSet]
constexpr uint8_t DIRECTION_C = 4;
using IntersectionBitSet = std::bitset|
+ $projectname
+ $projectnumber
+
+
+
+ $projectbrief
+
+ |
+
+
+
+
+ $projectbrief
+ |
+
+
+
+
+
+ $searchbox | + + + +|
| $searchbox | +|||