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

Merge branch 'master' into fontdebug

Browse Source
This commit is contained in:
Jack Andersen
2015-12-01 15:43:54 -10:00
parent 35edc47c91 24718b5bde
commit b55e10ea22
7 changed files with 306 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
specter/lib/View.cpp
View File

@@ -145,12 +145,12 @@ void View::System::init(boo::ID3DDataFactory* factory)
" return tex.Sample(samp, vtf.uv);\n"
"}\n";
boo::VertexElementDescriptor vdescs[] =
boo::VertexElementDescriptor solidvdescs[] =
{
{nullptr, nullptr, boo::VertexSemantic::Position4},
{nullptr, nullptr, boo::VertexSemantic::Color | boo::VertexSemantic::Instanced}
};
m_solidVtxFmt = factory->newVertexFormat(2, vdescs);
m_solidVtxFmt = factory->newVertexFormat(2, solidvdescs);
ComPtr<ID3DBlob> vertBlob;
ComPtr<ID3DBlob> fragBlob;
@@ -159,19 +159,19 @@ void View::System::init(boo::ID3DDataFactory* factory)
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false);
boo::VertexElementDescriptor vdescs[] =
boo::VertexElementDescriptor texvdescs[] =
{
{nullptr, nullptr, boo::VertexSemantic::Position4},
{nullptr, nullptr, boo::VertexSemantic::UV4}
};
m_texVtxFmt = factory->newVertexFormat(2, vdescs);
m_texVtxFmt = factory->newVertexFormat(2, texvdescs);
vertBlob.Reset();
fragBlob.Reset();
pipeBlob.Reset();
m_solidShader = factory->newShaderPipeline(TexVS, TexFS, vertBlob, fragBlob, pipeBlob, m_texVtxFmt,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false);
m_texShader = factory->newShaderPipeline(TexVS, TexFS, vertBlob, fragBlob, pipeBlob, m_texVtxFmt,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false);
}
#elif BOO_HAS_METAL
@@ -249,23 +249,23 @@ void View::System::init(boo::MetalDataFactory* factory)
" return tex.sample(samp, vtf.uv);\n"
"}\n";
boo::VertexElementDescriptor vdescs[] =
boo::VertexElementDescriptor solidvdescs[] =
{
{nullptr, nullptr, boo::VertexSemantic::Position4},
{nullptr, nullptr, boo::VertexSemantic::Color | boo::VertexSemantic::Instanced}
};
m_solidVtxFmt = factory->newVertexFormat(2, vdescs);
m_solidVtxFmt = factory->newVertexFormat(2, solidvdescs);
m_solidShader = factory->newShaderPipeline(SolidVS, SolidFS, m_solidVtxFmt, 1,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false);
boo::VertexElementDescriptor vdescs[] =
boo::VertexElementDescriptor texvdescs[] =
{
{nullptr, nullptr, boo::VertexSemantic::Position4},
{nullptr, nullptr, boo::VertexSemantic::UV4}
};
m_texVtxFmt = factory->newVertexFormat(2, vdescs);
m_texVtxFmt = factory->newVertexFormat(2, texvdescs);
m_texShader = factory->newShaderPipeline(TexVS, TexFS, m_texVtxFmt, 1,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,