Clarify names of some functions

diff --git a/source/game/owned.h b/source/game/owned.h
index baebf9c8c17a975d6b87664eb5890023b9698654..904101c5faf1f68b5d196eb9cac94bff46163bec 100644 (file)
--- a/source/game/owned.h
+++ b/source/game/owned.h
@@ -69,7 +69,7 @@ Owned<T>::Owned(Handle<P> parent, Args &&... args)
                throw std::invalid_argument("Owned::Owned");
 
        Stage &stage = get_stage(*parent);
-       Pool<T> &pool = stage.get_pools().get_pool<T>();
+       Pool<T> &pool = stage.get_pools().get_or_create_pool<T>();
        this->ptr = pool.create(parent, std::forward<Args>(args)...);
        if constexpr(std::is_base_of_v<Component, T>)
        {
@@ -135,7 +135,7 @@ void Owned<T>::destroy()
                parent->remove_child(*this);
        }
 
-       Pool<T> &pool = stage.get_pools().get_pool<T>();
+       Pool<T> &pool = stage.get_pools().get_or_create_pool<T>();
        pool.destroy(this->ptr);
 }
 

diff --git a/source/game/pool.h b/source/game/pool.h
index 4555c0d9b166d37e672f3aae6e5d2788c86f046c..fa3cb6dc754ecd9c065b22c311b69de549e4326f 100644 (file)
--- a/source/game/pool.h
+++ b/source/game/pool.h
@@ -37,7 +37,7 @@ public:
        static unsigned get_type_id() { static unsigned id = get_next_id(); return id; }
 
        template<typename T>
-       Pool<T> &get_pool();
+       Pool<T> &get_or_create_pool();
 };
 
 
@@ -111,7 +111,7 @@ private:
 
 
 template<typename T>
-inline Pool<T> &PoolPool::get_pool()
+inline Pool<T> &PoolPool::get_or_create_pool()
 {
        unsigned id = get_type_id<T>();
        if(pools.size()<=id)

diff --git a/source/game/stage.h b/source/game/stage.h
index 0ae9b263315039f96dfc1457b79a17ffea8e047c..58908ea5c19b4a18936013d08e5afa39c9d273b7 100644 (file)
--- a/source/game/stage.h
+++ b/source/game/stage.h
@@ -93,7 +93,7 @@ public:
 template<typename T, typename F>
 inline void Stage::iterate_objects(const F &func)
 {
-       pools.get_pool<T>().iterate_objects(func);
+       pools.get_or_create_pool<T>().iterate_objects(func);
 }
 
 template<typename T, typename... Args>

diff --git a/source/gameview/renderer.cpp b/source/gameview/renderer.cpp
index 322effe2fc765f6bc03edce9876334fb68a32913..c9dcc207838717dd12e604da576db40ff442e7ff 100644 (file)
--- a/source/gameview/renderer.cpp
+++ b/source/gameview/renderer.cpp
@@ -123,7 +123,7 @@ void Renderer::component_created(const Game::Events::ComponentCreated &event)
        if(auto shape = dynamic_handle_cast<Game::Shape>(event.component))
                if(!shape->get_technique_name().empty())
                {
-                       RenderedEntity &re = get_rendered_entity(event.component->get_entity());
+                       RenderedEntity &re = get_or_create_rendered_entity(event.component->get_entity());
                        if(!re.generated_mesh)
                        {
                                const GL::Technique &tech = stage.get_resources().get<GL::Technique>(shape->get_technique_name());
@@ -136,7 +136,7 @@ void Renderer::component_created(const Game::Events::ComponentCreated &event)
        auto dyn_mesh_src = dynamic_handle_cast<DynamicMeshSource>(event.component);
        if(mesh_source || dyn_mesh_src)
        {
-               RenderedEntity &re = get_rendered_entity(event.component->get_entity());
+               RenderedEntity &re = get_or_create_rendered_entity(event.component->get_entity());
                if(!re.mesh_renderer)
                {
                        const GL::Object &object = dyn_mesh_src ? dyn_mesh_src->get_object() :
@@ -149,7 +149,7 @@ void Renderer::component_created(const Game::Events::ComponentCreated &event)
        auto light = dynamic_handle_cast<Game::Light>(event.component);
        if(light)
        {
-               RenderedEntity &re = get_rendered_entity(event.component->get_entity());
+               RenderedEntity &re = get_or_create_rendered_entity(event.component->get_entity());
                if(!re.light_emitter)
                {
                        re.light_emitter = Game::Owned<LightEmitter>(re.entity, light->get_type());
@@ -161,7 +161,7 @@ void Renderer::component_created(const Game::Events::ComponentCreated &event)
        }
 }
 
-Renderer::RenderedEntity &Renderer::get_rendered_entity(Game::Handle<Game::Entity> entity)
+Renderer::RenderedEntity &Renderer::get_or_create_rendered_entity(Game::Handle<Game::Entity> entity)
 {
        auto i = lower_bound_member(entities, entity, &RenderedEntity::entity);
        if(i!=entities.end() && i->entity==entity)

diff --git a/source/gameview/renderer.h b/source/gameview/renderer.h
index 211a0e96f93403f6bf92acbffe1fa3afd960a21a..b7cb3f7d89f2933f9e73b5b47b5ffe73d918fc5a 100644 (file)
--- a/source/gameview/renderer.h
+++ b/source/gameview/renderer.h
@@ -74,7 +74,7 @@ private:
        void create_sequence();
 
        void component_created(const Game::Events::ComponentCreated &);
-       RenderedEntity &get_rendered_entity(Game::Handle<Game::Entity>);
+       RenderedEntity &get_or_create_rendered_entity(Game::Handle<Game::Entity>);
        void component_destroyed(const Game::Events::ComponentDestroyed &);
        void camera_changed(const Game::Events::CameraChanged &);