From 391fca7497c0a823d603731576c77b136ad48049 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Fri, 28 Sep 2018 14:18:09 +0200 Subject: [PATCH] gs-effect: Formatting --- source/gs-effect.cpp | 190 +++++++++++++++++++++++++------------------ source/gs-effect.h | 41 +++++----- 2 files changed, 133 insertions(+), 98 deletions(-) diff --git a/source/gs-effect.cpp b/source/gs-effect.cpp index f80477c7..2033001f 100644 --- a/source/gs-effect.cpp +++ b/source/gs-effect.cpp @@ -19,21 +19,21 @@ #include "gs-effect.h" #include + extern "C" { - #pragma warning( push ) - #pragma warning( disable: 4201 ) - #include - #pragma warning( pop ) +#pragma warning(push) +#pragma warning(disable : 4201) +#include +#pragma warning(pop) } -gs::effect::effect() { - m_effect = nullptr; -} +gs::effect::effect() : m_effect(nullptr) {} -gs::effect::effect(std::string file) { +gs::effect::effect(std::string file) +{ obs_enter_graphics(); char* errorMessage = nullptr; - m_effect = gs_effect_create_from_file(file.c_str(), &errorMessage); + m_effect = gs_effect_create_from_file(file.c_str(), &errorMessage); if (!m_effect || errorMessage) { std::string error = "Generic Error"; if (errorMessage) { @@ -46,10 +46,11 @@ gs::effect::effect(std::string file) { obs_leave_graphics(); } -gs::effect::effect(std::string code, std::string name) { +gs::effect::effect(std::string code, std::string name) +{ obs_enter_graphics(); char* errorMessage = nullptr; - m_effect = gs_effect_create(code.c_str(), name.c_str(), &errorMessage); + m_effect = gs_effect_create(code.c_str(), name.c_str(), &errorMessage); if (!m_effect || errorMessage) { std::string error = "Generic Error"; if (errorMessage) { @@ -62,22 +63,26 @@ gs::effect::effect(std::string code, std::string name) { obs_leave_graphics(); } -gs::effect::~effect() { +gs::effect::~effect() +{ obs_enter_graphics(); gs_effect_destroy(m_effect); obs_leave_graphics(); } -gs_effect_t* gs::effect::get_object() { +gs_effect_t* gs::effect::get_object() +{ return m_effect; } -size_t gs::effect::count_parameters() { +size_t gs::effect::count_parameters() +{ return (size_t)gs_effect_get_num_params(m_effect); } -std::list gs::effect::get_parameters() { - size_t num = gs_effect_get_num_params(m_effect); +std::list gs::effect::get_parameters() +{ + size_t num = gs_effect_get_num_params(m_effect); std::list ps; for (size_t idx = 0; idx < num; idx++) { ps.emplace_back(get_parameter(idx)); @@ -85,19 +90,22 @@ std::list gs::effect::get_parameters() { return ps; } -gs::effect_parameter gs::effect::get_parameter(size_t idx) { +gs::effect_parameter gs::effect::get_parameter(size_t idx) +{ gs_eparam_t* param = gs_effect_get_param_by_idx(m_effect, idx); if (!param) throw std::invalid_argument("parameter with index not found"); return effect_parameter(param); } -bool gs::effect::has_parameter(std::string name) { +bool gs::effect::has_parameter(std::string name) +{ gs_eparam_t* param = gs_effect_get_param_by_name(m_effect, name.c_str()); return (param != nullptr); } -bool gs::effect::has_parameter(std::string name, effect_parameter::type type) { +bool gs::effect::has_parameter(std::string name, effect_parameter::type type) +{ gs_eparam_t* param = gs_effect_get_param_by_name(m_effect, name.c_str()); if (param == nullptr) return false; @@ -105,14 +113,16 @@ bool gs::effect::has_parameter(std::string name, effect_parameter::type type) { return eprm.get_type() == type; } -gs::effect_parameter gs::effect::get_parameter(std::string name) { +gs::effect_parameter gs::effect::get_parameter(std::string name) +{ gs_eparam_t* param = gs_effect_get_param_by_name(m_effect, name.c_str()); if (!param) throw std::invalid_argument("parameter with name not found"); return effect_parameter(param); } -gs::effect_parameter::effect_parameter(gs_eparam_t* param) { +gs::effect_parameter::effect_parameter(gs_eparam_t* param) +{ if (!param) throw std::invalid_argument("param is null"); @@ -120,163 +130,187 @@ gs::effect_parameter::effect_parameter(gs_eparam_t* param) { gs_effect_get_param_info(m_param, &m_paramInfo); } -std::string gs::effect_parameter::get_name() { +std::string gs::effect_parameter::get_name() +{ return m_paramInfo.name; } -gs::effect_parameter::type gs::effect_parameter::get_type() { +gs::effect_parameter::type gs::effect_parameter::get_type() +{ switch (m_paramInfo.type) { - case GS_SHADER_PARAM_BOOL: - return type::Boolean; - case GS_SHADER_PARAM_FLOAT: - return type::Float; - case GS_SHADER_PARAM_VEC2: - return type::Float2; - case GS_SHADER_PARAM_VEC3: - return type::Float3; - case GS_SHADER_PARAM_VEC4: - return type::Float4; - case GS_SHADER_PARAM_INT: - return type::Integer; - case GS_SHADER_PARAM_INT2: - return type::Integer2; - case GS_SHADER_PARAM_INT3: - return type::Integer3; - case GS_SHADER_PARAM_INT4: - return type::Integer4; - case GS_SHADER_PARAM_MATRIX4X4: - return type::Matrix; - case GS_SHADER_PARAM_TEXTURE: - return type::Texture; - //case GS_SHADER_PARAM_STRING: - // return Type::String; - default: - case GS_SHADER_PARAM_UNKNOWN: - return type::Unknown; + case GS_SHADER_PARAM_BOOL: + return type::Boolean; + case GS_SHADER_PARAM_FLOAT: + return type::Float; + case GS_SHADER_PARAM_VEC2: + return type::Float2; + case GS_SHADER_PARAM_VEC3: + return type::Float3; + case GS_SHADER_PARAM_VEC4: + return type::Float4; + case GS_SHADER_PARAM_INT: + return type::Integer; + case GS_SHADER_PARAM_INT2: + return type::Integer2; + case GS_SHADER_PARAM_INT3: + return type::Integer3; + case GS_SHADER_PARAM_INT4: + return type::Integer4; + case GS_SHADER_PARAM_MATRIX4X4: + return type::Matrix; + case GS_SHADER_PARAM_TEXTURE: + return type::Texture; + //case GS_SHADER_PARAM_STRING: + // return Type::String; + default: + case GS_SHADER_PARAM_UNKNOWN: + return type::Unknown; } } -void gs::effect_parameter::set_bool(bool v) { +void gs::effect_parameter::set_bool(bool v) +{ if (get_type() != type::Boolean) throw std::bad_cast(); gs_effect_set_bool(m_param, v); } -void gs::effect_parameter::set_bool_array(bool v[], size_t sz) { +void gs::effect_parameter::set_bool_array(bool v[], size_t sz) +{ if (get_type() != type::Boolean) throw std::bad_cast(); gs_effect_set_val(m_param, v, sz); } -void gs::effect_parameter::set_float(float_t x) { +void gs::effect_parameter::set_float(float_t x) +{ if (get_type() != type::Float) throw std::bad_cast(); gs_effect_set_float(m_param, x); } -void gs::effect_parameter::set_float2(vec2& v) { +void gs::effect_parameter::set_float2(vec2& v) +{ if (get_type() != type::Float2) throw std::bad_cast(); gs_effect_set_vec2(m_param, &v); } -void gs::effect_parameter::set_float2(float_t x, float_t y) { +void gs::effect_parameter::set_float2(float_t x, float_t y) +{ if (get_type() != type::Float2) throw std::bad_cast(); - vec2 v = { x, y }; + vec2 v = {x, y}; gs_effect_set_vec2(m_param, &v); } -void gs::effect_parameter::set_float3(vec3& v) { +void gs::effect_parameter::set_float3(vec3& v) +{ if (get_type() != type::Float3) throw std::bad_cast(); gs_effect_set_vec3(m_param, &v); } -void gs::effect_parameter::set_float3(float_t x, float_t y, float_t z) { +void gs::effect_parameter::set_float3(float_t x, float_t y, float_t z) +{ if (get_type() != type::Float3) throw std::bad_cast(); - vec3 v = { x, y, z }; + vec3 v = {x, y, z}; gs_effect_set_vec3(m_param, &v); } -void gs::effect_parameter::set_float4(vec4& v) { +void gs::effect_parameter::set_float4(vec4& v) +{ if (get_type() != type::Float4) throw std::bad_cast(); gs_effect_set_vec4(m_param, &v); } -void gs::effect_parameter::set_float4(float_t x, float_t y, float_t z, float_t w) { +void gs::effect_parameter::set_float4(float_t x, float_t y, float_t z, float_t w) +{ if (get_type() != type::Float4) throw std::bad_cast(); - vec4 v = { x, y, z, w }; + vec4 v = {x, y, z, w}; gs_effect_set_vec4(m_param, &v); } -void gs::effect_parameter::set_float_array(float_t v[], size_t sz) { - if ((get_type() != type::Float) && (get_type() != type::Float2) && (get_type() != type::Float3) && (get_type() != type::Float4)) +void gs::effect_parameter::set_float_array(float_t v[], size_t sz) +{ + if ((get_type() != type::Float) && (get_type() != type::Float2) && (get_type() != type::Float3) + && (get_type() != type::Float4)) throw std::bad_cast(); gs_effect_set_val(m_param, v, sizeof(float_t) * sz); } -void gs::effect_parameter::set_int(int32_t x) { +void gs::effect_parameter::set_int(int32_t x) +{ if ((get_type() != type::Integer) && (get_type() != type::Unknown)) throw std::bad_cast(); gs_effect_set_int(m_param, x); } -void gs::effect_parameter::set_int2(int32_t x, int32_t y) { +void gs::effect_parameter::set_int2(int32_t x, int32_t y) +{ if ((get_type() != type::Integer2) && (get_type() != type::Unknown)) throw std::bad_cast(); - int32_t v[2] = { x, y }; + int32_t v[2] = {x, y}; gs_effect_set_val(m_param, v, sizeof(int) * 2); } -void gs::effect_parameter::set_int3(int32_t x, int32_t y, int32_t z) { +void gs::effect_parameter::set_int3(int32_t x, int32_t y, int32_t z) +{ if ((get_type() != type::Integer3) && (get_type() != type::Unknown)) throw std::bad_cast(); - int32_t v[3] = { x, y, z }; + int32_t v[3] = {x, y, z}; gs_effect_set_val(m_param, v, sizeof(int) * 3); } -void gs::effect_parameter::set_int4(int32_t x, int32_t y, int32_t z, int32_t w) { +void gs::effect_parameter::set_int4(int32_t x, int32_t y, int32_t z, int32_t w) +{ if ((get_type() != type::Integer4) && (get_type() != type::Unknown)) throw std::bad_cast(); - int32_t v[4] = { x, y, z, w }; + int32_t v[4] = {x, y, z, w}; gs_effect_set_val(m_param, v, sizeof(int) * 4); } -void gs::effect_parameter::set_int_array(int32_t v[], size_t sz) { - if ((get_type() != type::Integer) && (get_type() != type::Integer2) && (get_type() != type::Integer3) && (get_type() != type::Integer4) && (get_type() != type::Unknown)) +void gs::effect_parameter::set_int_array(int32_t v[], size_t sz) +{ + if ((get_type() != type::Integer) && (get_type() != type::Integer2) && (get_type() != type::Integer3) + && (get_type() != type::Integer4) && (get_type() != type::Unknown)) throw std::bad_cast(); gs_effect_set_val(m_param, v, sizeof(int) * sz); } -void gs::effect_parameter::set_matrix(matrix4& v) { +void gs::effect_parameter::set_matrix(matrix4& v) +{ if (get_type() != type::Matrix) throw std::bad_cast(); gs_effect_set_matrix4(m_param, &v); } -void gs::effect_parameter::set_texture(std::shared_ptr v) { +void gs::effect_parameter::set_texture(std::shared_ptr v) +{ if (get_type() != type::Texture) throw std::bad_cast(); gs_effect_set_texture(m_param, v->get_object()); } -void gs::effect_parameter::set_texture(gs_texture_t* v) { +void gs::effect_parameter::set_texture(gs_texture_t* v) +{ if (get_type() != type::Texture) throw std::bad_cast(); gs_effect_set_texture(m_param, v); } -void gs::effect_parameter::set_sampler(std::shared_ptr v) { +void gs::effect_parameter::set_sampler(std::shared_ptr v) +{ if (get_type() != type::Texture) throw std::bad_cast(); gs_effect_set_next_sampler(m_param, v->get_object()); } -void gs::effect_parameter::set_sampler(gs_sampler_state* v) { +void gs::effect_parameter::set_sampler(gs_sampler_state* v) +{ if (get_type() != type::Texture) throw std::bad_cast(); gs_effect_set_next_sampler(m_param, v); diff --git a/source/gs-effect.h b/source/gs-effect.h index 1e41d110..2b61addc 100644 --- a/source/gs-effect.h +++ b/source/gs-effect.h @@ -18,21 +18,22 @@ */ #pragma once -#include "gs-texture.h" -#include "gs-sampler.h" #include +#include #include #include -#include +#include "gs-sampler.h" +#include "gs-texture.h" + extern "C" { - #pragma warning( push ) - #pragma warning( disable: 4201 ) - #include - #include - #include - #include - #include - #pragma warning( pop ) +#pragma warning(push) +#pragma warning(disable : 4201) +#include +#include +#include +#include +#include +#pragma warning(pop) } namespace gs { @@ -56,9 +57,9 @@ namespace gs { public: effect_parameter(gs_eparam_t* param); - + std::string get_name(); - type get_type(); + type get_type(); void set_bool(bool v); void set_bool_array(bool v[], size_t sz); @@ -82,7 +83,7 @@ namespace gs { void set_sampler(gs_sampler_state* v); private: - gs_eparam_t* m_param; + gs_eparam_t* m_param; gs_effect_param_info m_paramInfo; }; @@ -95,14 +96,14 @@ namespace gs { gs_effect_t* get_object(); - size_t count_parameters(); + size_t count_parameters(); std::list get_parameters(); - effect_parameter get_parameter(size_t idx); - effect_parameter get_parameter(std::string name); - bool has_parameter(std::string name); - bool has_parameter(std::string name, effect_parameter::type type); + effect_parameter get_parameter(size_t idx); + effect_parameter get_parameter(std::string name); + bool has_parameter(std::string name); + bool has_parameter(std::string name, effect_parameter::type type); protected: gs_effect_t* m_effect; }; -} +} // namespace gs