etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-25 04:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

filter/displacement: Fix unicode support

Browse source 
Related: #359
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-11-28 23:32:51 +01:00 committed by Xaymar
parent 9fb75fc4f2
commit 73dfb580cb
1 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/filters/filter-displacement.cpp
View file

@ -33,14 +33,7 @@ using namespace streamfx::filter::displacement;
displacement_instance::displacement_instance(obs_data_t* data, obs_source_t* context) displacement_instance::displacement_instance(obs_data_t* data, obs_source_t* context)
: obs::source_instance(data, context) : obs::source_instance(data, context)
{ {
std::string effect = ""; _effect = gs::effect::create(streamfx::data_file_path("effects/displace.effect").u8string());
{
char* buf = obs_module_file("effects/displace.effect");
effect = buf;
bfree(buf);
}
_effect = gs::effect::create(effect);
update(data); update(data);
} }
@ -141,12 +134,8 @@ const char* displacement_factory::get_name()
void displacement_factory::get_defaults2(obs_data_t* data) void displacement_factory::get_defaults2(obs_data_t* data)
{ {
{ obs_data_set_default_string(data, ST_FILE,
char* disp = obs_module_file("examples/normal-maps/neutral.png"); streamfx::data_file_path("examples/normal-maps/neutral.png").u8string().c_str());
obs_data_set_default_string(data, ST_FILE, disp);
bfree(disp);
}
obs_data_set_default_double(data, ST_SCALE, 0.0); obs_data_set_default_double(data, ST_SCALE, 0.0);
obs_data_set_default_double(data, ST_SCALE_TYPE, 0.0); obs_data_set_default_double(data, ST_SCALE_TYPE, 0.0);
} }
@ -159,9 +148,7 @@ obs_properties_t* displacement_factory::get_properties2(displacement_instance* d
if (data) { if (data) {
path = data->get_file(); path = data->get_file();
} else { } else {
char* buf = obs_module_file("examples/normal-maps/neutral.png"); path = streamfx::data_file_path("examples/normal-maps/neutral.png").u8string();
path = buf;
bfree(buf);
} }
{ {