mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-09 09:47:43 +00:00
New code style refactor
This commit is contained in:
Jack Andersen
@@ -2,8 +2,7 @@
|
||||
#include "Graphics/CLineRenderer.hpp"
|
||||
#include "hecl/Pipeline.hpp"
|
||||
|
||||
namespace urde
|
||||
{
|
||||
namespace urde {
|
||||
|
||||
boo::ObjToken<boo::IShaderPipeline> CLineRendererShaders::m_texAlpha;
|
||||
boo::ObjToken<boo::IShaderPipeline> CLineRendererShaders::m_texAdditive;
|
||||
@@ -19,111 +18,89 @@ boo::ObjToken<boo::IShaderPipeline> CLineRendererShaders::m_noTexAdditiveZ;
|
||||
|
||||
boo::ObjToken<boo::IShaderPipeline> CLineRendererShaders::m_noTexAlphaZGEqual;
|
||||
|
||||
void CLineRendererShaders::Initialize()
|
||||
{
|
||||
CGraphics::CommitResources(
|
||||
[](boo::IGraphicsDataFactory::Context& ctx)
|
||||
{
|
||||
m_texAlpha = hecl::conv->convert(ctx, Shader_CLineRendererShaderTexAlpha{});
|
||||
m_texAdditive = hecl::conv->convert(ctx, Shader_CLineRendererShaderTexAdditive{});
|
||||
m_noTexAlpha = hecl::conv->convert(ctx, Shader_CLineRendererShaderNoTexAlpha{});
|
||||
m_noTexAdditive = hecl::conv->convert(ctx, Shader_CLineRendererShaderNoTexAdditive{});
|
||||
m_texAlphaZ = hecl::conv->convert(ctx, Shader_CLineRendererShaderTexAlphaZ{});
|
||||
m_texAdditiveZ = hecl::conv->convert(ctx, Shader_CLineRendererShaderTexAdditiveZ{});
|
||||
m_noTexAlphaZ = hecl::conv->convert(ctx, Shader_CLineRendererShaderNoTexAlphaZ{});
|
||||
m_noTexAdditiveZ = hecl::conv->convert(ctx, Shader_CLineRendererShaderNoTexAdditiveZ{});
|
||||
m_noTexAlphaZGEqual = hecl::conv->convert(ctx, Shader_CLineRendererShaderNoTexAlphaZGEqual{});
|
||||
return true;
|
||||
} BooTrace);
|
||||
void CLineRendererShaders::Initialize() {
|
||||
CGraphics::CommitResources([](boo::IGraphicsDataFactory::Context& ctx) {
|
||||
m_texAlpha = hecl::conv->convert(ctx, Shader_CLineRendererShaderTexAlpha{});
|
||||
m_texAdditive = hecl::conv->convert(ctx, Shader_CLineRendererShaderTexAdditive{});
|
||||
m_noTexAlpha = hecl::conv->convert(ctx, Shader_CLineRendererShaderNoTexAlpha{});
|
||||
m_noTexAdditive = hecl::conv->convert(ctx, Shader_CLineRendererShaderNoTexAdditive{});
|
||||
m_texAlphaZ = hecl::conv->convert(ctx, Shader_CLineRendererShaderTexAlphaZ{});
|
||||
m_texAdditiveZ = hecl::conv->convert(ctx, Shader_CLineRendererShaderTexAdditiveZ{});
|
||||
m_noTexAlphaZ = hecl::conv->convert(ctx, Shader_CLineRendererShaderNoTexAlphaZ{});
|
||||
m_noTexAdditiveZ = hecl::conv->convert(ctx, Shader_CLineRendererShaderNoTexAdditiveZ{});
|
||||
m_noTexAlphaZGEqual = hecl::conv->convert(ctx, Shader_CLineRendererShaderNoTexAlphaZGEqual{});
|
||||
return true;
|
||||
} BooTrace);
|
||||
}
|
||||
|
||||
void CLineRendererShaders::Shutdown()
|
||||
{
|
||||
m_texAlpha.reset();
|
||||
m_texAdditive.reset();
|
||||
m_noTexAlpha.reset();
|
||||
m_noTexAdditive.reset();
|
||||
m_texAlphaZ.reset();
|
||||
m_texAdditiveZ.reset();
|
||||
m_noTexAlphaZ.reset();
|
||||
m_noTexAdditiveZ.reset();
|
||||
m_noTexAlphaZGEqual.reset();
|
||||
void CLineRendererShaders::Shutdown() {
|
||||
m_texAlpha.reset();
|
||||
m_texAdditive.reset();
|
||||
m_noTexAlpha.reset();
|
||||
m_noTexAdditive.reset();
|
||||
m_texAlphaZ.reset();
|
||||
m_texAdditiveZ.reset();
|
||||
m_noTexAlphaZ.reset();
|
||||
m_noTexAdditiveZ.reset();
|
||||
m_noTexAlphaZGEqual.reset();
|
||||
}
|
||||
|
||||
void CLineRendererShaders::BuildShaderDataBinding(boo::IGraphicsDataFactory::Context& ctx,
|
||||
CLineRenderer& renderer,
|
||||
const boo::ObjToken<boo::ITexture>& texture,
|
||||
bool additive, bool zTest, bool zGEqual)
|
||||
{
|
||||
boo::ObjToken<boo::IShaderPipeline> pipeline;
|
||||
void CLineRendererShaders::BuildShaderDataBinding(boo::IGraphicsDataFactory::Context& ctx, CLineRenderer& renderer,
|
||||
const boo::ObjToken<boo::ITexture>& texture, bool additive,
|
||||
bool zTest, bool zGEqual) {
|
||||
boo::ObjToken<boo::IShaderPipeline> pipeline;
|
||||
|
||||
if (zGEqual)
|
||||
{
|
||||
pipeline = m_noTexAlphaZGEqual;
|
||||
if (zGEqual) {
|
||||
pipeline = m_noTexAlphaZGEqual;
|
||||
} else if (zTest) {
|
||||
if (texture) {
|
||||
if (additive)
|
||||
pipeline = m_texAdditiveZ;
|
||||
else
|
||||
pipeline = m_texAlphaZ;
|
||||
} else {
|
||||
if (additive)
|
||||
pipeline = m_noTexAdditiveZ;
|
||||
else
|
||||
pipeline = m_noTexAlphaZ;
|
||||
}
|
||||
else if (zTest)
|
||||
{
|
||||
if (texture)
|
||||
{
|
||||
if (additive)
|
||||
pipeline = m_texAdditiveZ;
|
||||
else
|
||||
pipeline = m_texAlphaZ;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (additive)
|
||||
pipeline = m_noTexAdditiveZ;
|
||||
else
|
||||
pipeline = m_noTexAlphaZ;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (texture)
|
||||
{
|
||||
if (additive)
|
||||
pipeline = m_texAdditive;
|
||||
else
|
||||
pipeline = m_texAlpha;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (additive)
|
||||
pipeline = m_noTexAdditive;
|
||||
else
|
||||
pipeline = m_noTexAlpha;
|
||||
}
|
||||
} else {
|
||||
if (texture) {
|
||||
if (additive)
|
||||
pipeline = m_texAdditive;
|
||||
else
|
||||
pipeline = m_texAlpha;
|
||||
} else {
|
||||
if (additive)
|
||||
pipeline = m_noTexAdditive;
|
||||
else
|
||||
pipeline = m_noTexAlpha;
|
||||
}
|
||||
}
|
||||
|
||||
int texCount = 0;
|
||||
boo::ObjToken<boo::ITexture> textures[1];
|
||||
int texCount = 0;
|
||||
boo::ObjToken<boo::ITexture> textures[1];
|
||||
|
||||
std::pair<boo::ObjToken<boo::IGraphicsBufferD>,
|
||||
hecl::VertexBufferPool<CLineRenderer::SDrawVertTex>::IndexTp> vbufInfo;
|
||||
std::pair<boo::ObjToken<boo::IGraphicsBufferD>,
|
||||
hecl::UniformBufferPool<CLineRenderer::SDrawUniform>::IndexTp> ubufInfo =
|
||||
renderer.m_uniformBuf.getBufferInfo();
|
||||
if (texture)
|
||||
{
|
||||
vbufInfo = renderer.m_vertBufTex.getBufferInfo();
|
||||
textures[0] = texture;
|
||||
texCount = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
vbufInfo = renderer.m_vertBufNoTex.getBufferInfo();
|
||||
}
|
||||
std::pair<boo::ObjToken<boo::IGraphicsBufferD>, hecl::VertexBufferPool<CLineRenderer::SDrawVertTex>::IndexTp>
|
||||
vbufInfo;
|
||||
std::pair<boo::ObjToken<boo::IGraphicsBufferD>, hecl::UniformBufferPool<CLineRenderer::SDrawUniform>::IndexTp>
|
||||
ubufInfo = renderer.m_uniformBuf.getBufferInfo();
|
||||
if (texture) {
|
||||
vbufInfo = renderer.m_vertBufTex.getBufferInfo();
|
||||
textures[0] = texture;
|
||||
texCount = 1;
|
||||
} else {
|
||||
vbufInfo = renderer.m_vertBufNoTex.getBufferInfo();
|
||||
}
|
||||
|
||||
boo::ObjToken<boo::IGraphicsBuffer> uniforms[] = {ubufInfo.first.get()};
|
||||
boo::PipelineStage stages[] = {boo::PipelineStage::Vertex};
|
||||
size_t ubufOffs[] = {size_t(ubufInfo.second)};
|
||||
size_t ubufSizes[] = {sizeof(CLineRenderer::SDrawUniform)};
|
||||
boo::ObjToken<boo::IGraphicsBuffer> uniforms[] = {ubufInfo.first.get()};
|
||||
boo::PipelineStage stages[] = {boo::PipelineStage::Vertex};
|
||||
size_t ubufOffs[] = {size_t(ubufInfo.second)};
|
||||
size_t ubufSizes[] = {sizeof(CLineRenderer::SDrawUniform)};
|
||||
|
||||
renderer.m_shaderBind = ctx.newShaderDataBinding(pipeline, vbufInfo.first.get(),
|
||||
nullptr, nullptr, 1, uniforms, stages,
|
||||
ubufOffs, ubufSizes, texCount, textures,
|
||||
nullptr, nullptr, vbufInfo.second);
|
||||
renderer.m_shaderBind =
|
||||
ctx.newShaderDataBinding(pipeline, vbufInfo.first.get(), nullptr, nullptr, 1, uniforms, stages, ubufOffs,
|
||||
ubufSizes, texCount, textures, nullptr, nullptr, vbufInfo.second);
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace urde
|
||||
|
||||
Reference in New Issue
Block a user