Skip to content

Commit

Permalink
🚚 [TextureSource] Renamed
Browse files Browse the repository at this point in the history
  • Loading branch information
@JulesFouchy
JulesFouchy committed May 23, 2024
1 parent 24e9c20 commit 34b1a15
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Cool
Submodule Cool updated 45 files
+4 −4 src/Cool/AppManager/AppManager.cpp
+1 −1 src/Cool/Core/run.cpp
+4 −4 src/Cool/DebugOptions/debug_options_windows.cpp
+1 −1 src/Cool/Gpu/OpenGL/Shader.cpp
+9 −9 src/Cool/Gpu/TextureDescriptor.h
+8 −8 src/Cool/Gpu/TextureLibrary_Image.cpp
+4 −4 src/Cool/Gpu/TextureLibrary_Image.h
+7 −7 src/Cool/Gpu/TextureLibrary_Video.cpp
+4 −4 src/Cool/Gpu/TextureLibrary_Video.h
+6 −6 src/Cool/Gpu/TextureSource.h
+0 −26 src/Cool/Gpu/TextureSource_FromFile.cpp
+26 −0 src/Cool/Gpu/TextureSource_Image.cpp
+2 −2 src/Cool/Gpu/TextureSource_Image.h
+24 −0 src/Cool/Gpu/TextureSource_Video.cpp
+2 −2 src/Cool/Gpu/TextureSource_Video.h
+0 −23 src/Cool/Gpu/TextureSource_VideoFile.cpp
+4 −4 src/Cool/Gpu/TextureSource_Webcam.cpp
+2 −2 src/Cool/Gpu/TextureSource_Webcam.h
+2 −2 src/Cool/Variables/TestVariables.cpp
+0 −15 src/Cool/Variables/Variable_TextureDescriptor_FromFile.cpp
+0 −3 src/Cool/Variables/Variable_TextureDescriptor_FromFile.h
+0 −15 src/Cool/Variables/Variable_TextureDescriptor_FromWebcam.cpp
+0 −3 src/Cool/Variables/Variable_TextureDescriptor_FromWebcam.h
+15 −0 src/Cool/Variables/Variable_TextureDescriptor_Image.cpp
+3 −0 src/Cool/Variables/Variable_TextureDescriptor_Image.h
+15 −0 src/Cool/Variables/Variable_TextureDescriptor_Video.cpp
+3 −0 src/Cool/Variables/Variable_TextureDescriptor_Video.h
+0 −15 src/Cool/Variables/Variable_TextureDescriptor_VideoFile.cpp
+0 −3 src/Cool/Variables/Variable_TextureDescriptor_VideoFile.h
+15 −0 src/Cool/Variables/Variable_TextureDescriptor_Webcam.cpp
+3 −0 src/Cool/Variables/Variable_TextureDescriptor_Webcam.h
+3 −3 src/Cool/Variables/generated/AnySharedVariable.inl
+3 −3 src/Cool/Variables/generated/AnySharedVariableDefinition.inl
+3 −3 src/Cool/Variables/generated/AnyVariable.inl
+3 −3 src/Cool/Variables/generated/AnyVariableData.inl
+5 −5 src/Cool/Variables/generated/Variable_TextureDescriptor_Image.inl
+5 −5 src/Cool/Variables/generated/Variable_TextureDescriptor_Video.inl
+5 −5 src/Cool/Variables/generated/Variable_TextureDescriptor_Webcam.inl
+3 −3 src/Cool/Variables/generated/always_requires_shader_code_generation.inl
+3 −3 src/Cool/Variables/generated/glsl_type.inl
+3 −3 src/Cool/Variables/generated/variables_includes.inl
+3 −3 src/Cool/Variables/generator_variables.py
+2 −2 src/Cool/Video/VideoDescriptor.cpp
+3 −3 src/Cool/type_from_string/generated/evaluate_function_template.inl
+3 −3 src/Cool/type_from_string/generated/string_to_type_associations.inl
12 changes: 6 additions & 6 deletions src/Commands/generated/register_set_variable_commands.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ LAB_REGISTER_COMMAND(Lab::Command_SetVariable<Cool::Direction2D>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<Cool::Hue>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<Cool::ColorPalette>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<Cool::Gradient>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<Cool::TextureDescriptor_FromFile>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<Cool::TextureDescriptor_FromWebcam>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<Cool::TextureDescriptor_Image>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<Cool::TextureDescriptor_Webcam>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<Cool::MathExpression>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<glm::mat2>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<glm::mat3>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<glm::mat4>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<Cool::MidiChannel>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<Cool::OSCChannel>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<Cool::TimeSpeed>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<Cool::TextureDescriptor_VideoFile>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariable<Cool::TextureDescriptor_Video>)

LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<bool>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<int>)
Expand All @@ -48,13 +48,13 @@ LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<Cool::Directi
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<Cool::Hue>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<Cool::ColorPalette>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<Cool::Gradient>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<Cool::TextureDescriptor_FromFile>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<Cool::TextureDescriptor_FromWebcam>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<Cool::TextureDescriptor_Image>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<Cool::TextureDescriptor_Webcam>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<Cool::MathExpression>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<glm::mat2>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<glm::mat3>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<glm::mat4>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<Cool::MidiChannel>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<Cool::OSCChannel>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<Cool::TimeSpeed>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<Cool::TextureDescriptor_VideoFile>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariable<Cool::TextureDescriptor_Video>)
12 changes: 6 additions & 6 deletions src/Commands/generated/register_set_variable_default_metadata_commands.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<Cool::Direction2D>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<Cool::Hue>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<Cool::ColorPalette>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<Cool::Gradient>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<Cool::TextureDescriptor_FromFile>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<Cool::TextureDescriptor_FromWebcam>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<Cool::TextureDescriptor_Image>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<Cool::TextureDescriptor_Webcam>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<Cool::MathExpression>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<glm::mat2>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<glm::mat3>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<glm::mat4>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<Cool::MidiChannel>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<Cool::OSCChannel>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<Cool::TimeSpeed>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<Cool::TextureDescriptor_VideoFile>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultMetadata<Cool::TextureDescriptor_Video>)

LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<bool>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<int>)
Expand All @@ -48,13 +48,13 @@ LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadat
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<Cool::Hue>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<Cool::ColorPalette>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<Cool::Gradient>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<Cool::TextureDescriptor_FromFile>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<Cool::TextureDescriptor_FromWebcam>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<Cool::TextureDescriptor_Image>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<Cool::TextureDescriptor_Webcam>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<Cool::MathExpression>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<glm::mat2>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<glm::mat3>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<glm::mat4>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<Cool::MidiChannel>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<Cool::OSCChannel>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<Cool::TimeSpeed>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<Cool::TextureDescriptor_VideoFile>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultMetadata<Cool::TextureDescriptor_Video>)
12 changes: 6 additions & 6 deletions src/Commands/generated/register_set_variable_default_value_commands.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<Cool::Direction2D>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<Cool::Hue>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<Cool::ColorPalette>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<Cool::Gradient>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<Cool::TextureDescriptor_FromFile>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<Cool::TextureDescriptor_FromWebcam>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<Cool::TextureDescriptor_Image>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<Cool::TextureDescriptor_Webcam>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<Cool::MathExpression>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<glm::mat2>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<glm::mat3>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<glm::mat4>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<Cool::MidiChannel>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<Cool::OSCChannel>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<Cool::TimeSpeed>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<Cool::TextureDescriptor_VideoFile>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableDefaultValue<Cool::TextureDescriptor_Video>)

LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<bool>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<int>)
Expand All @@ -48,13 +48,13 @@ LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<C
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<Cool::Hue>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<Cool::ColorPalette>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<Cool::Gradient>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<Cool::TextureDescriptor_FromFile>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<Cool::TextureDescriptor_FromWebcam>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<Cool::TextureDescriptor_Image>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<Cool::TextureDescriptor_Webcam>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<Cool::MathExpression>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<glm::mat2>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<glm::mat3>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<glm::mat4>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<Cool::MidiChannel>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<Cool::OSCChannel>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<Cool::TimeSpeed>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<Cool::TextureDescriptor_VideoFile>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableDefaultValue<Cool::TextureDescriptor_Video>)
12 changes: 6 additions & 6 deletions src/Commands/generated/register_set_variable_metadata_commands.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<Cool::Direction2D>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<Cool::Hue>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<Cool::ColorPalette>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<Cool::Gradient>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<Cool::TextureDescriptor_FromFile>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<Cool::TextureDescriptor_FromWebcam>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<Cool::TextureDescriptor_Image>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<Cool::TextureDescriptor_Webcam>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<Cool::MathExpression>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<glm::mat2>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<glm::mat3>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<glm::mat4>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<Cool::MidiChannel>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<Cool::OSCChannel>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<Cool::TimeSpeed>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<Cool::TextureDescriptor_VideoFile>)
LAB_REGISTER_COMMAND(Lab::Command_SetVariableMetadata<Cool::TextureDescriptor_Video>)

LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<bool>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<int>)
Expand All @@ -48,13 +48,13 @@ LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<Cool:
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<Cool::Hue>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<Cool::ColorPalette>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<Cool::Gradient>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<Cool::TextureDescriptor_FromFile>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<Cool::TextureDescriptor_FromWebcam>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<Cool::TextureDescriptor_Image>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<Cool::TextureDescriptor_Webcam>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<Cool::MathExpression>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<glm::mat2>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<glm::mat3>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<glm::mat4>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<Cool::MidiChannel>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<Cool::OSCChannel>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<Cool::TimeSpeed>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<Cool::TextureDescriptor_VideoFile>)
LAB_REGISTER_REVERSIBLE_COMMAND(Lab::ReversibleCommand_SetVariableMetadata<Cool::TextureDescriptor_Video>)
2 changes: 1 addition & 1 deletion src/Module/ModuleDependencies.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void update_dependencies_from_nodes_graph(ModuleDependencies& dependencies, Cool
dependencies.midi_channels.insert(midi_channel->value());
}
{
auto const* video_file = std::get_if<Cool::SharedVariable<Cool::TextureDescriptor_VideoFile>>(&value_input);
auto const* video_file = std::get_if<Cool::SharedVariable<Cool::TextureDescriptor_Video>>(&value_input);
if (video_file)
dependencies.time = true;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Module/ShaderBased/set_uniforms_for_shader_based_module.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "Cool/ColorSpaces/ColorAndAlphaSpace.h"
#include "Cool/ColorSpaces/ColorSpace.h"
#include "Cool/Exception/Exception.h"
#include "Cool/Gpu/TextureLibrary_FromFile.h"
#include "Cool/Gpu/TextureLibrary_Image.h"
#include "Cool/Midi/MidiManager.h"
#include "Cool/StrongTypes/set_uniform.h"
#include "Nodes/Node.h"
Expand Down Expand Up @@ -104,7 +104,7 @@ auto set_uniforms_for_shader_based_module(
shader.set_uniform("_time_since_last_midi_button_pressed", Cool::midi_manager().all_values().time_since_last_button_pressed_in_seconds());
shader.set_uniform("_aspect_ratio", system_values.aspect_ratio());
shader.set_uniform("_inverse_aspect_ratio", system_values.inverse_aspect_ratio());
shader.set_uniform_texture("mixbox_lut", Cool::TextureLibrary_FromFile::instance().get(Cool::Path::root() / "res/mixbox/mixbox_lut.png")->id());
shader.set_uniform_texture("mixbox_lut", Cool::TextureLibrary_Image::instance().get(Cool::Path::root() / "res/mixbox/mixbox_lut.png")->id());
shader.set_uniform("_time", system_values.time);
shader.set_uniform("_delta_time", system_values.delta_time);

Expand Down

0 comments on commit 34b1a15

Please sign in to comment.