issue #80

NevilClavain · Aug 10, 2023 · d5dff97 · d5dff97
1 parent 3fc84c1
commit d5dff97
Show file tree

Hide file tree

Showing 31 changed files with 224 additions and 234 deletions.
diff --git a/lua_extensions/planets_luaext/src/planetsrenderingaspectimpl.cpp b/lua_extensions/planets_luaext/src/planetsrenderingaspectimpl.cpp
@@ -1543,8 +1543,8 @@ void PlanetsRenderingAspectImpl::draw_sub_passes(void)
                 }
             }
 
-            task->SetTargetDescr(sequence_id);
-            task->SetActionDescr("UPDATE_SINGLESHOT_SUBPASS_QUEUES");
+            task->setTargetDescr(sequence_id);
+            task->setActionDescr("UPDATE_SINGLESHOT_SUBPASS_QUEUES");
             task->SetRenderingQueue(queues);
             task->DisableOpt(true);
 

diff --git a/src/buildemeshetask.cpp b/src/buildemeshetask.cpp
@@ -35,11 +35,11 @@ DrawSpace::Logger::Sink bmt_logger("BuildeMesheTask", DrawSpace::Logger::Configu
 using namespace DrawSpace;
 using namespace DrawSpace::Systems;
 
-BuildMesheTask::BuildMesheTask() : ITask("BUILDMESHE", "")
+BuildMesheTask::BuildMesheTask() : Task("BUILDMESHE", "")
 {
 }
 
-void BuildMesheTask::Execute(void)
+void BuildMesheTask::execute(void)
 {
     build_meshe(m_entity, m_meshe_node, m_meshes, m_target_meshe);
 }

diff --git a/src/buildemeshetask.h b/src/buildemeshetask.h
@@ -33,13 +33,13 @@ namespace DrawSpace
 {
 namespace Systems
 {
-struct BuildMesheTask : public Interface::ITask
+struct BuildMesheTask : public Task
 {
 public:
 
     BuildMesheTask();
 
-    void Execute(void);
+    void execute(void);
     void SetEntity(Core::Entity* p_entity);
     void SetMeshesIOInfos(aiMesh** m_source_meshes, Core::Meshe* p_target_meshe, aiNode* p_meshe_node);
 

diff --git a/src/compileshadertask.cpp b/src/compileshadertask.cpp
@@ -31,11 +31,11 @@ using namespace DrawSpace::Utils;
 using namespace DrawSpace::Interface;
 using namespace DrawSpace::Systems;
 
-CompileShaderTask::CompileShaderTask() : ITask("COMPILESHADER", "")
+CompileShaderTask::CompileShaderTask() : Task("COMPILESHADER", "")
 {
 }
 
-void CompileShaderTask::Execute(void)
+void CompileShaderTask::execute(void)
 {
     m_failure = false;
 

diff --git a/src/compileshadertask.h b/src/compileshadertask.h
@@ -36,7 +36,7 @@ class Renderer;
 
 namespace Systems
 {
-struct CompileShaderTask : public Interface::ITask
+struct CompileShaderTask : public Task
 {
 private:
 
@@ -54,13 +54,13 @@ struct CompileShaderTask : public Interface::ITask
 
     // shader bytecode buffer infos...
     long                            m_bc_length;
-    void* m_bc{ nullptr };
+    void*                           m_bc{ nullptr };
 
 public:
 
     CompileShaderTask();
 
-    void Execute(void);
+    void execute(void);
     void SetShaderText(void* p_text, long p_text_size, int p_shadertype);
     void SetShaderDirs(const dsstring& p_final_asset_dir, const dsstring& p_asset_path);
     void SetRenderer(DrawSpace::Interface::Renderer* p_renderer);

diff --git a/src/createdirectorytask.cpp b/src/createdirectorytask.cpp
@@ -29,11 +29,11 @@ using namespace DrawSpace::Systems;
 
 const dsstring CreateDirectoryTask::bcCacheName{ "bc_cache" };
 
-CreateDirectoryTask::CreateDirectoryTask() : ITask("CREATEDIRECTORY", "")
+CreateDirectoryTask::CreateDirectoryTask() : Task("CREATEDIRECTORY", "")
 {
 }
 
-void CreateDirectoryTask::Execute(void)
+void CreateDirectoryTask::execute(void)
 {
     dsstring path{ bcCacheName + dsstring("\\") + m_shader_id.c_str() };
     DrawSpace::FileSystem::createDirectory(path);

diff --git a/src/createdirectorytask.h b/src/createdirectorytask.h
@@ -32,7 +32,7 @@ namespace DrawSpace
 {
 namespace Systems
 {
-struct CreateDirectoryTask : public Interface::ITask
+struct CreateDirectoryTask : public Task
 {
 private:
 
@@ -44,7 +44,7 @@ struct CreateDirectoryTask : public Interface::ITask
 
     CreateDirectoryTask();
 
-    void Execute(void);
+    void execute(void);
     void SetShaderId(const dsstring& p_shader_id);
 };
 }

diff --git a/src/fillmeshesownernamestask.cpp b/src/fillmeshesownernamestask.cpp
@@ -27,11 +27,11 @@
 using namespace DrawSpace;
 using namespace DrawSpace::Systems;
 
-FillMeshesOwnerNamesTask::FillMeshesOwnerNamesTask() : ITask("FILLMESHESOWNERNAMES", "")
+FillMeshesOwnerNamesTask::FillMeshesOwnerNamesTask() : Task("FILLMESHESOWNERNAMES", "")
 {
 }
 
-void FillMeshesOwnerNamesTask::Execute(void)
+void FillMeshesOwnerNamesTask::execute(void)
 {
     m_meshes_node_owner_names.resize(m_nb_meshes);
     fill_scene_node(m_root);

diff --git a/src/fillmeshesownernamestask.h b/src/fillmeshesownernamestask.h
@@ -32,7 +32,7 @@ namespace DrawSpace
 {
 namespace Systems
 {
-struct FillMeshesOwnerNamesTask : public Interface::ITask
+struct FillMeshesOwnerNamesTask : public Task
 {
 private:
 
@@ -46,7 +46,7 @@ struct FillMeshesOwnerNamesTask : public Interface::ITask
 
     FillMeshesOwnerNamesTask();
 
-    void                    Execute(void);
+    void                    execute(void);
     void                    SetNbMeshes(int p_nb_meshes);
     void                    SetRoot(aiNode* p_root);
     std::vector<dsstring>   GetNodesNamesList(void) const;

diff --git a/src/loadanimationstask.cpp b/src/loadanimationstask.cpp
@@ -29,11 +29,11 @@ using namespace DrawSpace;
 using namespace DrawSpace::Systems;
 
 
-LoadAnimationsTask::LoadAnimationsTask() : ITask("LOADANIMATIONS", "")
+LoadAnimationsTask::LoadAnimationsTask() : Task("LOADANIMATIONS", "")
 {
 }
 
-void LoadAnimationsTask::Execute(void)
+void LoadAnimationsTask::execute(void)
 {
     std::map<dsstring, Aspect::AnimationsAspect::Node> scene_nodes;
     aiNode* root{ m_scene->mRootNode };

diff --git a/src/loadanimationstask.h b/src/loadanimationstask.h
@@ -32,7 +32,7 @@ namespace DrawSpace
 {
 namespace Systems
 {
-struct LoadAnimationsTask : public Interface::ITask
+struct LoadAnimationsTask : public Task
 {
 private:
 
@@ -46,7 +46,7 @@ struct LoadAnimationsTask : public Interface::ITask
 
     LoadAnimationsTask();
 
-    void Execute(void);
+    void execute(void);
     void SetScene(const aiScene* p_scene);
     void SetAnimAspect(Aspect::AnimationsAspect* p_aspect);
 };

diff --git a/src/loadfiletask.cpp b/src/loadfiletask.cpp
@@ -25,14 +25,13 @@
 #include "loadfiletask.h"
 
 using namespace DrawSpace;
-using namespace DrawSpace::Interface;
 using namespace DrawSpace::Systems;
 
-LoadFileTask::LoadFileTask() : ITask("", "")
+LoadFileTask::LoadFileTask() : Task("", "")
 {
 }
 
-void LoadFileTask::Execute(void)
+void LoadFileTask::execute(void)
 {
     long size;
     void* data = File::loadAndAllocBinaryFile(m_final_asset_path, &size);

diff --git a/src/loadfiletask.h b/src/loadfiletask.h
@@ -32,7 +32,7 @@ namespace DrawSpace
 {
 namespace Systems
 {
-struct LoadFileTask : public Interface::ITask
+struct LoadFileTask : public Task
 {
 private:
     // execution data
@@ -46,7 +46,7 @@ struct LoadFileTask : public Interface::ITask
 
     LoadFileTask();
 
-    void Execute(void);
+    void execute(void);
 
     void SetFinalAssetPath(const dsstring& p_final_asset_path);
     bool Failed(void) const;

diff --git a/src/loadfiletoassimptask.cpp b/src/loadfiletoassimptask.cpp
@@ -28,15 +28,13 @@
 #include "memalloc.h"
 
 using namespace DrawSpace;
-using namespace DrawSpace::Utils;
-using namespace DrawSpace::Interface;
 using namespace DrawSpace::Systems;
 
-LoadFileToAssimpTask::LoadFileToAssimpTask() : ITask("LOADFILETOASSIMP", "")
+LoadFileToAssimpTask::LoadFileToAssimpTask() : Task("LOADFILETOASSIMP", "")
 {
 }
 
-void LoadFileToAssimpTask::Execute(void)
+void LoadFileToAssimpTask::execute(void)
 {
     long size;
 

diff --git a/src/loadfiletoassimptask.h b/src/loadfiletoassimptask.h
@@ -40,13 +40,13 @@ namespace Core
 }
 namespace Systems
 {
-struct LoadFileToAssimpTask : public Interface::ITask
+struct LoadFileToAssimpTask : public Task
 {
 public:
 
     LoadFileToAssimpTask();
 
-    void Execute(void);
+    void execute(void);
     void SetFinalAssetPath(const dsstring& p_final_asset_path);
 
     void SetTargetMeshe(DrawSpace::Core::Meshe* p_meshe);

diff --git a/src/loadshaderfiletask.cpp b/src/loadshaderfiletask.cpp
@@ -31,10 +31,9 @@
 
 using namespace DrawSpace;
 using namespace DrawSpace::Utils;
-using namespace DrawSpace::Interface;
 using namespace DrawSpace::Systems;
 
-LoadShaderFileTask::LoadShaderFileTask() : ITask("", "")
+LoadShaderFileTask::LoadShaderFileTask() : Task("", "")
 {
 }
 
@@ -43,7 +42,7 @@ LoadShaderFileTask::~LoadShaderFileTask()
     release_blocs();
 }
 
-void LoadShaderFileTask::Execute(void)
+void LoadShaderFileTask::execute(void)
 {
     dsstring shader_source;
     recurs_browse_shader_source(m_final_asset_path, shader_source);

diff --git a/src/loadshaderfiletask.h b/src/loadshaderfiletask.h
@@ -34,7 +34,7 @@ namespace DrawSpace
 {
 namespace Systems
 {
-struct LoadShaderFileTask : public Interface::ITask
+struct LoadShaderFileTask : public Task
 {
 private:
 
@@ -57,7 +57,7 @@ struct LoadShaderFileTask : public Interface::ITask
     LoadShaderFileTask();
     ~LoadShaderFileTask();
 
-    void Execute(void);
+    void execute(void);
 
     void SetFinalAssetPath(const dsstring& p_final_asset_path);
     void SetFinalAssetDir(const dsstring& p_final_asset_dir);