mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-11 15:22:16 +00:00
Merge TC handling back into r_draw
This commit is contained in:
Magnus Norddahl
parent
beb70d7dfa
commit
e3e90e1a08
4 changed files with 518 additions and 2051 deletions
590
src/r_draw.cpp
590
src/r_draw.cpp
File diff suppressed because it is too large
Load diff
39
src/r_draw.h
39
src/r_draw.h
|
|
@ -3,7 +3,13 @@
|
||||||
|
|
||||||
#include "r_defs.h"
|
#include "r_defs.h"
|
||||||
|
|
||||||
|
struct FSWColormap;
|
||||||
|
|
||||||
EXTERN_CVAR(Bool, r_multithreaded);
|
EXTERN_CVAR(Bool, r_multithreaded);
|
||||||
|
EXTERN_CVAR(Bool, r_magfilter);
|
||||||
|
EXTERN_CVAR(Bool, r_minfilter);
|
||||||
|
EXTERN_CVAR(Bool, r_mipmap);
|
||||||
|
EXTERN_CVAR(Float, r_lod_bias);
|
||||||
EXTERN_CVAR(Int, r_drawfuzz);
|
EXTERN_CVAR(Int, r_drawfuzz);
|
||||||
EXTERN_CVAR(Bool, r_drawtrans);
|
EXTERN_CVAR(Bool, r_drawtrans);
|
||||||
EXTERN_CVAR(Float, transsouls);
|
EXTERN_CVAR(Float, transsouls);
|
||||||
|
|
@ -13,12 +19,29 @@ namespace swrenderer
|
||||||
{
|
{
|
||||||
struct vissprite_t;
|
struct vissprite_t;
|
||||||
|
|
||||||
|
struct ShadeConstants
|
||||||
|
{
|
||||||
|
uint16_t light_alpha;
|
||||||
|
uint16_t light_red;
|
||||||
|
uint16_t light_green;
|
||||||
|
uint16_t light_blue;
|
||||||
|
uint16_t fade_alpha;
|
||||||
|
uint16_t fade_red;
|
||||||
|
uint16_t fade_green;
|
||||||
|
uint16_t fade_blue;
|
||||||
|
uint16_t desaturate;
|
||||||
|
bool simple_shade;
|
||||||
|
};
|
||||||
|
|
||||||
extern double dc_texturemid;
|
extern double dc_texturemid;
|
||||||
|
|
||||||
namespace drawerargs
|
namespace drawerargs
|
||||||
{
|
{
|
||||||
extern int dc_pitch;
|
extern int dc_pitch;
|
||||||
extern lighttable_t *dc_colormap;
|
extern lighttable_t *dc_colormap;
|
||||||
|
extern FSWColormap *dc_fcolormap;
|
||||||
|
extern ShadeConstants dc_shade_constants;
|
||||||
|
extern fixed_t dc_light;
|
||||||
extern int dc_x;
|
extern int dc_x;
|
||||||
extern int dc_yl;
|
extern int dc_yl;
|
||||||
extern int dc_yh;
|
extern int dc_yh;
|
||||||
|
|
@ -41,6 +64,8 @@ namespace swrenderer
|
||||||
extern int dc_destheight;
|
extern int dc_destheight;
|
||||||
extern int dc_count;
|
extern int dc_count;
|
||||||
|
|
||||||
|
extern bool drawer_needs_pal_input;
|
||||||
|
|
||||||
extern uint32_t vplce[4];
|
extern uint32_t vplce[4];
|
||||||
extern uint32_t vince[4];
|
extern uint32_t vince[4];
|
||||||
extern uint8_t *palookupoffse[4];
|
extern uint8_t *palookupoffse[4];
|
||||||
|
|
@ -57,6 +82,8 @@ namespace swrenderer
|
||||||
extern int ds_x1;
|
extern int ds_x1;
|
||||||
extern int ds_x2;
|
extern int ds_x2;
|
||||||
extern lighttable_t * ds_colormap;
|
extern lighttable_t * ds_colormap;
|
||||||
|
extern FSWColormap *ds_fcolormap;
|
||||||
|
extern ShadeConstants ds_shade_constants;
|
||||||
extern dsfixed_t ds_light;
|
extern dsfixed_t ds_light;
|
||||||
extern dsfixed_t ds_xfrac;
|
extern dsfixed_t ds_xfrac;
|
||||||
extern dsfixed_t ds_yfrac;
|
extern dsfixed_t ds_yfrac;
|
||||||
|
|
@ -67,6 +94,7 @@ namespace swrenderer
|
||||||
extern fixed_t ds_alpha;
|
extern fixed_t ds_alpha;
|
||||||
extern double ds_lod;
|
extern double ds_lod;
|
||||||
extern const uint8_t *ds_source;
|
extern const uint8_t *ds_source;
|
||||||
|
extern bool ds_source_mipmapped;
|
||||||
extern int ds_color;
|
extern int ds_color;
|
||||||
|
|
||||||
extern unsigned int dc_tspans[4][MAXHEIGHT];
|
extern unsigned int dc_tspans[4][MAXHEIGHT];
|
||||||
|
|
@ -86,6 +114,8 @@ namespace swrenderer
|
||||||
extern int fuzzpos;
|
extern int fuzzpos;
|
||||||
extern int fuzzviewheight;
|
extern int fuzzviewheight;
|
||||||
|
|
||||||
|
extern bool r_swtruecolor;
|
||||||
|
|
||||||
void R_InitColumnDrawers();
|
void R_InitColumnDrawers();
|
||||||
void R_InitShadeMaps();
|
void R_InitShadeMaps();
|
||||||
void R_InitFuzzTable(int fuzzoff);
|
void R_InitFuzzTable(int fuzzoff);
|
||||||
|
|
@ -162,7 +192,7 @@ namespace swrenderer
|
||||||
void R_FillSpan();
|
void R_FillSpan();
|
||||||
void R_DrawTiltedSpan(int y, int x1, int x2, const FVector3 &plane_sz, const FVector3 &plane_su, const FVector3 &plane_sv, bool plane_shade, int planeshade, float planelightfloat, fixed_t pviewx, fixed_t pviewy);
|
void R_DrawTiltedSpan(int y, int x1, int x2, const FVector3 &plane_sz, const FVector3 &plane_su, const FVector3 &plane_sv, bool plane_shade, int planeshade, float planelightfloat, fixed_t pviewx, fixed_t pviewy);
|
||||||
void R_DrawColoredSpan(int y, int x1, int x2);
|
void R_DrawColoredSpan(int y, int x1, int x2);
|
||||||
void R_SetupDrawSlab(uint8_t *colormap);
|
void R_SetupDrawSlab(FSWColormap *base_colormap, float light, int shade);
|
||||||
void R_DrawSlab(int dx, fixed_t v, int dy, fixed_t vi, const uint8_t *vptr, uint8_t *p);
|
void R_DrawSlab(int dx, fixed_t v, int dy, fixed_t vi, const uint8_t *vptr, uint8_t *p);
|
||||||
void R_DrawFogBoundary(int x1, int x2, short *uclip, short *dclip);
|
void R_DrawFogBoundary(int x1, int x2, short *uclip, short *dclip);
|
||||||
uint32_t vlinec1();
|
uint32_t vlinec1();
|
||||||
|
|
@ -194,12 +224,13 @@ namespace swrenderer
|
||||||
void R_DrawDoubleSkyCol1(uint32_t solid_top, uint32_t solid_bottom);
|
void R_DrawDoubleSkyCol1(uint32_t solid_top, uint32_t solid_bottom);
|
||||||
void R_DrawDoubleSkyCol4(uint32_t solid_top, uint32_t solid_bottom);
|
void R_DrawDoubleSkyCol4(uint32_t solid_top, uint32_t solid_bottom);
|
||||||
|
|
||||||
void R_SetColorMapLight(lighttable_t *base_colormap, float light, int shade);
|
// Sets dc_colormap and dc_light to their appropriate values depending on the output format (pal vs true color)
|
||||||
void R_SetDSColorMapLight(lighttable_t *base_colormap, float light, int shade);
|
void R_SetColorMapLight(FSWColormap *base_colormap, float light, int shade);
|
||||||
|
void R_SetDSColorMapLight(FSWColormap *base_colormap, float light, int shade);
|
||||||
void R_SetTranslationMap(lighttable_t *translation);
|
void R_SetTranslationMap(lighttable_t *translation);
|
||||||
|
|
||||||
void R_SetupSpanBits(FTexture *tex);
|
void R_SetupSpanBits(FTexture *tex);
|
||||||
void R_SetSpanColormap(lighttable_t *colormap);
|
void R_SetSpanColormap(FDynamicColormap *colormap, int shade);
|
||||||
void R_SetSpanSource(FTexture *tex);
|
void R_SetSpanSource(FTexture *tex);
|
||||||
|
|
||||||
void R_MapTiltedPlane(int y, int x1);
|
void R_MapTiltedPlane(int y, int x1);
|
||||||
|
|
|
||||||
1701
src/r_draw_tc.cpp
1701
src/r_draw_tc.cpp
File diff suppressed because it is too large
Load diff
239
src/r_draw_tc.h
239
src/r_draw_tc.h
|
|
@ -1,239 +0,0 @@
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "r_defs.h"
|
|
||||||
|
|
||||||
struct FSWColormap;
|
|
||||||
|
|
||||||
EXTERN_CVAR(Bool, r_multithreaded);
|
|
||||||
EXTERN_CVAR(Bool, r_magfilter);
|
|
||||||
EXTERN_CVAR(Bool, r_minfilter);
|
|
||||||
EXTERN_CVAR(Bool, r_mipmap);
|
|
||||||
EXTERN_CVAR(Float, r_lod_bias);
|
|
||||||
EXTERN_CVAR(Int, r_drawfuzz);
|
|
||||||
EXTERN_CVAR(Bool, r_drawtrans);
|
|
||||||
EXTERN_CVAR(Float, transsouls);
|
|
||||||
EXTERN_CVAR(Int, r_columnmethod);
|
|
||||||
|
|
||||||
namespace swrenderer
|
|
||||||
{
|
|
||||||
struct vissprite_t;
|
|
||||||
|
|
||||||
struct ShadeConstants
|
|
||||||
{
|
|
||||||
uint16_t light_alpha;
|
|
||||||
uint16_t light_red;
|
|
||||||
uint16_t light_green;
|
|
||||||
uint16_t light_blue;
|
|
||||||
uint16_t fade_alpha;
|
|
||||||
uint16_t fade_red;
|
|
||||||
uint16_t fade_green;
|
|
||||||
uint16_t fade_blue;
|
|
||||||
uint16_t desaturate;
|
|
||||||
bool simple_shade;
|
|
||||||
};
|
|
||||||
|
|
||||||
extern double dc_texturemid;
|
|
||||||
|
|
||||||
namespace drawerargs
|
|
||||||
{
|
|
||||||
extern int dc_pitch;
|
|
||||||
extern lighttable_t *dc_colormap;
|
|
||||||
extern FSWColormap *dc_fcolormap;
|
|
||||||
extern ShadeConstants dc_shade_constants;
|
|
||||||
extern fixed_t dc_light;
|
|
||||||
extern int dc_x;
|
|
||||||
extern int dc_yl;
|
|
||||||
extern int dc_yh;
|
|
||||||
extern fixed_t dc_iscale;
|
|
||||||
extern fixed_t dc_texturefrac;
|
|
||||||
extern uint32_t dc_textureheight;
|
|
||||||
extern int dc_color;
|
|
||||||
extern uint32_t dc_srccolor;
|
|
||||||
extern uint32_t dc_srccolor_bgra;
|
|
||||||
extern uint32_t *dc_srcblend;
|
|
||||||
extern uint32_t *dc_destblend;
|
|
||||||
extern fixed_t dc_srcalpha;
|
|
||||||
extern fixed_t dc_destalpha;
|
|
||||||
extern const uint8_t *dc_source;
|
|
||||||
extern const uint8_t *dc_source2;
|
|
||||||
extern uint32_t dc_texturefracx;
|
|
||||||
extern uint8_t *dc_translation;
|
|
||||||
extern uint8_t *dc_dest;
|
|
||||||
extern uint8_t *dc_destorg;
|
|
||||||
extern int dc_destheight;
|
|
||||||
extern int dc_count;
|
|
||||||
|
|
||||||
extern bool drawer_needs_pal_input;
|
|
||||||
|
|
||||||
extern uint32_t vplce[4];
|
|
||||||
extern uint32_t vince[4];
|
|
||||||
extern uint8_t *palookupoffse[4];
|
|
||||||
extern fixed_t palookuplight[4];
|
|
||||||
extern const uint8_t *bufplce[4];
|
|
||||||
extern const uint8_t *bufplce2[4];
|
|
||||||
extern uint32_t buftexturefracx[4];
|
|
||||||
extern uint32_t bufheight[4];
|
|
||||||
extern int vlinebits;
|
|
||||||
extern int mvlinebits;
|
|
||||||
extern int tmvlinebits;
|
|
||||||
|
|
||||||
extern int ds_y;
|
|
||||||
extern int ds_x1;
|
|
||||||
extern int ds_x2;
|
|
||||||
extern lighttable_t * ds_colormap;
|
|
||||||
extern FSWColormap *ds_fcolormap;
|
|
||||||
extern ShadeConstants ds_shade_constants;
|
|
||||||
extern dsfixed_t ds_light;
|
|
||||||
extern dsfixed_t ds_xfrac;
|
|
||||||
extern dsfixed_t ds_yfrac;
|
|
||||||
extern dsfixed_t ds_xstep;
|
|
||||||
extern dsfixed_t ds_ystep;
|
|
||||||
extern int ds_xbits;
|
|
||||||
extern int ds_ybits;
|
|
||||||
extern fixed_t ds_alpha;
|
|
||||||
extern double ds_lod;
|
|
||||||
extern const uint8_t *ds_source;
|
|
||||||
extern bool ds_source_mipmapped;
|
|
||||||
extern int ds_color;
|
|
||||||
|
|
||||||
extern unsigned int dc_tspans[4][MAXHEIGHT];
|
|
||||||
extern unsigned int *dc_ctspan[4];
|
|
||||||
extern unsigned int *horizspan[4];
|
|
||||||
}
|
|
||||||
|
|
||||||
extern int ylookup[MAXHEIGHT];
|
|
||||||
extern uint8_t shadetables[/*NUMCOLORMAPS*16*256*/];
|
|
||||||
extern FDynamicColormap ShadeFakeColormap[16];
|
|
||||||
extern uint8_t identitymap[256];
|
|
||||||
extern FDynamicColormap identitycolormap;
|
|
||||||
|
|
||||||
// Spectre/Invisibility.
|
|
||||||
#define FUZZTABLE 50
|
|
||||||
extern int fuzzoffset[FUZZTABLE + 1];
|
|
||||||
extern int fuzzpos;
|
|
||||||
extern int fuzzviewheight;
|
|
||||||
|
|
||||||
extern bool r_swtruecolor;
|
|
||||||
|
|
||||||
void R_InitColumnDrawers();
|
|
||||||
void R_InitShadeMaps();
|
|
||||||
void R_InitFuzzTable(int fuzzoff);
|
|
||||||
|
|
||||||
enum ESPSResult
|
|
||||||
{
|
|
||||||
DontDraw, // not useful to draw this
|
|
||||||
DoDraw0, // draw this as if r_columnmethod is 0
|
|
||||||
DoDraw1, // draw this as if r_columnmethod is 1
|
|
||||||
};
|
|
||||||
|
|
||||||
ESPSResult R_SetPatchStyle(FRenderStyle style, fixed_t alpha, int translation, uint32_t color);
|
|
||||||
ESPSResult R_SetPatchStyle(FRenderStyle style, float alpha, int translation, uint32_t color);
|
|
||||||
void R_FinishSetPatchStyle(); // Call this after finished drawing the current thing, in case its style was STYLE_Shade
|
|
||||||
bool R_GetTransMaskDrawers(fixed_t(**tmvline1)(), void(**tmvline4)());
|
|
||||||
|
|
||||||
const uint8_t *R_GetColumn(FTexture *tex, int col);
|
|
||||||
void wallscan(int x1, int x2, short *uwal, short *dwal, float *swal, fixed_t *lwal, double yrepeat, const uint8_t *(*getcol)(FTexture *tex, int col) = R_GetColumn);
|
|
||||||
void maskwallscan(int x1, int x2, short *uwal, short *dwal, float *swal, fixed_t *lwal, double yrepeat, const uint8_t *(*getcol)(FTexture *tex, int col) = R_GetColumn);
|
|
||||||
void transmaskwallscan(int x1, int x2, short *uwal, short *dwal, float *swal, fixed_t *lwal, double yrepeat, const uint8_t *(*getcol)(FTexture *tex, int col) = R_GetColumn);
|
|
||||||
|
|
||||||
void rt_initcols(uint8_t *buffer = nullptr);
|
|
||||||
void rt_span_coverage(int x, int start, int stop);
|
|
||||||
void rt_draw4cols(int sx);
|
|
||||||
void rt_flip_posts();
|
|
||||||
void rt_copy1col(int hx, int sx, int yl, int yh);
|
|
||||||
void rt_copy4cols(int sx, int yl, int yh);
|
|
||||||
void rt_shaded1col(int hx, int sx, int yl, int yh);
|
|
||||||
void rt_shaded4cols(int sx, int yl, int yh);
|
|
||||||
void rt_map1col(int hx, int sx, int yl, int yh);
|
|
||||||
void rt_add1col(int hx, int sx, int yl, int yh);
|
|
||||||
void rt_addclamp1col(int hx, int sx, int yl, int yh);
|
|
||||||
void rt_subclamp1col(int hx, int sx, int yl, int yh);
|
|
||||||
void rt_revsubclamp1col(int hx, int sx, int yl, int yh);
|
|
||||||
void rt_tlate1col(int hx, int sx, int yl, int yh);
|
|
||||||
void rt_tlateadd1col(int hx, int sx, int yl, int yh);
|
|
||||||
void rt_tlateaddclamp1col(int hx, int sx, int yl, int yh);
|
|
||||||
void rt_tlatesubclamp1col(int hx, int sx, int yl, int yh);
|
|
||||||
void rt_tlaterevsubclamp1col(int hx, int sx, int yl, int yh);
|
|
||||||
void rt_map4cols(int sx, int yl, int yh);
|
|
||||||
void rt_add4cols(int sx, int yl, int yh);
|
|
||||||
void rt_addclamp4cols(int sx, int yl, int yh);
|
|
||||||
void rt_subclamp4cols(int sx, int yl, int yh);
|
|
||||||
void rt_revsubclamp4cols(int sx, int yl, int yh);
|
|
||||||
void rt_tlate4cols(int sx, int yl, int yh);
|
|
||||||
void rt_tlateadd4cols(int sx, int yl, int yh);
|
|
||||||
void rt_tlateaddclamp4cols(int sx, int yl, int yh);
|
|
||||||
void rt_tlatesubclamp4cols(int sx, int yl, int yh);
|
|
||||||
void rt_tlaterevsubclamp4cols(int sx, int yl, int yh);
|
|
||||||
void R_DrawColumnHoriz();
|
|
||||||
void R_DrawColumn();
|
|
||||||
void R_DrawFuzzColumn();
|
|
||||||
void R_DrawTranslatedColumn();
|
|
||||||
void R_DrawShadedColumn();
|
|
||||||
void R_FillColumn();
|
|
||||||
void R_FillAddColumn();
|
|
||||||
void R_FillAddClampColumn();
|
|
||||||
void R_FillSubClampColumn();
|
|
||||||
void R_FillRevSubClampColumn();
|
|
||||||
void R_DrawAddColumn();
|
|
||||||
void R_DrawTlatedAddColumn();
|
|
||||||
void R_DrawAddClampColumn();
|
|
||||||
void R_DrawAddClampTranslatedColumn();
|
|
||||||
void R_DrawSubClampColumn();
|
|
||||||
void R_DrawSubClampTranslatedColumn();
|
|
||||||
void R_DrawRevSubClampColumn();
|
|
||||||
void R_DrawRevSubClampTranslatedColumn();
|
|
||||||
void R_DrawSpan();
|
|
||||||
void R_DrawSpanMasked();
|
|
||||||
void R_DrawSpanTranslucent();
|
|
||||||
void R_DrawSpanMaskedTranslucent();
|
|
||||||
void R_DrawSpanAddClamp();
|
|
||||||
void R_DrawSpanMaskedAddClamp();
|
|
||||||
void R_FillSpan();
|
|
||||||
void R_DrawTiltedSpan(int y, int x1, int x2, const FVector3 &plane_sz, const FVector3 &plane_su, const FVector3 &plane_sv, bool plane_shade, int planeshade, float planelightfloat, fixed_t pviewx, fixed_t pviewy);
|
|
||||||
void R_DrawColoredSpan(int y, int x1, int x2);
|
|
||||||
void R_SetupDrawSlab(FSWColormap *base_colormap, float light, int shade);
|
|
||||||
void R_DrawSlab(int dx, fixed_t v, int dy, fixed_t vi, const uint8_t *vptr, uint8_t *p);
|
|
||||||
void R_DrawFogBoundary(int x1, int x2, short *uclip, short *dclip);
|
|
||||||
uint32_t vlinec1();
|
|
||||||
void vlinec4();
|
|
||||||
uint32_t mvlinec1();
|
|
||||||
void mvlinec4();
|
|
||||||
fixed_t tmvline1_add();
|
|
||||||
void tmvline4_add();
|
|
||||||
fixed_t tmvline1_addclamp();
|
|
||||||
void tmvline4_addclamp();
|
|
||||||
fixed_t tmvline1_subclamp();
|
|
||||||
void tmvline4_subclamp();
|
|
||||||
fixed_t tmvline1_revsubclamp();
|
|
||||||
void tmvline4_revsubclamp();
|
|
||||||
void R_FillColumnHoriz();
|
|
||||||
void R_FillSpan();
|
|
||||||
|
|
||||||
inline uint32_t dovline1() { return vlinec1(); }
|
|
||||||
inline void dovline4() { vlinec4(); }
|
|
||||||
inline uint32_t domvline1() { return mvlinec1(); }
|
|
||||||
inline void domvline4() { mvlinec4(); }
|
|
||||||
|
|
||||||
void setupvline(int fracbits);
|
|
||||||
void setupmvline(int fracbits);
|
|
||||||
void setuptmvline(int fracbits);
|
|
||||||
|
|
||||||
void R_DrawSingleSkyCol1(uint32_t solid_top, uint32_t solid_bottom);
|
|
||||||
void R_DrawSingleSkyCol4(uint32_t solid_top, uint32_t solid_bottom);
|
|
||||||
void R_DrawDoubleSkyCol1(uint32_t solid_top, uint32_t solid_bottom);
|
|
||||||
void R_DrawDoubleSkyCol4(uint32_t solid_top, uint32_t solid_bottom);
|
|
||||||
|
|
||||||
// Sets dc_colormap and dc_light to their appropriate values depending on the output format (pal vs true color)
|
|
||||||
void R_SetColorMapLight(FSWColormap *base_colormap, float light, int shade);
|
|
||||||
void R_SetDSColorMapLight(FSWColormap *base_colormap, float light, int shade);
|
|
||||||
void R_SetTranslationMap(lighttable_t *translation);
|
|
||||||
|
|
||||||
void R_SetupSpanBits(FTexture *tex);
|
|
||||||
void R_SetSpanColormap(FDynamicColormap *colormap, int shade);
|
|
||||||
void R_SetSpanSource(FTexture *tex);
|
|
||||||
|
|
||||||
void R_MapTiltedPlane(int y, int x1);
|
|
||||||
void R_MapColoredPlane(int y, int x1);
|
|
||||||
void R_DrawParticle(vissprite_t *);
|
|
||||||
}
|
|
||||||
Loading…
Reference in a new issue