Skip to content

Commit

Permalink
[FIX] : fix compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
@aiekick
aiekick committed Aug 1, 2024
1 parent 9fb9079 commit db5671e
Show file tree
Hide file tree
Showing 47 changed files with 90 additions and 78 deletions.
38 changes: 25 additions & 13 deletions Plugins/AudiArt/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ add_definitions(-DUSE_DECORATIONS_FOR_RESIZE_CHILD_WINDOWS) ## for the resize im
include(cmake/miniaudio.cmake)
include(cmake/kissfft.cmake)

set_target_properties(uninstall PROPERTIES FOLDER "cmakeTargets")

find_package(Vulkan REQUIRED)
if (uninstall)
set_target_properties(uninstall PROPERTIES FOLDER "cmakeTargets")
endif()

## other define
add_definitions(-DPROJECT_PATH="${CMAKE_SOURCE_DIR}")
Expand All @@ -54,6 +54,7 @@ add_definitions(-DUSE_IMCOOL_BAR)
add_definitions(-DUSE_IMGUI_MARKDOW)
add_definitions(-DUSE_IMGUI_FILE_DIALOG)
add_definitions(-DUSE_IMGUI_NODE_EDITOR)
add_definitions(-DUSE_IMGUI_COLOR_TEXT_EDIT)

if(UNIX)
add_definitions(-DUNIX)
Expand All @@ -62,7 +63,7 @@ elseif(WIN32)
endif()

