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

All CEnvFxManager effects working

Browse Source
This commit is contained in:
Jack Andersen
2018-11-02 22:46:12 -10:00
parent 97f18efd27
commit d140f35886
9 changed files with 81 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Shaders/CEnvFxShaders.shader
View File

@@ -40,7 +40,7 @@ struct VertToFrag
SBINDING(0) out VertToFrag vtf;
void main()
{
vec4 pos = posIn[gl_VertexID];
vec4 pos = vec4(posIn[gl_VertexID].xyz, 1.0);
vtf.color = colorIn * moduColor;
vtf.uvFlake = uvsIn[gl_VertexID].xy;
vtf.uvEnv = (envMtx * pos).xy;
@@ -134,8 +134,9 @@ VertToFrag main(in VertData v, in uint vertId : SV_VertexID)
VertToFrag vtf;
vtf.color = v.colorIn * moduColor;
vtf.uvFlake = v.uvsIn[vertId].xy;
vtf.uvEnv = mul(envMtx, v.posIn[vertId]).xy;
vtf.mvPos = mul(mv, v.posIn[vertId]);
float4 pos = float4(v.posIn[vertId].xyz, 1.0);
vtf.uvEnv = mul(envMtx, pos).xy;
vtf.mvPos = mul(mv, pos);
vtf.position = mul(proj, vtf.mvPos);
return vtf;
}
@@ -229,8 +230,9 @@ vertex VertToFrag vmain(constant VertData* va [[ buffer(1) ]],
constant VertData& v = va[instId];
vtf.color = v.colorIn * particle.moduColor;
vtf.uvFlake = v.uvsIn[vertId].xy;
vtf.uvEnv = (envMtx * v.posIn[vertId]).xy;
vtf.mvPos = particle.mv * v.posIn[vertId];
float4 pos = float4(v.posIn[vertId].xyz, 1.0);
vtf.uvEnv = (envMtx * pos).xy;
vtf.mvPos = particle.mv * pos;
vtf.position = particle.proj * vtf.mvPos;
return vtf;
}

4
Shaders/CLineRendererShaders.shader
View File

@@ -78,7 +78,7 @@ VertToFrag main(in VertData v)
}
#fragment hlsl
SamplerState samp : register(s0);
SamplerState samp : register(s3);
Texture2D tex0 : register(t0);
struct VertToFrag
{
@@ -133,7 +133,7 @@ struct VertToFrag
};
fragment float4 fmain(VertToFrag vtf [[ stage_in ]],
sampler samp [[ sampler(0) ]],
sampler samp [[ sampler(3) ]],
texture2d<float> tex0 [[ texture(0) ]])
{
return vtf.color * tex0.sample(samp, vtf.uv);