AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-07 15:25:53 +00:00
Code Issues Projects Releases Wiki Activity

CLineRendererShaders: Make use of static inline variables

Browse Source 
Same behavior, less code.
This commit is contained in:
Lioncash 2020-08-02 03:02:06 -04:00
parent 83c2023bbb
commit c9f5483c59
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Runtime/Graphics/Shaders/CLineRendererShaders.cpp
View File

@ -8,20 +8,6 @@
namespace urde { namespace urde {
std::array<boo::ObjToken<boo::IShaderPipeline>, 2> CLineRendererShaders::m_texAlpha;
std::array<boo::ObjToken<boo::IShaderPipeline>, 2> CLineRendererShaders::m_texAdditive;
std::array<boo::ObjToken<boo::IShaderPipeline>, 2> CLineRendererShaders::m_noTexAlpha;
std::array<boo::ObjToken<boo::IShaderPipeline>, 2> CLineRendererShaders::m_noTexAdditive;
std::array<boo::ObjToken<boo::IShaderPipeline>, 2> CLineRendererShaders::m_texAlphaZ;
std::array<boo::ObjToken<boo::IShaderPipeline>, 2> CLineRendererShaders::m_texAdditiveZ;
std::array<boo::ObjToken<boo::IShaderPipeline>, 2> CLineRendererShaders::m_noTexAlphaZ;
std::array<boo::ObjToken<boo::IShaderPipeline>, 2> CLineRendererShaders::m_noTexAdditiveZ;
std::array<boo::ObjToken<boo::IShaderPipeline>, 2> CLineRendererShaders::m_noTexAlphaZGEqual;
void CLineRendererShaders::Initialize() { void CLineRendererShaders::Initialize() {
CGraphics::CommitResources([](boo::IGraphicsDataFactory::Context& ctx) { CGraphics::CommitResources([](boo::IGraphicsDataFactory::Context& ctx) {
m_texAlpha = {hecl::conv->convert(ctx, Shader_CLineRendererShaderTexAlpha{}), m_texAlpha = {hecl::conv->convert(ctx, Shader_CLineRendererShaderTexAlpha{}),

18
Runtime/Graphics/Shaders/CLineRendererShaders.hpp
View File

@ -8,19 +8,19 @@ namespace urde {
class CLineRenderer; class CLineRenderer;
class CLineRendererShaders { class CLineRendererShaders {
static std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_texAlpha; static inline std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_texAlpha;
static std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_texAdditive; static inline std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_texAdditive;
static std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_noTexAlpha; static inline std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_noTexAlpha;
static std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_noTexAdditive; static inline std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_noTexAdditive;
static std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_texAlphaZ; static inline std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_texAlphaZ;
static std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_texAdditiveZ; static inline std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_texAdditiveZ;
static std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_noTexAlphaZ; static inline std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_noTexAlphaZ;
static std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_noTexAdditiveZ; static inline std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_noTexAdditiveZ;
static std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_noTexAlphaZGEqual; static inline std::array<boo::ObjToken<boo::IShaderPipeline>, 2> m_noTexAlphaZGEqual;
public: public:
static void Initialize(); static void Initialize();