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

mipmap sampling fix

This commit is contained in:
Jack Andersen 2016-02-16 09:42:24 -10:00
parent 7cd035c88c
commit 721929e4d0
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Editor/ViewManager.cpp
View File

@ -232,6 +232,7 @@ bool ViewManager::proc()
void ViewManager::stop()
{
pshag::CElementGen::Shutdown();
m_mainWindow->getCommandQueue()->stopRenderer();
}

14
Runtime/Particle/CElementGen.cpp
View File

@ -194,6 +194,11 @@ void CElementGenShaders::Initialize()
m_gfxToken = CGraphics::CommitResources();
}
void CElementGenShaders::Shutdown()
{
m_gfxToken.doDestroy();
}
struct SParticleInstanceTex
{
Zeus::CVector4f pos[4];
@ -249,6 +254,11 @@ void CElementGen::Initialize()
CElementGenShaders::Initialize();
}
void CElementGen::Shutdown()
{
CElementGenShaders::Shutdown();
}
CElementGen::CElementGen(const TToken<CGenDescription>& gen,
EModelOrientationType orientType,
EOptionalSystemFlags flags)
@ -1625,7 +1635,8 @@ void CElementGen::RenderParticles()
}
float size = 0.5f * particle.x2c_lineLengthOrSize;
fprintf(stderr, "%p (%f %f %f) %f\n", this, viewPoint.x, viewPoint.y, viewPoint.z, size);
size = 0.5f;
fprintf(stderr, "%p (%f %f %f) %f %f\n", this, viewPoint.x, viewPoint.y, viewPoint.z, size, particle.x30_lineWidthOrRota);
if (0.f == particle.x30_lineWidthOrRota)
{
switch (m_shaderClass)
@ -1680,6 +1691,7 @@ void CElementGen::RenderParticles()
inst.uvs[1] = {uvs.xMin, uvs.yMax};
inst.uvs[2] = {uvs.xMax, uvs.yMin};
inst.uvs[3] = {uvs.xMin, uvs.yMin};
fprintf(stderr, "(%f %f) (%f %f)\n", uvs.xMax, uvs.yMax, uvs.xMin, uvs.yMin);
break;
}
case CElementGenShaders::EShaderClass::NoTex:

1
Runtime/Particle/CElementGen.hpp
View File

@ -171,6 +171,7 @@ public:
static int g_ParticleSystemAliveCount;
static bool g_MoveRedToAlphaBuffer;
static void Initialize();
static void Shutdown();
void SetGeneratorRateScalar(float scalar)
{

1
Runtime/Particle/CElementGenShaders.hpp
View File

@ -68,6 +68,7 @@ public:
#endif
static void Initialize();
static void Shutdown();
static EShaderClass GetShaderClass(CElementGen& gen);
static void BuildShaderDataBinding(CElementGen& gen);
};

13
Runtime/Particle/CElementGenShadersGLSL.cpp
View File

@ -9,7 +9,7 @@ static const char* VS_GLSL_TEX =
"#version 330\n"
"layout(location=0) in vec4 posIn[4];\n"
"layout(location=4) in vec4 colorIn;\n"
"layout(location=5) in vec2 uvsIn[4];\n"
"layout(location=5) in vec4 uvsIn[4];\n"
"\n"
"uniform ParticleUniform\n"
"{\n"
@ -27,7 +27,7 @@ static const char* VS_GLSL_TEX =
"void main()\n"
"{\n"
" vtf.color = colorIn * moduColor;\n"
" vtf.uv = uvsIn[gl_VertexID];\n"
" vtf.uv = uvsIn[gl_VertexID].xy;\n"
" gl_Position = mvp * posIn[gl_VertexID];\n"
" gl_Position = vec4(posIn[gl_VertexID].x, posIn[gl_VertexID].z, 0.0, 1.0);\n"
"}\n";
@ -46,7 +46,6 @@ static const char* FS_GLSL_TEX =
"void main()\n"
"{\n"
" colorOut = vtf.color * texture(texs[0], vtf.uv);\n"
" colorOut = vtf.color;\n"
"}\n";
static const char* FS_GLSL_TEX_REDTOALPHA =
@ -64,7 +63,6 @@ static const char* FS_GLSL_TEX_REDTOALPHA =
"{\n"
" colorOut = vtf.color * texture(texs[0], vtf.uv);\n"
" colorOut.a = colorOut.r;\n"
" colorOut = vec4(1.0,1.0,1.0,1.0);\n"
"}\n";
static const char* VS_GLSL_INDTEX =
@ -118,7 +116,6 @@ static const char* FS_GLSL_INDTEX =
" vec4 texrTexel = texture(texs[0], vtf.uvTexr);\n"
" colorOut = vtf.color * sceneTexel + texrTexel;\n"
" colorOut.a = vtf.color.a * texrTexel.a;"
" colorOut = vec4(1.0,1.0,1.0,1.0);\n"
"}\n";
static const char* FS_GLSL_CINDTEX =
@ -139,7 +136,6 @@ static const char* FS_GLSL_CINDTEX =
" vec2 tindTexel = texture(texs[2], vtf.uvTind).xy;\n"
" vec4 sceneTexel = texture(texs[1], vtf.uvScene + tindTexel);\n"
" colorOut = vtf.color * sceneTexel * texture(texs[0], vtf.uvTexr);\n"
" colorOut = vec4(1.0,1.0,1.0,1.0);\n"
"}\n";
static const char* VS_GLSL_NOTEX =
@ -177,10 +173,9 @@ static const char* FS_GLSL_NOTEX =
"void main()\n"
"{\n"
" colorOut = vtf.color;\n"
" colorOut = vec4(1.0,1.0,1.0,1.0);\n"
"}\n";
struct MetalDataBindingFactory : CElementGenShaders::IDataBindingFactory
struct GLSLDataBindingFactory : CElementGenShaders::IDataBindingFactory
{
void BuildShaderDataBinding(CElementGen& gen,
boo::IShaderPipeline* regPipeline,
@ -336,7 +331,7 @@ CElementGenShaders::IDataBindingFactory* CElementGenShaders::Initialize(boo::GLD
boo::BlendFactor::SrcAlpha, boo::BlendFactor::One,
false, false, false);
return new struct MetalDataBindingFactory;
return new struct GLSLDataBindingFactory;
}
}

2
hecl

@ -1 +1 @@
Subproject commit 268a2071b75323022ef4f4cf61f9f8441b6579d2
Subproject commit 82a0c26fd7c1f2acda42c73f4bf4bafbf3281b59