renderer: particles: using weak_ptr for storing the camera

San7o · San7o · commit 330667f41d12 · 2026-03-02T11:10:13.000+01:00
diff --git a/examples/demo/include/demo/callbacks/camera_mouse.hpp b/examples/demo/include/demo/callbacks/camera_mouse.hpp
@@ -8,4 +8,5 @@
 #include <brenta/renderer/camera.hpp>
 #include <brenta/mouse.hpp>
 
-void init_camera_mouse_callback(brenta::Camera *cam, brenta::Mouse *mouse);
+void init_camera_mouse_callback(tenno::weak_ptr<brenta::Camera> cam,
+                                brenta::Mouse *mouse);
diff --git a/examples/demo/include/demo/resources/camera.hpp b/examples/demo/include/demo/resources/camera.hpp
@@ -13,8 +13,8 @@ using namespace viotecs;
 
 struct CameraResource : Resource
 {
-  brenta::Camera *cam;
-  CameraResource(brenta::Camera *c) : cam(c)
+  tenno::shared_ptr<brenta::Camera> cam;
+  CameraResource(tenno::shared_ptr<brenta::Camera> c) : cam(c)
   {
   }
 };
diff --git a/examples/demo/include/demo/systems/debug_text.hpp b/examples/demo/include/demo/systems/debug_text.hpp
@@ -23,7 +23,7 @@ struct DebugTextSystem : System<None>
   {
     auto            color            = Color::yellow();
     const float     offset           = 20.0f;
-    brenta::Camera *cam              = World::get_resource<CameraResource>()->cam;
+    auto            cam              = World::get_resource<CameraResource>()->cam;
     auto            camera_world_pos = cam->get_transform().get_pos();
     auto            font             = AssetManager::get<Font>("TextFont");
 
diff --git a/examples/demo/include/demo/systems/renderer.hpp b/examples/demo/include/demo/systems/renderer.hpp
@@ -36,7 +36,7 @@ struct RendererSystem : System<ModelComponent, TransformComponent>
       return;
     }
 
