Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-06 19:01:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into RendererRefactor

Browse source
This commit is contained in:
Raildex 2020-01-08 19:08:28 +01:00
commit 694d6f65c4
12 changed files with 113 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TR5Main/Renderer/Renderer11.cpp
View file

@ -4765,7 +4765,7 @@ void Renderer11::drawBlood()
{
AddSpriteBillboard(m_sprites[Objects[ID_DEFAULT_SPRITES].meshIndex + 15],
Vector3(blood->x, blood->y, blood->z),
Vector4(blood->shade * 244/255.0f, blood->shade * 0, blood->shade * 0,1.0f),
Vector4(blood->shade / 255.0f, blood->shade * 0, blood->shade * 0,1.0f),
TR_ANGLE_TO_RAD(blood->rotAng), 1.0f, blood->size * 8.0f, blood->size * 8.0f,
BLENDMODE_ALPHABLEND);
}
@ -4986,7 +4986,7 @@ void Renderer11::drawBubbles()
{
BUBBLE_STRUCT* bubble = &Bubbles[i];
if (bubble->size)
AddSpriteBillboard(m_sprites[Objects[ID_DEFAULT_SPRITES].meshIndex + SPR_BUBBLES], Vector3(bubble->pos.x, bubble->pos.y, bubble->pos.z),Vector4( bubble->shade, bubble->shade, bubble->shade,1.0f), 0.0f, 1.0f, bubble->size * 0.5f, bubble->size * 0.5f, BLENDMODE_ALPHABLEND);
AddSpriteBillboard(m_sprites[Objects[ID_DEFAULT_SPRITES].meshIndex + SPR_BUBBLES], Vector3(bubble->pos.x, bubble->pos.y, bubble->pos.z),Vector4( bubble->shade/255.0f, bubble->shade/255.0f, bubble->shade/255.0f,1.0f), 0.0f, 1.0f, bubble->size * 0.5f, bubble->size * 0.5f, BLENDMODE_ALPHABLEND);
}
}