zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-12-13 21:51:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
nashmuhandes 2016-05-09 16:52:29 +08:00
commit eab28fc150
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gl/scene/gl_flats.cpp
View file

@ -448,6 +448,12 @@ void GLFlat::Draw(int pass, bool trans) // trans only has meaning for GLPASS_LIG
case GLPASS_LIGHTTEX_ADDITIVE: case GLPASS_LIGHTTEX_ADDITIVE:
DrawLightsCompat(pass); DrawLightsCompat(pass);
break; break;
case GLPASS_TEXONLY:
gl_RenderState.SetMaterial(gltexture, CLAMP_NONE, 0, -1, false);
gl_SetPlaneTextureRotation(&plane, gltexture);
DrawSubsectors(pass, false, false);
break;
} }
} }

6
src/gl/scene/gl_walls_draw.cpp
View file

@ -442,10 +442,16 @@ void GLWall::Draw(int pass)
RenderTranslucentWall(); RenderTranslucentWall();
break; break;
} }
break;
case GLPASS_LIGHTTEX: case GLPASS_LIGHTTEX:
case GLPASS_LIGHTTEX_ADDITIVE: case GLPASS_LIGHTTEX_ADDITIVE:
RenderLightsCompat(pass); RenderLightsCompat(pass);
break; break;
case GLPASS_TEXONLY:
gl_RenderState.SetMaterial(gltexture, flags & 3, 0, -1, false);
RenderWall(RWF_TEXTURED);
break;
} }
} }