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

filter-displacement: Cleanup data

Browse source
This commit is contained in:
Michael Fabian Dirks 2017-06-29 07:35:41 +02:00
parent 21aa03d52a
commit aacc4f99e6
7 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
data/disp-stretch-middle.png → data/filter-displacement/disp-stretch-middle.png
View file

0
data/displacement.effect → data/filter-displacement/displacement.effect
View file

0
data/neutral.png → data/filter-displacement/neutral.png
View file

0
data/displace-stretch-middle.png → rawdata/displace-stretch-middle.png
View file

0
data/displacement.png → rawdata/displacement.png
View file

4
source/filter-displacement.cpp
View file

@ -67,7 +67,7 @@ uint32_t Filter::Displacement::get_height(void *ptr) {
} }
void Filter::Displacement::get_defaults(obs_data_t *data) { void Filter::Displacement::get_defaults(obs_data_t *data) {
char* disp = obs_module_file("displacement.png"); char* disp = obs_module_file("filter-displacement/neutral.png");
obs_data_set_default_string(data, P_FILTER_DISPLACEMENT_FILE, disp); obs_data_set_default_string(data, P_FILTER_DISPLACEMENT_FILE, disp);
obs_data_set_default_double(data, P_FILTER_DISPLACEMENT_RATIO, 0); obs_data_set_default_double(data, P_FILTER_DISPLACEMENT_RATIO, 0);
obs_data_set_default_double(data, P_FILTER_DISPLACEMENT_SCALE, 0); obs_data_set_default_double(data, P_FILTER_DISPLACEMENT_SCALE, 0);
@ -124,7 +124,7 @@ Filter::Displacement::Instance::Instance(obs_data_t *data, obs_source_t *context
this->context = context; this->context = context;
obs_enter_graphics(); obs_enter_graphics();
char* effectFile = obs_module_file("displacement.effect"); char* effectFile = obs_module_file("filter-displacement/displacement.effect");
char* errorMessage = nullptr; char* errorMessage = nullptr;
this->customEffect = gs_effect_create_from_file(effectFile, &errorMessage); this->customEffect = gs_effect_create_from_file(effectFile, &errorMessage);
bfree(effectFile); bfree(effectFile);

2
source/filter-transform.cpp
View file

@ -424,5 +424,3 @@ void Filter::Transform::Instance::video_render(gs_effect_t *paramEffect) {
gs_draw_sprite(shapeTexture, 0, 0, 0); gs_draw_sprite(shapeTexture, 0, 0, 0);
} }
} }