RomanNum3ral
/
obs-streamFX
mirror of https://github.com/RomanNum3ral/obs-StreamFX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

source-shader: Fix size and parameters

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-04-01 00:09:21 +02:00
parent 3dcf4e5dd6
commit cf6e867ba5
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/sources/source-shader.cpp
View File

@ -27,7 +27,7 @@
using namespace source; using namespace source;
shader::shader_instance::shader_instance(obs_data_t* data, obs_source_t* self) shader::shader_instance::shader_instance(obs_data_t* data, obs_source_t* self)
: obs::source_instance(data, self), _is_main(false) : obs::source_instance(data, self), _fx()
{ {
_fx = std::make_shared<gfx::shader::shader>(self, gfx::shader::shader_mode::Source); _fx = std::make_shared<gfx::shader::shader>(self, gfx::shader::shader_mode::Source);
@ -69,7 +69,9 @@ void shader::shader_instance::video_tick(float_t sec_since_last)
obs_data_release(data); obs_data_release(data);
} }
_is_main = true; obs_video_info ovi;
obs_get_video_info(&ovi);
_fx->set_size(ovi.base_width, ovi.base_height);
} }
void shader::shader_instance::video_render(gs_effect_t* effect) void shader::shader_instance::video_render(gs_effect_t* effect)
@ -78,13 +80,7 @@ void shader::shader_instance::video_render(gs_effect_t* effect)
return; return;
} }
if (_is_main) { // Dirty hack to only take the value from the first render, which usually is the main view. _fx->prepare_render();
gs_rect vect;
gs_get_viewport(&vect);
_fx->set_size(static_cast<uint32_t>(vect.cx), static_cast<uint32_t>(vect.cy));
_is_main = false;
}
_fx->render(); _fx->render();
} }

2
source/sources/source-shader.hpp
View File

@ -32,8 +32,6 @@ namespace source::shader {
class shader_instance : public obs::source_instance { class shader_instance : public obs::source_instance {
std::shared_ptr<gfx::shader::shader> _fx; std::shared_ptr<gfx::shader::shader> _fx;
bool _is_main;
public: public:
shader_instance(obs_data_t* data, obs_source_t* self); shader_instance(obs_data_t* data, obs_source_t* self);
virtual ~shader_instance(); virtual ~shader_instance();