diff --git a/CMakeLists.txt b/CMakeLists.txt index ff0830ad0..471996fdc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,7 +121,7 @@ add_definitions(-DPLUGIN_PREFIX="${PLUGIN_PREFIX}") ########################################################### set(LOADED_LUMO_PLUGINS) ### musty be fillerd by each pluigns in CMakeLists.txt with plugin name -set(PLUGINS_DIRECTORY ${CMAKE_SOURCE_DIR}/Plugins) +set(PLUGINS_DIRECTORY ${CMAKE_SOURCE_DIR}/plugins) file(GLOB SUBDIRS RELATIVE ${PLUGINS_DIRECTORY} ${PLUGINS_DIRECTORY}/*) FOREACH(SUBDIR ${SUBDIRS}) if(IS_DIRECTORY ${PLUGINS_DIRECTORY}/${SUBDIR}) diff --git a/Plugins/AudiArt/CMakeLists.txt b/Plugins/AudiArt/CMakeLists.txt index 933d51d03..5a05d674e 100644 --- a/Plugins/AudiArt/CMakeLists.txt +++ b/Plugins/AudiArt/CMakeLists.txt @@ -132,7 +132,7 @@ set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PLUGIN_PREFIX}_${PROJ set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${FINAL_BIN_DIR}") -set_target_properties(${PROJECT} PROPERTIES FOLDER Plugins) +set_target_properties(${PROJECT} PROPERTIES FOLDER plugins) install(IMPORTED_RUNTIME_ARTIFACTS ${PROJECT} DESTINATION plugins COMPONENT PLUGIN_BINARY_${PROJECT}) diff --git a/Plugins/AudiArt/src/AudiArt.cpp b/Plugins/AudiArt/src/AudiArt.cpp index b18c97393..22296b3bc 100644 --- a/Plugins/AudiArt/src/AudiArt.cpp +++ b/Plugins/AudiArt/src/AudiArt.cpp @@ -1,8 +1,8 @@ // This is an independent project of an individual developer. Dear PVS-Studio, please check it. // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com -#include "AudiArt.h" -#include +#include "Audiart.h" +#include #include #include #include @@ -28,52 +28,52 @@ extern "C" // needed for avoid renaming of funcs by the compiler #define PLUGIN_PREFIX #endif -PLUGIN_PREFIX AudiArt* allocator() { - return new AudiArt(); +PLUGIN_PREFIX Audiart* allocator() { + return new Audiart(); } -PLUGIN_PREFIX void deleter(AudiArt* ptr) { +PLUGIN_PREFIX void deleter(Audiart* ptr) { delete ptr; } } #endif // USE_PLUGIN_STATIC_LINKING -AudiArt::AudiArt() { +Audiart::Audiart() { #ifdef _MSC_VER // active memory leak detector //_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); #endif } -void AudiArt::ActionAfterInit() { +void Audiart::ActionAfterInit() { NodeSlot::sGetSlotColors()->AddSlotColor("SCENEAUDIART", ImVec4(0.2f, 0.6f, 0.4f, 1.0f)); } -uint32_t AudiArt::GetVersionMajor() const { - return AudiArt_MinorNumber; +uint32_t Audiart::GetVersionMajor() const { + return Audiart_MinorNumber; } -uint32_t AudiArt::GetVersionMinor() const { - return AudiArt_MajorNumber; +uint32_t Audiart::GetVersionMinor() const { + return Audiart_MajorNumber; } -uint32_t AudiArt::GetVersionBuild() const { - return AudiArt_BuildNumber; +uint32_t Audiart::GetVersionBuild() const { + return Audiart_BuildNumber; } -std::string AudiArt::GetName() const { - return "AudiArt"; +std::string Audiart::GetName() const { + return "Audiart"; } -std::string AudiArt::GetVersion() const { - return AudiArt_BuildId; +std::string Audiart::GetVersion() const { + return Audiart_BuildId; } -std::string AudiArt::GetDescription() const { +std::string Audiart::GetDescription() const { return "Audio Art plugin"; } -std::vector AudiArt::GetNodes() const { +std::vector Audiart::GetNodes() const { return { /* "MESH_SIM_RENDERER", @@ -82,21 +82,21 @@ std::vector AudiArt::GetNodes() const { }; } -std::vector AudiArt::GetLibrary() const { +std::vector Audiart::GetLibrary() const { std::vector res; - res.push_back(AddLibraryEntry("AudiArt/Effects", "FFT (audio to audio)", "SOUND_FFT")); - res.push_back(AddLibraryEntry("AudiArt/Operations", "Historize (audio to texture)", "HISTORIZE")); - res.push_back(AddLibraryEntry("AudiArt/Operations", "AudiArt to Texture", "AUDIO_TEXTURE")); - res.push_back(AddLibraryEntry("AudiArt/Sources", "Speacker (to audio)", "SPEAKER_SOURCE")); - res.push_back(AddLibraryEntry("AudiArt/Viewers", "Source Preview (audio plot display)", "SOURCE_PREVIEW")); - res.push_back(AddLibraryEntry("AudiArt/Viewers", "Visu Hex Grid (texture to texture)", "VISU_HEX_GRID")); - res.push_back(AddLibraryEntry("AudiArt/Windowing", "Blackman FIlter", "BLACKMAN_FILTER")); + res.push_back(AddLibraryEntry("Audiart/Effects", "FFT (audio to audio)", "SOUND_FFT")); + res.push_back(AddLibraryEntry("Audiart/Operations", "Historize (audio to texture)", "HISTORIZE")); + res.push_back(AddLibraryEntry("Audiart/Operations", "Audiart to Texture", "AUDIO_TEXTURE")); + res.push_back(AddLibraryEntry("Audiart/Sources", "Speacker (to audio)", "SPEAKER_SOURCE")); + res.push_back(AddLibraryEntry("Audiart/Viewers", "Source Preview (audio plot display)", "SOURCE_PREVIEW")); + res.push_back(AddLibraryEntry("Audiart/Viewers", "Visu Hex Grid (texture to texture)", "VISU_HEX_GRID")); + res.push_back(AddLibraryEntry("Audiart/Windowing", "Blackman FIlter", "BLACKMAN_FILTER")); return res; } -BaseNodePtr AudiArt::CreatePluginNode(const std::string& vPluginNodeName) { +BaseNodePtr Audiart::CreatePluginNode(const std::string& vPluginNodeName) { auto vkCorePtr = m_VulkanCoreWeak.lock(); if (vPluginNodeName == "SOUND_FFT") @@ -117,13 +117,13 @@ BaseNodePtr AudiArt::CreatePluginNode(const std::string& vPluginNodeName) { return nullptr; } -std::vector AudiArt::GetPanes() const { +std::vector Audiart::GetPanes() const { std::vector res; return res; } -int AudiArt::ResetImGuiID(const int& vWidgetId) { +int Audiart::ResetImGuiID(const int& vWidgetId) { auto ids = ImGui::GetPUSHID(); ImGui::SetPUSHID(vWidgetId); return ids; diff --git a/Plugins/AudiArt/src/AudiArt.h b/Plugins/AudiArt/src/AudiArt.h index b77599037..e56f3ce28 100644 --- a/Plugins/AudiArt/src/AudiArt.h +++ b/Plugins/AudiArt/src/AudiArt.h @@ -5,9 +5,9 @@ #include #include -class AudiArt : public PluginInterface { +class Audiart : public PluginInterface { public: - AudiArt(); + Audiart(); void ActionAfterInit() override; uint32_t GetVersionMajor() const override; uint32_t GetVersionMinor() const override; diff --git a/Plugins/AudiArt/src/Headers/AudiArtBuild.h b/Plugins/AudiArt/src/Headers/AudiArtBuild.h index 86c78e58d..269bd6d00 100644 --- a/Plugins/AudiArt/src/Headers/AudiArtBuild.h +++ b/Plugins/AudiArt/src/Headers/AudiArtBuild.h @@ -1,7 +1,7 @@ #pragma once -#define AudiArt_Prefix "AudiArt" -#define AudiArt_BuildNumber 123 -#define AudiArt_MinorNumber 0 -#define AudiArt_MajorNumber 0 -#define AudiArt_BuildId "0.0.123" +#define Audiart_Prefix "Audiart" +#define Audiart_BuildNumber 123 +#define Audiart_MinorNumber 0 +#define Audiart_MajorNumber 0 +#define Audiart_BuildId "0.0.123" diff --git a/Plugins/AudiArt/src/Interfaces/SceneAudiArtInputInterface.h b/Plugins/AudiArt/src/Interfaces/SceneAudiArtInputInterface.h index c0e5dc06e..dc863b58d 100644 --- a/Plugins/AudiArt/src/Interfaces/SceneAudiArtInputInterface.h +++ b/Plugins/AudiArt/src/Interfaces/SceneAudiArtInputInterface.h @@ -16,15 +16,15 @@ limitations under the License. #pragma once -#include +#include #include #include -class SceneAudiArtInputInterface { +class SceneAudiartInputInterface { protected: - std::map m_SceneAudiArts; + std::map m_SceneAudiarts; public: - virtual void SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) = 0; + virtual void SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) = 0; }; diff --git a/Plugins/AudiArt/src/Interfaces/SceneAudiArtOutputInterface.h b/Plugins/AudiArt/src/Interfaces/SceneAudiArtOutputInterface.h index 50a679b9d..03cddc338 100644 --- a/Plugins/AudiArt/src/Interfaces/SceneAudiArtOutputInterface.h +++ b/Plugins/AudiArt/src/Interfaces/SceneAudiArtOutputInterface.h @@ -16,10 +16,10 @@ limitations under the License. #pragma once -#include +#include #include -class SceneAudiArtOutputInterface { +class SceneAudiartOutputInterface { public: - virtual SceneAudiArtWeak GetSceneAudiArt(const std::string& vName) = 0; + virtual SceneAudiartWeak GetSceneAudiart(const std::string& vName) = 0; }; diff --git a/Plugins/AudiArt/src/Modules/Effect/SoundFFTModule.cpp b/Plugins/AudiArt/src/Modules/Effect/SoundFFTModule.cpp index e78d03182..afe69daf6 100644 --- a/Plugins/AudiArt/src/Modules/Effect/SoundFFTModule.cpp +++ b/Plugins/AudiArt/src/Modules/Effect/SoundFFTModule.cpp @@ -146,7 +146,7 @@ bool SoundFFTModule::DrawDialogsAndPopups( //// SCENEAUDIART INPUT ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -void SoundFFTModule::SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) { +void SoundFFTModule::SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) { ZoneScoped; } @@ -154,9 +154,9 @@ void SoundFFTModule::SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak //// SCENEAUDIART OUTPUT ///////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -SceneAudiArtWeak SoundFFTModule::GetSceneAudiArt(const std::string& vName) { +SceneAudiartWeak SoundFFTModule::GetSceneAudiart(const std::string& vName) { ZoneScoped; - return SceneAudiArtWeak(); + return SceneAudiartWeak(); } //////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Plugins/AudiArt/src/Modules/Effect/SoundFFTModule.h b/Plugins/AudiArt/src/Modules/Effect/SoundFFTModule.h index 123984cd5..34da21178 100644 --- a/Plugins/AudiArt/src/Modules/Effect/SoundFFTModule.h +++ b/Plugins/AudiArt/src/Modules/Effect/SoundFFTModule.h @@ -45,14 +45,14 @@ limitations under the License. #include #include -#include -#include +#include +#include class SoundFFTModule : public NodeInterface, public conf::ConfigAbstract, public TaskInterface, - public SceneAudiArtInputInterface, - public SceneAudiArtOutputInterface, + public SceneAudiartInputInterface, + public SceneAudiartOutputInterface, public GuiInterface { public: static std::shared_ptr Create(GaiApi::VulkanCoreWeak vVulkanCore, BaseNodeWeak vParentNode); @@ -78,10 +78,10 @@ class SoundFFTModule : public NodeInterface, const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override; // Interfaces Setters - void SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) override; + void SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) override; // Interfaces Getters - SceneAudiArtWeak GetSceneAudiArt(const std::string& vName) override; + SceneAudiartWeak GetSceneAudiart(const std::string& vName) override; std::string getXml(const std::string& vOffset, const std::string& vUserDatas = "") override; bool setFromXml(tinyxml2::XMLElement* vElem, tinyxml2::XMLElement* vParent, const std::string& vUserDatas = "") override; diff --git a/Plugins/AudiArt/src/Modules/Operations/AudioTextureModule.cpp b/Plugins/AudiArt/src/Modules/Operations/AudioTextureModule.cpp index 805f55482..a0686fae7 100644 --- a/Plugins/AudiArt/src/Modules/Operations/AudioTextureModule.cpp +++ b/Plugins/AudiArt/src/Modules/Operations/AudioTextureModule.cpp @@ -181,11 +181,11 @@ void AudioTextureModule::NeedResizeByResizeEvent(ct::ivec2* vNewSize, const uint //// SCENEAUDIART INPUT ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -void AudioTextureModule::SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) { +void AudioTextureModule::SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) { ZoneScoped; if (m_AudioTextureModule_Comp_2D_Pass_Ptr) { - m_AudioTextureModule_Comp_2D_Pass_Ptr->SetSceneAudiArt(vName, vSceneAudiArt); + m_AudioTextureModule_Comp_2D_Pass_Ptr->SetSceneAudiart(vName, vSceneAudiart); } } diff --git a/Plugins/AudiArt/src/Modules/Operations/AudioTextureModule.h b/Plugins/AudiArt/src/Modules/Operations/AudioTextureModule.h index 2a661d989..1a7014b55 100644 --- a/Plugins/AudiArt/src/Modules/Operations/AudioTextureModule.h +++ b/Plugins/AudiArt/src/Modules/Operations/AudioTextureModule.h @@ -45,14 +45,14 @@ limitations under the License. #include #include -#include +#include #include class AudioTextureModule_Comp_2D_Pass; class AudioTextureModule : public NodeInterface, public BaseRenderer, public TaskInterface, - public SceneAudiArtInputInterface, + public SceneAudiartInputInterface, public Texture2DOutputInterface { public: static std::shared_ptr Create(GaiApi::VulkanCoreWeak vVulkanCore, BaseNodeWeak vParentNode); @@ -80,7 +80,7 @@ class AudioTextureModule : public NodeInterface, void NeedResizeByResizeEvent(ct::ivec2* vNewSize, const uint32_t* vCountColorBuffers) override; // Interfaces Setters - void SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) override; + void SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) override; // Interfaces Getters vk::DescriptorImageInfo* GetDescriptorImageInfo(const uint32_t& vBindingPoint, ct::fvec2* vOutSize = nullptr, void* vUserDatas = nullptr) override; diff --git a/Plugins/AudiArt/src/Modules/Operations/Pass/AudioTextureModule_Comp_2D_Pass.cpp b/Plugins/AudiArt/src/Modules/Operations/Pass/AudioTextureModule_Comp_2D_Pass.cpp index dfcd4732a..1aaec3990 100644 --- a/Plugins/AudiArt/src/Modules/Operations/Pass/AudioTextureModule_Comp_2D_Pass.cpp +++ b/Plugins/AudiArt/src/Modules/Operations/Pass/AudioTextureModule_Comp_2D_Pass.cpp @@ -102,10 +102,10 @@ bool AudioTextureModule_Comp_2D_Pass::DrawDialogsAndPopups( //// SCENEAUDIART INPUT ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -void AudioTextureModule_Comp_2D_Pass::SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) { +void AudioTextureModule_Comp_2D_Pass::SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) { ZoneScoped; - m_SceneAudiArts[vName] = vSceneAudiArt; + m_SceneAudiarts[vName] = vSceneAudiart; } ////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Plugins/AudiArt/src/Modules/Operations/Pass/AudioTextureModule_Comp_2D_Pass.h b/Plugins/AudiArt/src/Modules/Operations/Pass/AudioTextureModule_Comp_2D_Pass.h index bdf8752b4..1978c3c4c 100644 --- a/Plugins/AudiArt/src/Modules/Operations/Pass/AudioTextureModule_Comp_2D_Pass.h +++ b/Plugins/AudiArt/src/Modules/Operations/Pass/AudioTextureModule_Comp_2D_Pass.h @@ -40,10 +40,10 @@ limitations under the License. #include #include -#include +#include #include -class AudioTextureModule_Comp_2D_Pass : public ShaderPass, public SceneAudiArtInputInterface, public Texture2DOutputInterface, public NodeInterface { +class AudioTextureModule_Comp_2D_Pass : public ShaderPass, public SceneAudiartInputInterface, public Texture2DOutputInterface, public NodeInterface { private: public: AudioTextureModule_Comp_2D_Pass(GaiApi::VulkanCoreWeak vVulkanCore); @@ -61,7 +61,7 @@ class AudioTextureModule_Comp_2D_Pass : public ShaderPass, public SceneAudiArtIn const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override; // Interfaces Setters - void SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) override; + void SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) override; // Interfaces Getters vk::DescriptorImageInfo* GetDescriptorImageInfo(const uint32_t& vBindingPoint, ct::fvec2* vOutSize = nullptr, void* vUserDatas = nullptr) override; diff --git a/Plugins/AudiArt/src/Modules/Source/SpeakerSourceModule.cpp b/Plugins/AudiArt/src/Modules/Source/SpeakerSourceModule.cpp index 0509b457e..caf8570a8 100644 --- a/Plugins/AudiArt/src/Modules/Source/SpeakerSourceModule.cpp +++ b/Plugins/AudiArt/src/Modules/Source/SpeakerSourceModule.cpp @@ -139,9 +139,9 @@ bool SpeakerSourceModule::DrawDialogsAndPopups( //// SCENEAUDIART OUTPUT ///////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -SceneAudiArtWeak SpeakerSourceModule::GetSceneAudiArt(const std::string& vName) { +SceneAudiartWeak SpeakerSourceModule::GetSceneAudiart(const std::string& vName) { ZoneScoped; - return SceneAudiArtWeak(); + return SceneAudiartWeak(); } //////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Plugins/AudiArt/src/Modules/Source/SpeakerSourceModule.h b/Plugins/AudiArt/src/Modules/Source/SpeakerSourceModule.h index 59429b3a8..be1cd5bac 100644 --- a/Plugins/AudiArt/src/Modules/Source/SpeakerSourceModule.h +++ b/Plugins/AudiArt/src/Modules/Source/SpeakerSourceModule.h @@ -45,12 +45,12 @@ limitations under the License. #include #include -#include +#include class SpeakerSourceModule : public NodeInterface, public conf::ConfigAbstract, public TaskInterface, - public SceneAudiArtOutputInterface, + public SceneAudiartOutputInterface, public GuiInterface { public: static std::shared_ptr Create(GaiApi::VulkanCoreWeak vVulkanCore, BaseNodeWeak vParentNode); @@ -76,7 +76,7 @@ class SpeakerSourceModule : public NodeInterface, const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override; // Interfaces Getters - SceneAudiArtWeak GetSceneAudiArt(const std::string& vName) override; + SceneAudiartWeak GetSceneAudiart(const std::string& vName) override; std::string getXml(const std::string& vOffset, const std::string& vUserDatas = "") override; bool setFromXml(tinyxml2::XMLElement* vElem, tinyxml2::XMLElement* vParent, const std::string& vUserDatas = "") override; diff --git a/Plugins/AudiArt/src/Modules/Viewer/SourcePreviewModule.cpp b/Plugins/AudiArt/src/Modules/Viewer/SourcePreviewModule.cpp index 1be673e79..da767693f 100644 --- a/Plugins/AudiArt/src/Modules/Viewer/SourcePreviewModule.cpp +++ b/Plugins/AudiArt/src/Modules/Viewer/SourcePreviewModule.cpp @@ -139,7 +139,7 @@ bool SourcePreviewModule::DrawDialogsAndPopups( //// SCENEAUDIART INPUT ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -void SourcePreviewModule::SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) { +void SourcePreviewModule::SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) { ZoneScoped; } diff --git a/Plugins/AudiArt/src/Modules/Viewer/SourcePreviewModule.h b/Plugins/AudiArt/src/Modules/Viewer/SourcePreviewModule.h index c51f10d53..e45527a69 100644 --- a/Plugins/AudiArt/src/Modules/Viewer/SourcePreviewModule.h +++ b/Plugins/AudiArt/src/Modules/Viewer/SourcePreviewModule.h @@ -45,12 +45,12 @@ limitations under the License. #include #include -#include +#include class SourcePreviewModule : public NodeInterface, public conf::ConfigAbstract, public TaskInterface, - public SceneAudiArtInputInterface, + public SceneAudiartInputInterface, public GuiInterface { public: static std::shared_ptr Create(GaiApi::VulkanCoreWeak vVulkanCore, BaseNodeWeak vParentNode); @@ -76,7 +76,7 @@ class SourcePreviewModule : public NodeInterface, const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override; // Interfaces Setters - void SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) override; + void SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) override; std::string getXml(const std::string& vOffset, const std::string& vUserDatas = "") override; bool setFromXml(tinyxml2::XMLElement* vElem, tinyxml2::XMLElement* vParent, const std::string& vUserDatas = "") override; diff --git a/Plugins/AudiArt/src/Modules/Windowing/BlackmanFilterModule.cpp b/Plugins/AudiArt/src/Modules/Windowing/BlackmanFilterModule.cpp index 7c9e1b65f..fff6ad228 100644 --- a/Plugins/AudiArt/src/Modules/Windowing/BlackmanFilterModule.cpp +++ b/Plugins/AudiArt/src/Modules/Windowing/BlackmanFilterModule.cpp @@ -143,7 +143,7 @@ bool BlackmanFilterModule::DrawDialogsAndPopups( //// SCENEAUDIART INPUT ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -void BlackmanFilterModule::SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) { +void BlackmanFilterModule::SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) { ZoneScoped; } @@ -151,9 +151,9 @@ void BlackmanFilterModule::SetSceneAudiArt(const std::string& vName, SceneAudiAr //// SCENEAUDIART OUTPUT ///////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -SceneAudiArtWeak BlackmanFilterModule::GetSceneAudiArt(const std::string& vName) { +SceneAudiartWeak BlackmanFilterModule::GetSceneAudiart(const std::string& vName) { ZoneScoped; - return SceneAudiArtWeak(); + return SceneAudiartWeak(); } //////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Plugins/AudiArt/src/Modules/Windowing/BlackmanFilterModule.h b/Plugins/AudiArt/src/Modules/Windowing/BlackmanFilterModule.h index 8f5fcfd8c..1b3743bd8 100644 --- a/Plugins/AudiArt/src/Modules/Windowing/BlackmanFilterModule.h +++ b/Plugins/AudiArt/src/Modules/Windowing/BlackmanFilterModule.h @@ -45,14 +45,14 @@ limitations under the License. #include #include -#include -#include +#include +#include class BlackmanFilterModule : public NodeInterface, public conf::ConfigAbstract, public TaskInterface, - public SceneAudiArtInputInterface, - public SceneAudiArtOutputInterface, + public SceneAudiartInputInterface, + public SceneAudiartOutputInterface, public GuiInterface { public: static std::shared_ptr Create(GaiApi::VulkanCoreWeak vVulkanCore, BaseNodeWeak vParentNode); @@ -78,10 +78,10 @@ class BlackmanFilterModule : public NodeInterface, const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override; // Interfaces Setters - void SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) override; + void SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) override; // Interfaces Getters - SceneAudiArtWeak GetSceneAudiArt(const std::string& vName) override; + SceneAudiartWeak GetSceneAudiart(const std::string& vName) override; std::string getXml(const std::string& vOffset, const std::string& vUserDatas = "") override; bool setFromXml(tinyxml2::XMLElement* vElem, tinyxml2::XMLElement* vParent, const std::string& vUserDatas = "") override; diff --git a/Plugins/AudiArt/src/Nodes/Effect/SoundFFTNode.cpp b/Plugins/AudiArt/src/Nodes/Effect/SoundFFTNode.cpp index e22bbaa46..ed2ca52e2 100644 --- a/Plugins/AudiArt/src/Nodes/Effect/SoundFFTNode.cpp +++ b/Plugins/AudiArt/src/Nodes/Effect/SoundFFTNode.cpp @@ -19,8 +19,8 @@ limitations under the License. #include "SoundFFTNode.h" #include -#include -#include +#include +#include #ifdef PROFILER_INCLUDE #include @@ -69,9 +69,9 @@ bool SoundFFTNode::Init(GaiApi::VulkanCoreWeak vVulkanCore) { name = "Sound FFT"; - AddInput(NodeSlotSceneAudiArtInput::Create(""), false, true); + AddInput(NodeSlotSceneAudiartInput::Create(""), false, true); - AddOutput(NodeSlotSceneAudiArtOutput::Create("FFT"), false, false); + AddOutput(NodeSlotSceneAudiartOutput::Create("FFT"), false, false); m_SoundFFTModulePtr = SoundFFTModule::Create(vVulkanCore, m_This); if (m_SoundFFTModulePtr) { @@ -165,11 +165,11 @@ void SoundFFTNode::DisplayInfosOnTopOfTheNode(BaseNodeState* vBaseNodeState) { //// SCENEAUDIART INPUT ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -void SoundFFTNode::SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) { +void SoundFFTNode::SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) { ZoneScoped; if (m_SoundFFTModulePtr) { - m_SoundFFTModulePtr->SetSceneAudiArt(vName, vSceneAudiArt); + m_SoundFFTModulePtr->SetSceneAudiart(vName, vSceneAudiart); } } @@ -177,14 +177,14 @@ void SoundFFTNode::SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vS //// SCENEAUDIART OUTPUT ///////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -SceneAudiArtWeak SoundFFTNode::GetSceneAudiArt(const std::string& vName) { +SceneAudiartWeak SoundFFTNode::GetSceneAudiart(const std::string& vName) { ZoneScoped; if (m_SoundFFTModulePtr) { - return m_SoundFFTModulePtr->GetSceneAudiArt(vName); + return m_SoundFFTModulePtr->GetSceneAudiart(vName); } - return SceneAudiArtWeak(); + return SceneAudiartWeak(); } ////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Plugins/AudiArt/src/Nodes/Effect/SoundFFTNode.h b/Plugins/AudiArt/src/Nodes/Effect/SoundFFTNode.h index 7ab31391d..8cc0b4079 100644 --- a/Plugins/AudiArt/src/Nodes/Effect/SoundFFTNode.h +++ b/Plugins/AudiArt/src/Nodes/Effect/SoundFFTNode.h @@ -16,10 +16,10 @@ limitations under the License. #include #include -#include -#include +#include +#include class SoundFFTModule; -class SoundFFTNode : public SceneAudiArtInputInterface, public SceneAudiArtOutputInterface, public BaseNode { +class SoundFFTNode : public SceneAudiartInputInterface, public SceneAudiartOutputInterface, public BaseNode { public: static std::shared_ptr Create(GaiApi::VulkanCoreWeak vVulkanCore); @@ -45,10 +45,10 @@ class SoundFFTNode : public SceneAudiArtInputInterface, public SceneAudiArtOutpu void DisplayInfosOnTopOfTheNode(BaseNodeState* vBaseNodeState) override; // Interfaces Setters - void SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) override; + void SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) override; // Interfaces Getters - SceneAudiArtWeak GetSceneAudiArt(const std::string& vName) override; + SceneAudiartWeak GetSceneAudiart(const std::string& vName) override; // Configuration std::string getXml(const std::string& vOffset, const std::string& vUserDatas = "") override; diff --git a/Plugins/AudiArt/src/Nodes/Operations/AudioTextureNode.cpp b/Plugins/AudiArt/src/Nodes/Operations/AudioTextureNode.cpp index 67c2a0c28..5e3366309 100644 --- a/Plugins/AudiArt/src/Nodes/Operations/AudioTextureNode.cpp +++ b/Plugins/AudiArt/src/Nodes/Operations/AudioTextureNode.cpp @@ -19,7 +19,7 @@ limitations under the License. #include "AudioTextureNode.h" #include -#include +#include #include #ifdef PROFILER_INCLUDE @@ -69,7 +69,7 @@ bool AudioTextureNode::Init(GaiApi::VulkanCoreWeak vVulkanCore) { name = "Audio Texture"; - AddInput(NodeSlotSceneAudiArtInput::Create(""), false, true); + AddInput(NodeSlotSceneAudiartInput::Create(""), false, true); AddOutput(NodeSlotTexture2DOutput::Create("", 0), false, true); @@ -181,11 +181,11 @@ void AudioTextureNode::NeedResizeByResizeEvent(ct::ivec2* vNewSize, const uint32 //// SCENEAUDIART INPUT ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -void AudioTextureNode::SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) { +void AudioTextureNode::SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) { ZoneScoped; if (m_AudioTextureModulePtr) { - m_AudioTextureModulePtr->SetSceneAudiArt(vName, vSceneAudiArt); + m_AudioTextureModulePtr->SetSceneAudiart(vName, vSceneAudiart); } } diff --git a/Plugins/AudiArt/src/Nodes/Operations/AudioTextureNode.h b/Plugins/AudiArt/src/Nodes/Operations/AudioTextureNode.h index 25b2ccdc0..10d75dca6 100644 --- a/Plugins/AudiArt/src/Nodes/Operations/AudioTextureNode.h +++ b/Plugins/AudiArt/src/Nodes/Operations/AudioTextureNode.h @@ -16,12 +16,12 @@ limitations under the License. #include #include -#include +#include #include #include class AudioTextureModule; -class AudioTextureNode : public SceneAudiArtInputInterface, public Texture2DOutputInterface, public ShaderUpdateInterface, public BaseNode { +class AudioTextureNode : public SceneAudiartInputInterface, public Texture2DOutputInterface, public ShaderUpdateInterface, public BaseNode { public: static std::shared_ptr Create(GaiApi::VulkanCoreWeak vVulkanCore); @@ -50,7 +50,7 @@ class AudioTextureNode : public SceneAudiArtInputInterface, public Texture2DOutp void NeedResizeByResizeEvent(ct::ivec2* vNewSize, const uint32_t* vCountColorBuffers) override; // Interfaces Setters - void SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) override; + void SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) override; // Interfaces Getters vk::DescriptorImageInfo* GetDescriptorImageInfo(const uint32_t& vBindingPoint, ct::fvec2* vOutSize = nullptr, void* vUserDatas = nullptr) override; diff --git a/Plugins/AudiArt/src/Nodes/Source/SpeakerSourceNode.cpp b/Plugins/AudiArt/src/Nodes/Source/SpeakerSourceNode.cpp index ec27437e8..cd12e57f0 100644 --- a/Plugins/AudiArt/src/Nodes/Source/SpeakerSourceNode.cpp +++ b/Plugins/AudiArt/src/Nodes/Source/SpeakerSourceNode.cpp @@ -19,7 +19,7 @@ limitations under the License. #include "SpeakerSourceNode.h" #include -#include +#include #ifdef PROFILER_INCLUDE #include @@ -68,8 +68,8 @@ bool SpeakerSourceNode::Init(GaiApi::VulkanCoreWeak vVulkanCore) { name = "Speaker Source"; - AddOutput(NodeSlotSceneAudiArtOutput::Create("PCM L"), false, false); - AddOutput(NodeSlotSceneAudiArtOutput::Create("PCM R"), false, false); + AddOutput(NodeSlotSceneAudiartOutput::Create("PCM L"), false, false); + AddOutput(NodeSlotSceneAudiartOutput::Create("PCM R"), false, false); m_SpeakerSourceModulePtr = SpeakerSourceModule::Create(vVulkanCore, m_This); if (m_SpeakerSourceModulePtr) { @@ -161,14 +161,14 @@ void SpeakerSourceNode::DisplayInfosOnTopOfTheNode(BaseNodeState* vBaseNodeState //// SCENEAUDIART OUTPUT ///////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -SceneAudiArtWeak SpeakerSourceNode::GetSceneAudiArt(const std::string& vName) { +SceneAudiartWeak SpeakerSourceNode::GetSceneAudiart(const std::string& vName) { ZoneScoped; if (m_SpeakerSourceModulePtr) { - return m_SpeakerSourceModulePtr->GetSceneAudiArt(vName); + return m_SpeakerSourceModulePtr->GetSceneAudiart(vName); } - return SceneAudiArtWeak(); + return SceneAudiartWeak(); } ////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Plugins/AudiArt/src/Nodes/Source/SpeakerSourceNode.h b/Plugins/AudiArt/src/Nodes/Source/SpeakerSourceNode.h index 70add1a72..9f799c322 100644 --- a/Plugins/AudiArt/src/Nodes/Source/SpeakerSourceNode.h +++ b/Plugins/AudiArt/src/Nodes/Source/SpeakerSourceNode.h @@ -16,10 +16,10 @@ limitations under the License. #include #include -#include +#include class SpeakerSourceModule; -class SpeakerSourceNode : public SceneAudiArtOutputInterface, public BaseNode { +class SpeakerSourceNode : public SceneAudiartOutputInterface, public BaseNode { public: static std::shared_ptr Create(GaiApi::VulkanCoreWeak vVulkanCore); @@ -45,7 +45,7 @@ class SpeakerSourceNode : public SceneAudiArtOutputInterface, public BaseNode { void DisplayInfosOnTopOfTheNode(BaseNodeState* vBaseNodeState) override; // Interfaces Getters - SceneAudiArtWeak GetSceneAudiArt(const std::string& vName) override; + SceneAudiartWeak GetSceneAudiart(const std::string& vName) override; // Configuration std::string getXml(const std::string& vOffset, const std::string& vUserDatas = "") override; diff --git a/Plugins/AudiArt/src/Nodes/Viewer/SourcePreviewNode.cpp b/Plugins/AudiArt/src/Nodes/Viewer/SourcePreviewNode.cpp index c8f21a5ca..0dfe1cf29 100644 --- a/Plugins/AudiArt/src/Nodes/Viewer/SourcePreviewNode.cpp +++ b/Plugins/AudiArt/src/Nodes/Viewer/SourcePreviewNode.cpp @@ -19,7 +19,7 @@ limitations under the License. #include "SourcePreviewNode.h" #include -#include +#include #ifdef PROFILER_INCLUDE #include @@ -68,7 +68,7 @@ bool SourcePreviewNode::Init(GaiApi::VulkanCoreWeak vVulkanCore) { name = "Source Preview"; - AddInput(NodeSlotSceneAudiArtInput::Create("New Slot"), false, false); + AddInput(NodeSlotSceneAudiartInput::Create("New Slot"), false, false); m_SourcePreviewModulePtr = SourcePreviewModule::Create(vVulkanCore, m_This); if (m_SourcePreviewModulePtr) { @@ -162,11 +162,11 @@ void SourcePreviewNode::DisplayInfosOnTopOfTheNode(BaseNodeState* vBaseNodeState //// SCENEAUDIART INPUT ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -void SourcePreviewNode::SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) { +void SourcePreviewNode::SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) { ZoneScoped; if (m_SourcePreviewModulePtr) { - m_SourcePreviewModulePtr->SetSceneAudiArt(vName, vSceneAudiArt); + m_SourcePreviewModulePtr->SetSceneAudiart(vName, vSceneAudiart); } } diff --git a/Plugins/AudiArt/src/Nodes/Viewer/SourcePreviewNode.h b/Plugins/AudiArt/src/Nodes/Viewer/SourcePreviewNode.h index f485f8aae..d90994fb5 100644 --- a/Plugins/AudiArt/src/Nodes/Viewer/SourcePreviewNode.h +++ b/Plugins/AudiArt/src/Nodes/Viewer/SourcePreviewNode.h @@ -16,10 +16,10 @@ limitations under the License. #include #include -#include +#include class SourcePreviewModule; -class SourcePreviewNode : public SceneAudiArtInputInterface, public BaseNode { +class SourcePreviewNode : public SceneAudiartInputInterface, public BaseNode { public: static std::shared_ptr Create(GaiApi::VulkanCoreWeak vVulkanCore); @@ -45,7 +45,7 @@ class SourcePreviewNode : public SceneAudiArtInputInterface, public BaseNode { void DisplayInfosOnTopOfTheNode(BaseNodeState* vBaseNodeState) override; // Interfaces Setters - void SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) override; + void SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) override; // Configuration std::string getXml(const std::string& vOffset, const std::string& vUserDatas = "") override; diff --git a/Plugins/AudiArt/src/Nodes/Windowing/BlackmanFilterNode.cpp b/Plugins/AudiArt/src/Nodes/Windowing/BlackmanFilterNode.cpp index 3c8cb4a02..4582d48a0 100644 --- a/Plugins/AudiArt/src/Nodes/Windowing/BlackmanFilterNode.cpp +++ b/Plugins/AudiArt/src/Nodes/Windowing/BlackmanFilterNode.cpp @@ -19,8 +19,8 @@ limitations under the License. #include "BlackmanFilterNode.h" #include -#include -#include +#include +#include #ifdef PROFILER_INCLUDE #include @@ -69,9 +69,9 @@ bool BlackmanFilterNode::Init(GaiApi::VulkanCoreWeak vVulkanCore) { name = "Blackman Filter"; - AddInput(NodeSlotSceneAudiArtInput::Create(""), false, true); + AddInput(NodeSlotSceneAudiartInput::Create(""), false, true); - AddOutput(NodeSlotSceneAudiArtOutput::Create(""), false, true); + AddOutput(NodeSlotSceneAudiartOutput::Create(""), false, true); m_BlackmanFilterModulePtr = BlackmanFilterModule::Create(vVulkanCore, m_This); if (m_BlackmanFilterModulePtr) { @@ -154,11 +154,11 @@ void BlackmanFilterNode::DisplayInfosOnTopOfTheNode(BaseNodeState* vBaseNodeStat //// SCENEAUDIART INPUT ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -void BlackmanFilterNode::SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) { +void BlackmanFilterNode::SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) { ZoneScoped; if (m_BlackmanFilterModulePtr) { - m_BlackmanFilterModulePtr->SetSceneAudiArt(vName, vSceneAudiArt); + m_BlackmanFilterModulePtr->SetSceneAudiart(vName, vSceneAudiart); } } @@ -166,14 +166,14 @@ void BlackmanFilterNode::SetSceneAudiArt(const std::string& vName, SceneAudiArtW //// SCENEAUDIART OUTPUT ///////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -SceneAudiArtWeak BlackmanFilterNode::GetSceneAudiArt(const std::string& vName) { +SceneAudiartWeak BlackmanFilterNode::GetSceneAudiart(const std::string& vName) { ZoneScoped; if (m_BlackmanFilterModulePtr) { - return m_BlackmanFilterModulePtr->GetSceneAudiArt(vName); + return m_BlackmanFilterModulePtr->GetSceneAudiart(vName); } - return SceneAudiArtWeak(); + return SceneAudiartWeak(); } ////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Plugins/AudiArt/src/Nodes/Windowing/BlackmanFilterNode.h b/Plugins/AudiArt/src/Nodes/Windowing/BlackmanFilterNode.h index 3eeb0c592..e148b097e 100644 --- a/Plugins/AudiArt/src/Nodes/Windowing/BlackmanFilterNode.h +++ b/Plugins/AudiArt/src/Nodes/Windowing/BlackmanFilterNode.h @@ -16,11 +16,11 @@ limitations under the License. #include #include -#include -#include +#include +#include class BlackmanFilterModule; -class BlackmanFilterNode : public SceneAudiArtInputInterface, public SceneAudiArtOutputInterface, public BaseNode { +class BlackmanFilterNode : public SceneAudiartInputInterface, public SceneAudiartOutputInterface, public BaseNode { public: static std::shared_ptr Create(GaiApi::VulkanCoreWeak vVulkanCore); @@ -46,10 +46,10 @@ class BlackmanFilterNode : public SceneAudiArtInputInterface, public SceneAudiAr void DisplayInfosOnTopOfTheNode(BaseNodeState* vBaseNodeState) override; // Interfaces Setters - void SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) override; + void SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) override; // Interfaces Getters - SceneAudiArtWeak GetSceneAudiArt(const std::string& vName) override; + SceneAudiartWeak GetSceneAudiart(const std::string& vName) override; // Configuration std::string getXml(const std::string& vOffset, const std::string& vUserDatas = "") override; diff --git a/Plugins/AudiArt/src/SceneGraph/SceneAudiArt.cpp b/Plugins/AudiArt/src/SceneGraph/SceneAudiArt.cpp index 153c5752d..17fb8110f 100644 --- a/Plugins/AudiArt/src/SceneGraph/SceneAudiArt.cpp +++ b/Plugins/AudiArt/src/SceneGraph/SceneAudiArt.cpp @@ -17,7 +17,7 @@ limitations under the License. // This is an independent project of an individual developer. Dear PVS-Studio, please check it. // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com -#include +#include #ifdef PROFILER_INCLUDE #include @@ -31,8 +31,8 @@ limitations under the License. //// STATIC ////////////////////////////////////////////////// ////////////////////////////////////////////////////////////// -SceneAudiArtPtr SceneAudiArt::Create() { - auto res = std::make_shared(); +SceneAudiartPtr SceneAudiart::Create() { + auto res = std::make_shared(); res->m_This = res; return res; } @@ -41,16 +41,16 @@ SceneAudiArtPtr SceneAudiArt::Create() { //// PUBLIC : BUILD / CLEAR ////////////////////////////////// ////////////////////////////////////////////////////////////// -SceneAudiArt::SceneAudiArt() { +SceneAudiart::SceneAudiart() { } -SceneAudiArt::~SceneAudiArt() { +SceneAudiart::~SceneAudiart() { Clear(); } -void SceneAudiArt::Clear() { +void SceneAudiart::Clear() { } -bool SceneAudiArt::IsOk() const { +bool SceneAudiart::IsOk() const { return true; } diff --git a/Plugins/AudiArt/src/SceneGraph/SceneAudiArt.h b/Plugins/AudiArt/src/SceneGraph/SceneAudiArt.h index dceaa1937..23339c1f2 100644 --- a/Plugins/AudiArt/src/SceneGraph/SceneAudiArt.h +++ b/Plugins/AudiArt/src/SceneGraph/SceneAudiArt.h @@ -20,16 +20,16 @@ limitations under the License. #include #include -class SceneAudiArt; -typedef std::shared_ptr SceneAudiArtPtr; -typedef std::weak_ptr SceneAudiArtWeak; +class SceneAudiart; +typedef std::shared_ptr SceneAudiartPtr; +typedef std::weak_ptr SceneAudiartWeak; // NotifyEvent : need to update the audio buffer -#define SceneAudiArtUpdateDone "SceneAudiArtUpdateDone" +#define SceneAudiartUpdateDone "SceneAudiartUpdateDone" -class SceneAudiArt { +class SceneAudiart { public: - static SceneAudiArtPtr Create(); + static SceneAudiartPtr Create(); private: static constexpr size_t scFftSize = 512U; @@ -37,12 +37,12 @@ class SceneAudiArt { static constexpr size_t scMaxAverageSize = 50U; private: - SceneAudiArtWeak m_This; + SceneAudiartWeak m_This; std::array m_AudioBuffer = {}; public: - SceneAudiArt(); - ~SceneAudiArt(); + SceneAudiart(); + ~SceneAudiart(); void Clear(); bool IsOk() const; }; diff --git a/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtInput.cpp b/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtInput.cpp index 22c11613d..2bd441962 100644 --- a/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtInput.cpp +++ b/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtInput.cpp @@ -17,13 +17,13 @@ limitations under the License. // This is an independent project of an individual developer. Dear PVS-Studio, please check it. // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com -#include "NodeSlotSceneAudiArtInput.h" +#include "NodeSlotSceneAudiartInput.h" #include -#include +#include #include -#include -#include +#include +#include static const float slotIconSize = 15.0f; @@ -31,26 +31,26 @@ static const float slotIconSize = 15.0f; //// STATIC ////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -NodeSlotSceneAudiArtInputPtr NodeSlotSceneAudiArtInput::Create(NodeSlotSceneAudiArtInput vSlot) { - auto res = std::make_shared(vSlot); +NodeSlotSceneAudiartInputPtr NodeSlotSceneAudiartInput::Create(NodeSlotSceneAudiartInput vSlot) { + auto res = std::make_shared(vSlot); res->m_This = res; return res; } -NodeSlotSceneAudiArtInputPtr NodeSlotSceneAudiArtInput::Create(const std::string& vName) { - auto res = std::make_shared(vName); +NodeSlotSceneAudiartInputPtr NodeSlotSceneAudiartInput::Create(const std::string& vName) { + auto res = std::make_shared(vName); res->m_This = res; return res; } -NodeSlotSceneAudiArtInputPtr NodeSlotSceneAudiArtInput::Create(const std::string& vName, const bool& vHideName) { - auto res = std::make_shared(vName, vHideName); +NodeSlotSceneAudiartInputPtr NodeSlotSceneAudiartInput::Create(const std::string& vName, const bool& vHideName) { + auto res = std::make_shared(vName, vHideName); res->m_This = res; return res; } -NodeSlotSceneAudiArtInputPtr NodeSlotSceneAudiArtInput::Create(const std::string& vName, const bool& vHideName, const bool& vShowWidget) { - auto res = std::make_shared(vName, vHideName, vShowWidget); +NodeSlotSceneAudiartInputPtr NodeSlotSceneAudiartInput::Create(const std::string& vName, const bool& vHideName, const bool& vShowWidget) { + auto res = std::make_shared(vName, vHideName, vShowWidget); res->m_This = res; return res; } @@ -59,40 +59,40 @@ NodeSlotSceneAudiArtInputPtr NodeSlotSceneAudiArtInput::Create(const std::string //// PUBLIC CLASS //////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -NodeSlotSceneAudiArtInput::NodeSlotSceneAudiArtInput() : NodeSlotInput("", "SCENEAUDIART") { +NodeSlotSceneAudiartInput::NodeSlotSceneAudiartInput() : NodeSlotInput("", "SCENEAUDIART") { pinID = sGetNewSlotId(); color = sGetSlotColors()->GetSlotColor(slotType); colorIsSet = true; } -NodeSlotSceneAudiArtInput::NodeSlotSceneAudiArtInput(const std::string& vName) : NodeSlotInput(vName, "SCENEAUDIART") { +NodeSlotSceneAudiartInput::NodeSlotSceneAudiartInput(const std::string& vName) : NodeSlotInput(vName, "SCENEAUDIART") { pinID = sGetNewSlotId(); color = sGetSlotColors()->GetSlotColor(slotType); colorIsSet = true; } -NodeSlotSceneAudiArtInput::NodeSlotSceneAudiArtInput(const std::string& vName, const bool& vHideName) +NodeSlotSceneAudiartInput::NodeSlotSceneAudiartInput(const std::string& vName, const bool& vHideName) : NodeSlotInput(vName, "SCENEAUDIART", vHideName) { pinID = sGetNewSlotId(); color = sGetSlotColors()->GetSlotColor(slotType); colorIsSet = true; } -NodeSlotSceneAudiArtInput::NodeSlotSceneAudiArtInput(const std::string& vName, const bool& vHideName, const bool& vShowWidget) +NodeSlotSceneAudiartInput::NodeSlotSceneAudiartInput(const std::string& vName, const bool& vHideName, const bool& vShowWidget) : NodeSlotInput(vName, "SCENEAUDIART", vHideName, vShowWidget) { pinID = sGetNewSlotId(); color = sGetSlotColors()->GetSlotColor(slotType); colorIsSet = true; } -NodeSlotSceneAudiArtInput::~NodeSlotSceneAudiArtInput() = default; +NodeSlotSceneAudiartInput::~NodeSlotSceneAudiartInput() = default; -void NodeSlotSceneAudiArtInput::Init() { +void NodeSlotSceneAudiartInput::Init() { } -void NodeSlotSceneAudiArtInput::Unit() { +void NodeSlotSceneAudiartInput::Unit() { // ici pas besoin du assert sur le m_This - // car NodeSlotSceneAudiArtInput peut etre isntancié à l'ancienne en copie local donc sans shared_ptr + // car NodeSlotSceneAudiartInput peut etre isntancié à l'ancienne en copie local donc sans shared_ptr // donc pour gagner du temps on va checker le this, si expiré on va pas plus loins if (!m_This.expired()) { if (!parentNode.expired()) { @@ -110,41 +110,41 @@ void NodeSlotSceneAudiArtInput::Unit() { } } -void NodeSlotSceneAudiArtInput::OnConnectEvent(NodeSlotWeak vOtherSlot) { +void NodeSlotSceneAudiartInput::OnConnectEvent(NodeSlotWeak vOtherSlot) { auto endSlotPtr = vOtherSlot.lock(); if (endSlotPtr) { - auto parentNodePtr = dynamic_pointer_cast(parentNode.lock()); + auto parentNodePtr = dynamic_pointer_cast(parentNode.lock()); if (parentNodePtr) { - auto otherCodeNodePtr = dynamic_pointer_cast(endSlotPtr->parentNode.lock()); + auto otherCodeNodePtr = dynamic_pointer_cast(endSlotPtr->parentNode.lock()); if (otherCodeNodePtr) { - parentNodePtr->SetSceneAudiArt(name, otherCodeNodePtr->GetSceneAudiArt(endSlotPtr->name)); + parentNodePtr->SetSceneAudiart(name, otherCodeNodePtr->GetSceneAudiart(endSlotPtr->name)); } } } } -void NodeSlotSceneAudiArtInput::OnDisConnectEvent(NodeSlotWeak vOtherSlot) { +void NodeSlotSceneAudiartInput::OnDisConnectEvent(NodeSlotWeak vOtherSlot) { auto endSlotPtr = vOtherSlot.lock(); if (endSlotPtr) { - auto parentNodePtr = dynamic_pointer_cast(parentNode.lock()); + auto parentNodePtr = dynamic_pointer_cast(parentNode.lock()); if (parentNodePtr) { - parentNodePtr->SetSceneAudiArt(name, SceneAudiArtWeak()); + parentNodePtr->SetSceneAudiart(name, SceneAudiartWeak()); } } } -void NodeSlotSceneAudiArtInput::TreatNotification(NotifyEvent vEvent, const NodeSlotWeak& vEmitterSlot, const NodeSlotWeak& vReceiverSlot) { - if (vEvent == SceneAudiArtUpdateDone) { +void NodeSlotSceneAudiartInput::TreatNotification(NotifyEvent vEvent, const NodeSlotWeak& vEmitterSlot, const NodeSlotWeak& vReceiverSlot) { + if (vEvent == SceneAudiartUpdateDone) { auto emiterSlotPtr = vEmitterSlot.lock(); if (emiterSlotPtr) { if (emiterSlotPtr->IsAnOutput()) { - auto parentCodeInputNodePtr = dynamic_pointer_cast(parentNode.lock()); + auto parentCodeInputNodePtr = dynamic_pointer_cast(parentNode.lock()); if (parentCodeInputNodePtr) { - auto otherNodePtr = dynamic_pointer_cast(emiterSlotPtr->parentNode.lock()); + auto otherNodePtr = dynamic_pointer_cast(emiterSlotPtr->parentNode.lock()); if (otherNodePtr) { auto receiverSlotPtr = vReceiverSlot.lock(); if (receiverSlotPtr) { - parentCodeInputNodePtr->SetSceneAudiArt(receiverSlotPtr->name, otherNodePtr->GetSceneAudiArt(emiterSlotPtr->name)); + parentCodeInputNodePtr->SetSceneAudiart(receiverSlotPtr->name, otherNodePtr->GetSceneAudiart(emiterSlotPtr->name)); } } } @@ -153,9 +153,9 @@ void NodeSlotSceneAudiArtInput::TreatNotification(NotifyEvent vEvent, const Node } } -void NodeSlotSceneAudiArtInput::DrawDebugInfos() { +void NodeSlotSceneAudiartInput::DrawDebugInfos() { ImGui::Text("--------------------"); - ImGui::Text("Slot SceneAudiArt", name.c_str()); + ImGui::Text("Slot SceneAudiart", name.c_str()); ImGui::Text(IsAnInput() ? "Input" : "Output"); ImGui::Text("Count connections : %u", (uint32_t)linkedSlots.size()); } diff --git a/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtInput.h b/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtInput.h index 1108feb19..22ad75410 100644 --- a/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtInput.h +++ b/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtInput.h @@ -19,23 +19,23 @@ limitations under the License. #include #include -class NodeSlotSceneAudiArtInput; -typedef std::weak_ptr NodeSlotSceneAudiArtInputWeak; -typedef std::shared_ptr NodeSlotSceneAudiArtInputPtr; +class NodeSlotSceneAudiartInput; +typedef std::weak_ptr NodeSlotSceneAudiartInputWeak; +typedef std::shared_ptr NodeSlotSceneAudiartInputPtr; -class NodeSlotSceneAudiArtInput : public NodeSlotInput { +class NodeSlotSceneAudiartInput : public NodeSlotInput { public: - static NodeSlotSceneAudiArtInputPtr Create(NodeSlotSceneAudiArtInput vSlot); - static NodeSlotSceneAudiArtInputPtr Create(const std::string& vName); - static NodeSlotSceneAudiArtInputPtr Create(const std::string& vName, const bool& vHideName); - static NodeSlotSceneAudiArtInputPtr Create(const std::string& vName, const bool& vHideName, const bool& vShowWidget); + static NodeSlotSceneAudiartInputPtr Create(NodeSlotSceneAudiartInput vSlot); + static NodeSlotSceneAudiartInputPtr Create(const std::string& vName); + static NodeSlotSceneAudiartInputPtr Create(const std::string& vName, const bool& vHideName); + static NodeSlotSceneAudiartInputPtr Create(const std::string& vName, const bool& vHideName, const bool& vShowWidget); public: - explicit NodeSlotSceneAudiArtInput(); - explicit NodeSlotSceneAudiArtInput(const std::string& vName); - explicit NodeSlotSceneAudiArtInput(const std::string& vName, const bool& vHideName); - explicit NodeSlotSceneAudiArtInput(const std::string& vName, const bool& vHideName, const bool& vShowWidget); - ~NodeSlotSceneAudiArtInput(); + explicit NodeSlotSceneAudiartInput(); + explicit NodeSlotSceneAudiartInput(const std::string& vName); + explicit NodeSlotSceneAudiartInput(const std::string& vName, const bool& vHideName); + explicit NodeSlotSceneAudiartInput(const std::string& vName, const bool& vHideName, const bool& vShowWidget); + ~NodeSlotSceneAudiartInput(); void Init(); void Unit(); diff --git a/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtOutput.cpp b/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtOutput.cpp index e831777a7..2ab71b60c 100644 --- a/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtOutput.cpp +++ b/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtOutput.cpp @@ -17,10 +17,10 @@ limitations under the License. // This is an independent project of an individual developer. Dear PVS-Studio, please check it. // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com -#include "NodeSlotSceneAudiArtOutput.h" +#include "NodeSlotSceneAudiartOutput.h" #include -#include +#include #include static const float slotIconSize = 15.0f; @@ -29,26 +29,26 @@ static const float slotIconSize = 15.0f; //// STATIC ////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -NodeSlotSceneAudiArtOutputPtr NodeSlotSceneAudiArtOutput::Create(NodeSlotSceneAudiArtOutput vSlot) { - auto res = std::make_shared(vSlot); +NodeSlotSceneAudiartOutputPtr NodeSlotSceneAudiartOutput::Create(NodeSlotSceneAudiartOutput vSlot) { + auto res = std::make_shared(vSlot); res->m_This = res; return res; } -NodeSlotSceneAudiArtOutputPtr NodeSlotSceneAudiArtOutput::Create(const std::string& vName) { - auto res = std::make_shared(vName); +NodeSlotSceneAudiartOutputPtr NodeSlotSceneAudiartOutput::Create(const std::string& vName) { + auto res = std::make_shared(vName); res->m_This = res; return res; } -NodeSlotSceneAudiArtOutputPtr NodeSlotSceneAudiArtOutput::Create(const std::string& vName, const bool& vHideName) { - auto res = std::make_shared(vName, vHideName); +NodeSlotSceneAudiartOutputPtr NodeSlotSceneAudiartOutput::Create(const std::string& vName, const bool& vHideName) { + auto res = std::make_shared(vName, vHideName); res->m_This = res; return res; } -NodeSlotSceneAudiArtOutputPtr NodeSlotSceneAudiArtOutput::Create(const std::string& vName, const bool& vHideName, const bool& vShowWidget) { - auto res = std::make_shared(vName, vHideName, vShowWidget); +NodeSlotSceneAudiartOutputPtr NodeSlotSceneAudiartOutput::Create(const std::string& vName, const bool& vHideName, const bool& vShowWidget) { + auto res = std::make_shared(vName, vHideName, vShowWidget); res->m_This = res; return res; } @@ -57,40 +57,40 @@ NodeSlotSceneAudiArtOutputPtr NodeSlotSceneAudiArtOutput::Create(const std::stri //// PUBIC CLASS ///////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////// -NodeSlotSceneAudiArtOutput::NodeSlotSceneAudiArtOutput() : NodeSlotOutput("", "SCENEAUDIART") { +NodeSlotSceneAudiartOutput::NodeSlotSceneAudiartOutput() : NodeSlotOutput("", "SCENEAUDIART") { pinID = sGetNewSlotId(); color = sGetSlotColors()->GetSlotColor(slotType); colorIsSet = true; } -NodeSlotSceneAudiArtOutput::NodeSlotSceneAudiArtOutput(const std::string& vName) : NodeSlotOutput(vName, "SCENEAUDIART") { +NodeSlotSceneAudiartOutput::NodeSlotSceneAudiartOutput(const std::string& vName) : NodeSlotOutput(vName, "SCENEAUDIART") { pinID = sGetNewSlotId(); color = sGetSlotColors()->GetSlotColor(slotType); colorIsSet = true; } -NodeSlotSceneAudiArtOutput::NodeSlotSceneAudiArtOutput(const std::string& vName, const bool& vHideName) +NodeSlotSceneAudiartOutput::NodeSlotSceneAudiartOutput(const std::string& vName, const bool& vHideName) : NodeSlotOutput(vName, "SCENEAUDIART", vHideName) { pinID = sGetNewSlotId(); color = sGetSlotColors()->GetSlotColor(slotType); colorIsSet = true; } -NodeSlotSceneAudiArtOutput::NodeSlotSceneAudiArtOutput(const std::string& vName, const bool& vHideName, const bool& vShowWidget) +NodeSlotSceneAudiartOutput::NodeSlotSceneAudiartOutput(const std::string& vName, const bool& vHideName, const bool& vShowWidget) : NodeSlotOutput(vName, "SCENEAUDIART", vHideName, vShowWidget) { pinID = sGetNewSlotId(); color = sGetSlotColors()->GetSlotColor(slotType); colorIsSet = true; } -NodeSlotSceneAudiArtOutput::~NodeSlotSceneAudiArtOutput() = default; +NodeSlotSceneAudiartOutput::~NodeSlotSceneAudiartOutput() = default; -void NodeSlotSceneAudiArtOutput::Init() { +void NodeSlotSceneAudiartOutput::Init() { } -void NodeSlotSceneAudiArtOutput::Unit() { +void NodeSlotSceneAudiartOutput::Unit() { // ici pas besoin du assert sur le m_This - // car NodeSlotSceneAudiArtOutput peut etre instancié à l'ancienne en copie local donc sans shared_ptr + // car NodeSlotSceneAudiartOutput peut etre instancié à l'ancienne en copie local donc sans shared_ptr // donc pour gagner du temps on va checker le this, si expiré on va pas plus loins if (!m_This.expired()) { if (!parentNode.expired()) { @@ -108,15 +108,15 @@ void NodeSlotSceneAudiArtOutput::Unit() { } } -void NodeSlotSceneAudiArtOutput::SendFrontNotification(const NotifyEvent& vEvent) { - if (vEvent == SceneAudiArtUpdateDone) { +void NodeSlotSceneAudiartOutput::SendFrontNotification(const NotifyEvent& vEvent) { + if (vEvent == SceneAudiartUpdateDone) { SendNotification(slotType, vEvent); } } -void NodeSlotSceneAudiArtOutput::DrawDebugInfos() { +void NodeSlotSceneAudiartOutput::DrawDebugInfos() { ImGui::Text("--------------------"); - ImGui::Text("Slot SceneAudiArt", name.c_str()); + ImGui::Text("Slot SceneAudiart", name.c_str()); ImGui::Text(IsAnInput() ? "Input" : "Output"); ImGui::Text("Count connections : %u", (uint32_t)linkedSlots.size()); } diff --git a/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtOutput.h b/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtOutput.h index b79680634..b6988241c 100644 --- a/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtOutput.h +++ b/Plugins/AudiArt/src/Slots/NodeSlotSceneAudiArtOutput.h @@ -19,23 +19,23 @@ limitations under the License. #include #include -class NodeSlotSceneAudiArtOutput; -typedef std::weak_ptr NodeSlotSceneAudiArtOutputWeak; -typedef std::shared_ptr NodeSlotSceneAudiArtOutputPtr; +class NodeSlotSceneAudiartOutput; +typedef std::weak_ptr NodeSlotSceneAudiartOutputWeak; +typedef std::shared_ptr NodeSlotSceneAudiartOutputPtr; -class NodeSlotSceneAudiArtOutput : public NodeSlotOutput { +class NodeSlotSceneAudiartOutput : public NodeSlotOutput { public: - static NodeSlotSceneAudiArtOutputPtr Create(NodeSlotSceneAudiArtOutput vSlot); - static NodeSlotSceneAudiArtOutputPtr Create(const std::string& vName); - static NodeSlotSceneAudiArtOutputPtr Create(const std::string& vName, const bool& vHideName); - static NodeSlotSceneAudiArtOutputPtr Create(const std::string& vName, const bool& vHideName, const bool& vShowWidget); + static NodeSlotSceneAudiartOutputPtr Create(NodeSlotSceneAudiartOutput vSlot); + static NodeSlotSceneAudiartOutputPtr Create(const std::string& vName); + static NodeSlotSceneAudiartOutputPtr Create(const std::string& vName, const bool& vHideName); + static NodeSlotSceneAudiartOutputPtr Create(const std::string& vName, const bool& vHideName, const bool& vShowWidget); public: - explicit NodeSlotSceneAudiArtOutput(); - explicit NodeSlotSceneAudiArtOutput(const std::string& vName); - explicit NodeSlotSceneAudiArtOutput(const std::string& vName, const bool& vHideName); - explicit NodeSlotSceneAudiArtOutput(const std::string& vName, const bool& vHideName, const bool& vShowWidget); - ~NodeSlotSceneAudiArtOutput(); + explicit NodeSlotSceneAudiartOutput(); + explicit NodeSlotSceneAudiartOutput(const std::string& vName); + explicit NodeSlotSceneAudiartOutput(const std::string& vName, const bool& vHideName); + explicit NodeSlotSceneAudiartOutput(const std::string& vName, const bool& vHideName, const bool& vShowWidget); + ~NodeSlotSceneAudiartOutput(); void Init(); void Unit(); diff --git a/Plugins/CodeGenerator/CMakeLists.txt b/Plugins/CodeGenerator/CMakeLists.txt index b67a81f31..f74feee5f 100644 --- a/Plugins/CodeGenerator/CMakeLists.txt +++ b/Plugins/CodeGenerator/CMakeLists.txt @@ -129,7 +129,7 @@ set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PLUGIN_PREFIX}_${PROJ set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${FINAL_BIN_DIR}") -set_target_properties(${PROJECT} PROPERTIES FOLDER Plugins) +set_target_properties(${PROJECT} PROPERTIES FOLDER plugins) install(IMPORTED_RUNTIME_ARTIFACTS ${PROJECT} DESTINATION plugins COMPONENT PLUGIN_BINARY_${PROJECT}) diff --git a/Plugins/Landscape/CMakeLists.txt b/Plugins/Landscape/CMakeLists.txt index 85ed17856..acb69de83 100644 --- a/Plugins/Landscape/CMakeLists.txt +++ b/Plugins/Landscape/CMakeLists.txt @@ -129,7 +129,7 @@ set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PLUGIN_PREFIX}_${PROJ set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${FINAL_BIN_DIR}") -set_target_properties(${PROJECT} PROPERTIES FOLDER Plugins) +set_target_properties(${PROJECT} PROPERTIES FOLDER plugins) install(IMPORTED_RUNTIME_ARTIFACTS ${PROJECT} DESTINATION plugins COMPONENT PLUGIN_BINARY_${PROJECT}) diff --git a/Plugins/Lighting/CMakeLists.txt b/Plugins/Lighting/CMakeLists.txt index dba61d2b5..59176896b 100644 --- a/Plugins/Lighting/CMakeLists.txt +++ b/Plugins/Lighting/CMakeLists.txt @@ -129,7 +129,7 @@ set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PLUGIN_PREFIX}_${PROJ set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${FINAL_BIN_DIR}") -set_target_properties(${PROJECT} PROPERTIES FOLDER Plugins) +set_target_properties(${PROJECT} PROPERTIES FOLDER plugins) install(IMPORTED_RUNTIME_ARTIFACTS ${PROJECT} DESTINATION plugins COMPONENT PLUGIN_BINARY_${PROJECT}) diff --git a/Plugins/MeshGen/CMakeLists.txt b/Plugins/MeshGen/CMakeLists.txt index 768f930d2..c35d8979c 100644 --- a/Plugins/MeshGen/CMakeLists.txt +++ b/Plugins/MeshGen/CMakeLists.txt @@ -135,7 +135,7 @@ set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PLUGIN_PREFIX}_${PROJ set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${FINAL_BIN_DIR}") -set_target_properties(${PROJECT} PROPERTIES FOLDER Plugins) +set_target_properties(${PROJECT} PROPERTIES FOLDER plugins) install(IMPORTED_RUNTIME_ARTIFACTS ${PROJECT} DESTINATION plugins COMPONENT PLUGIN_BINARY_${PROJECT}) diff --git a/Plugins/Misc/CMakeLists.txt b/Plugins/Misc/CMakeLists.txt index 4c63521dc..f6cf2821b 100644 --- a/Plugins/Misc/CMakeLists.txt +++ b/Plugins/Misc/CMakeLists.txt @@ -128,7 +128,7 @@ set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PLUGIN_PREFIX}_${PROJ set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${FINAL_BIN_DIR}") -set_target_properties(${PROJECT} PROPERTIES FOLDER Plugins) +set_target_properties(${PROJECT} PROPERTIES FOLDER plugins) install(IMPORTED_RUNTIME_ARTIFACTS ${PROJECT} DESTINATION plugins COMPONENT PLUGIN_BINARY_${PROJECT}) diff --git a/Plugins/Particles/CMakeLists.txt b/Plugins/Particles/CMakeLists.txt index 61b466e0b..92faf5a13 100644 --- a/Plugins/Particles/CMakeLists.txt +++ b/Plugins/Particles/CMakeLists.txt @@ -130,7 +130,7 @@ set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PLUGIN_PREFIX}_${PROJ set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${FINAL_BIN_DIR}") -set_target_properties(${PROJECT} PROPERTIES FOLDER Plugins) +set_target_properties(${PROJECT} PROPERTIES FOLDER plugins) install(IMPORTED_RUNTIME_ARTIFACTS ${PROJECT} DESTINATION plugins COMPONENT PLUGIN_BINARY_${PROJECT}) diff --git a/Plugins/PlanetSystem/CMakeLists.txt b/Plugins/PlanetSystem/CMakeLists.txt index c2a3400b3..7b2be5363 100644 --- a/Plugins/PlanetSystem/CMakeLists.txt +++ b/Plugins/PlanetSystem/CMakeLists.txt @@ -118,7 +118,7 @@ set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PLUGIN_PREFIX}_${PROJ set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${FINAL_BIN_DIR}") -set_target_properties(${PROJECT} PROPERTIES FOLDER Plugins) +set_target_properties(${PROJECT} PROPERTIES FOLDER plugins) install(IMPORTED_RUNTIME_ARTIFACTS ${PROJECT} DESTINATION plugins COMPONENT PLUGIN_BINARY_${PROJECT}) diff --git a/Plugins/PostProcessing/CMakeLists.txt b/Plugins/PostProcessing/CMakeLists.txt index 3591a74bb..ff7093eaa 100644 --- a/Plugins/PostProcessing/CMakeLists.txt +++ b/Plugins/PostProcessing/CMakeLists.txt @@ -129,7 +129,7 @@ set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PLUGIN_PREFIX}_${PROJ set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${FINAL_BIN_DIR}") -set_target_properties(${PROJECT} PROPERTIES FOLDER Plugins) +set_target_properties(${PROJECT} PROPERTIES FOLDER plugins) install(IMPORTED_RUNTIME_ARTIFACTS ${PROJECT} DESTINATION plugins COMPONENT PLUGIN_BINARY_${PROJECT}) diff --git a/Plugins/RTX/CMakeLists.txt b/Plugins/RTX/CMakeLists.txt index 8a45162cc..d7450d573 100644 --- a/Plugins/RTX/CMakeLists.txt +++ b/Plugins/RTX/CMakeLists.txt @@ -129,7 +129,7 @@ set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PLUGIN_PREFIX}_${PROJ set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${FINAL_BIN_DIR}") -set_target_properties(${PROJECT} PROPERTIES FOLDER Plugins) +set_target_properties(${PROJECT} PROPERTIES FOLDER plugins) install(IMPORTED_RUNTIME_ARTIFACTS ${PROJECT} DESTINATION plugins COMPONENT PLUGIN_BINARY_${PROJECT}) diff --git a/Plugins/ScreenSpace/CMakeLists.txt b/Plugins/ScreenSpace/CMakeLists.txt index 059ff929c..07dccc2af 100644 --- a/Plugins/ScreenSpace/CMakeLists.txt +++ b/Plugins/ScreenSpace/CMakeLists.txt @@ -129,7 +129,7 @@ set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PLUGIN_PREFIX}_${PROJ set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${FINAL_BIN_DIR}") -set_target_properties(${PROJECT} PROPERTIES FOLDER Plugins) +set_target_properties(${PROJECT} PROPERTIES FOLDER plugins) install(IMPORTED_RUNTIME_ARTIFACTS ${PROJECT} DESTINATION plugins COMPONENT PLUGIN_BINARY_${PROJECT}) diff --git a/Plugins/Simulation/CMakeLists.txt b/Plugins/Simulation/CMakeLists.txt index 09e9a0e71..1df9c6ca2 100644 --- a/Plugins/Simulation/CMakeLists.txt +++ b/Plugins/Simulation/CMakeLists.txt @@ -129,7 +129,7 @@ set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PLUGIN_PREFIX}_${PROJ set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${FINAL_BIN_DIR}") -set_target_properties(${PROJECT} PROPERTIES FOLDER Plugins) +set_target_properties(${PROJECT} PROPERTIES FOLDER plugins) install(IMPORTED_RUNTIME_ARTIFACTS ${PROJECT} DESTINATION plugins COMPONENT PLUGIN_BINARY_${PROJECT}) diff --git a/Plugins/Smoke/CMakeLists.txt b/Plugins/Smoke/CMakeLists.txt index 521069c3f..b97ce54f5 100644 --- a/Plugins/Smoke/CMakeLists.txt +++ b/Plugins/Smoke/CMakeLists.txt @@ -129,7 +129,7 @@ set_target_properties(${PROJECT} PROPERTIES OUTPUT_NAME "${PLUGIN_PREFIX}_${PROJ set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${FINAL_BIN_DIR}") set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${FINAL_BIN_DIR}") -set_target_properties(${PROJECT} PROPERTIES FOLDER Plugins) +set_target_properties(${PROJECT} PROPERTIES FOLDER plugins) install(IMPORTED_RUNTIME_ARTIFACTS ${PROJECT} DESTINATION plugins COMPONENT PLUGIN_BINARY_${PROJECT}) diff --git a/Readme.md b/Readme.md index 8266ef64e..7ca3d3752 100644 --- a/Readme.md +++ b/Readme.md @@ -65,7 +65,7 @@ The mac platform is not supported for the moment, due to the vulkan driver. Coul | Target | Win (x64) | Linux (x64) | MacOs (x64) | | - | - | - | - | | Lumo | [![Build Status][ba_applic_lumoapp_win]][ci_applic_lumoapp_win] | [![Build Status][ba_applic_lumoapp_lin]][ci_applic_lumoapp_lin] | - | -| Plugin AudiArt | [![Build Status][ba_plugin_audiart_win]][ci_plugin_audiart_win] | [![Build Status][ba_plugin_audiart_lin]][ci_plugin_audiart_lin] | - | +| Plugin Audiart | [![Build Status][ba_plugin_audiart_win]][ci_plugin_audiart_win] | [![Build Status][ba_plugin_audiart_lin]][ci_plugin_audiart_lin] | - | | Plugin CodeGenerator | [![Build Status][ba_plugin_codegen_win]][ci_plugin_codegen_win] | [![Build Status][ba_plugin_codegen_lin]][ci_plugin_codegen_lin] | - | | Plugin Landscape | [![Build Status][ba_plugin_landsca_win]][ci_plugin_landsca_win] | [![Build Status][ba_plugin_landsca_lin]][ci_plugin_landsca_lin] | - | | Plugin Lighting | [![Build Status][ba_plugin_lightin_win]][ci_plugin_lightin_win] | [![Build Status][ba_plugin_lightin_lin]][ci_plugin_lightin_lin] | - | @@ -171,11 +171,11 @@ The mac platform is not supported for the moment, due to the vulkan driver. Coul -# Lumo Plugins : +# Lumo plugins :
-AudiArt Plugin : +Audiart Plugin : ### Description : diff --git a/VERSION b/VERSION index 062f45a7d..0a87aeb85 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Lumo_Windows_Debug_x64_v0.0.5604 +Lumo_Windows_Debug_x64_v0.0.5606