Minor fixes before switching to raylib

tristankpka · Jul 29, 2024 · c5d313d · c5d313d
1 parent 78acb2e
commit c5d313d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/include/NodeSystem.h b/include/NodeSystem.h
@@ -28,10 +28,6 @@ class NodeSystem : public System {
 
 private:
     QueryFunction m_query;
-    std::unordered_set<Entity::Id> m_rootNodes;
-    std::unordered_map<Entity::Id, sf::Transform> m_nodeTransforms;
-    std::unordered_map<Entity::Id, Entity::Id> m_parentMap;
-    std::unordered_map<Entity::Id, std::vector<Entity::Id>> m_childNodes;
 
     void onEventEntityChildAdded(Entity::Id parentId, Entity::Id childId) const;
 };

diff --git a/include/RenderingSystem.h b/include/RenderingSystem.h
@@ -14,7 +14,7 @@
 #include "components/Node.h"   // for Node
 #include "components/Shape.h"  // for Shape
 class World;
-namespace sf { class Drawable; }
+namespace sf { class Shape; }
 namespace sf { class RenderWindow; }
 namespace sf { class Transform; }
 

diff --git a/include/components/Shape.h b/include/components/Shape.h
@@ -5,10 +5,11 @@
 #ifndef DRAWABLE_H
 #define DRAWABLE_H
 
+#include <memory>
 #include <SFML/Graphics/Shape.hpp>
 
 struct Shape {
-    std::unique_ptr<sf::Shape> shape;
+    std::unique_ptr<sf::Shape> shape{};
 };
 
 #endif //DRAWABLE_H
diff --git a/src/RenderingSystem.cpp b/src/RenderingSystem.cpp
@@ -9,7 +9,6 @@
 #include <memory>                          // for unique_ptr
 #include "ComponentManager.h"            // for ComponentManager::getCompo...
 #include "World.h"                         // for World
-#include "World.h"                       // for World::getComponentQuery
 
 RenderingSystem::RenderingSystem(World& world, sf::RenderWindow& window)
     : m_query(world.getComponentQuery<Node, Shape>()), m_window(window) {}
@@ -23,7 +22,7 @@ void RenderingSystem::update() {
 }
 
 void RenderingSystem::doDraw(const Entity::Id id, const sf::Transform& parentTransform) {
-    m_query([this, parentTransform](Entity::Id, const Node& node, const Shape& renderable) {
+    m_query([this, parentTransform](Entity::Id, Node& node, Shape& renderable) {
             m_window.draw(*renderable.shape, node.transform * parentTransform);
         for (const auto child: node.children) {
             doDraw(child, node.transform * parentTransform);