mirror of
https://github.com/Xaymar/obs-StreamFX
synced 2024-11-10 22:05:06 +00:00
gfx-shader: Rename from gfx-effect-source
This commit is contained in:
parent
738b08de36
commit
0ad896e905
13 changed files with 19 additions and 14 deletions
|
@ -294,8 +294,6 @@ set(PROJECT_PRIVATE_SOURCE
|
|||
"${PROJECT_SOURCE_DIR}/source/util-memory.cpp"
|
||||
|
||||
# Graphics
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/gfx-effect-source.hpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/gfx-effect-source.cpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/gfx-source-texture.hpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/gfx-source-texture.cpp"
|
||||
# Graphics/Blur
|
||||
|
@ -311,6 +309,19 @@ set(PROJECT_PRIVATE_SOURCE
|
|||
"${PROJECT_SOURCE_DIR}/source/gfx/blur/gfx-blur-gaussian.cpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/blur/gfx-blur-gaussian-linear.hpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/blur/gfx-blur-gaussian-linear.cpp"
|
||||
# Graphics/Shader
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/shader/gfx-shader.hpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/shader/gfx-shader.cpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/shader/gfx-shader-param.hpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/shader/gfx-shader-param.cpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/shader/gfx-shader-param-audio.hpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/shader/gfx-shader-param-audio.cpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/shader/gfx-shader-param-basic.hpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/shader/gfx-shader-param-basic.cpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/shader/gfx-shader-param-matrix.hpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/shader/gfx-shader-param-matrix.cpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/shader/gfx-shader-param-texture.hpp"
|
||||
"${PROJECT_SOURCE_DIR}/source/gfx/shader/gfx-shader-param-texture.cpp"
|
||||
|
||||
# OBS
|
||||
"${PROJECT_SOURCE_DIR}/source/obs/gs/gs-helper.hpp"
|
||||
|
|
0
source/gfx/shader/gfx-shader-param-audio.cpp
Normal file
0
source/gfx/shader/gfx-shader-param-audio.cpp
Normal file
0
source/gfx/shader/gfx-shader-param-audio.hpp
Normal file
0
source/gfx/shader/gfx-shader-param-audio.hpp
Normal file
0
source/gfx/shader/gfx-shader-param-basic.cpp
Normal file
0
source/gfx/shader/gfx-shader-param-basic.cpp
Normal file
0
source/gfx/shader/gfx-shader-param-basic.hpp
Normal file
0
source/gfx/shader/gfx-shader-param-basic.hpp
Normal file
0
source/gfx/shader/gfx-shader-param-matrix.cpp
Normal file
0
source/gfx/shader/gfx-shader-param-matrix.cpp
Normal file
0
source/gfx/shader/gfx-shader-param-matrix.hpp
Normal file
0
source/gfx/shader/gfx-shader-param-matrix.hpp
Normal file
0
source/gfx/shader/gfx-shader-param-texture.cpp
Normal file
0
source/gfx/shader/gfx-shader-param-texture.cpp
Normal file
0
source/gfx/shader/gfx-shader-param-texture.hpp
Normal file
0
source/gfx/shader/gfx-shader-param-texture.hpp
Normal file
0
source/gfx/shader/gfx-shader-param.cpp
Normal file
0
source/gfx/shader/gfx-shader-param.cpp
Normal file
0
source/gfx/shader/gfx-shader-param.hpp
Normal file
0
source/gfx/shader/gfx-shader-param.hpp
Normal file
|
@ -48,7 +48,7 @@ extern "C" {
|
|||
|
||||
namespace gfx {
|
||||
namespace effect_source {
|
||||
enum class value_mode {
|
||||
/* enum class value_mode {
|
||||
INPUT,
|
||||
SLIDER,
|
||||
};
|
||||
|
@ -274,9 +274,11 @@ namespace gfx {
|
|||
typedef std::pair<gs::effect_parameter::type, std::string> param_ident_t;
|
||||
typedef std::function<bool(std::shared_ptr<gs::effect_parameter> param)> valid_property_cb_t;
|
||||
typedef std::function<void(std::shared_ptr<gs::effect> effect)> param_override_cb_t;
|
||||
|
||||
class effect_source : public std::enable_shared_from_this<effect_source> {
|
||||
obs_source_t* _self;
|
||||
*/
|
||||
class effect_source {
|
||||
// Shader
|
||||
std::string _source_file;
|
||||
std::shared_ptr<gs::effect> _effect;
|
||||
|
||||
std::string _file;
|
||||
std::shared_ptr<gs::effect> _effect;
|
||||
|
@ -297,9 +299,6 @@ namespace gfx {
|
|||
std::uniform_real_distribution<float_t> _random_dist{0.f, 1.f};
|
||||
std::default_random_engine _random_generator;
|
||||
|
||||
valid_property_cb_t _cb_valid;
|
||||
param_override_cb_t _cb_override;
|
||||
|
||||
void load_file(std::string file);
|
||||
|
||||
public:
|
||||
|
@ -318,11 +317,6 @@ namespace gfx {
|
|||
|
||||
void enum_active_sources(obs_source_enum_proc_t, void*);
|
||||
|
||||
public:
|
||||
void set_valid_property_cb(valid_property_cb_t cb);
|
||||
|
||||
void set_override_cb(param_override_cb_t cb);
|
||||
|
||||
bool modified2(obs_properties_t* props, obs_property_t* property, obs_data_t* settings);
|
||||
};
|
||||
} // namespace effect_source
|
Loading…
Reference in a new issue