text: made render function non static

Author: San7o

README.md

@@ -2,13 +2,11 @@
 
 **Brenta Engine** is a simple 3D graphics engine written in modern
 C++/OpenGL using a hybrid scene-graph and Entity Component System
-architecture. The engine was created by Giovanni Santini in the summer
-of 2024, the name is inspired by the Brenta Dolimites in the Italian
-Alps.
+architecture.
 
-Check out [GUIDE.md](./docs/GUIDE.md) for a quick introduction on how
-the engine works, and [DESIGN.md](./docs/DESIGN.md) for an overview of
-the engine's internals.
+Check out [DESIGN.md](./docs/DESIGN.md) for an overview of
+the engine's architecture, and [GUIDE.md](./docs/GUIDE.md) for an
+introduction to its API.
 
 <h2 align=center>  Features </h2>
 

TODO

@@ -1,2 +1,3 @@
 - move sound to the asset manager and make it non-static
+- remove unnecessary setters and getters
 - rework website

docs/DESIGN.md

@@ -3,8 +3,8 @@
 I could tell you that the Brenta engine was perfectly designed, with a
 clear vision from its inception, with a beautiful and powerful API
 that makes programming truly enjoyable. Except the fact that it would
-be a lie. It does not mean that I don't find the current design and
-API beautiful and fun - I think Brenta is a powerful engine - but its
+be a lie. I do not mean that I don't find the current design and API
+beautiful and fun - I think Brenta is a powerful engine - but its
 development has been more iterative than meticulously designed. I
 rewrote huge parts of the engine many many times, to the point where I
 am not scared to do big refactoring anymore - that is just routine -

docs/GUIDE.md

@@ -154,7 +154,7 @@ and a `Window`. These are indeed subsystems. You can work with any
 class that implements the `Subsystem` interface by adding it to the
 `Engine` using `with(MyClass::Builder)`.
 
-We then call `Engine::manager()` which will return an object (an
+We then call `Engine::managed()` which will return an object (an
 "engine manager") that will terminate the engine and all its
 subsystems when it goes out of scope. If you don't want to use this,
 you can initialize and terminate the engine manually:
@@ -171,7 +171,7 @@ engine.terminate();
 
 Each subsystem can be configured through their builder, as we have
 already discussed. Like all other things, these usage of `Engine` is
-not mandatory, but it provides a nice way to do manage subsystems.
+not mandatory, but it provides a nice way to manage subsystems.
 
 ### Drivers
 
@@ -182,8 +182,9 @@ example, playing audio can be done with several libraries such as
 including your favourite in the list). Some functionalities may even
 be OS-dependent such as waiting for files in the filesystem (inotify
 on Linux, iocp in Windows). To support multiple implementations
-("backends"), the engine often uses a `Driver` abstraction. A driver
-specifies an interface that can be implemented by different classes.
+("backends") of the same API, the engine often uses a `Driver`
+abstraction. A driver specifies an interface that can be implemented
+by different classes.
 
 In practice, it looks like the following:
 

docs/index.md

@@ -2,9 +2,11 @@
 
 **Brenta Engine** is a simple 3D graphics engine written in modern
 C++/OpenGL using a hybrid scene-graph and Entity Component System
-architecture. The engine was created by Giovanni Santini in the summer
-of 2024, the name is inspired by the Brenta Dolimites in the Italian
-Alps.
+architecture.
+
+Check out [DESIGN.md](./DESIGN.md) for an overview of
+the engine's architecture, and [GUIDE.md](./GUIDE.md) for an
+introduction to its API.
 
 <h2 align=center>  Features </h2>
 

examples/text.cpp

@@ -41,6 +41,16 @@ int main()
   //
 
   auto font = Font("examples/assets/fonts/arial.ttf", 100);
