AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Graphics bug fixes

This commit is contained in:
Jack Andersen 2016-07-26 20:11:02 -10:00
parent e59a0408cf
commit bf7b8fcec9
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Editor/ViewManager.cpp
View File

@ -377,6 +377,7 @@ void ViewManager::stop()
{ {
m_videoVoice.reset(); m_videoVoice.reset();
m_projManager.shutdown(); m_projManager.shutdown();
TShader<CThermalColdFilter>::Shutdown();
CElementGen::Shutdown(); CElementGen::Shutdown();
CMoviePlayer::Shutdown(); CMoviePlayer::Shutdown();
CLineRenderer::Shutdown(); CLineRenderer::Shutdown();

2
Runtime/Graphics/Shaders/CLineRendererShadersMetal.cpp
View File

@ -1,5 +1,5 @@
#include "CLineRendererShaders.hpp" #include "CLineRendererShaders.hpp"
#include "CLineRenderer.hpp" #include "Graphics/CLineRenderer.hpp"
#if BOO_HAS_METAL #if BOO_HAS_METAL
namespace urde namespace urde

2
Runtime/Graphics/Shaders/CThermalColdFilterGLSL.cpp
View File

@ -90,7 +90,7 @@ struct CThermalColdFilterGLDataBindingFactory : TShader<CThermalColdFilter>::IDa
boo::PipelineStage stages[] = {boo::PipelineStage::Vertex}; boo::PipelineStage stages[] = {boo::PipelineStage::Vertex};
boo::ITexture* texs[] = {CGraphics::g_SpareTexture, filter.m_shiftTex}; boo::ITexture* texs[] = {CGraphics::g_SpareTexture, filter.m_shiftTex};
return cctx.newShaderDataBinding(TShader<CThermalColdFilter>::m_pipeline, return cctx.newShaderDataBinding(TShader<CThermalColdFilter>::m_pipeline,
ctx.newVertexFormat(3, VtxVmt), filter.m_vbo, nullptr, nullptr, ctx.newVertexFormat(2, VtxVmt), filter.m_vbo, nullptr, nullptr,
1, bufs, stages, nullptr, nullptr, 2, texs); 1, bufs, stages, nullptr, nullptr, 2, texs);
} }
}; };

2
hecl

@ -1 +1 @@
Subproject commit ba0684b9153beb9d098a87b048ec642f289b0ed5 Subproject commit 3e5c8a7992c4ada055034194687f6f7b7c6b5d72