zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-24 13:01:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- adjustments for the DrawTexture interface changes.

Browse source
This commit is contained in:
Christoph Oelckers 2016-04-09 13:05:43 +02:00
parent bc42dd26c8
commit 1f0fd85d0e
4 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl/renderer/gl_renderer.cpp
View file

@ -299,7 +299,7 @@ void FGLRenderer::ClearBorders()
// //
//========================================================================== //==========================================================================
void FGLRenderer::DrawTexture(FTexture *img, DCanvas::DrawParms &parms) void FGLRenderer::DrawTexture(FTexture *img, DrawParms &parms)
{ {
double xscale = parms.destwidth / parms.texwidth; double xscale = parms.destwidth / parms.texwidth;
double yscale = parms.destheight / parms.texheight; double yscale = parms.destheight / parms.texheight;

2
src/gl/renderer/gl_renderer.h
View file

@ -110,7 +110,7 @@ public:
void Begin2D(); void Begin2D();
void ClearBorders(); void ClearBorders();
void DrawTexture(FTexture *img, DCanvas::DrawParms &parms); void DrawTexture(FTexture *img, DrawParms &parms);
void DrawLine(int x1, int y1, int x2, int y2, int palcolor, uint32 color); void DrawLine(int x1, int y1, int x2, int y2, int palcolor, uint32 color);
void DrawPixel(int x1, int y1, int palcolor, uint32 color); void DrawPixel(int x1, int y1, int palcolor, uint32 color);
void Dim(PalEntry color, float damount, int x1, int y1, int w, int h); void Dim(PalEntry color, float damount, int x1, int y1, int w, int h);

9
src/gl/system/gl_framebuffer.cpp
View file

@ -402,14 +402,9 @@ bool OpenGLFrameBuffer::Begin2D(bool)
// //
//========================================================================== //==========================================================================
void STACK_ARGS OpenGLFrameBuffer::DrawTextureV(FTexture *img, double x0, double y0, uint32 tag, va_list tags) void STACK_ARGS OpenGLFrameBuffer::DrawTextureParms(FTexture *img, DrawParms &parms)
{ {
DrawParms parms; if (GLRenderer != NULL) GLRenderer->DrawTexture(img, parms);
if (ParseDrawTextureTags(img, x0, y0, tag, tags, &parms, true))
{
if (GLRenderer != NULL) GLRenderer->DrawTexture(img, parms);
}
} }
//========================================================================== //==========================================================================

2
src/gl/system/gl_framebuffer.h
View file

@ -58,7 +58,7 @@ public:
virtual void ReleaseScreenshotBuffer(); virtual void ReleaseScreenshotBuffer();
// 2D drawing // 2D drawing
void STACK_ARGS DrawTextureV(FTexture *img, double x, double y, uint32 tag, va_list tags); void DrawTextureParms(FTexture *img, DrawParms &parms);
void DrawLine(int x1, int y1, int x2, int y2, int palcolor, uint32 color); void DrawLine(int x1, int y1, int x2, int y2, int palcolor, uint32 color);
void DrawPixel(int x1, int y1, int palcolor, uint32 color); void DrawPixel(int x1, int y1, int palcolor, uint32 color);
void Clear(int left, int top, int right, int bottom, int palcolor, uint32 color); void Clear(int left, int top, int right, int bottom, int palcolor, uint32 color);