if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /FR")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 ")
add_definitions(-D_USE_MATH_DEFINES)
add_definitions(-DMSVC)
add_definitions(-DNOMINMAX) ## for avoid issue regarding std::max and std::min
Expand All @@ -77,21 +78,32 @@ file(GLOB_RECURSE PROJECT_SRC_RECURSE
${CMAKE_CURRENT_SOURCE_DIR}/src/*.hpp)
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX src FILES ${PROJECT_SRC_RECURSE})

file(GLOB SHADER_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/shaders/*.vert
${CMAKE_CURRENT_SOURCE_DIR}/shaders/*.frag
${CMAKE_CURRENT_SOURCE_DIR}/shaders/*.geom
${CMAKE_CURRENT_SOURCE_DIR}/shaders/*.tesseval
${CMAKE_CURRENT_SOURCE_DIR}/shaders/*.tessctrl
${CMAKE_CURRENT_SOURCE_DIR}/shaders/*.comp)
source_group(Shaders FILES ${SHADER_SOURCES})

file(GLOB_RECURSE PROJECT_SHADERS_RECURSE
${CMAKE_CURRENT_SOURCE_DIR}/builtins/*.glsl
${CMAKE_CURRENT_SOURCE_DIR}/builtins/*.scen
${CMAKE_CURRENT_SOURCE_DIR}/builtins/*.comp)
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} PREFIX Shaders FILES ${PROJECT_SHADERS_RECURSE})

file(GLOB_RECURSE CMAKE_RECURSE
${CMAKE_CURRENT_SOURCE_DIR}/cmake/*.cmake)
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/cmake PREFIX cmake FILES ${CMAKE_RECURSE})

set(ENABLE_EXPORTS ON CACHE STRING "" FORCE)

set(LINKING_TYPE MODULE)
if (PLUGIN_ENABLE_STATIC_LINKING)
set(LINKING_TYPE STATIC)
add_definitions(-DPLUGIN_ENABLE_STATIC_LINKING)
endif()

add_library(${PROJECT} ${LINKING_TYPE}
add_library(${PROJECT} MODULE
${CMAKE_RECURSE}
${SHADER_SOURCES}
${PROJECT_SRC_RECURSE}
${PROJECT_SHADERS_RECURSE}
)

if ("${CMAKE_EXE_LINKER_FLAGS}" STREQUAL "/machine:x64")
Expand Down Expand Up @@ -121,7 +133,7 @@ set_target_properties(${PROJECT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${FINAL_BI
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)

install(IMPORTED_RUNTIME_ARTIFACTS ${PROJECT} DESTINATION plugins COMPONENT PLUGIN_BINARY_${PROJECT})

include_directories(
Expand Down Expand Up @@ -149,7 +161,7 @@ set(LOADED_LUMO_PLUGINS ${LOADED_LUMO_PLUGINS} ${PROJECT} PARENT_SCOPE)
## only for Debug
add_custom_command(
TARGET ${PROJECT} PRE_BUILD
COMMAND BuildInc -prefix=${PROJECT} 1000:10 $<$<CONFIG:Debug>:${CMAKE_CURRENT_SOURCE_DIR}/src/Headers/${PROJECT}Build.h>
COMMAND BuildInc -prefix=${PROJECT} 1000000:10 $<$<CONFIG:Debug>:${CMAKE_CURRENT_SOURCE_DIR}/src/Headers/${PROJECT}Build.h>
DEPENDS ${PROJECT}
)

Expand Down
4 changes: 2 additions & 2 deletions Plugins/AudiArt/src/Headers/AudiArtBuild.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#define AudiArt_Prefix "AudiArt"
#define AudiArt_BuildNumber 120
#define AudiArt_BuildNumber 122
#define AudiArt_MinorNumber 0
#define AudiArt_MajorNumber 0
#define AudiArt_BuildId "0.0.120"
#define AudiArt_BuildId "0.0.122"
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Effect/SoundFFTModule.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ bool SoundFFTModule::DrawOverlays(const uint32_t& vCurrentFrame, const ImRect& v
}

bool SoundFFTModule::DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas) {
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr, void* vUserDatas) {
ZoneScoped;

assert(vContextPtr);
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Effect/SoundFFTModule.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class SoundFFTModule : public NodeInterface,
bool DrawOverlays(
const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
bool DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
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;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Operations/AudioTextureModule.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ bool AudioTextureModule::DrawOverlays(const uint32_t& vCurrentFrame, const ImRec
}

bool AudioTextureModule::DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas) {
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr, void* vUserDatas) {
ZoneScoped;

assert(vContextPtr);
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Operations/AudioTextureModule.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class AudioTextureModule : public NodeInterface,
bool DrawOverlays(
const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
bool DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;

void NeedResizeByResizeEvent(ct::ivec2* vNewSize, const uint32_t* vCountColorBuffers) override;

Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Operations/HistorizeModule.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ bool HistorizeModule::DrawOverlays(const uint32_t& vCurrentFrame, const ImRect&
}

bool HistorizeModule::DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas) {
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr, void* vUserDatas) {
ZoneScoped;

assert(vContextPtr);
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Operations/HistorizeModule.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class HistorizeModule : public NodeInterface,
bool DrawOverlays(
const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
bool DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas) override;
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr, void* vUserDatas) override;

void NeedResizeByResizeEvent(ct::ivec2* vNewSize, const uint32_t* vCountColorBuffers) override;

Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Operations/Pass/AudioTextureModule_Comp_2D_Pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ bool AudioTextureModule_Comp_2D_Pass::DrawOverlays(
}

bool AudioTextureModule_Comp_2D_Pass::DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas) {
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr, void* vUserDatas) {
ZoneScoped;

assert(vContextPtr);
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Operations/Pass/AudioTextureModule_Comp_2D_Pass.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class AudioTextureModule_Comp_2D_Pass : public ShaderPass, public SceneAudiArtIn
bool DrawOverlays(
const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
bool DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
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;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Operations/Pass/HistorizeModule_Comp_2D_Pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ bool HistorizeModule_Comp_2D_Pass::DrawOverlays(
}

bool HistorizeModule_Comp_2D_Pass::DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas) {
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr, void* vUserDatas) {
ZoneScoped;

assert(vContextPtr);
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Operations/Pass/HistorizeModule_Comp_2D_Pass.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class HistorizeModule_Comp_2D_Pass : public ShaderPass, public Texture2DInputInt
bool DrawOverlays(
const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
bool DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;

// Interfaces Setters
void SetTexture(const uint32_t& vBindingPoint, vk::DescriptorImageInfo* vImageInfo, ct::fvec2* vTextureSize = nullptr, void* vUserDatas = nullptr) override;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Source/SpeakerSourceModule.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ bool SpeakerSourceModule::DrawOverlays(const uint32_t& vCurrentFrame, const ImRe
}

bool SpeakerSourceModule::DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas) {
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr, void* vUserDatas) {
ZoneScoped;

assert(vContextPtr);
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Source/SpeakerSourceModule.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class SpeakerSourceModule : public NodeInterface,
bool DrawOverlays(
const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
bool DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;

// Interfaces Getters
SceneAudiArtWeak GetSceneAudiArt(const std::string& vName) override;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Viewer/Pass/VisuHexGridModule_Vertex_Pass.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ bool VisuHexGridModule_Vertex_Pass::DrawOverlays(
}

bool VisuHexGridModule_Vertex_Pass::DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas) {
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr, void* vUserDatas) {
ZoneScoped;

assert(vContextPtr);
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Viewer/Pass/VisuHexGridModule_Vertex_Pass.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class VisuHexGridModule_Vertex_Pass : public VertexShaderPass, public Texture2DI
bool DrawOverlays(
const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
bool DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;

// Interfaces Setters
void SetTexture(const uint32_t& vBindingPoint, vk::DescriptorImageInfo* vImageInfo, ct::fvec2* vTextureSize = nullptr, void* vUserDatas = nullptr) override;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Viewer/SourcePreviewModule.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ bool SourcePreviewModule::DrawOverlays(const uint32_t& vCurrentFrame, const ImRe
}

bool SourcePreviewModule::DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas) {
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr, void* vUserDatas) {
ZoneScoped;

assert(vContextPtr);
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Viewer/SourcePreviewModule.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class SourcePreviewModule : public NodeInterface,
bool DrawOverlays(
const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
bool DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
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;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Viewer/VisuHexGridModule.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ bool VisuHexGridModule::DrawOverlays(const uint32_t& vCurrentFrame, const ImRect
}

bool VisuHexGridModule::DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas) {
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr, void* vUserDatas) {
ZoneScoped;

assert(vContextPtr);
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Viewer/VisuHexGridModule.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class VisuHexGridModule : public NodeInterface,
bool DrawOverlays(
const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
bool DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;

void NeedResizeByResizeEvent(ct::ivec2* vNewSize, const uint32_t* vCountColorBuffers) override;

Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Windowing/BlackmanFilterModule.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ bool BlackmanFilterModule::DrawOverlays(
}

bool BlackmanFilterModule::DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas) {
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr, void* vUserDatas) {
ZoneScoped;

assert(vContextPtr);
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Modules/Windowing/BlackmanFilterModule.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class BlackmanFilterModule : public NodeInterface,
bool DrawOverlays(
const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
bool DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
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;
Expand Down
4 changes: 2 additions & 2 deletions Plugins/AudiArt/src/Nodes/Effect/SoundFFTNode.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,14 @@ bool SoundFFTNode::DrawOverlays(const uint32_t& vCurrentFrame, const ImRect& vRe
}

bool SoundFFTNode::DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas) {
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr, void* vUserDatas) {
ZoneScoped;

assert(vContextPtr);
ImGui::SetCurrentContext(vContextPtr);

if (m_SoundFFTModulePtr) {
return m_SoundFFTModulePtr->DrawDialogsAndPopups(vCurrentFrame, vMaxSize, vContextPtr, vUserDatas);
return m_SoundFFTModulePtr->DrawDialogsAndPopups(vCurrentFrame, vMaxRect, vContextPtr, vUserDatas);
}

return false;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Nodes/Effect/SoundFFTNode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class SoundFFTNode : public SceneAudiArtInputInterface, public SceneAudiArtOutpu
bool DrawOverlays(
const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
bool DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
void DisplayInfosOnTopOfTheNode(BaseNodeState* vBaseNodeState) override;

// Interfaces Setters
Expand Down
4 changes: 2 additions & 2 deletions Plugins/AudiArt/src/Nodes/Operations/AudioTextureNode.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,14 @@ bool AudioTextureNode::DrawOverlays(const uint32_t& vCurrentFrame, const ImRect&
}

bool AudioTextureNode::DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas) {
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr, void* vUserDatas) {
ZoneScoped;

assert(vContextPtr);
ImGui::SetCurrentContext(vContextPtr);

if (m_AudioTextureModulePtr) {
return m_AudioTextureModulePtr->DrawDialogsAndPopups(vCurrentFrame, vMaxSize, vContextPtr, vUserDatas);
return m_AudioTextureModulePtr->DrawDialogsAndPopups(vCurrentFrame, vMaxRect, vContextPtr, vUserDatas);
}

return false;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Nodes/Operations/AudioTextureNode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class AudioTextureNode : public SceneAudiArtInputInterface, public Texture2DOutp
bool DrawOverlays(
const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
bool DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
void DisplayInfosOnTopOfTheNode(BaseNodeState* vBaseNodeState) override;

// Resize
Expand Down
4 changes: 2 additions & 2 deletions Plugins/AudiArt/src/Nodes/Operations/HistorizeNode.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,14 @@ bool HistorizeNode::DrawOverlays(const uint32_t& vCurrentFrame, const ImRect& vR
}

bool HistorizeNode::DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas) {
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr, void* vUserDatas) {
ZoneScoped;

assert(vContextPtr);
ImGui::SetCurrentContext(vContextPtr);

if (m_HistorizeModulePtr) {
return m_HistorizeModulePtr->DrawDialogsAndPopups(vCurrentFrame, vMaxSize, vContextPtr, vUserDatas);
return m_HistorizeModulePtr->DrawDialogsAndPopups(vCurrentFrame, vMaxRect, vContextPtr, vUserDatas);
}

return false;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Nodes/Operations/HistorizeNode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class HistorizeNode : public Texture2DInputInterface<0U>, public Texture2DOutput
bool DrawOverlays(
const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
bool DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
void DisplayInfosOnTopOfTheNode(BaseNodeState* vBaseNodeState) override;

// Resize
Expand Down
4 changes: 2 additions & 2 deletions Plugins/AudiArt/src/Nodes/Source/SpeakerSourceNode.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,14 @@ bool SpeakerSourceNode::DrawOverlays(const uint32_t& vCurrentFrame, const ImRect
}

bool SpeakerSourceNode::DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr, void* vUserDatas) {
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr, void* vUserDatas) {
ZoneScoped;

assert(vContextPtr);
ImGui::SetCurrentContext(vContextPtr);

if (m_SpeakerSourceModulePtr) {
return m_SpeakerSourceModulePtr->DrawDialogsAndPopups(vCurrentFrame, vMaxSize, vContextPtr, vUserDatas);
return m_SpeakerSourceModulePtr->DrawDialogsAndPopups(vCurrentFrame, vMaxRect, vContextPtr, vUserDatas);
}

return false;
Expand Down
2 changes: 1 addition & 1 deletion Plugins/AudiArt/src/Nodes/Source/SpeakerSourceNode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class SpeakerSourceNode : public SceneAudiArtOutputInterface, public BaseNode {
bool DrawOverlays(
const uint32_t& vCurrentFrame, const ImRect& vRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
bool DrawDialogsAndPopups(
const uint32_t& vCurrentFrame, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
const uint32_t& vCurrentFrame, const ImRect& vMaxRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
void DisplayInfosOnTopOfTheNode(BaseNodeState* vBaseNodeState) override;

// Interfaces Getters
Expand Down
Loading

0 comments on commit db5671e

Please sign in to comment.