zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed indexed display of 2D content.

Browse source
This commit is contained in:
Christoph Oelckers 2020-05-29 16:46:36 +02:00
parent 87a87c155d
commit 66809ca9f4
5 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/build/src/mdsprite.cpp
View file

@ -1726,7 +1726,8 @@ static int32_t polymost_md3draw(md3model_t *m, tspriteptr_t tspr)
} }
glow = hw_glowmapping ? mdloadskin((md2model_t *) m, tile2model[Ptile2tile(tspr->picnum, lpal)].skinnum, GLOWPAL, surfi, nullptr) : 0; glow = hw_glowmapping ? mdloadskin((md2model_t *) m, tile2model[Ptile2tile(tspr->picnum, lpal)].skinnum, GLOWPAL, surfi, nullptr) : 0;
} }
GLInterface.SetModelTexture(tex, globalpal, det, detscale, glow); int palid = TRANSLATION(Translation_Remap + curbasepal, globalpal);
GLInterface.SetModelTexture(tex, palid, det, detscale, glow);
if (tspr->clipdist & TSPR_FLAGS_MDHACK) if (tspr->clipdist & TSPR_FLAGS_MDHACK)
{ {

9
source/build/src/polymost.cpp
View file

@ -426,7 +426,8 @@ static void polymost_drawpoly(vec2f_t const * const dpxy, int32_t const n, int32
else if (drawpoly_trepeat) sampleroverride = SamplerClampX; else if (drawpoly_trepeat) sampleroverride = SamplerClampX;
else sampleroverride = SamplerClampXY; else sampleroverride = SamplerClampXY;
bool success = GLInterface.SetTexture(globalpicnum, tileGetTexture(globalpicnum), globalpal, method, sampleroverride); int palid = TRANSLATION(Translation_Remap + curbasepal, globalpal);
bool success = GLInterface.SetTexture(globalpicnum, tileGetTexture(globalpicnum), palid, method, sampleroverride);
if (!success) if (!success)
{ {
tsiz.x = tsiz.y = 1; tsiz.x = tsiz.y = 1;
@ -4551,7 +4552,8 @@ static void polymost_precache(int32_t dapicnum, int32_t dapalnum, int32_t datype
//Printf("precached %d %d type %d\n", dapicnum, dapalnum, datype); //Printf("precached %d %d type %d\n", dapicnum, dapalnum, datype);
hicprecaching = 1; hicprecaching = 1;
GLInterface.SetTexture(dapicnum, tileGetTexture(dapicnum), dapalnum, 0, -1); int palid = TRANSLATION(Translation_Remap + curbasepal, dapalnum);
GLInterface.SetTexture(dapicnum, tileGetTexture(dapicnum), palid, 0, -1);
hicprecaching = 0; hicprecaching = 0;
if (datype == 0 || !hw_models) return; if (datype == 0 || !hw_models) return;
@ -4565,7 +4567,8 @@ static void polymost_precache(int32_t dapicnum, int32_t dapalnum, int32_t datype
for (int i = 0; i <= surfaces; i++) for (int i = 0; i <= surfaces; i++)
{ {
auto tex = mdloadskin((md2model_t *)models[mid], 0, dapalnum, i, nullptr); auto tex = mdloadskin((md2model_t *)models[mid], 0, dapalnum, i, nullptr);
if (tex) GLInterface.SetTexture(-1, tex, dapalnum, 0, -1); int palid = TRANSLATION(Translation_Remap + curbasepal, dapalnum);
if (tex) GLInterface.SetTexture(-1, tex, palid, 0, -1);
} }
} }

2
source/core/rendering/gl/renderer/gl_renderer.cpp
View file

@ -59,7 +59,7 @@
//#include "r_data/models/models.h" //#include "r_data/models/models.h"
#include "gl/renderer/gl_postprocessstate.h" #include "gl/renderer/gl_postprocessstate.h"
#include "gl/system/gl_buffers.h" #include "gl/system/gl_buffers.h"
#include "../glbackend/gl_hwtexture.h" #include "gl_hwtexture.h"
#include "build.h" #include "build.h"
EXTERN_CVAR(Int, screenblocks) EXTERN_CVAR(Int, screenblocks)

4
source/glbackend/gl_texture.cpp
View file

@ -201,9 +201,11 @@ TexturePick PickTexture(int tilenum, int basepal, int palette)
} }
#endif #endif
bool GLInstance::SetTextureInternal(int picnum, FGameTexture* tex, int palette, int method, int sampleroverride, FGameTexture *det, float detscale, FGameTexture *glow) bool GLInstance::SetTextureInternal(int picnum, FGameTexture* tex, int paletteid, int method, int sampleroverride, FGameTexture *det, float detscale, FGameTexture *glow)
{ {
if (tex->GetTexelWidth() <= 0 || tex->GetTexelHeight() <= 0) return false; if (tex->GetTexelWidth() <= 0 || tex->GetTexelHeight() <= 0) return false;
int curbasepal = GetTranslationType(paletteid) - Translation_Remap;
int palette = GetTranslationIndex(paletteid);
int usepalette = fixpalette >= 0 ? fixpalette : curbasepal; int usepalette = fixpalette >= 0 ? fixpalette : curbasepal;
int usepalswap = fixpalswap >= 0 ? fixpalswap : palette; int usepalswap = fixpalswap >= 0 ? fixpalswap : palette;
GLInterface.SetPalette(usepalette); GLInterface.SetPalette(usepalette);

8
source/glbackend/hw_draw2d.cpp
View file

@ -166,9 +166,10 @@ void GLInstance::Draw2D(F2DDrawer *drawer)
{ {
auto tex = cmd.mTexture; auto tex = cmd.mTexture;
SetFadeDisable(true); SetFadeDisable(true);
SetShade(0, numshades); SetShade(0, numshades);
SetNamedTexture(cmd.mTexture, cmd.mTranslationId, cmd.mFlags & F2DDrawer::DTF_Wrap ? SamplerRepeat : SamplerClampXY);
SetTexture(TileFiles.GetTileIndex(cmd.mTexture), cmd.mTexture, cmd.mTranslationId, 0, cmd.mFlags & F2DDrawer::DTF_Wrap ? CLAMP_NONE : CLAMP_XY);
EnableBlend(!(cmd.mRenderStyle.Flags & STYLEF_Alpha1)); EnableBlend(!(cmd.mRenderStyle.Flags & STYLEF_Alpha1));
UseColorOnly(false); UseColorOnly(false);
} }
@ -180,7 +181,6 @@ void GLInstance::Draw2D(F2DDrawer *drawer)
switch (cmd.mType) switch (cmd.mType)
{ {
case F2DDrawer::DrawTypeTriangles: case F2DDrawer::DrawTypeTriangles:
case F2DDrawer::DrawTypeRotateSprite:
DrawElement(DT_TRIANGLES, cmd.mIndexIndex, cmd.mIndexCount, renderState); DrawElement(DT_TRIANGLES, cmd.mIndexIndex, cmd.mIndexCount, renderState);
break; break;