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

project: Reapply clang-format globally

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2019-04-03 00:19:01 +02:00
parent b1d7814c64
commit 721bdaf642
10 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/filters/filter-displacement.hpp
View File

@ -48,8 +48,8 @@ namespace filter {
obs_source_info sourceInfo; obs_source_info sourceInfo;
public: // Singleton public: // Singleton
static void initialize(); static void initialize();
static void finalize(); static void finalize();
static std::shared_ptr<displacement_factory> get(); static std::shared_ptr<displacement_factory> get();
public: public:

12
source/filters/filter-sdf-effects.hpp
View File

@ -43,7 +43,7 @@ namespace filter {
class sdf_effects_factory { class sdf_effects_factory {
friend class std::_Ptr_base<filter::sdf_effects::sdf_effects_factory>; friend class std::_Ptr_base<filter::sdf_effects::sdf_effects_factory>;
obs_source_info source_info; obs_source_info source_info;
std::list<sdf_effects_instance*> sources; std::list<sdf_effects_instance*> sources;
@ -51,8 +51,8 @@ namespace filter {
std::shared_ptr<gs::effect> sdf_shadow_effect; std::shared_ptr<gs::effect> sdf_shadow_effect;
public: // Singleton public: // Singleton
static void initialize(); static void initialize();
static void finalize(); static void finalize();
static std::shared_ptr<sdf_effects_factory> get(); static std::shared_ptr<sdf_effects_factory> get();
public: public:
@ -96,7 +96,7 @@ namespace filter {
std::shared_ptr<gs::rendertarget> m_sdf_write, m_sdf_read; std::shared_ptr<gs::rendertarget> m_sdf_write, m_sdf_read;
std::shared_ptr<gs::texture> m_sdf_texture; std::shared_ptr<gs::texture> m_sdf_texture;
double_t m_sdf_scale; double_t m_sdf_scale;
bool m_inner_shadow; bool m_inner_shadow;
float_t m_inner_range_min; float_t m_inner_range_min;
float_t m_inner_range_max; float_t m_inner_range_max;
@ -117,7 +117,7 @@ namespace filter {
obs_data_t* settings); obs_data_t* settings);
static bool cb_modified_advanced(void* ptr, obs_properties_t* props, obs_property* prop, static bool cb_modified_advanced(void* ptr, obs_properties_t* props, obs_property* prop,
obs_data_t* settings); obs_data_t* settings);
public: public:
sdf_effects_instance(obs_data_t* settings, obs_source_t* self); sdf_effects_instance(obs_data_t* settings, obs_source_t* self);
@ -135,5 +135,5 @@ namespace filter {
void video_tick(float); void video_tick(float);
void video_render(gs_effect_t*); void video_render(gs_effect_t*);
}; };
} // namespace shadow_sdf } // namespace sdf_effects
} // namespace filter } // namespace filter

2
source/gfx/blur/gfx-blur-box-linear.hpp
View File

@ -37,7 +37,7 @@ namespace gfx {
}; };
class box_linear_factory : public ::gfx::blur::ifactory { class box_linear_factory : public ::gfx::blur::ifactory {
std::mutex m_data_lock; std::mutex m_data_lock;
std::weak_ptr<::gfx::blur::box_linear_data> m_data; std::weak_ptr<::gfx::blur::box_linear_data> m_data;
public: public:

12
source/gfx/blur/gfx-blur-dual-filtering.hpp
View File

@ -38,7 +38,7 @@ namespace gfx {
}; };
class dual_filtering_factory : public ::gfx::blur::ifactory { class dual_filtering_factory : public ::gfx::blur::ifactory {
std::mutex m_data_lock; std::mutex m_data_lock;
std::weak_ptr<::gfx::blur::dual_filtering_data> m_data; std::weak_ptr<::gfx::blur::dual_filtering_data> m_data;
public: public:
@ -94,18 +94,18 @@ namespace gfx {
public: public:
dual_filtering(); dual_filtering();
virtual ~dual_filtering(); virtual ~dual_filtering();
virtual void set_input(std::shared_ptr<::gs::texture> texture) override; virtual void set_input(std::shared_ptr<::gs::texture> texture) override;
virtual ::gfx::blur::type get_type() override; virtual ::gfx::blur::type get_type() override;
virtual double_t get_size() override; virtual double_t get_size() override;
virtual void set_size(double_t width) override; virtual void set_size(double_t width) override;
virtual void set_step_scale(double_t x, double_t y) override; virtual void set_step_scale(double_t x, double_t y) override;
virtual void get_step_scale(double_t& x, double_t& y) override; virtual void get_step_scale(double_t& x, double_t& y) override;
virtual std::shared_ptr<::gs::texture> render() override; virtual std::shared_ptr<::gs::texture> render() override;

4
source/gfx/blur/gfx-blur-gaussian-linear.hpp
View File

@ -39,7 +39,7 @@ namespace gfx {
}; };
class gaussian_linear_factory : public ::gfx::blur::ifactory { class gaussian_linear_factory : public ::gfx::blur::ifactory {
std::mutex m_data_lock; std::mutex m_data_lock;
std::weak_ptr<::gfx::blur::gaussian_linear_data> m_data; std::weak_ptr<::gfx::blur::gaussian_linear_data> m_data;
public: public:
@ -130,7 +130,7 @@ namespace gfx {
virtual double_t get_angle() override; virtual double_t get_angle() override;
virtual void set_angle(double_t angle) override; virtual void set_angle(double_t angle) override;
virtual std::shared_ptr<::gs::texture> render() override; virtual std::shared_ptr<::gs::texture> render() override;
}; };

2
source/obs/gs/gs-rendertarget.hpp
View File

@ -34,7 +34,7 @@
namespace gs { namespace gs {
class rendertarget_op; class rendertarget_op;
class rendertarget { class rendertarget {
friend class rendertarget_op; friend class rendertarget_op;

2
source/plugin.hpp
View File

@ -18,8 +18,8 @@
*/ */
#pragma once #pragma once
#include <functional>
#include <cinttypes> #include <cinttypes>
#include <functional>
#include <list> #include <list>
// OBS // OBS

10
source/sources/source-mirror.hpp
View File

@ -47,8 +47,8 @@ namespace source {
obs_source_info osi; obs_source_info osi;
public: // Singleton public: // Singleton
static void initialize(); static void initialize();
static void finalize(); static void finalize();
static std::shared_ptr<mirror_factory> get(); static std::shared_ptr<mirror_factory> get();
public: public:
@ -106,9 +106,9 @@ namespace source {
bool m_audio_have_output; bool m_audio_have_output;
// Input // Input
std::shared_ptr<obs::source> m_source; std::shared_ptr<obs::source> m_source;
obs_sceneitem_t* m_source_item; obs_sceneitem_t* m_source_item;
std::string m_source_name; std::string m_source_name;
private: private:
void release_input(); void release_input();

6
source/util-math.hpp
View File

@ -40,7 +40,7 @@
#define PI2 6.283185307179586476925286766559 // 2PI = 2 * pi #define PI2 6.283185307179586476925286766559 // 2PI = 2 * pi
#define PI2_SQROOT 2.506628274631000502415765284811 // sqrt(2 * pi) #define PI2_SQROOT 2.506628274631000502415765284811 // sqrt(2 * pi)
#define V_RAD 57.295779513082320876798154814105 // 180/pi #define V_RAD 57.295779513082320876798154814105 // 180/pi
#define V_DEG 0.01745329251994329576923690768489 // pi/180 #define V_DEG 0.01745329251994329576923690768489 // pi/180
#define DEG_TO_RAD(x) (x * V_DEG) #define DEG_TO_RAD(x) (x * V_DEG)
#define RAD_TO_DEG(x) (x * V_RAD) #define RAD_TO_DEG(x) (x * V_RAD)
@ -67,7 +67,7 @@ namespace util {
#ifdef _MSC_VER #ifdef _MSC_VER
__declspec(align(16)) __declspec(align(16))
#endif #endif
struct vec3a : public vec3 { struct vec3a : public vec3 {
// 16-byte Aligned version of vec3 // 16-byte Aligned version of vec3
static void* operator new(size_t count); static void* operator new(size_t count);
static void* operator new[](size_t count); static void* operator new[](size_t count);
@ -78,7 +78,7 @@ namespace util {
#ifdef _MSC_VER #ifdef _MSC_VER
__declspec(align(16)) __declspec(align(16))
#endif #endif
struct vec4a : public vec4 { struct vec4a : public vec4 {
// 16-byte Aligned version of vec4 // 16-byte Aligned version of vec4
static void* operator new(size_t count); static void* operator new(size_t count);
static void* operator new[](size_t count); static void* operator new[](size_t count);

2
source/util-memory.hpp
View File

@ -106,7 +106,7 @@ namespace util {
// Returns true if and only if storage allocated from *this // Returns true if and only if storage allocated from *this
// can be deallocated from other, and vice versa. // can be deallocated from other, and vice versa.
// Always returns true for stateless allocators. // Always returns true for stateless allocators.
bool operator==(const AlignmentAllocator<T, N>& ) const bool operator==(const AlignmentAllocator<T, N>&) const
{ {
return true; return true;
} }