etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-11 06:15:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

gfx-shader-param-basic: Support for scaling and fix enumerations

Browse source 
Scaling is now fully supported for Floats and Integers, which allows much higher precision inputs, or upscaling to a different range. Complex functions for scaling are not supported as those would be a scripting thing and should be kept as that (OBS Studio has built in Lua scripting).

Additionally, enumerations are now correctly loaded with data.

Related #5
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-01-01 02:58:45 +01:00
parent ce15bc6abc
commit 26a58645a7
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/gfx/shader/gfx-shader-param-basic.cpp
View file

@ -29,6 +29,7 @@
#define ANNO_VALUE_STEP "step" #define ANNO_VALUE_STEP "step"
#define ANNO_VALUE_SCALE "scale" #define ANNO_VALUE_SCALE "scale"
#define ANNO_ENUM_VALUES "values" #define ANNO_ENUM_VALUES "values"
#define ANNO_ENUM_VALUE "value"
inline bool get_annotation_string(gs::effect_parameter param, std::string anno_name, std::string& out) inline bool get_annotation_string(gs::effect_parameter param, std::string anno_name, std::string& out)
{ {
@ -126,7 +127,9 @@ gfx::shader::basic_parameter::basic_parameter(gs::effect_parameter param, std::s
if (auto annoe = anno.get_annotation(key); if (auto annoe = anno.get_annotation(key);
annoe && (annoe.get_type() == gs::effect_parameter::type::String)) { annoe && (annoe.get_type() == gs::effect_parameter::type::String)) {
entry.name = annoe.get_default_string(); entry.name = annoe.get_default_string();
load_parameter_data(annoe, entry.data); if (auto annoev = annoe.get_annotation(ANNO_ENUM_VALUE); annoev) {
load_parameter_data(annoev, entry.data);
}
} else { } else {
P_LOG_WARNING("[%s] Parameter enumeration entry '%s' is of invalid type, must be string.", P_LOG_WARNING("[%s] Parameter enumeration entry '%s' is of invalid type, must be string.",
get_name().c_str(), string_buffer); get_name().c_str(), string_buffer);
@ -143,7 +146,7 @@ gfx::shader::basic_parameter::~basic_parameter() {}
void gfx::shader::basic_parameter::load_parameter_data(gs::effect_parameter parameter, basic_data& data) void gfx::shader::basic_parameter::load_parameter_data(gs::effect_parameter parameter, basic_data& data)
{ {
data.i32 = 0; parameter.get_default_value(&data.i32, 1);
} }
gfx::shader::basic_field_type gfx::shader::basic_parameter::get_field_type() gfx::shader::basic_field_type gfx::shader::basic_parameter::get_field_type()
@ -322,7 +325,7 @@ void gfx::shader::float_parameter::properties(obs_properties_t* props, obs_data_
void gfx::shader::float_parameter::update(obs_data_t* settings) void gfx::shader::float_parameter::update(obs_data_t* settings)
{ {
for (size_t idx = 0; idx < get_size(); idx++) { for (size_t idx = 0; idx < get_size(); idx++) {
_data[idx].f32 = static_cast<float_t>(obs_data_get_double(settings, _keys[idx].c_str())); _data[idx].f32 = static_cast<float_t>(obs_data_get_double(settings, _keys[idx].c_str())) * _scale[idx].f32;
} }
} }
@ -431,7 +434,7 @@ void gfx::shader::int_parameter::properties(obs_properties_t* props, obs_data_t*
void gfx::shader::int_parameter::update(obs_data_t* settings) void gfx::shader::int_parameter::update(obs_data_t* settings)
{ {
for (size_t idx = 0; idx < get_size(); idx++) { for (size_t idx = 0; idx < get_size(); idx++) {
_data[idx].i32 = static_cast<int32_t>(obs_data_get_int(settings, _keys[idx].c_str())); _data[idx].i32 = static_cast<int32_t>(obs_data_get_int(settings, _keys[idx].c_str()) * _scale[idx].i32);
} }
} }