Fixed hardcoded font in the engine (#57)

* Fixed hardcoded font in the engine * Updated engine
Brick-Studios · Dec 9, 2019 · 54c98f7 · 54c98f7
1 parent fe261eb
commit 54c98f7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/extern/brickengine b/extern/brickengine
diff --git a/include/entities/entity_factory.hpp b/include/entities/entity_factory.hpp
@@ -54,6 +54,7 @@ class EntityFactory {
     const std::vector<Character> getAvailableCharacters() const;
     const std::vector<std::pair<Character, bool>> getPickedCharacters() const;
 
+    inline static const std::string FONT_PATH = "./assets/fonts/Roboto-Bold.ttf";
 private:
     std::shared_ptr<EntityManager> entityManager;
     RenderableFactory& renderableFactory;
@@ -69,4 +70,4 @@ class EntityFactory {
     SpawnComponent::CreateCompsFn createSniperComponents;
 };
 
-#endif // FILE_ENTITY_FACTORY_HPP
+#endif // FILE_ENTITY_FACTORY_HPP
diff --git a/lib/controllers/game_controller.cpp b/lib/controllers/game_controller.cpp
@@ -85,7 +85,7 @@ GameController::GameController() {
 
     this->delta_time_modifier = std::unique_ptr<double>(new double(1));
 
-    engine = std::make_unique<BrickEngine>("Beast Arena", SCREEN_WIDTH, SCREEN_HEIGHT, layers, fps_cap);
+    engine = std::make_unique<BrickEngine>("Beast Arena", SCREEN_WIDTH, SCREEN_HEIGHT, layers, fps_cap, EntityFactory::FONT_PATH);
     engine->start();
     entityManager = std::make_shared<EntityManager>();
     entityFactory = std::make_shared<EntityFactory>(entityManager, *engine->getRenderableFactory());
@@ -452,4 +452,4 @@ void GameController::loadEndGameLevel() {
 void GameController::showHighscores() {
     scene_manager->destroyAllScenes();
     scene_manager->createScene<HighscoreScene>(*entityManager, *entityFactory, *engine, *score_json, *this);
-}
+}
diff --git a/lib/entities/entity_factory.cpp b/lib/entities/entity_factory.cpp
@@ -259,7 +259,7 @@ std::vector<EntityComponents> EntityFactory::createButton(std::string text, Colo
     }
     {
         auto dstText = std::unique_ptr<Rect>(new Rect{ 0, 0 , 0, 0});
-        auto rText = renderableFactory.createText(text, font_size, text_color, (int)Layers::Foreground, std::move(dstText));
+        auto rText = renderableFactory.createText(FONT_PATH, text, font_size, text_color, (int)Layers::Foreground, std::move(dstText));
 
         auto comps = std::make_unique<std::vector<std::unique_ptr<Component>>>();
         // Relative to button
@@ -277,7 +277,7 @@ std::vector<EntityComponents> EntityFactory::createButton(std::string text, Colo
 
 EntityComponents EntityFactory::createText(std::string text, Color color, int font_size, int x, int y, int x_scale, int y_scale, double relative_modifier) {
     auto dst = std::unique_ptr<Rect>(new Rect{ 0, 0 , 0, 0});
-    auto r_text = renderableFactory.createText(text, font_size, color, (int)Layers::UI, std::move(dst));
+    auto r_text = renderableFactory.createText(FONT_PATH, text, font_size, color, (int)Layers::UI, std::move(dst));
     auto comps = std::make_unique<std::vector<std::unique_ptr<Component>>>();
     comps->push_back(std::make_unique<TransformComponent>(x / relative_modifier, y / relative_modifier, x_scale / relative_modifier, y_scale / relative_modifier, Direction::POSITIVE, Direction::POSITIVE));
     comps->push_back(std::make_unique<TextureComponent>(std::move(r_text)));
+2 −1		include/brickengine/engine.hpp
+1 −1		include/brickengine/rendering/renderable_factory.hpp
+3 −3		lib/engine.cpp
+3 −3		lib/rendering/renderable_factory.cpp