RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix blend_color_scale

This commit is contained in:
David Rose 2005-06-02 16:25:23 +00:00
parent 3c4141979c
commit 44831d5eb9
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx
View File

@ -2847,7 +2847,19 @@ set_texture_blend_mode(int i, const TextureStage *stage) {
_d3d_device->SetTextureStageState(i, D3DTSS_COLORARG0, D3DTA_TEXTURE);
_d3d_device->SetTextureStageState(i, D3DTSS_COLORARG2, D3DTA_CURRENT);
_d3d_device->SetTextureStageState(i, D3DTSS_COLORARG1, D3DTA_TFACTOR);
D3DCOLOR texture_factor = Colorf_to_D3DCOLOR(stage->get_color());
D3DCOLOR texture_factor;
if (stage->involves_color_scale() && _color_scale_enabled) {
Colorf color = stage->get_color();
color.set(color[0] * _current_color_scale[0],
color[1] * _current_color_scale[1],
color[2] * _current_color_scale[2],
color[3] * _current_color_scale[3]);
_texture_involves_color_scale = true;
texture_factor = Colorf_to_D3DCOLOR(color);
} else {
texture_factor = Colorf_to_D3DCOLOR(stage->get_color());
}
_d3d_device->SetRenderState(D3DRS_TEXTUREFACTOR, texture_factor);
_d3d_device->SetTextureStageState(i, D3DTSS_ALPHAOP, D3DTOP_MODULATE);