OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master' into qzdoom

Browse source 
# Conflicts:
#	src/swrenderer/scene/r_things.cpp
This commit is contained in:
Magnus Norddahl 2017-01-07 17:44:15 +01:00
commit bf850bb788
10 changed files with 74 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/polyrenderer/scene/poly_particle.cpp
View file

@ -84,16 +84,17 @@ void RenderPolyParticle::Render(const TriMatrix &worldToClip, const Vec4f &clipP
}
args.uniforms.subsectorDepth = subsectorDepth;
uint32_t alpha = (uint32_t)clamp(particle->alpha * 255.0f + 0.5f, 0.0f, 255.0f);
if (swrenderer::r_swtruecolor)
{
uint32_t alpha = particle->trans;
args.uniforms.color = (alpha << 24) | (particle->color & 0xffffff);
}
else
{
args.uniforms.color = ((uint32_t)particle->color) >> 24;
args.uniforms.srcalpha = particle->trans;
args.uniforms.destalpha = 255 - particle->trans;
args.uniforms.srcalpha = alpha;
args.uniforms.destalpha = 255 - alpha;
}
args.objectToClip = &worldToClip;