zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-29 15:32:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sub pinkie crashes the pal drawer :(

Browse source
This commit is contained in:
Magnus Norddahl 2016-11-21 15:40:42 +01:00
parent 0108ff89d7
commit ddb0161f9c
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/r_poly_sprite.cpp
View file

@ -226,6 +226,9 @@ void RenderPolySprite::Render(const TriMatrix &worldToClip, AActor *thing, subse
uint32_t g = (args.uniforms.color >> 8) & 0xff; uint32_t g = (args.uniforms.color >> 8) & 0xff;
uint32_t b = args.uniforms.color & 0xff; uint32_t b = args.uniforms.color & 0xff;
args.uniforms.color = RGB32k.RGB[r >> 3][g >> 3][b >> 3]; args.uniforms.color = RGB32k.RGB[r >> 3][g >> 3][b >> 3];
if (blendmode == TriBlendMode::Sub) // Sub crashes in pal mode for some weird reason.
blendmode = TriBlendMode::Add;
} }
PolyTriangleDrawer::draw(args, TriDrawVariant::DrawSubsector, blendmode); PolyTriangleDrawer::draw(args, TriDrawVariant::DrawSubsector, blendmode);

4
src/r_poly_triangle.cpp
View file

@ -371,7 +371,9 @@ FString DrawPolyTrianglesCommand::DebugInfo()
} }
FString info; FString info;
info.Format("DrawPolyTriangles: variant = %s, blend mode = %s, color = %d", variantstr.GetChars(), blendmodestr.GetChars(), args.uniforms.color); info.Format("DrawPolyTriangles: variant = %s, blend mode = %s, color = %d, light = %d, textureWidth = %d, textureHeight = %d, texture = %s, translation = %s, colormaps = %s",
variantstr.GetChars(), blendmodestr.GetChars(), args.uniforms.color, args.uniforms.light, args.textureWidth, args.textureHeight,
args.texturePixels ? "ptr" : "null", args.translation ? "ptr" : "null", args.colormaps ? "ptr" : "null");
return info; return info;
} }