mirror of
https://github.com/Xaymar/obs-StreamFX
synced 2024-11-11 06:15:05 +00:00
transition-shader: Add initial version of Shader transitions
With this, the first proper shader effect is now possible. By using the four new automated shader parameters 'InputA', 'InputB', 'TransitionTime' and 'TransitionSize' you can write your own transition in HLSL. Fixes #96
This commit is contained in:
parent
2e250ad826
commit
ead355beea
4 changed files with 237 additions and 5 deletions
|
@ -626,8 +626,8 @@ if(${PropertyPrefix}ENABLE_TRANSITION_SHADER)
|
||||||
list(APPEND PROJECT_DATA
|
list(APPEND PROJECT_DATA
|
||||||
)
|
)
|
||||||
list(APPEND PROJECT_PRIVATE_SOURCE
|
list(APPEND PROJECT_PRIVATE_SOURCE
|
||||||
# "source/transitions/transition-shader.hpp"
|
"source/transitions/transition-shader.hpp"
|
||||||
# "source/transitions/transition-shader.cpp"
|
"source/transitions/transition-shader.cpp"
|
||||||
)
|
)
|
||||||
list(APPEND PROJECT_DEFINITIONS
|
list(APPEND PROJECT_DEFINITIONS
|
||||||
ENABLE_TRANSITION_SHADER
|
ENABLE_TRANSITION_SHADER
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ENABLE_TRANSITION_SHADER
|
#ifdef ENABLE_TRANSITION_SHADER
|
||||||
//#include "transitions/source-shader.hpp"
|
#include "transitions/transition-shader.hpp"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static std::shared_ptr<util::threadpool> global_threadpool;
|
static std::shared_ptr<util::threadpool> global_threadpool;
|
||||||
|
@ -107,7 +107,7 @@ try {
|
||||||
|
|
||||||
// Transitions
|
// Transitions
|
||||||
#ifdef ENABLE_TRANSITION_SHADER
|
#ifdef ENABLE_TRANSITION_SHADER
|
||||||
//transition::shader::shader_factory::initialize();
|
transition::shader::shader_factory::initialize();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -122,7 +122,7 @@ try {
|
||||||
|
|
||||||
// Transitions
|
// Transitions
|
||||||
#ifdef ENABLE_TRANSITION_SHADER
|
#ifdef ENABLE_TRANSITION_SHADER
|
||||||
//transition::shader::shader_factory::finalize();
|
transition::shader::shader_factory::finalize();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Sources
|
// Sources
|
||||||
|
|
141
source/transitions/transition-shader.cpp
Normal file
141
source/transitions/transition-shader.cpp
Normal file
|
@ -0,0 +1,141 @@
|
||||||
|
/*
|
||||||
|
* Modern effects for a modern Streamer
|
||||||
|
* Copyright (C) 2017 Michael Fabian Dirks
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "transition-shader.hpp"
|
||||||
|
#include <stdexcept>
|
||||||
|
#include "strings.hpp"
|
||||||
|
#include "utility.hpp"
|
||||||
|
|
||||||
|
#define ST "Source.Shader"
|
||||||
|
|
||||||
|
transition::shader::shader_instance::shader_instance(obs_data_t* data, obs_source_t* self)
|
||||||
|
: obs::source_instance(data, self), _is_main(false)
|
||||||
|
{
|
||||||
|
_fx = std::make_shared<gfx::shader::shader>(self, gfx::shader::shader_mode::Transition);
|
||||||
|
|
||||||
|
update(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
transition::shader::shader_instance::~shader_instance() {}
|
||||||
|
|
||||||
|
uint32_t transition::shader::shader_instance::get_width()
|
||||||
|
{
|
||||||
|
return _fx->width();
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t transition::shader::shader_instance::get_height()
|
||||||
|
{
|
||||||
|
return _fx->height();
|
||||||
|
}
|
||||||
|
|
||||||
|
void transition::shader::shader_instance::properties(obs_properties_t* props)
|
||||||
|
{
|
||||||
|
_fx->properties(props);
|
||||||
|
}
|
||||||
|
|
||||||
|
void transition::shader::shader_instance::load(obs_data_t* data)
|
||||||
|
{
|
||||||
|
update(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
void transition::shader::shader_instance::update(obs_data_t* data)
|
||||||
|
{
|
||||||
|
_fx->update(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
void transition::shader::shader_instance::video_tick(float_t sec_since_last)
|
||||||
|
{
|
||||||
|
if (_fx->tick(sec_since_last)) {
|
||||||
|
obs_data_t* data = obs_source_get_settings(_self);
|
||||||
|
_fx->update(data);
|
||||||
|
obs_data_release(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update Size from global base resolution.
|
||||||
|
obs_video_info ovi;
|
||||||
|
obs_get_video_info(&ovi);
|
||||||
|
_fx->set_size(ovi.base_width, ovi.base_height);
|
||||||
|
}
|
||||||
|
|
||||||
|
void transition::shader::shader_instance::video_render(gs_effect_t* effect)
|
||||||
|
{
|
||||||
|
if (!_fx) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_fx->prepare_render();
|
||||||
|
obs_transition_video_render(_self,
|
||||||
|
[](void* data, gs_texture_t* a, gs_texture_t* b, float t, uint32_t cx, uint32_t cy) {
|
||||||
|
reinterpret_cast<shader_instance*>(data)->transition_render(a, b, t, cx, cy);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void transition::shader::shader_instance::transition_render(gs_texture_t* a, gs_texture_t* b, float t, uint32_t cx,
|
||||||
|
uint32_t cy)
|
||||||
|
{
|
||||||
|
_fx->set_input_a(std::make_shared<::gs::texture>(a, false));
|
||||||
|
_fx->set_input_b(std::make_shared<::gs::texture>(b, false));
|
||||||
|
_fx->set_transition_time(t);
|
||||||
|
_fx->set_transition_size(cx, cy);
|
||||||
|
_fx->render();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool transition::shader::shader_instance::audio_render(uint64_t* ts_out, obs_source_audio_mix* audio_output,
|
||||||
|
uint32_t mixers, size_t channels, size_t sample_rate)
|
||||||
|
{
|
||||||
|
return obs_transition_audio_render(
|
||||||
|
_self, ts_out, audio_output, mixers, channels, sample_rate, [](void*, float_t t) { return 1.0f - t; },
|
||||||
|
[](void*, float_t t) { return t; });
|
||||||
|
}
|
||||||
|
|
||||||
|
void transition::shader::shader_instance::transition_start() {}
|
||||||
|
|
||||||
|
void transition::shader::shader_instance::transition_stop() {}
|
||||||
|
|
||||||
|
std::shared_ptr<transition::shader::shader_factory> transition::shader::shader_factory::factory_instance = nullptr;
|
||||||
|
|
||||||
|
transition::shader::shader_factory::shader_factory()
|
||||||
|
{
|
||||||
|
_info.id = "obs-stream-effects-transition-shader";
|
||||||
|
_info.type = OBS_SOURCE_TYPE_TRANSITION;
|
||||||
|
_info.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW;
|
||||||
|
|
||||||
|
finish_setup();
|
||||||
|
}
|
||||||
|
|
||||||
|
transition::shader::shader_factory::~shader_factory() {}
|
||||||
|
|
||||||
|
const char* transition::shader::shader_factory::get_name()
|
||||||
|
{
|
||||||
|
return D_TRANSLATE(ST);
|
||||||
|
}
|
||||||
|
|
||||||
|
void transition::shader::shader_factory::get_defaults2(obs_data_t* data) {}
|
||||||
|
|
||||||
|
obs_properties_t* transition::shader::shader_factory::get_properties2(shader::shader_instance* data)
|
||||||
|
{
|
||||||
|
auto pr = obs_properties_create();
|
||||||
|
obs_properties_set_param(pr, data, nullptr);
|
||||||
|
|
||||||
|
if (data) {
|
||||||
|
reinterpret_cast<shader_instance*>(data)->properties(pr);
|
||||||
|
}
|
||||||
|
|
||||||
|
return pr;
|
||||||
|
}
|
91
source/transitions/transition-shader.hpp
Normal file
91
source/transitions/transition-shader.hpp
Normal file
|
@ -0,0 +1,91 @@
|
||||||
|
/*
|
||||||
|
* Modern effects for a modern Streamer
|
||||||
|
* Copyright (C) 2017 Michael Fabian Dirks
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "gfx/shader/gfx-shader.hpp"
|
||||||
|
#include "obs/gs/gs-rendertarget.hpp"
|
||||||
|
#include "obs/obs-source-factory.hpp"
|
||||||
|
#include "plugin.hpp"
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
#include <obs.h>
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace transition::shader {
|
||||||
|
class shader_instance : public obs::source_instance {
|
||||||
|
std::shared_ptr<gfx::shader::shader> _fx;
|
||||||
|
|
||||||
|
bool _is_main;
|
||||||
|
|
||||||
|
public:
|
||||||
|
shader_instance(obs_data_t* data, obs_source_t* self);
|
||||||
|
virtual ~shader_instance();
|
||||||
|
|
||||||
|
virtual uint32_t get_width() override;
|
||||||
|
virtual uint32_t get_height() override;
|
||||||
|
|
||||||
|
void properties(obs_properties_t* props);
|
||||||
|
|
||||||
|
virtual void load(obs_data_t* data) override;
|
||||||
|
virtual void update(obs_data_t* data) override;
|
||||||
|
|
||||||
|
virtual void video_tick(float_t sec_since_last) override;
|
||||||
|
virtual void video_render(gs_effect_t* effect) override;
|
||||||
|
|
||||||
|
void transition_render(gs_texture_t* a, gs_texture_t* b, float t, uint32_t cx, uint32_t cy);
|
||||||
|
|
||||||
|
virtual bool audio_render(uint64_t* ts_out, struct obs_source_audio_mix* audio_output, uint32_t mixers,
|
||||||
|
size_t channels, size_t sample_rate) override;
|
||||||
|
|
||||||
|
virtual void transition_start() override;
|
||||||
|
virtual void transition_stop() override;
|
||||||
|
};
|
||||||
|
|
||||||
|
class shader_factory
|
||||||
|
: public obs::source_factory<transition::shader::shader_factory, transition::shader::shader_instance> {
|
||||||
|
static std::shared_ptr<transition::shader::shader_factory> factory_instance;
|
||||||
|
|
||||||
|
public: // Singleton
|
||||||
|
static void initialize()
|
||||||
|
{
|
||||||
|
factory_instance = std::make_shared<transition::shader::shader_factory>();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void finalize()
|
||||||
|
{
|
||||||
|
factory_instance.reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
static std::shared_ptr<shader_factory> get()
|
||||||
|
{
|
||||||
|
return factory_instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
public:
|
||||||
|
shader_factory();
|
||||||
|
virtual ~shader_factory();
|
||||||
|
|
||||||
|
virtual const char* get_name() override;
|
||||||
|
|
||||||
|
virtual void get_defaults2(obs_data_t* data) override;
|
||||||
|
|
||||||
|
virtual obs_properties_t* get_properties2(transition::shader::shader_instance* data) override;
|
||||||
|
};
|
||||||
|
} // namespace transition::shader
|
Loading…
Reference in a new issue