Skip to content

Commit

Permalink
[RFR] : Renaming of Plugins to plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
aiekick committed Sep 10, 2024
1 parent 814254d commit d37b0d4
Show file tree
Hide file tree
Showing 49 changed files with 248 additions and 248 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
60 changes: 30 additions & 30 deletions Plugins/AudiArt/src/AudiArt.cpp
Original file line number Diff line number Diff line change
@@ -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 <Headers/AudiArtBuild.h>
#include "Audiart.h"
#include <Headers/AudiartBuild.h>
#include <ctools/FileHelper.h>
#include <ImGuiPack.h>
#include <LumoBackend/Graph/Base/BaseNode.h>
Expand All @@ -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<std::string> AudiArt::GetNodes() const {
std::vector<std::string> Audiart::GetNodes() const {
return {
/*
"MESH_SIM_RENDERER",
Expand All @@ -82,21 +82,21 @@ std::vector<std::string> AudiArt::GetNodes() const {
};
}

std::vector<LibraryEntry> AudiArt::GetLibrary() const {
std::vector<LibraryEntry> Audiart::GetLibrary() const {
std::vector<LibraryEntry> 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")
Expand All @@ -117,13 +117,13 @@ BaseNodePtr AudiArt::CreatePluginNode(const std::string& vPluginNodeName) {
return nullptr;
}

std::vector<PluginPaneConfig> AudiArt::GetPanes() const {
std::vector<PluginPaneConfig> Audiart::GetPanes() const {
std::vector<PluginPaneConfig> res;

return res;
}

int AudiArt::ResetImGuiID(const int& vWidgetId) {
int Audiart::ResetImGuiID(const int& vWidgetId) {
auto ids = ImGui::GetPUSHID();
ImGui::SetPUSHID(vWidgetId);
return ids;
Expand Down
4 changes: 2 additions & 2 deletions Plugins/AudiArt/src/AudiArt.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include <Gaia/Resources/VulkanRessource.h>
#include <Gaia/Core/vk_mem_alloc.h>

class AudiArt : public PluginInterface {
class Audiart : public PluginInterface {
public:
AudiArt();
Audiart();
void ActionAfterInit() override;
uint32_t GetVersionMajor() const override;
uint32_t GetVersionMinor() const override;
Expand Down
10 changes: 5 additions & 5 deletions Plugins/AudiArt/src/Headers/AudiArtBuild.h
Original file line number Diff line number Diff line change
@@ -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"
8 changes: 4 additions & 4 deletions Plugins/AudiArt/src/Interfaces/SceneAudiArtInputInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ limitations under the License.

#pragma once

#include <SceneGraph/SceneAudiArt.h>
#include <SceneGraph/SceneAudiart.h>

#include <map>
#include <string>

class SceneAudiArtInputInterface {
class SceneAudiartInputInterface {
protected:
std::map<std::string, SceneAudiArtWeak> m_SceneAudiArts;
std::map<std::string, SceneAudiartWeak> m_SceneAudiarts;

public:
virtual void SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) = 0;
virtual void SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) = 0;
};
6 changes: 3 additions & 3 deletions Plugins/AudiArt/src/Interfaces/SceneAudiArtOutputInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ limitations under the License.

#pragma once

#include <SceneGraph/SceneAudiArt.h>
#include <SceneGraph/SceneAudiart.h>
#include <string>

class SceneAudiArtOutputInterface {
class SceneAudiartOutputInterface {
public:
virtual SceneAudiArtWeak GetSceneAudiArt(const std::string& vName) = 0;
virtual SceneAudiartWeak GetSceneAudiart(const std::string& vName) = 0;
};
6 changes: 3 additions & 3 deletions Plugins/AudiArt/src/Modules/Effect/SoundFFTModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -146,17 +146,17 @@ bool SoundFFTModule::DrawDialogsAndPopups(
//// SCENEAUDIART INPUT //////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////

void SoundFFTModule::SetSceneAudiArt(const std::string& vName, SceneAudiArtWeak vSceneAudiArt) {
void SoundFFTModule::SetSceneAudiart(const std::string& vName, SceneAudiartWeak vSceneAudiart) {
ZoneScoped;
}

//////////////////////////////////////////////////////////////////////////////////////////////
//// SCENEAUDIART OUTPUT /////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////

SceneAudiArtWeak SoundFFTModule::GetSceneAudiArt(const std::string& vName) {
SceneAudiartWeak SoundFFTModule::GetSceneAudiart(const std::string& vName) {
ZoneScoped;
return SceneAudiArtWeak();
return SceneAudiartWeak();
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
12 changes: 6 additions & 6 deletions Plugins/AudiArt/src/Modules/Effect/SoundFFTModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ limitations under the License.
#include <LumoBackend/Interfaces/NodeInterface.h>
#include <LumoBackend/Interfaces/ResizerInterface.h>

#include <Interfaces/SceneAudiArtInputInterface.h>
#include <Interfaces/SceneAudiArtOutputInterface.h>
#include <Interfaces/SceneAudiartInputInterface.h>
#include <Interfaces/SceneAudiartOutputInterface.h>

class SoundFFTModule : public NodeInterface,
public conf::ConfigAbstract,
public TaskInterface,
public SceneAudiArtInputInterface,
public SceneAudiArtOutputInterface,
public SceneAudiartInputInterface,
public SceneAudiartOutputInterface,
public GuiInterface {
public:
static std::shared_ptr<SoundFFTModule> Create(GaiApi::VulkanCoreWeak vVulkanCore, BaseNodeWeak vParentNode);
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Plugins/AudiArt/src/Modules/Operations/AudioTextureModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
6 changes: 3 additions & 3 deletions Plugins/AudiArt/src/Modules/Operations/AudioTextureModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ limitations under the License.
#include <LumoBackend/Interfaces/NodeInterface.h>
#include <LumoBackend/Interfaces/ResizerInterface.h>

#include <Interfaces/SceneAudiArtInputInterface.h>
#include <Interfaces/SceneAudiartInputInterface.h>
#include <LumoBackend/Interfaces/Texture2DOutputInterface.h>

class AudioTextureModule_Comp_2D_Pass;
class AudioTextureModule : public NodeInterface,
public BaseRenderer,
public TaskInterface,
public SceneAudiArtInputInterface,
public SceneAudiartInputInterface,
public Texture2DOutputInterface {
public:
static std::shared_ptr<AudioTextureModule> Create(GaiApi::VulkanCoreWeak vVulkanCore, BaseNodeWeak vParentNode);
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

//////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ limitations under the License.

#include <LumoBackend/Interfaces/GuiInterface.h>
#include <LumoBackend/Interfaces/NodeInterface.h>
#include <Interfaces/SceneAudiArtInputInterface.h>
#include <Interfaces/SceneAudiartInputInterface.h>
#include <LumoBackend/Interfaces/Texture2DOutputInterface.h>

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);
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions Plugins/AudiArt/src/Modules/Source/SpeakerSourceModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
6 changes: 3 additions & 3 deletions Plugins/AudiArt/src/Modules/Source/SpeakerSourceModule.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ limitations under the License.
#include <LumoBackend/Interfaces/NodeInterface.h>
#include <LumoBackend/Interfaces/ResizerInterface.h>

#include <Interfaces/SceneAudiArtOutputInterface.h>
#include <Interfaces/SceneAudiartOutputInterface.h>

class SpeakerSourceModule : public NodeInterface,
public conf::ConfigAbstract,
public TaskInterface,
public SceneAudiArtOutputInterface,
public SceneAudiartOutputInterface,
public GuiInterface {
public:
static std::shared_ptr<SpeakerSourceModule> Create(GaiApi::VulkanCoreWeak vVulkanCore, BaseNodeWeak vParentNode);
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Viewer/SourcePreviewModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Loading

0 comments on commit d37b0d4

Please sign in to comment.