-    brenta::Camera *cam = World::get_resource<CameraResource>()->cam;
+    auto cam = World::get_resource<CameraResource>()->cam;
 
     for (auto match : matches)
     {
diff --git a/examples/demo/src/callbacks/camera_mouse.cpp b/examples/demo/src/callbacks/camera_mouse.cpp
@@ -12,7 +12,7 @@
 
 using namespace brenta;
 
-void init_camera_mouse_callback(Camera *cam, Mouse *mouse)
+void init_camera_mouse_callback(tenno::weak_ptr<Camera> cam, Mouse *mouse)
 {
   auto camera_mouse_callback = [cam, mouse](double xpos, double ypos)
   {
@@ -35,7 +35,10 @@ void init_camera_mouse_callback(Camera *cam, Mouse *mouse)
       xoffset *= sensitivity;
       yoffset *= sensitivity;
 
-      auto new_cam = cam->get_pos();
+      auto camera = cam.lock();
+      if (!camera) return;
+      
+      auto new_cam = camera->get_pos();
       try {
         Camera::Spherical scam = std::get<Camera::Spherical>(new_cam);
         scam.theta += yoffset * sensitivity;
@@ -44,7 +47,7 @@ void init_camera_mouse_callback(Camera *cam, Mouse *mouse)
         if (scam.theta <= 0.01f) scam.theta = 0.01f;
         if (scam.theta >= 3.13f) scam.theta = 3.13f;
 
-        cam->set_pos(scam);
+        camera->set_pos(scam);
         
       } catch ([[maybe_unused]] const std::bad_variant_access& ex) {
         return;
@@ -69,23 +72,26 @@ void init_camera_mouse_callback(Camera *cam, Mouse *mouse)
       xoffset *= sensitivity * 0.3f;
       yoffset *= sensitivity * 0.3f;
 
-      auto new_cam = cam->get_pos();
+      auto camera = cam.lock();
+      if (!camera) return;
+
+      auto new_cam = camera->get_pos();
       try {
         Camera::Spherical scam = std::get<Camera::Spherical>(new_cam);
-        glm::vec3 world_pos = cam->get_transform().get_pos();
+        glm::vec3 world_pos = camera->get_transform().get_pos();
         // Local coordinate system
         glm::vec3 fixed_center =
           glm::vec3(scam.center.x, world_pos.y, scam.center.z);
         // Unit vectors
         glm::vec3 front =
           glm::normalize(world_pos - fixed_center);
         glm::vec3 right =
-          glm::normalize(glm::cross(front, cam->get_world_up()));
+          glm::normalize(glm::cross(front, camera->get_world_up()));
 
         scam.center += right * glm::vec3(xoffset);
-        scam.center -= cam->get_world_up() * glm::vec3(yoffset);
+        scam.center -= camera->get_world_up() * glm::vec3(yoffset);
 
-        cam->set_pos(scam);
+        camera->set_pos(scam);
       } catch ([[maybe_unused]] const std::bad_variant_access& ex) {
         return;
       }
@@ -107,15 +113,18 @@ void init_camera_mouse_callback(Camera *cam, Mouse *mouse)
 
       xoffset *= mouse->get_sensitivity();
       yoffset *= mouse->get_sensitivity();
+
+      auto camera = cam.lock();
+      if (!camera) return;
       
-      auto new_cam = cam->get_pos();
+      auto new_cam = camera->get_pos();
       try {
         Camera::Spherical scam = std::get<Camera::Spherical>(new_cam);
 
         scam.radius -= yoffset;
         if (scam.radius <= 0.1f) scam.radius = 0.1f;
 
-        cam->set_pos(scam);
+        camera->set_pos(scam);
       } catch ([[maybe_unused]] const std::bad_variant_access& ex) {
         return;
       }
diff --git a/examples/demo/src/main.cpp b/examples/demo/src/main.cpp
@@ -51,16 +51,17 @@ int main()
   engine.initialize();
   ///auto engine = Engine::managed();
 
-  auto camera = Camera::Builder()
-    .projection_type(Camera::ProjectionType::Perspective)
-    .position(Camera::Spherical::Builder()
-              .center({0.0f, 2.0f, 0.0f})
-              .phi(1.25f)
-              .theta(1.25f)
-              .radius(30.0f)
-              .build())
-    .fov(45.0f)
-    .build();
+  auto camera =
+    tenno::shared_ptr<Camera>(Camera::Builder()
+                              .projection_type(Camera::ProjectionType::Perspective)
+                              .position(Camera::Spherical::Builder()
+                                        .center({0.0f, 2.0f, 0.0f})
+                                        .phi(1.25f)
+                                        .theta(1.25f)
+                                        .radius(30.0f)
+                                        .build())
+                              .fov(45.0f)
+                              .build());
 
   Mouse mouse = {};
   mouse.set_sensitivity(0.05f);
@@ -76,11 +77,11 @@ int main()
 
   init_toggle_wireframe_callback();
   init_close_window_callback();
-  init_camera_mouse_callback(&camera, &mouse);
+  init_camera_mouse_callback(camera, &mouse);
   init_play_guitar_callback();
 
   World::add_resource<WireframeResource>(false);
-  World::add_resource<CameraResource>(&camera);
+  World::add_resource<CameraResource>(camera);
   World::register_systems<RendererSystem,
                           PointLightsSystem,
                           DebugTextSystem,
@@ -98,7 +99,7 @@ int main()
                                     .size(40));
     
     auto emitter = ParticleEmitter::Builder()
-      .with_camera(&camera)
+      .with_camera(camera)
       .starting_position(glm::vec3(0.0f, 0.0f, 5.0f))
       .starting_velocity(glm::vec3(0.0f, 5.0f, 0.0f))
       .starting_spread(glm::vec3(3.0f, 10.0f, 3.0f))
diff --git a/examples/particles.cpp b/examples/particles.cpp
@@ -46,19 +46,20 @@ int main()
     .build(); 
   auto engine = Engine::managed();
 
-  auto camera = Camera::Builder()
-    .position(Camera::Spherical::Builder()
-              .center({0.0f, 2.0f, 0.0f})
-              .theta(1.25f)
-              .phi(1.25f)
-              .radius(10.0f)
-              .build())
-    .projection_type(Camera::ProjectionType::Perspective)
-    .fov(45.0f)
-    .build();
+  auto camera =
+    tenno::make_shared<Camera>(Camera::Builder()
+                               .position(Camera::Spherical::Builder()
+                                         .center({0.0f, 2.0f, 0.0f})
+                                         .theta(1.25f)
+                                         .phi(1.25f)
+                                         .radius(10.0f)
+                                         .build())
+                               .projection_type(Camera::ProjectionType::Perspective)
+                               .fov(45.0f)
+                               .build());
 
   auto emitter = ParticleEmitter::Builder()
-      .with_camera(&camera)
+      .with_camera(camera)
       .starting_position(glm::vec3(0.0f, 0.0f, 0.0f))
       .starting_velocity(glm::vec3(0.0f, 5.0f, 0.0f))
       .starting_spread(glm::vec3(3.0f, 10.0f, 3.0f))
diff --git a/external/tenno-tl b/external/tenno-tl
@@ -1 +1 @@
-Subproject commit 2e9a5cf98962530920188fd04a0b9edbf0505f11
+Subproject commit 495ece95636c0f993683557e2faf38c872b3c48f
diff --git a/include/brenta/renderer/particles.hpp b/include/brenta/renderer/particles.hpp
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#define MAX_PARTICLES 1000
+#define BRENTA_MAX_PARTICLES 1000
 
 #include <brenta/renderer/camera.hpp>
 #include <brenta/renderer/opengl/texture.hpp>
@@ -67,26 +67,26 @@ class ParticleEmitter
 
 private:
   
-  Camera *cam;
-  tenno::shared_ptr<Shader> shader_update;
-  tenno::shared_ptr<Shader> shader_render;
+  tenno::weak_ptr<Camera>     cam;
+  tenno::shared_ptr<Shader>   shader_update;
+  tenno::shared_ptr<Shader>   shader_render;
 
 };
 
 struct ParticleEmitter::Config
 {
-  glm::vec3              starting_position     = {};
-  glm::vec3              starting_velocity     = {};
-  glm::vec3              starting_spread       = {};
-  float                  starting_time_to_live = 1.0f;
-  int                    num_particles         = MAX_PARTICLES;
-  float                  spawn_rate            = 0.01f;
-  float                  scale                 = 1.0f;
-  std::filesystem::path  atlas_path            = "";
-  int                    atlas_width           = 8;
-  int                    atlas_height          = 8;
-  int                    atlas_index           = 0;
-  Camera                *cam                   = nullptr;
+  glm::vec3               starting_position     = {};
+  glm::vec3               starting_velocity     = {};
+  glm::vec3               starting_spread       = {};
+  float                   starting_time_to_live = 1.0f;
+  int                     num_particles         = BRENTA_MAX_PARTICLES;
+  float                   spawn_rate            = 0.01f;
+  float                   scale                 = 1.0f;
+  std::filesystem::path   atlas_path            = "";
+  int                     atlas_width           = 8;
+  int                     atlas_height          = 8;
+  int                     atlas_index           = 0;
+  tenno::weak_ptr<Camera> cam                   = {};
 };
   
 class ParticleEmitter::Builder
@@ -107,7 +107,7 @@ class ParticleEmitter::Builder
   Builder &atlas_width(int atlas_width);
   Builder &atlas_height(int atlas_height);
   Builder &atlas_index(int atlas_index);
-  Builder &with_camera(Camera *cam);
+  Builder &with_camera(tenno::weak_ptr<Camera> cam);
 
   ParticleEmitter build();
 };
diff --git a/src/renderer/particles.cpp b/src/renderer/particles.cpp
@@ -184,7 +184,8 @@ void ParticleEmitter::update(float delta_time)
 // Render particles
 void ParticleEmitter::render()
 {
-  if (!this->cam)
+  tenno::shared_ptr<Camera> camera = this->cam.lock();
+  if (!camera)
   {
     ERROR("ParticleEmitter::render_particles: Camera not set or null for emitter");
     return;
@@ -208,10 +209,10 @@ void ParticleEmitter::render()
   int window_width  = Window::get_width();
   int window_height = Window::get_height();
   auto projection =
-    this->cam->get_projection_matrix(window_width, window_height);
+    camera->get_projection_matrix(window_width, window_height);
 
   shader_render->use();
-  shader_render->set_mat4("view",        this->cam->get_view_matrix());
+  shader_render->set_mat4("view",        camera->get_view_matrix());
   shader_render->set_mat4("projection",  projection);
   shader_render->set_mat4("model",       glm::mat4(1.0f));
   shader_render->set_int("atlas_width",  this->atlas_width);
@@ -316,7 +317,8 @@ ParticleEmitter::Builder::atlas_index(int atlas_index)
   return *this;
 }
 
-ParticleEmitter::Builder &ParticleEmitter::Builder::with_camera(Camera *cam)
+ParticleEmitter::Builder &
+ParticleEmitter::Builder::with_camera(tenno::weak_ptr<Camera> cam)
 {
   this->conf.cam = cam;
   return *this;

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ using namespace viotecs;`
`13`	`13`
`14`	`14`	`struct CameraResource : Resource`
`15`	`15`	`{`
`16`		`- brenta::Camera *cam;`
`17`		`- CameraResource(brenta::Camera *c) : cam(c)`
	`16`	`+ tenno::shared_ptr<brenta::Camera> cam;`
	`17`	`+ CameraResource(tenno::shared_ptr<brenta::Camera> c) : cam(c)`
`18`	`18`	`{`
`19`	`19`	`}`
`20`	`20`	`};`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ struct DebugTextSystem : System<None>`
`23`	`23`	`{`
`24`	`24`	`auto color = Color::yellow();`
`25`	`25`	`const float offset = 20.0f;`
`26`		`- brenta::Camera *cam = World::get_resource<CameraResource>()->cam;`
	`26`	`+ auto cam = World::get_resource<CameraResource>()->cam;`
`27`	`27`	`auto camera_world_pos = cam->get_transform().get_pos();`
`28`	`28`	`auto font = AssetManager::get<Font>("TextFont");`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ struct RendererSystem : System<ModelComponent, TransformComponent>`
`36`	`36`	`return;`
`37`	`37`	`}`
`38`	`38`
`39`		`- brenta::Camera *cam = World::get_resource<CameraResource>()->cam;`
	`39`	`+ auto cam = World::get_resource<CameraResource>()->cam;`
`40`	`40`
`41`	`41`	`for (auto match : matches)`
`42`	`42`	`{`