AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 13:47:43 +00:00
Code Issues Projects Releases Wiki Activity

Changes to support boo object tracker API

Browse Source
This commit is contained in:
Jack Andersen
2017-11-04 20:17:12 -10:00
parent d301491bd6
commit 3894749675
138 changed files with 1679 additions and 1243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Runtime/Graphics/Shaders/CTextSupportShader.hpp
View File

@@ -20,13 +20,13 @@ class CTextSupportShader
friend struct CTextSupportShaderD3DDataBindingFactory;
friend class CTextRenderBuffer;
static boo::IVertexFormat* s_TextVtxFmt;
static boo::IShaderPipeline* s_TextAlphaPipeline;
static boo::IShaderPipeline* s_TextAddPipeline;
static boo::ObjToken<boo::IVertexFormat> s_TextVtxFmt;
static boo::ObjToken<boo::IShaderPipeline> s_TextAlphaPipeline;
static boo::ObjToken<boo::IShaderPipeline> s_TextAddPipeline;
static boo::IVertexFormat* s_ImageVtxFmt;
static boo::IShaderPipeline* s_ImageAlphaPipeline;
static boo::IShaderPipeline* s_ImageAddPipeline;
static boo::ObjToken<boo::IVertexFormat> s_ImageVtxFmt;
static boo::ObjToken<boo::IShaderPipeline> s_ImageAlphaPipeline;
static boo::ObjToken<boo::IShaderPipeline> s_ImageAddPipeline;
struct Uniform
{
@@ -60,7 +60,7 @@ public:
using _CLS = CTextSupportShader;
#include "TMultiBlendShaderDecl.hpp"
static boo::IShaderPipeline* SelectTextPipeline(CGuiWidget::EGuiModelDrawFlags df)
static boo::ObjToken<boo::IShaderPipeline> SelectTextPipeline(CGuiWidget::EGuiModelDrawFlags df)
{
switch (df)
{
@@ -72,11 +72,11 @@ public:
case CGuiWidget::EGuiModelDrawFlags::AlphaAdditiveOverdraw:
return s_TextAddPipeline;
default:
return nullptr;
return {};
}
}
static boo::IShaderPipeline* SelectImagePipeline(CGuiWidget::EGuiModelDrawFlags df)
static boo::ObjToken<boo::IShaderPipeline> SelectImagePipeline(CGuiWidget::EGuiModelDrawFlags df)
{
switch (df)
{
@@ -88,7 +88,7 @@ public:
case CGuiWidget::EGuiModelDrawFlags::AlphaAdditiveOverdraw:
return s_ImageAddPipeline;
default:
return nullptr;
return {};
}
}
@@ -98,6 +98,8 @@ public:
s_ImgInsts.updateBuffers();
s_Uniforms.updateBuffers();
}
static void Shutdown();
};
}