+  auto font_ptr =
+    tenno::make_shared<Font>(tenno::move(font));
+  Text hello = {
+    "Hello OpenGL!",
+    25.0f,
+    25.0f,
+    1.0f,
+    Color::yellow(),
+    font_ptr
+  };
 
   while (!Window::should_close())
   {
@@ -50,9 +60,7 @@ int main()
     Gl::set_color(Color::grey());
     Gl::clear();
 
-    Text::render("Hello OpenGL!",
-                 25.0f, 25.0f, 1.0f,
-                 Color::yellow(), font);
+    hello.render();
 
     Window::poll_events();
     Window::swap_buffers();

include/brenta/renderer/material.hpp

@@ -30,14 +30,44 @@ class Material
 {
 public:
 
-  class Builder;
+  class Builder
+  {
+  public:
+
+    Builder& shader(tenno::shared_ptr<Shader> shader);
+    Builder& integer(const std::string &name, int val);
+    Builder& floating(const std::string &name, float val);
+    Builder& vector(const std::string &name, glm::vec3 val);
+    Builder& texture(const std::string &name,
+                     tenno::shared_ptr<Texture> val, int index);
+
+    // Add path to be watched for hot-reloading
+    Builder &watch(const std::filesystem::path &path);
+  
+    Material build();
+    tenno::vector<std::filesystem::path> get_watch_paths() const;  
+  
+  private:
+  
+    tenno::shared_ptr<Shader> _shader;
+    tenno::vector<std::pair<std::string, int>> ints;
+    tenno::vector<std::pair<std::string, float>> floats;
+    tenno::vector<std::pair<std::string, glm::vec3>> vectors;
+    tenno::vector<std::pair<std::string,
+                            std::pair<int, tenno::shared_ptr<Texture>>>> textures;
+
+  };  
 
   tenno::shared_ptr<Shader> shader;
 
   Material() = default;
   Material(tenno::shared_ptr<Shader> s) : shader(s) {}
   Material(Shader&& s);
   Material(Material&& other) = default;
+  Material(Material::Builder& builder)
+  {
+    *this = builder.build();
+  }
   Material &operator=(Material&& other) = default;
 
   void apply();
@@ -58,32 +88,4 @@ class Material
 
 };
 
-class Material::Builder
-{
-public:
-
-  Builder& shader(tenno::shared_ptr<Shader> shader);
-  Builder& integer(const std::string &name, int val);
-  Builder& floating(const std::string &name, float val);
-  Builder& vector(const std::string &name, glm::vec3 val);
-  Builder& texture(const std::string &name,
-                   tenno::shared_ptr<Texture> val, int index);
-
- // Add path to be watched for hot-reloading
-  Builder &watch(const std::filesystem::path &path);
-  
-  Material build();
-  tenno::vector<std::filesystem::path> get_watch_paths() const;  
-  
-private:
-  
-  tenno::shared_ptr<Shader> _shader;
-  tenno::vector<std::pair<std::string, int>> ints;
-  tenno::vector<std::pair<std::string, float>> floats;
-  tenno::vector<std::pair<std::string, glm::vec3>> vectors;
-  tenno::vector<std::pair<std::string,
-                          std::pair<int, tenno::shared_ptr<Texture>>>> textures;
-
-};  
-
 } // namespace brenta

include/brenta/text.hpp

@@ -34,18 +34,8 @@ class Text
     : text(text), x(x), y(y), scale(scale), color(color), font(font)
   {}
   ~Text() = default;
-
-  //
-  // Static API
-  //
 
-  static void render(const std::string &text,
-                     float x,
-                     float y,
-                     float scale,
-                     Color color,
-                     Font& font);
-  static void render(const Text& text);
+  void render();
 
 };
 

src/drivers/fswatcher_unix.cpp

@@ -8,9 +8,8 @@
 #include <brenta/fswatcher.hpp>
 #include <sys/inotify.h>
 
-using namespace brenta;
-
-#define _FSWATCHER_BUFFER_LEN  (1024 * (sizeof(struct inotify_event) + 16))
+namespace brenta
+{
 
 struct FsWatcherUnixWdList
 {
@@ -26,6 +25,12 @@ struct FsWatcherUnix
   FsWatcherUnixWdList *wd_list;  
 };
 
+} // namespace brenta
+
+using namespace brenta;
+
+#define _FSWATCHER_BUFFER_LEN  (1024 * (sizeof(struct inotify_event) + 16))
+
 FilesystemWatcher::~FilesystemWatcher()
 {
   this->destroy();

src/drivers/fswatcher_windows.cpp

@@ -8,6 +8,9 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
+namespace brenta
+{
+
 struct FsWatcherWindowsDirList
 {
   HANDLE     hDir;
@@ -25,6 +28,10 @@ struct FsWatcherWindows
   FsWatcherWindowsDirList *dir_list;
 };
 
+} // namespace brenta
+
+using namespace brenta;
+  
 FilesystemWatcher::~FilesystemWatcher()
 {
   this->destroy();