diff --git a/CMakeLists.txt b/CMakeLists.txt
index e12b0d34532546595ea627329eba5e973567c671..25a44f01659a58dcd5b6fcd439b4778970b6b805 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,12 @@
cmake_minimum_required(VERSION 3.0)
+
+file(STRINGS src/version.h SRB2_VERSION)
+string(REGEX MATCH "[0-9]+\\.[0-9.]+" SRB2_VERSION ${SRB2_VERSION})
+
# DO NOT CHANGE THIS SRB2 STRING! Some variable names depend on this string.
# Version change is fine.
project(SRB2
- VERSION 2.2.6
+ VERSION ${SRB2_VERSION}
LANGUAGES C)
if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f222b04edea2276d6f1acabfd74136da6599fa69..2823eadba161a4ef528b765e366b13f37d4c745d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -461,7 +461,6 @@ if(${SRB2_CONFIG_HWRENDER})
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_defs.h
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_dll.h
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_drv.h
- ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_glide.h
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_glob.h
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_light.h
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.h
diff --git a/src/Makefile b/src/Makefile
index eca788f378d011e53cbffac6650f0abd4933565f..2cb0c1b8ca02a06f26ab71ccc2b4804c093934fe 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -657,7 +657,7 @@ ifdef SDL
ifdef MINGW
$(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h \
doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_drv.h screen.h \
- command.h hardware/hw_data.h hardware/hw_glide.h hardware/hw_defs.h \
+ command.h hardware/hw_data.h hardware/hw_defs.h \
hardware/hw_md2.h hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h \
hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \
am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \
@@ -666,7 +666,7 @@ $(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
else
$(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h \
doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_drv.h screen.h \
- command.h hardware/hw_data.h hardware/hw_glide.h hardware/hw_defs.h \
+ command.h hardware/hw_data.h hardware/hw_defs.h \
hardware/hw_md2.h hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h \
hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \
am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \
@@ -744,7 +744,7 @@ ifndef SDL
ifndef NOHW
$(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h \
doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_drv.h screen.h \
- command.h hardware/hw_data.h hardware/hw_glide.h hardware/hw_defs.h \
+ command.h hardware/hw_data.h hardware/hw_defs.h \
hardware/hw_md2.h hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h \
hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \
am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \
@@ -753,7 +753,7 @@ $(OBJDIR)/r_opengl.o: hardware/r_opengl/r_opengl.c hardware/r_opengl/r_opengl.h
$(OBJDIR)/ogl_win.o: hardware/r_opengl/ogl_win.c hardware/r_opengl/r_opengl.h \
doomdef.h doomtype.h g_state.h m_swap.h hardware/hw_drv.h screen.h \
- command.h hardware/hw_data.h hardware/hw_glide.h hardware/hw_defs.h \
+ command.h hardware/hw_data.h hardware/hw_defs.h \
hardware/hw_md2.h hardware/hw_glob.h hardware/hw_main.h hardware/hw_clip.h \
hardware/hw_md2load.h hardware/hw_md3load.h hardware/hw_model.h hardware/u_list.h \
am_map.h d_event.h d_player.h p_pspr.h m_fixed.h tables.h info.h d_think.h \
diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index 23e6027981a94bcb652c31d68a92cdfb481c4244..4a2c0687be1a4ce7a448ffe47043c0cc25f3e2c9 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -47,7 +47,7 @@ endif
# Automatically set version flag, but not if one was manually set
ifeq (,$(filter GCC%,$(.VARIABLES)))
- ifneq (,$(findstring GCC,$(shell $(CC) --version))) # if it's GCC
+ ifneq (,$(findstring gcc,$(shell $(CC) --version))) # if it's GCC
version:=$(shell $(CC) -dumpversion)
# Turn version into words of major, minor
diff --git a/src/command.c b/src/command.c
index 6fd8c11f9540c4cc04e7766e09b358c8d86f3b86..4973812e7c14bf87c951c92ed385b6d1689b04a1 100644
--- a/src/command.c
+++ b/src/command.c
@@ -626,7 +626,7 @@ static void COM_ExecuteString(char *ptext)
// check cvars
// Hurdler: added at Ebola's request ;)
- // (don't flood the console in software mode with bad gr_xxx command)
+ // (don't flood the console in software mode with bad gl_xxx command)
if (!CV_Command() && con_destlines)
CONS_Printf(M_GetText("Unknown command '%s'\n"), COM_Argv(0));
}
diff --git a/src/d_main.c b/src/d_main.c
index d953f3c0981dbddf415fdfdf0cc65399197c15db..d14f6b7aa1b57488f540ba0b7fbcb5e156c39868 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -94,6 +94,10 @@ int snprintf(char *str, size_t n, const char *fmt, ...);
#include "lua_script.h"
+// Version numbers for netplay :upside_down_face:
+int VERSION;
+int SUBVERSION;
+
// platform independant focus loss
UINT8 window_notinfocus = false;
@@ -628,7 +632,7 @@ static void D_Display(void)
snprintf(s, sizeof s - 1, "SysMiss %.2f%%", lostpercent);
V_DrawRightAlignedString(BASEVIDWIDTH, BASEVIDHEIGHT-ST_HEIGHT-10, V_YELLOWMAP, s);
}
-
+
if (cv_renderstats.value)
{
char s[50];
@@ -637,7 +641,7 @@ static void D_Display(void)
rs_prevframetime = I_GetTimeMicros();
if (rs_rendercalltime > 10000) divisor = 1000;
-
+
snprintf(s, sizeof s - 1, "ft %d", frametime / divisor);
V_DrawThinString(30, 10, V_MONOSPACE | V_YELLOWMAP, s);
snprintf(s, sizeof s - 1, "rtot %d", rs_rendercalltime / divisor);
@@ -664,7 +668,7 @@ static void D_Display(void)
V_DrawThinString(30, 70, V_MONOSPACE | V_YELLOWMAP, s);
snprintf(s, sizeof s - 1, "fin %d", rs_swaptime / divisor);
V_DrawThinString(30, 80, V_MONOSPACE | V_YELLOWMAP, s);
- if (cv_grbatching.value)
+ if (cv_glbatching.value)
{
snprintf(s, sizeof s - 1, "bsrt %d", rs_hw_batchsorttime / divisor);
V_DrawThinString(80, 55, V_MONOSPACE | V_REDMAP, s);
@@ -1171,6 +1175,21 @@ static inline void D_Titlebar(void)
}
#endif
+static void
+D_ConvertVersionNumbers (void)
+{
+ /* leave at defaults (0) under DEVELOP */
+#ifndef DEVELOP
+ int major;
+ int minor;
+
+ sscanf(SRB2VERSION, "%d.%d.%d", &major, &minor, &SUBVERSION);
+
+ /* this is stupid */
+ VERSION = ( major * 100 ) + minor;
+#endif
+}
+
//
// D_SRB2Main
//
@@ -1181,6 +1200,9 @@ void D_SRB2Main(void)
INT32 pstartmap = 1;
boolean autostart = false;
+ /* break the version string into version numbers, for netplay */
+ D_ConvertVersionNumbers();
+
// Print GPL notice for our console users (Linux)
CONS_Printf(
"\n\nSonic Robo Blast 2\n"
diff --git a/src/dehacked.c b/src/dehacked.c
index 99d4883f6de75ebec0e3275a7d19e0c04a4f248a..d02dc3d24ae797a5fe628bab54570e186d55bc79 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -9484,8 +9484,6 @@ struct {
{"PUSHACCEL",PUSHACCEL},
{"MODID",MODID}, // I don't know, I just thought it would be cool for a wad to potentially know what mod it was loaded into.
{"CODEBASE",CODEBASE}, // or what release of SRB2 this is.
- {"VERSION",VERSION}, // Grab the game's version!
- {"SUBVERSION",SUBVERSION}, // more precise version number
{"NEWTICRATE",NEWTICRATE}, // TICRATE*NEWTICRATERATIO
{"NEWTICRATERATIO",NEWTICRATERATIO},
diff --git a/src/doomdef.h b/src/doomdef.h
index 8853b4aae4978239a367bdbab7f94e764594e27f..fab83d38c1a2dd4885a9750fc2c5a66a95457ece 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -86,6 +86,7 @@
// warning C4213: nonstandard extension used : cast on l-value
+#include "version.h"
#include "doomtype.h"
#include <stdarg.h>
@@ -135,21 +136,17 @@ extern char logfilename[1024];
//#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
#ifdef DEVELOP
-#define VERSION 0 // Game version
-#define SUBVERSION 0 // more precise version number
#define VERSIONSTRING "Development EXE"
-#define VERSIONSTRINGW L"Development EXE"
// most interface strings are ignored in development mode.
// we use comprevision and compbranch instead.
#else
-#define VERSION 202 // Game version
-#define SUBVERSION 6 // more precise version number
-#define VERSIONSTRING "v2.2.6"
-#define VERSIONSTRINGW L"v2.2.6"
+#define VERSIONSTRING "v"SRB2VERSION
// Hey! If you change this, add 1 to the MODVERSION below!
// Otherwise we can't force updates!
#endif
+#define VERSIONSTRINGW WSTRING (VERSIONSTRING)
+
/* A custom URL protocol for server links. */
#define SERVER_URL_PROTOCOL "srb2://"
@@ -204,17 +201,6 @@ extern char logfilename[1024];
// Will always resemble the versionstring, 205 = 2.0.5, 210 = 2.1, etc.
#define CODEBASE 220
-// The Modification ID; must be obtained from a Master Server Admin ( https://mb.srb2.org/showgroups.php ).
-// DO NOT try to set this otherwise, or your modification will be unplayable through the Master Server.
-// "18" is the default mod ID for version 2.2
-#define MODID 18
-
-// The Modification Version, starting from 1. Do not follow your version string for this,
-// it's only for detection of the version the player is using so the MS can alert them of an update.
-// Only set it higher, not lower, obviously.
-// Note that we use this to help keep internal testing in check; this is why v2.2.0 is not version "1".
-#define MODVERSION 47
-
// To version config.cfg, MAJOREXECVERSION is set equal to MODVERSION automatically.
// Increment MINOREXECVERSION whenever a config change is needed that does not correspond
// to an increment in MODVERSION. This might never happen in practice.
@@ -503,6 +489,8 @@ char *sizeu4(size_t num);
char *sizeu5(size_t num);
// d_main.c
+extern int VERSION;
+extern int SUBVERSION;
extern boolean devparm; // development mode (-debug)
// d_netcmd.c
extern INT32 cv_debug;
diff --git a/src/doomtype.h b/src/doomtype.h
index 571e930e0b540f08a923fb033a9d7c4951cae54c..0aa3e23e05b74613b690993450e87b5dad6e800d 100644
--- a/src/doomtype.h
+++ b/src/doomtype.h
@@ -367,4 +367,8 @@ typedef UINT32 tic_t;
#define UINT2RGBA(a) (UINT32)((a&0xff)<<24)|((a&0xff00)<<8)|((a&0xff0000)>>8)|(((UINT32)a&0xff000000)>>24)
#endif
+/* preprocessor dumb and needs second macro to expand input */
+#define WSTRING2(s) L ## s
+#define WSTRING(s) WSTRING2 (s)
+
#endif //__DOOMTYPE__
diff --git a/src/f_finale.c b/src/f_finale.c
index 4fa58aaf6e8329498261530c681e2dec2ca26804..36c51de51824040af7e16f3415de9e151b5193c5 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1691,7 +1691,7 @@ void F_GameEvaluationDrawer(void)
endingtext = va("%s & %s, %s%s", skins[players[consoleplayer].skin].realname, skins[botskin-1].realname, rtatext, cuttext);
else
endingtext = va("%s, %s%s", skins[players[consoleplayer].skin].realname, rtatext, cuttext);
- V_DrawCenteredString(BASEVIDWIDTH/2, 182, (ultimatemode ? V_REDMAP : V_YELLOWMAP), endingtext);
+ V_DrawCenteredString(BASEVIDWIDTH/2, 182, V_SNAPTOBOTTOM|(ultimatemode ? V_REDMAP : V_YELLOWMAP), endingtext);
}
}
diff --git a/src/g_game.c b/src/g_game.c
index 69aac5065dc5f523811fbf72d53840bf78ce2394..cce4ac822b65e5ddb1248e52be6663353a9d7ac9 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4505,7 +4505,7 @@ void G_SaveGame(UINT32 slot, INT16 mapnum)
{
UINT32 writetime = marathontime;
if (!(marathonmode & MA_INGAME))
- marathontime += TICRATE*5; // live event backup penalty because we don't know how long it takes to get to the next map
+ writetime += TICRATE*5; // live event backup penalty because we don't know how long it takes to get to the next map
WRITEUINT32(save_p, writetime);
WRITEUINT8(save_p, (marathonmode & ~MA_INIT));
}
diff --git a/src/hardware/hw_batching.c b/src/hardware/hw_batching.c
index 5c5379f6ddee431a9e3eb0948898a51838d3b099..492cea5fa13653163bfef64c6581ceb1b55280df 100644
--- a/src/hardware/hw_batching.c
+++ b/src/hardware/hw_batching.c
@@ -250,7 +250,7 @@ void HWR_RenderBatches(void)
// sort polygons
rs_hw_batchsorttime = I_GetTimeMicros();
- if (cv_grshaders.value && gr_shadersavailable)
+ if (cv_glshaders.value && gl_shadersavailable)
qsort(polygonIndexArray, polygonArraySize, sizeof(unsigned int), comparePolygons);
else
qsort(polygonIndexArray, polygonArraySize, sizeof(unsigned int), comparePolygonsNoShaders);
@@ -272,8 +272,8 @@ void HWR_RenderBatches(void)
// and a color array could replace the color calls.
// set state for first batch
-
- if (cv_grshaders.value && gr_shadersavailable)
+
+ if (cv_glshaders.value && gl_shadersavailable)
{
HWD.pfnSetShader(currentShader);
}
@@ -355,7 +355,7 @@ void HWR_RenderBatches(void)
nextSurfaceInfo = polygonArray[nextIndex].surf;
if (nextPolyFlags & PF_NoTexture)
nextTexture = 0;
- if (currentShader != nextShader && cv_grshaders.value && gr_shadersavailable)
+ if (currentShader != nextShader && cv_glshaders.value && gl_shadersavailable)
{
changeState = true;
changeShader = true;
@@ -370,7 +370,7 @@ void HWR_RenderBatches(void)
changeState = true;
changePolyFlags = true;
}
- if (cv_grshaders.value && gr_shadersavailable)
+ if (cv_glshaders.value && gl_shadersavailable)
{
if (currentSurfaceInfo.PolyColor.rgba != nextSurfaceInfo.PolyColor.rgba ||
currentSurfaceInfo.TintColor.rgba != nextSurfaceInfo.TintColor.rgba ||
diff --git a/src/hardware/hw_bsp.c b/src/hardware/hw_bsp.c
index 6987e9d01c6adaab73016fa8becd403b2d9a3dd7..4db69ff8b130b00eb46c403f8a47a8c86e535947 100644
--- a/src/hardware/hw_bsp.c
+++ b/src/hardware/hw_bsp.c
@@ -61,17 +61,17 @@ static INT32 totalsubsecpolys = 0;
/// \todo check out how much is used
static size_t POLYPOOLSIZE = 1024000;
-static UINT8 *gr_polypool = NULL;
-static UINT8 *gr_ppcurrent;
-static size_t gr_ppfree;
+static UINT8 *gl_polypool = NULL;
+static UINT8 *gl_ppcurrent;
+static size_t gl_ppfree;
#endif
// only between levels, clear poly pool
static void HWR_ClearPolys(void)
{
#ifndef ZPLANALLOC
- gr_ppcurrent = gr_polypool;
- gr_ppfree = POLYPOOLSIZE;
+ gl_ppcurrent = gl_polypool;
+ gl_ppfree = POLYPOOLSIZE;
#endif
}
@@ -86,8 +86,8 @@ void HWR_InitPolyPool(void)
POLYPOOLSIZE = atoi(myargv[pnum+1])*1024; // (in kb)
CONS_Debug(DBG_RENDER, "HWR_InitPolyPool(): allocating %d bytes\n", POLYPOOLSIZE);
- gr_polypool = malloc(POLYPOOLSIZE);
- if (!gr_polypool)
+ gl_polypool = malloc(POLYPOOLSIZE);
+ if (!gl_polypool)
I_Error("HWR_InitPolyPool(): couldn't malloc polypool\n");
HWR_ClearPolys();
#endif
@@ -96,9 +96,9 @@ void HWR_InitPolyPool(void)
void HWR_FreePolyPool(void)
{
#ifndef ZPLANALLOC
- if (gr_polypool)
- free(gr_polypool);
- gr_polypool = NULL;
+ if (gl_polypool)
+ free(gl_polypool);
+ gl_polypool = NULL;
#endif
}
@@ -110,19 +110,19 @@ static poly_t *HWR_AllocPoly(INT32 numpts)
p = Z_Malloc(size, PU_HWRPLANE, NULL);
#else
#ifdef PARANOIA
- if (!gr_polypool)
- I_Error("Used gr_polypool without init!\n");
- if (!gr_ppcurrent)
- I_Error("gr_ppcurrent == NULL!\n");
+ if (!gl_polypool)
+ I_Error("Used gl_polypool without init!\n");
+ if (!gl_ppcurrent)
+ I_Error("gl_ppcurrent == NULL!\n");
#endif
- if (gr_ppfree < size)
+ if (gl_ppfree < size)
I_Error("HWR_AllocPoly(): no more memory %u bytes left, %u bytes needed\n\n%s\n",
- gr_ppfree, size, "You can try the param -polypoolsize 2048 (or higher if needed)");
+ gl_ppfree, size, "You can try the param -polypoolsize 2048 (or higher if needed)");
- p = (poly_t *)gr_ppcurrent;
- gr_ppcurrent += size;
- gr_ppfree -= size;
+ p = (poly_t *)gl_ppcurrent;
+ gl_ppcurrent += size;
+ gl_ppfree -= size;
#endif
p->numpts = numpts;
return p;
@@ -135,13 +135,13 @@ static polyvertex_t *HWR_AllocVertex(void)
#ifdef ZPLANALLOC
p = Z_Malloc(size, PU_HWRPLANE, NULL);
#else
- if (gr_ppfree < size)
+ if (gl_ppfree < size)
I_Error("HWR_AllocVertex(): no more memory %u bytes left, %u bytes needed\n\n%s\n",
- gr_ppfree, size, "You can try the param -polypoolsize 2048 (or higher if needed)");
+ gl_ppfree, size, "You can try the param -polypoolsize 2048 (or higher if needed)");
- p = (polyvertex_t *)gr_ppcurrent;
- gr_ppcurrent += size;
- gr_ppfree -= size;
+ p = (polyvertex_t *)gl_ppcurrent;
+ gl_ppcurrent += size;
+ gl_ppfree -= size;
#endif
return p;
}
@@ -829,7 +829,7 @@ static INT32 SolveTProblem(void)
INT32 i;
size_t l;
- if (cv_grsolvetjoin.value == 0)
+ if (cv_glsolvetjoin.value == 0)
return 0;
CONS_Debug(DBG_RENDER, "Solving T-joins. This may take a while. Please wait...\n");
@@ -983,9 +983,9 @@ void HWR_CreatePlanePolygons(INT32 bspnum)
I_Error("couldn't malloc extrasubsectors totsubsectors %s\n", sizeu1(totsubsectors));
// allocate table for back to front drawing of subsectors
- /*gr_drawsubsectors = (INT16 *)malloc(sizeof (*gr_drawsubsectors) * totsubsectors);
- if (!gr_drawsubsectors)
- I_Error("couldn't malloc gr_drawsubsectors\n");*/
+ /*gl_drawsubsectors = (INT16 *)malloc(sizeof (*gl_drawsubsectors) * totsubsectors);
+ if (!gl_drawsubsectors)
+ I_Error("couldn't malloc gl_drawsubsectors\n");*/
// number of the first new subsector that might be added
addsubsector = numsubsectors;
diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c
index ab9a50dd5d884ba39ee9acf7c5f850d9589d1f67..ed3b6afee8010f3a8a7ce6e6f4bdb4d2eadcafce 100644
--- a/src/hardware/hw_cache.c
+++ b/src/hardware/hw_cache.c
@@ -27,27 +27,18 @@
#include "../r_patch.h"
#include "../p_setup.h"
-INT32 patchformat = GR_TEXFMT_AP_88; // use alpha for holes
-INT32 textureformat = GR_TEXFMT_P_8; // use chromakey for hole
+INT32 patchformat = GL_TEXFMT_AP_88; // use alpha for holes
+INT32 textureformat = GL_TEXFMT_P_8; // use chromakey for hole
-static const INT32 format2bpp[16] =
+static INT32 format2bpp(GLTextureFormat_t format)
{
- 0, //0
- 0, //1
- 1, //2 GR_TEXFMT_ALPHA_8
- 1, //3 GR_TEXFMT_INTENSITY_8
- 1, //4 GR_TEXFMT_ALPHA_INTENSITY_44
- 1, //5 GR_TEXFMT_P_8
- 4, //6 GR_RGBA
- 0, //7
- 0, //8
- 0, //9
- 2, //10 GR_TEXFMT_RGB_565
- 2, //11 GR_TEXFMT_ARGB_1555
- 2, //12 GR_TEXFMT_ARGB_4444
- 2, //13 GR_TEXFMT_ALPHA_INTENSITY_88
- 2, //14 GR_TEXFMT_AP_88
-};
+ if (format == GL_TEXFMT_RGBA)
+ return 4;
+ else if (format == GL_TEXFMT_ALPHA_INTENSITY_88 || format == GL_TEXFMT_AP_88)
+ return 2;
+ else
+ return 1;
+}
// This code was originally placed directly in HWR_DrawPatchInCache.
// It is now split from it for my sanity! (and the sanity of others)
@@ -126,7 +117,7 @@ static void HWR_DrawColumnInCache(const column_t *patchcol, UINT8 *block, GLMipm
{
case 2 : // uhhhhhhhh..........
if ((originPatch != NULL) && (originPatch->style != AST_COPY))
- texel = ASTBlendPixel_8bpp(*(dest+1), texel, originPatch->style, originPatch->alpha);
+ texel = ASTBlendPaletteIndexes(*(dest+1), texel, originPatch->style, originPatch->alpha);
texelu16 = (UINT16)((alpha<<8) | texel);
memcpy(dest, &texelu16, sizeof(UINT16));
break;
@@ -135,7 +126,7 @@ static void HWR_DrawColumnInCache(const column_t *patchcol, UINT8 *block, GLMipm
{
RGBA_t rgbatexel;
rgbatexel.rgba = *(UINT32 *)dest;
- colortemp.rgba = ASTBlendPixel(rgbatexel, colortemp, originPatch->style, originPatch->alpha);
+ colortemp.rgba = ASTBlendTexturePixel(rgbatexel, colortemp, originPatch->style, originPatch->alpha);
}
memcpy(dest, &colortemp, sizeof(RGBA_t)-sizeof(UINT8));
break;
@@ -145,14 +136,14 @@ static void HWR_DrawColumnInCache(const column_t *patchcol, UINT8 *block, GLMipm
{
RGBA_t rgbatexel;
rgbatexel.rgba = *(UINT32 *)dest;
- colortemp.rgba = ASTBlendPixel(rgbatexel, colortemp, originPatch->style, originPatch->alpha);
+ colortemp.rgba = ASTBlendTexturePixel(rgbatexel, colortemp, originPatch->style, originPatch->alpha);
}
memcpy(dest, &colortemp, sizeof(RGBA_t));
break;
// default is 1
default:
if ((originPatch != NULL) && (originPatch->style != AST_COPY))
- *dest = ASTBlendPixel_8bpp(*dest, texel, originPatch->style, originPatch->alpha);
+ *dest = ASTBlendPaletteIndexes(*dest, texel, originPatch->style, originPatch->alpha);
else
*dest = texel;
break;
@@ -238,7 +229,7 @@ static void HWR_DrawFlippedColumnInCache(const column_t *patchcol, UINT8 *block,
{
case 2 : // uhhhhhhhh..........
if ((originPatch != NULL) && (originPatch->style != AST_COPY))
- texel = ASTBlendPixel_8bpp(*(dest+1), texel, originPatch->style, originPatch->alpha);
+ texel = ASTBlendPaletteIndexes(*(dest+1), texel, originPatch->style, originPatch->alpha);
texelu16 = (UINT16)((alpha<<8) | texel);
memcpy(dest, &texelu16, sizeof(UINT16));
break;
@@ -247,7 +238,7 @@ static void HWR_DrawFlippedColumnInCache(const column_t *patchcol, UINT8 *block,
{
RGBA_t rgbatexel;
rgbatexel.rgba = *(UINT32 *)dest;
- colortemp.rgba = ASTBlendPixel(rgbatexel, colortemp, originPatch->style, originPatch->alpha);
+ colortemp.rgba = ASTBlendTexturePixel(rgbatexel, colortemp, originPatch->style, originPatch->alpha);
}
memcpy(dest, &colortemp, sizeof(RGBA_t)-sizeof(UINT8));
break;
@@ -257,14 +248,14 @@ static void HWR_DrawFlippedColumnInCache(const column_t *patchcol, UINT8 *block,
{
RGBA_t rgbatexel;
rgbatexel.rgba = *(UINT32 *)dest;
- colortemp.rgba = ASTBlendPixel(rgbatexel, colortemp, originPatch->style, originPatch->alpha);
+ colortemp.rgba = ASTBlendTexturePixel(rgbatexel, colortemp, originPatch->style, originPatch->alpha);
}
memcpy(dest, &colortemp, sizeof(RGBA_t));
break;
// default is 1
default:
if ((originPatch != NULL) && (originPatch->style != AST_COPY))
- *dest = ASTBlendPixel_8bpp(*dest, texel, originPatch->style, originPatch->alpha);
+ *dest = ASTBlendPaletteIndexes(*dest, texel, originPatch->style, originPatch->alpha);
else
*dest = texel;
break;
@@ -292,7 +283,7 @@ static void HWR_DrawPatchInCache(GLMipmap_t *mipmap,
fixed_t xfrac, xfracstep;
fixed_t yfracstep, scale_y;
const column_t *patchcol;
- UINT8 *block = mipmap->grInfo.data;
+ UINT8 *block = mipmap->data;
INT32 bpp;
INT32 blockmodulo;
@@ -307,7 +298,7 @@ static void HWR_DrawPatchInCache(GLMipmap_t *mipmap,
yfracstep = FRACUNIT;
scale_y = FRACUNIT;
- bpp = format2bpp[mipmap->grInfo.format];
+ bpp = format2bpp(mipmap->format);
if (bpp < 1 || bpp > 4)
I_Error("HWR_DrawPatchInCache: no drawer defined for this bpp (%d)\n",bpp);
@@ -339,7 +330,7 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
fixed_t xfrac, xfracstep;
fixed_t yfracstep, scale_y;
const column_t *patchcol;
- UINT8 *block = mipmap->grInfo.data;
+ UINT8 *block = mipmap->data;
INT32 bpp;
INT32 blockmodulo;
INT32 width, height;
@@ -400,7 +391,7 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
yfracstep = (texture->height<< FRACBITS) / pblockheight;
scale_y = (pblockheight << FRACBITS) / texture->height;
- bpp = format2bpp[mipmap->grInfo.format];
+ bpp = format2bpp(mipmap->format);
if (bpp < 1 || bpp > 4)
I_Error("HWR_DrawPatchInCache: no drawer defined for this bpp (%d)\n",bpp);
@@ -431,8 +422,8 @@ static UINT8 *MakeBlock(GLMipmap_t *grMipmap)
UINT16 bu16 = ((0x00 <<8) | HWR_PATCHES_CHROMAKEY_COLORINDEX);
INT32 blocksize = (grMipmap->width * grMipmap->height);
- bpp = format2bpp[grMipmap->grInfo.format];
- block = Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(grMipmap->grInfo.data));
+ bpp = format2bpp(grMipmap->format);
+ block = Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(grMipmap->data));
switch (bpp)
{
@@ -453,7 +444,7 @@ static UINT8 *MakeBlock(GLMipmap_t *grMipmap)
// Create a composite texture from patches, adapt the texture size to a power of 2
// height and width for the hardware texture cache.
//
-static void HWR_GenerateTexture(INT32 texnum, GLTexture_t *grtex)
+static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *grtex)
{
UINT8 *block;
texture_t *texture;
@@ -483,7 +474,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLTexture_t *grtex)
grtex->mipmap.width = (UINT16)texture->width;
grtex->mipmap.height = (UINT16)texture->height;
- grtex->mipmap.grInfo.format = textureformat;
+ grtex->mipmap.format = textureformat;
blockwidth = texture->width;
blockheight = texture->height;
@@ -537,7 +528,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLTexture_t *grtex)
Z_Unlock(realpatch);
}
//Hurdler: not efficient at all but I don't remember exactly how HWR_DrawPatchInCache works :(
- if (format2bpp[grtex->mipmap.grInfo.format]==4)
+ if (format2bpp(grtex->mipmap.format)==4)
{
for (i = 3; i < blocksize*4; i += 4) // blocksize*4 because blocksize doesn't include the bpp
{
@@ -581,15 +572,15 @@ void HWR_MakePatch (const patch_t *patch, GLPatch_t *grPatch, GLMipmap_t *grMipm
// no wrap around, no chroma key
grMipmap->flags = 0;
// setup the texture info
- grMipmap->grInfo.format = patchformat;
+ grMipmap->format = patchformat;
//grPatch->max_s = grPatch->max_t = 1.0f;
grPatch->max_s = (float)grPatch->width / (float)grMipmap->width;
grPatch->max_t = (float)grPatch->height / (float)grMipmap->height;
}
- Z_Free(grMipmap->grInfo.data);
- grMipmap->grInfo.data = NULL;
+ Z_Free(grMipmap->data);
+ grMipmap->data = NULL;
if (makebitmap)
{
@@ -607,14 +598,14 @@ void HWR_MakePatch (const patch_t *patch, GLPatch_t *grPatch, GLMipmap_t *grMipm
// CACHING HANDLING
// =================================================
-static size_t gr_numtextures = 0; // Texture count
-static GLTexture_t *gr_textures; // For all textures
-static GLTexture_t *gr_flats; // For all (texture) flats, as normal flats don't need to be cached
+static size_t gl_numtextures = 0; // Texture count
+static GLMapTexture_t *gl_textures; // For all textures
+static GLMapTexture_t *gl_flats; // For all (texture) flats, as normal flats don't need to be cached
void HWR_InitTextureCache(void)
{
- gr_textures = NULL;
- gr_flats = NULL;
+ gl_textures = NULL;
+ gl_flats = NULL;
}
// Callback function for HWR_FreeTextureCache.
@@ -648,9 +639,9 @@ static void FreeMipmapColormap(INT32 patchnum, void *patch)
pat->mipmap->nextcolormap = next->nextcolormap;
// Free image data from memory.
- if (next->grInfo.data)
- Z_Free(next->grInfo.data);
- next->grInfo.data = NULL;
+ if (next->data)
+ Z_Free(next->data);
+ next->data = NULL;
// Free the old colormap mipmap from memory.
free(next);
@@ -682,13 +673,13 @@ void HWR_FreeTextureCache(void)
// now the heap don't have any 'user' pointing to our
// texturecache info, we can free it
- if (gr_textures)
- free(gr_textures);
- if (gr_flats)
- free(gr_flats);
- gr_textures = NULL;
- gr_flats = NULL;
- gr_numtextures = 0;
+ if (gl_textures)
+ free(gl_textures);
+ if (gl_flats)
+ free(gl_flats);
+ gl_textures = NULL;
+ gl_flats = NULL;
+ gl_numtextures = 0;
}
void HWR_LoadTextures(size_t pnumtextures)
@@ -697,13 +688,13 @@ void HWR_LoadTextures(size_t pnumtextures)
HWR_FreeTextureCache();
// Why not Z_Malloc?
- gr_numtextures = pnumtextures;
- gr_textures = calloc(gr_numtextures, sizeof(*gr_textures));
- gr_flats = calloc(gr_numtextures, sizeof(*gr_flats));
+ gl_numtextures = pnumtextures;
+ gl_textures = calloc(gl_numtextures, sizeof(*gl_textures));
+ gl_flats = calloc(gl_numtextures, sizeof(*gl_flats));
// Doesn't tell you which it _is_, but hopefully
// should never ever happen (right?!)
- if ((gr_textures == NULL) || (gr_flats == NULL))
+ if ((gl_textures == NULL) || (gl_flats == NULL))
I_Error("HWR_LoadTextures: ran out of memory for OpenGL textures. Sad!");
}
@@ -713,7 +704,7 @@ void HWR_SetPalette(RGBA_t *palette)
// hardware driver will flush there own cache if cache is non paletized
// now flush data texture cache so 32 bit texture are recomputed
- if (patchformat == GR_RGBA || textureformat == GR_RGBA)
+ if (patchformat == GL_TEXFMT_RGBA || textureformat == GL_TEXFMT_RGBA)
{
Z_FreeTag(PU_HWRCACHE);
Z_FreeTag(PU_HWRCACHE_UNLOCKED);
@@ -723,30 +714,30 @@ void HWR_SetPalette(RGBA_t *palette)
// --------------------------------------------------------------------------
// Make sure texture is downloaded and set it as the source
// --------------------------------------------------------------------------
-GLTexture_t *HWR_GetTexture(INT32 tex)
+GLMapTexture_t *HWR_GetTexture(INT32 tex)
{
- GLTexture_t *grtex;
+ GLMapTexture_t *grtex;
#ifdef PARANOIA
- if ((unsigned)tex >= gr_numtextures)
+ if ((unsigned)tex >= gl_numtextures)
I_Error("HWR_GetTexture: tex >= numtextures\n");
#endif
// Every texture in memory, stored in the
// hardware renderer's bit depth format. Wow!
- grtex = &gr_textures[tex];
+ grtex = &gl_textures[tex];
// Generate texture if missing from the cache
- if (!grtex->mipmap.grInfo.data && !grtex->mipmap.downloaded)
+ if (!grtex->mipmap.data && !grtex->mipmap.downloaded)
HWR_GenerateTexture(tex, grtex);
// If hardware does not have the texture, then call pfnSetTexture to upload it
if (!grtex->mipmap.downloaded)
HWD.pfnSetTexture(&grtex->mipmap);
-
+
HWR_SetCurrentTexture(&grtex->mipmap);
// The system-memory data can be purged now.
- Z_ChangeTag(grtex->mipmap.grInfo.data, PU_HWRCACHE_UNLOCKED);
+ Z_ChangeTag(grtex->mipmap.data, PU_HWRCACHE_UNLOCKED);
return grtex;
}
@@ -756,7 +747,7 @@ static void HWR_CacheFlat(GLMipmap_t *grMipmap, lumpnum_t flatlumpnum)
size_t size, pflatsize;
// setup the texture info
- grMipmap->grInfo.format = GR_TEXFMT_P_8;
+ grMipmap->format = GL_TEXFMT_P_8;
grMipmap->flags = TF_WRAPXY|TF_CHROMAKEYED;
size = W_LumpLength(flatlumpnum);
@@ -791,7 +782,7 @@ static void HWR_CacheFlat(GLMipmap_t *grMipmap, lumpnum_t flatlumpnum)
// the flat raw data needn't be converted with palettized textures
W_ReadLump(flatlumpnum, Z_Malloc(W_LumpLength(flatlumpnum),
- PU_HWRCACHE, &grMipmap->grInfo.data));
+ PU_HWRCACHE, &grMipmap->data));
}
static void HWR_CacheTextureAsFlat(GLMipmap_t *grMipmap, INT32 texturenum)
@@ -799,13 +790,13 @@ static void HWR_CacheTextureAsFlat(GLMipmap_t *grMipmap, INT32 texturenum)
UINT8 *flat;
// setup the texture info
- grMipmap->grInfo.format = GR_TEXFMT_P_8;
+ grMipmap->format = GL_TEXFMT_P_8;
grMipmap->flags = TF_WRAPXY|TF_CHROMAKEYED;
grMipmap->width = (UINT16)textures[texturenum]->width;
grMipmap->height = (UINT16)textures[texturenum]->height;
- flat = Z_Malloc(grMipmap->width * grMipmap->height, PU_HWRCACHE, &grMipmap->grInfo.data);
+ flat = Z_Malloc(grMipmap->width * grMipmap->height, PU_HWRCACHE, &grMipmap->data);
memset(flat, TRANSPARENTPIXEL, grMipmap->width * grMipmap->height);
R_TextureToFlat(texturenum, flat);
@@ -819,17 +810,17 @@ void HWR_LiterallyGetFlat(lumpnum_t flatlumpnum)
return;
grmip = HWR_GetCachedGLPatch(flatlumpnum)->mipmap;
- if (!grmip->downloaded && !grmip->grInfo.data)
+ if (!grmip->downloaded && !grmip->data)
HWR_CacheFlat(grmip, flatlumpnum);
// If hardware does not have the texture, then call pfnSetTexture to upload it
if (!grmip->downloaded)
HWD.pfnSetTexture(grmip);
-
+
HWR_SetCurrentTexture(grmip);
// The system-memory data can be purged now.
- Z_ChangeTag(grmip->grInfo.data, PU_HWRCACHE_UNLOCKED);
+ Z_ChangeTag(grmip->data, PU_HWRCACHE_UNLOCKED);
}
void HWR_GetLevelFlat(levelflat_t *levelflat)
@@ -842,10 +833,10 @@ void HWR_GetLevelFlat(levelflat_t *levelflat)
HWR_LiterallyGetFlat(levelflat->u.flat.lumpnum);
else if (levelflat->type == LEVELFLAT_TEXTURE)
{
- GLTexture_t *grtex;
+ GLMapTexture_t *grtex;
INT32 texturenum = levelflat->u.texture.num;
#ifdef PARANOIA
- if ((unsigned)texturenum >= gr_numtextures)
+ if ((unsigned)texturenum >= gl_numtextures)
I_Error("HWR_GetLevelFlat: texturenum >= numtextures\n");
#endif
@@ -854,20 +845,20 @@ void HWR_GetLevelFlat(levelflat_t *levelflat)
return;
// Every texture in memory, stored as a 8-bit flat. Wow!
- grtex = &gr_flats[texturenum];
+ grtex = &gl_flats[texturenum];
// Generate flat if missing from the cache
- if (!grtex->mipmap.grInfo.data && !grtex->mipmap.downloaded)
+ if (!grtex->mipmap.data && !grtex->mipmap.downloaded)
HWR_CacheTextureAsFlat(&grtex->mipmap, texturenum);
// If hardware does not have the texture, then call pfnSetTexture to upload it
if (!grtex->mipmap.downloaded)
HWD.pfnSetTexture(&grtex->mipmap);
-
+
HWR_SetCurrentTexture(&grtex->mipmap);
// The system-memory data can be purged now.
- Z_ChangeTag(grtex->mipmap.grInfo.data, PU_HWRCACHE_UNLOCKED);
+ Z_ChangeTag(grtex->mipmap.data, PU_HWRCACHE_UNLOCKED);
}
else // set no texture
HWR_SetCurrentTexture(NULL);
@@ -879,7 +870,7 @@ void HWR_GetLevelFlat(levelflat_t *levelflat)
//
static void HWR_LoadMappedPatch(GLMipmap_t *grmip, GLPatch_t *gpatch)
{
- if (!grmip->downloaded && !grmip->grInfo.data)
+ if (!grmip->downloaded && !grmip->data)
{
patch_t *patch = gpatch->rawpatch;
if (!patch)
@@ -895,11 +886,11 @@ static void HWR_LoadMappedPatch(GLMipmap_t *grmip, GLPatch_t *gpatch)
// If hardware does not have the texture, then call pfnSetTexture to upload it
if (!grmip->downloaded)
HWD.pfnSetTexture(grmip);
-
+
HWR_SetCurrentTexture(grmip);
// The system-memory data can be purged now.
- Z_ChangeTag(grmip->grInfo.data, PU_HWRCACHE_UNLOCKED);
+ Z_ChangeTag(grmip->data, PU_HWRCACHE_UNLOCKED);
}
// -----------------+
@@ -908,7 +899,7 @@ static void HWR_LoadMappedPatch(GLMipmap_t *grmip, GLPatch_t *gpatch)
void HWR_GetPatch(GLPatch_t *gpatch)
{
// is it in hardware cache
- if (!gpatch->mipmap->downloaded && !gpatch->mipmap->grInfo.data)
+ if (!gpatch->mipmap->downloaded && !gpatch->mipmap->data)
{
// load the software patch, PU_STATIC or the Z_Malloc for hardware patch will
// flush the software patch before the conversion! oh yeah I suffered
@@ -930,7 +921,7 @@ void HWR_GetPatch(GLPatch_t *gpatch)
HWR_SetCurrentTexture(gpatch->mipmap);
// The system-memory patch data can be purged now.
- Z_ChangeTag(gpatch->mipmap->grInfo.data, PU_HWRCACHE_UNLOCKED);
+ Z_ChangeTag(gpatch->mipmap->data, PU_HWRCACHE_UNLOCKED);
}
@@ -980,17 +971,17 @@ void HWR_UnlockCachedPatch(GLPatch_t *gpatch)
if (!gpatch)
return;
- Z_ChangeTag(gpatch->mipmap->grInfo.data, PU_HWRCACHE_UNLOCKED);
+ Z_ChangeTag(gpatch->mipmap->data, PU_HWRCACHE_UNLOCKED);
Z_ChangeTag(gpatch, PU_HWRPATCHINFO_UNLOCKED);
}
static const INT32 picmode2GR[] =
{
- GR_TEXFMT_P_8, // PALETTE
+ GL_TEXFMT_P_8, // PALETTE
0, // INTENSITY (unsupported yet)
- GR_TEXFMT_ALPHA_INTENSITY_88, // INTENSITY_ALPHA (corona use this)
+ GL_TEXFMT_ALPHA_INTENSITY_88, // INTENSITY_ALPHA (corona use this)
0, // RGB24 (unsupported yet)
- GR_RGBA, // RGBA32 (opengl only)
+ GL_TEXFMT_RGBA, // RGBA32 (opengl only)
};
static void HWR_DrawPicInCache(UINT8 *block, INT32 pblockwidth, INT32 pblockheight,
@@ -1005,7 +996,7 @@ static void HWR_DrawPicInCache(UINT8 *block, INT32 pblockwidth, INT32 pblockheig
stepy = ((INT32)SHORT(pic->height)<<FRACBITS)/pblockheight;
stepx = ((INT32)SHORT(pic->width)<<FRACBITS)/pblockwidth;
- picbpp = format2bpp[picmode2GR[pic->mode]];
+ picbpp = format2bpp(picmode2GR[pic->mode]);
posy = 0;
for (j = 0; j < pblockheight; j++)
{
@@ -1065,7 +1056,7 @@ static void HWR_DrawPicInCache(UINT8 *block, INT32 pblockwidth, INT32 pblockheig
GLPatch_t *HWR_GetPic(lumpnum_t lumpnum)
{
GLPatch_t *grpatch = HWR_GetCachedGLPatch(lumpnum);
- if (!grpatch->mipmap->downloaded && !grpatch->mipmap->grInfo.data)
+ if (!grpatch->mipmap->downloaded && !grpatch->mipmap->data)
{
pic_t *pic;
UINT8 *block;
@@ -1083,27 +1074,27 @@ GLPatch_t *HWR_GetPic(lumpnum_t lumpnum)
grpatch->mipmap->height = (UINT16)grpatch->height;
if (pic->mode == PALETTE)
- grpatch->mipmap->grInfo.format = textureformat; // can be set by driver
+ grpatch->mipmap->format = textureformat; // can be set by driver
else
- grpatch->mipmap->grInfo.format = picmode2GR[pic->mode];
+ grpatch->mipmap->format = picmode2GR[pic->mode];
- Z_Free(grpatch->mipmap->grInfo.data);
+ Z_Free(grpatch->mipmap->data);
// allocate block
block = MakeBlock(grpatch->mipmap);
if (grpatch->width == SHORT(pic->width) &&
grpatch->height == SHORT(pic->height) &&
- format2bpp[grpatch->mipmap->grInfo.format] == format2bpp[picmode2GR[pic->mode]])
+ format2bpp(grpatch->mipmap->format) == format2bpp(picmode2GR[pic->mode]))
{
// no conversion needed
- M_Memcpy(grpatch->mipmap->grInfo.data, pic->data,len);
+ M_Memcpy(grpatch->mipmap->data, pic->data,len);
}
else
HWR_DrawPicInCache(block, SHORT(pic->width), SHORT(pic->height),
- SHORT(pic->width)*format2bpp[grpatch->mipmap->grInfo.format],
+ SHORT(pic->width)*format2bpp(grpatch->mipmap->format),
pic,
- format2bpp[grpatch->mipmap->grInfo.format]);
+ format2bpp(grpatch->mipmap->format));
Z_Unlock(pic);
Z_ChangeTag(block, PU_HWRCACHE_UNLOCKED);
@@ -1112,7 +1103,7 @@ GLPatch_t *HWR_GetPic(lumpnum_t lumpnum)
grpatch->max_s = grpatch->max_t = 1.0f;
}
HWD.pfnSetTexture(grpatch->mipmap);
- //CONS_Debug(DBG_RENDER, "picloaded at %x as texture %d\n",grpatch->mipmap.grInfo.data, grpatch->mipmap.downloaded);
+ //CONS_Debug(DBG_RENDER, "picloaded at %x as texture %d\n",grpatch->mipmap.data, grpatch->mipmap.downloaded);
return grpatch;
}
@@ -1145,7 +1136,7 @@ static void HWR_DrawFadeMaskInCache(GLMipmap_t *mipmap, INT32 pblockwidth, INT32
{
INT32 i,j;
fixed_t posx, posy, stepx, stepy;
- UINT8 *block = mipmap->grInfo.data; // places the data directly into here
+ UINT8 *block = mipmap->data; // places the data directly into here
UINT8 *flat;
UINT8 *dest, *src, texel;
RGBA_t col;
@@ -1184,7 +1175,7 @@ static void HWR_CacheFadeMask(GLMipmap_t *grMipmap, lumpnum_t fademasklumpnum)
UINT16 fmheight = 0, fmwidth = 0;
// setup the texture info
- grMipmap->grInfo.format = GR_TEXFMT_ALPHA_8; // put the correct alpha levels straight in so I don't need to convert it later
+ grMipmap->format = GL_TEXFMT_ALPHA_8; // put the correct alpha levels straight in so I don't need to convert it later
grMipmap->flags = 0;
size = W_LumpLength(fademasklumpnum);
@@ -1228,13 +1219,13 @@ static void HWR_CacheFadeMask(GLMipmap_t *grMipmap, lumpnum_t fademasklumpnum)
void HWR_GetFadeMask(lumpnum_t fademasklumpnum)
{
GLMipmap_t *grmip = HWR_GetCachedGLPatch(fademasklumpnum)->mipmap;
- if (!grmip->downloaded && !grmip->grInfo.data)
+ if (!grmip->downloaded && !grmip->data)
HWR_CacheFadeMask(grmip, fademasklumpnum);
HWD.pfnSetTexture(grmip);
// The system-memory data can be purged now.
- Z_ChangeTag(grmip->grInfo.data, PU_HWRCACHE_UNLOCKED);
+ Z_ChangeTag(grmip->data, PU_HWRCACHE_UNLOCKED);
}
#endif //HWRENDER
diff --git a/src/hardware/hw_data.h b/src/hardware/hw_data.h
index 686d522a0d96cb284c057a5fc826d16d9023a54b..e5477d7292b3701a4bb8966c19715c0cd508d881 100644
--- a/src/hardware/hw_data.h
+++ b/src/hardware/hw_data.h
@@ -20,8 +20,6 @@
#endif
#include "../doomdef.h"
-//THIS MUST DISAPPEAR!!!
-#include "hw_glide.h"
#include "../screen.h"
@@ -29,12 +27,27 @@
// TEXTURE INFO
// ==========================================================================
-// grInfo.data holds the address of the graphics data cached in heap memory
+typedef enum GLTextureFormat_e
+{
+ GL_TEXFMT_P_8 = 0x01, /* 8-bit palette */
+ GL_TEXFMT_AP_88 = 0x02, /* 8-bit alpha, 8-bit palette */
+
+ GL_TEXFMT_RGBA = 0x10, /* 32 bit RGBA! */
+
+ GL_TEXFMT_ALPHA_8 = 0x20, /* (0..0xFF) alpha */
+ GL_TEXFMT_INTENSITY_8 = 0x21, /* (0..0xFF) intensity */
+ GL_TEXFMT_ALPHA_INTENSITY_88 = 0x22,
+} GLTextureFormat_t;
+
+// data holds the address of the graphics data cached in heap memory
// NULL if the texture is not in Doom heap cache.
struct GLMipmap_s
{
- GrTexInfo grInfo; //for TexDownloadMipMap
- FxU32 flags;
+ //for TexDownloadMipMap
+ GLTextureFormat_t format;
+ void *data;
+
+ UINT32 flags;
UINT16 height;
UINT16 width;
UINT32 downloaded; // the dll driver have it in there cache ?
@@ -51,13 +64,13 @@ typedef struct GLMipmap_s GLMipmap_t;
//
// Doom texture info, as cached for hardware rendering
//
-struct GLTexture_s
+struct GLMapTexture_s
{
GLMipmap_t mipmap;
float scaleX; //used for scaling textures on walls
float scaleY;
};
-typedef struct GLTexture_s GLTexture_t;
+typedef struct GLMapTexture_s GLMapTexture_t;
// a cached patch as converted to hardware format, holding the original patch_t
diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c
index 3d20cd9b077ea9e0fe06328f00f9385a5da6b244..f5a984d5d3a23ed3bd80d4d7e690bcba8d42422c 100644
--- a/src/hardware/hw_draw.c
+++ b/src/hardware/hw_draw.c
@@ -936,17 +936,17 @@ void HWR_DrawViewBorder(INT32 clearlines)
INT32 basewindowx, basewindowy;
GLPatch_t *patch;
-// if (gr_viewwidth == vid.width)
+// if (gl_viewwidth == vid.width)
// return;
if (!clearlines)
clearlines = BASEVIDHEIGHT; // refresh all
// calc view size based on original game resolution
- baseviewwidth = FixedInt(FixedDiv(FLOAT_TO_FIXED(gr_viewwidth), vid.fdupx)); //(cv_viewsize.value * BASEVIDWIDTH/10)&~7;
- baseviewheight = FixedInt(FixedDiv(FLOAT_TO_FIXED(gr_viewheight), vid.fdupy));
- top = FixedInt(FixedDiv(FLOAT_TO_FIXED(gr_baseviewwindowy), vid.fdupy));
- side = FixedInt(FixedDiv(FLOAT_TO_FIXED(gr_viewwindowx), vid.fdupx));
+ baseviewwidth = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewwidth), vid.fdupx)); //(cv_viewsize.value * BASEVIDWIDTH/10)&~7;
+ baseviewheight = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewheight), vid.fdupy));
+ top = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_baseviewwindowy), vid.fdupy));
+ side = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewwindowx), vid.fdupx));
// top
HWR_DrawFlatFill(0, 0,
diff --git a/src/hardware/hw_glide.h b/src/hardware/hw_glide.h
deleted file mode 100644
index d0eeebaeb7399fa5f4c97f13bd12bf1a59cce7eb..0000000000000000000000000000000000000000
--- a/src/hardware/hw_glide.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// SONIC ROBO BLAST 2
-//-----------------------------------------------------------------------------
-// Copyright (C) 1998-2000 by DooM Legacy Team.
-//
-// This program is free software distributed under the
-// terms of the GNU General Public License, version 2.
-// See the 'LICENSE' file for more details.
-//-----------------------------------------------------------------------------
-/// \file hw_glide.h
-/// \brief Declaration needed by Glide renderer
-/// !!! To be replaced by our own def in the future !!!
-
-#ifndef _GLIDE_H_
-#define _GLIDE_H_
-
-#ifndef __GLIDE_H__
-
-typedef unsigned long FxU32;
-typedef long FxI32;
-
-typedef FxI32 GrTextureFormat_t;
-#define GR_TEXFMT_ALPHA_8 0x2 /* (0..0xFF) alpha */
-#define GR_TEXFMT_INTENSITY_8 0x3 /* (0..0xFF) intensity */
-#define GR_TEXFMT_ALPHA_INTENSITY_44 0x4
-#define GR_TEXFMT_P_8 0x5 /* 8-bit palette */
-#define GR_TEXFMT_RGB_565 0xa
-#define GR_TEXFMT_ARGB_1555 0xb
-#define GR_TEXFMT_ARGB_4444 0xc
-#define GR_TEXFMT_ALPHA_INTENSITY_88 0xd
-#define GR_TEXFMT_AP_88 0xe /* 8-bit alpha 8-bit palette */
-#define GR_RGBA 0x6 // 32 bit RGBA !
-
-typedef struct
-{
- GrTextureFormat_t format;
- void *data;
-} GrTexInfo;
-
-#endif // __GLIDE_H__ (defined in <glide.h>)
-
-#endif // _GLIDE_H_
diff --git a/src/hardware/hw_glob.h b/src/hardware/hw_glob.h
index d8ea7c7a33b7655e9c1375dfb17f646df53bbf32..6ede8448bf88cc6ee2b9a7083546e2b2e059e904 100644
--- a/src/hardware/hw_glob.h
+++ b/src/hardware/hw_glob.h
@@ -59,22 +59,23 @@ typedef struct
// needed for sprite rendering
// equivalent of the software renderer's vissprites
-typedef struct gr_vissprite_s
+typedef struct gl_vissprite_s
{
float x1, x2;
float tz, ty;
+ float tracertz; // for MF2_LINKDRAW sprites, this contains tracer's tz for use in sorting
//lumpnum_t patchlumpnum;
GLPatch_t *gpatch;
boolean flip;
UINT8 translucency; //alpha level 0-255
- mobj_t *mobj;
+ mobj_t *mobj; // NOTE: This is a precipmobj_t if precip is true !!! Watch out.
boolean precip; // Tails 08-25-2002
boolean vflip;
//Hurdler: 25/04/2000: now support colormap in hardware mode
UINT8 *colormap;
INT32 dispoffset; // copy of info->dispoffset, affects ordering but not drawing
float z1, z2;
-} gr_vissprite_t;
+} gl_vissprite_t;
// --------
// hw_bsp.c
@@ -95,7 +96,7 @@ void HWR_FreeExtraSubsectors(void);
void HWR_GetLevelFlat(levelflat_t *levelflat);
void HWR_LiterallyGetFlat(lumpnum_t flatlumpnum);
-GLTexture_t *HWR_GetTexture(INT32 tex);
+GLMapTexture_t *HWR_GetTexture(INT32 tex);
void HWR_GetPatch(GLPatch_t *gpatch);
void HWR_GetMappedPatch(GLPatch_t *gpatch, const UINT8 *colormap);
void HWR_UnlockCachedPatch(GLPatch_t *gpatch);
diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c
index a685994ccd6275e92b9965303a7db669738e0187..32c2d550d4355b02b039bb2a8ee708b9afd17c51 100644
--- a/src/hardware/hw_light.c
+++ b/src/hardware/hw_light.c
@@ -821,7 +821,7 @@ void HWR_WallLighting(FOutVector *wlVerts)
{
int i, j;
- // dynlights->nb == 0 if cv_grdynamiclighting.value is not set
+ // dynlights->nb == 0 if cv_gldynamiclighting.value is not set
for (j = 0; j < dynlights->nb; j++)
{
FVector inter;
@@ -970,7 +970,7 @@ static lumpnum_t coronalumpnum = LUMPERROR;
// --------------------------------------------------------------------------
// coronas lighting
// --------------------------------------------------------------------------
-void HWR_DoCoronasLighting(FOutVector *outVerts, gr_vissprite_t *spr)
+void HWR_DoCoronasLighting(FOutVector *outVerts, gl_vissprite_t *spr)
{
light_t *p_lspr;
@@ -985,7 +985,7 @@ void HWR_DoCoronasLighting(FOutVector *outVerts, gr_vissprite_t *spr)
p_lspr = &lspr[ROCKETEXP_L];
}
- if (cv_grcoronas.value && (p_lspr->type & CORONA_SPR))
+ if (cv_glcoronas.value && (p_lspr->type & CORONA_SPR))
{ // it's an object which emits light
FOutVector light[4];
FSurfaceInfo Surf;
@@ -1010,7 +1010,7 @@ void HWR_DoCoronasLighting(FOutVector *outVerts, gr_vissprite_t *spr)
}
if (size > p_lspr->corona_radius)
size = p_lspr->corona_radius;
- size *= FIXED_TO_FLOAT(cv_grcoronasize.value<<1);
+ size *= FIXED_TO_FLOAT(cv_glcoronasize.value<<1);
// compute position doing average
for (i = 0; i < 4; i++)
@@ -1067,7 +1067,7 @@ void HWR_DrawCoronas(void)
{
int j;
- if (!cv_grcoronas.value || dynlights->nb <= 0 || coronalumpnum == LUMPERROR)
+ if (!cv_glcoronas.value || dynlights->nb <= 0 || coronalumpnum == LUMPERROR)
return;
HWR_GetPic(coronalumpnum); /// \todo use different coronas
@@ -1121,7 +1121,7 @@ void HWR_DrawCoronas(void)
}
if (size > p_lspr->corona_radius)
size = p_lspr->corona_radius;
- size = (float)(FIXED_TO_FLOAT(cv_grcoronasize.value<<1)*size);
+ size = (float)(FIXED_TO_FLOAT(cv_glcoronasize.value<<1)*size);
// put light little forward the sprite so there is no
// z-buffer problem (coplanar polygons)
@@ -1170,13 +1170,13 @@ void HWR_SetLights(int viewnumber)
// Add a light for dynamic lighting
// The light position is already transformed execpt for mlook
// --------------------------------------------------------------------------
-void HWR_DL_AddLight(gr_vissprite_t *spr, GLPatch_t *patch)
+void HWR_DL_AddLight(gl_vissprite_t *spr, GLPatch_t *patch)
{
light_t *p_lspr;
//Hurdler: moved here because it's better;-)
(void)patch;
- if (!cv_grdynamiclighting.value)
+ if (!cv_gldynamiclighting.value)
return;
if (!spr->mobj)
@@ -1193,7 +1193,7 @@ void HWR_DL_AddLight(gr_vissprite_t *spr, GLPatch_t *patch)
p_lspr = t_lspr[spr->mobj->sprite];
if (!(p_lspr->type & DYNLIGHT_SPR))
return;
- if ((p_lspr->type != LIGHT_SPR) || cv_grstaticlighting.value)
+ if ((p_lspr->type != LIGHT_SPR) || cv_glstaticlighting.value)
return;
LIGHT_POS(dynlights->nb).x = FIXED_TO_FLOAT(spr->mobj->x);
@@ -1229,10 +1229,10 @@ static void HWR_SetLight(void)
{
int i, j;
- if (!lightmappatch.mipmap->downloaded && !lightmappatch.mipmap->grInfo.data)
+ if (!lightmappatch.mipmap->downloaded && !lightmappatch.mipmap->data)
{
- UINT16 *Data = Z_Malloc(129*128*sizeof (UINT16), PU_HWRCACHE, &lightmappatch.mipmap->grInfo.data);
+ UINT16 *Data = Z_Malloc(129*128*sizeof (UINT16), PU_HWRCACHE, &lightmappatch.mipmap->data);
for (i = 0; i < 128; i++)
{
@@ -1245,7 +1245,7 @@ static void HWR_SetLight(void)
Data[i*128+j] = 0;
}
}
- lightmappatch.mipmap->grInfo.format = GR_TEXFMT_ALPHA_INTENSITY_88;
+ lightmappatch.mipmap->format = GL_TEXFMT_ALPHA_INTENSITY_88;
lightmappatch.width = 128;
lightmappatch.height = 128;
@@ -1256,7 +1256,7 @@ static void HWR_SetLight(void)
HWD.pfnSetTexture(lightmappatch.mipmap);
// The system-memory data can be purged now.
- Z_ChangeTag(lightmappatch.mipmap->grInfo.data, PU_HWRCACHE_UNLOCKED);
+ Z_ChangeTag(lightmappatch.mipmap->data, PU_HWRCACHE_UNLOCKED);
}
//**********************************************************
@@ -1265,8 +1265,8 @@ static void HWR_SetLight(void)
#ifdef STATICLIGHT
// is this really necessary?
-static sector_t *lgr_backsector;
-static seg_t *lgr_curline;
+static sector_t *lgl_backsector;
+static seg_t *lgl_curline;
#endif
// p1 et p2 c'est le deux bou du seg en float
@@ -1304,27 +1304,27 @@ static void HWR_AddLightMapForLine(int lightnum, seg_t *line)
*/
FVector p1,p2;
- lgr_curline = line;
- lgr_backsector = line->backsector;
+ lgl_curline = line;
+ lgl_backsector = line->backsector;
// Reject empty lines used for triggers and special events.
// Identical floor and ceiling on both sides,
// identical light levels on both sides,
// and no middle texture.
/*
- if ( lgr_backsector->ceilingpic == gr_frontsector->ceilingpic
- && lgr_backsector->floorpic == gr_frontsector->floorpic
- && lgr_backsector->lightlevel == gr_frontsector->lightlevel
- && lgr_curline->sidedef->midtexture == 0)
+ if ( lgl_backsector->ceilingpic == gl_frontsector->ceilingpic
+ && lgl_backsector->floorpic == gl_frontsector->floorpic
+ && lgl_backsector->lightlevel == gl_frontsector->lightlevel
+ && lgl_curline->sidedef->midtexture == 0)
{
return;
}
*/
- p1.y = FIXED_TO_FLOAT(lgr_curline->v1->y);
- p1.x = FIXED_TO_FLOAT(lgr_curline->v1->x);
- p2.y = FIXED_TO_FLOAT(lgr_curline->v2->y);
- p2.x = FIXED_TO_FLOAT(lgr_curline->v2->x);
+ p1.y = FIXED_TO_FLOAT(lgl_curline->v1->y);
+ p1.x = FIXED_TO_FLOAT(lgl_curline->v1->x);
+ p2.y = FIXED_TO_FLOAT(lgl_curline->v2->y);
+ p2.x = FIXED_TO_FLOAT(lgl_curline->v2->x);
// check bbox of the seg
// if (CircleTouchBBox(&p1, &p2, &LIGHT_POS(lightnum), DL_RADIUS(lightnum))==false)
diff --git a/src/hardware/hw_light.h b/src/hardware/hw_light.h
index 3b12f9c8715e5de6acfca21b3e7953b1030af88a..fed7db47f2a67e6b81f82bfe2e97048594ce43be 100644
--- a/src/hardware/hw_light.h
+++ b/src/hardware/hw_light.h
@@ -24,7 +24,7 @@
#define DL_MAX_LIGHT 256 // maximum number of lights (extra lights are ignored)
void HWR_InitLight(void);
-void HWR_DL_AddLight(gr_vissprite_t *spr, GLPatch_t *patch);
+void HWR_DL_AddLight(gl_vissprite_t *spr, GLPatch_t *patch);
void HWR_PlaneLighting(FOutVector *clVerts, int nrClipVerts);
void HWR_WallLighting(FOutVector *wlVerts);
void HWR_ResetLights(void);
@@ -33,7 +33,7 @@ void HWR_SetLights(int viewnumber);
#ifdef NEWCORONAS
void HWR_DrawCoronas(void);
#else
-void HWR_DoCoronasLighting(FOutVector *outVerts, gr_vissprite_t *spr);
+void HWR_DoCoronasLighting(FOutVector *outVerts, gl_vissprite_t *spr);
#endif
typedef struct
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index f4beed61ed994022b41490dabe2b7834f843035f..0d7404c7740760c81793912f58d5b2781c2e01bf 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -77,18 +77,18 @@ boolean drawsky = true;
#define FIELDOFVIEW ANGLE_90
#define ABS(x) ((x) < 0 ? -(x) : (x))
-static angle_t gr_clipangle;
+static angle_t gl_clipangle;
// The viewangletox[viewangle + FINEANGLES/4] lookup
// maps the visible view angles to screen X coordinates,
// flattening the arc to a flat projection plane.
// There will be many angles mapped to the same X.
-static INT32 gr_viewangletox[FINEANGLES/2];
+static INT32 gl_viewangletox[FINEANGLES/2];
// The xtoviewangleangle[] table maps a screen pixel
// to the lowest viewangle that maps back to x ranges
// from clipangle to -clipangle.
-static angle_t gr_xtoviewangle[MAXVIDWIDTH+1];
+static angle_t gl_xtoviewangle[MAXVIDWIDTH+1];
// ==========================================================================
// GLOBALS
@@ -106,24 +106,24 @@ static angle_t gr_xtoviewangle[MAXVIDWIDTH+1];
//#define NOCRAPPYMLOOK
// base values set at SetViewSize
-static float gr_basecentery;
+static float gl_basecentery;
-float gr_baseviewwindowy, gr_basewindowcentery;
-float gr_viewwidth, gr_viewheight; // viewport clipping boundaries (screen coords)
-float gr_viewwindowx;
+float gl_baseviewwindowy, gl_basewindowcentery;
+float gl_viewwidth, gl_viewheight; // viewport clipping boundaries (screen coords)
+float gl_viewwindowx;
-static float gr_centerx, gr_centery;
-static float gr_viewwindowy; // top left corner of view window
-static float gr_windowcenterx; // center of view window, for projection
-static float gr_windowcentery;
+static float gl_centerx, gl_centery;
+static float gl_viewwindowy; // top left corner of view window
+static float gl_windowcenterx; // center of view window, for projection
+static float gl_windowcentery;
-static float gr_pspritexscale, gr_pspriteyscale;
+static float gl_pspritexscale, gl_pspriteyscale;
-static seg_t *gr_curline;
-static side_t *gr_sidedef;
-static line_t *gr_linedef;
-static sector_t *gr_frontsector;
-static sector_t *gr_backsector;
+static seg_t *gl_curline;
+static side_t *gl_sidedef;
+static line_t *gl_linedef;
+static sector_t *gl_frontsector;
+static sector_t *gl_backsector;
// --------------------------------------------------------------------------
// STUFF FOR THE PROJECTION CODE
@@ -135,14 +135,14 @@ FTransform atransform;
static fixed_t dup_viewx, dup_viewy, dup_viewz;
static angle_t dup_viewangle;
-static float gr_viewx, gr_viewy, gr_viewz;
-static float gr_viewsin, gr_viewcos;
+static float gl_viewx, gl_viewy, gl_viewz;
+static float gl_viewsin, gl_viewcos;
// Maybe not necessary with the new T&L code (needs to be checked!)
-static float gr_viewludsin, gr_viewludcos; // look up down kik test
-static float gr_fovlud;
+static float gl_viewludsin, gl_viewludcos; // look up down kik test
+static float gl_fovlud;
-static angle_t gr_aimingangle;
+static angle_t gl_aimingangle;
static void HWR_SetTransformAiming(FTransform *trans, player_t *player, boolean skybox);
// Render stats
@@ -162,7 +162,7 @@ int rs_hw_numcolors = 0;
int rs_hw_batchsorttime = 0;
int rs_hw_batchdrawtime = 0;
-boolean gr_shadersavailable = true;
+boolean gl_shadersavailable = true;
// ==========================================================================
@@ -178,7 +178,7 @@ void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *col
fade_color.rgba = (colormap != NULL) ? (UINT32)colormap->fadergba : GL_DEFAULTFOG;
// Crappy backup coloring if you can't do shaders
- if (!cv_grshaders.value || !gr_shadersavailable)
+ if (!cv_glshaders.value || !gl_shadersavailable)
{
// be careful, this may get negative for high lightlevel values.
float tint_alpha, fade_alpha;
@@ -229,7 +229,7 @@ UINT8 HWR_FogBlockAlpha(INT32 light, extracolormap_t *colormap) // Let's see if
realcolor.rgba = (colormap != NULL) ? colormap->rgba : GL_DEFAULTMIX;
- if (cv_grshaders.value && gr_shadersavailable)
+ if (cv_glshaders.value && gl_shadersavailable)
{
surfcolor.s.alpha = (255 - light);
}
@@ -256,12 +256,12 @@ static FUINT HWR_CalcWallLight(FUINT lightnum, fixed_t v1x, fixed_t v1y, fixed_t
{
INT16 finallight = lightnum;
- if (cv_grfakecontrast.value != 0)
+ if (cv_glfakecontrast.value != 0)
{
const UINT8 contrast = 8;
fixed_t extralight = 0;
- if (cv_grfakecontrast.value == 2) // Smooth setting
+ if (cv_glfakecontrast.value == 2) // Smooth setting
{
extralight = (-(contrast<<FRACBITS) +
FixedDiv(AngleFixed(R_PointToAngle2(0, 0,
@@ -295,12 +295,12 @@ static FUINT HWR_CalcSlopeLight(FUINT lightnum, angle_t dir, fixed_t delta)
{
INT16 finallight = lightnum;
- if (cv_grfakecontrast.value != 0 && cv_grslopecontrast.value != 0)
+ if (cv_glfakecontrast.value != 0 && cv_glslopecontrast.value != 0)
{
const UINT8 contrast = 8;
fixed_t extralight = 0;
- if (cv_grfakecontrast.value == 2) // Smooth setting
+ if (cv_glfakecontrast.value == 2) // Smooth setting
{
fixed_t dirmul = abs(FixedDiv(AngleFixed(dir) - (180<<FRACBITS), 180<<FRACBITS));
@@ -381,10 +381,10 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
}
else
{
- if (gr_frontsector->f_slope && !isceiling)
- slope = gr_frontsector->f_slope;
- else if (gr_frontsector->c_slope && isceiling)
- slope = gr_frontsector->c_slope;
+ if (gl_frontsector->f_slope && !isceiling)
+ slope = gl_frontsector->f_slope;
+ else if (gl_frontsector->c_slope && isceiling)
+ slope = gl_frontsector->c_slope;
}
// Set fixedheight to the slope's height from our viewpoint, if we have a slope
@@ -471,19 +471,19 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
angle = FOFsector->ceilingpic_angle;
}
}
- else if (gr_frontsector)
+ else if (gl_frontsector)
{
if (!isceiling) // it's a floor
{
- scrollx = FIXED_TO_FLOAT(gr_frontsector->floor_xoffs)/fflatwidth;
- scrolly = FIXED_TO_FLOAT(gr_frontsector->floor_yoffs)/fflatheight;
- angle = gr_frontsector->floorpic_angle;
+ scrollx = FIXED_TO_FLOAT(gl_frontsector->floor_xoffs)/fflatwidth;
+ scrolly = FIXED_TO_FLOAT(gl_frontsector->floor_yoffs)/fflatheight;
+ angle = gl_frontsector->floorpic_angle;
}
else // it's a ceiling
{
- scrollx = FIXED_TO_FLOAT(gr_frontsector->ceiling_xoffs)/fflatwidth;
- scrolly = FIXED_TO_FLOAT(gr_frontsector->ceiling_yoffs)/fflatheight;
- angle = gr_frontsector->ceilingpic_angle;
+ scrollx = FIXED_TO_FLOAT(gl_frontsector->ceiling_xoffs)/fflatwidth;
+ scrolly = FIXED_TO_FLOAT(gl_frontsector->ceiling_yoffs)/fflatheight;
+ angle = gl_frontsector->ceilingpic_angle;
}
}
@@ -607,9 +607,9 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
vy = y1 + yd * j / numplanes;
SETUP3DVERT((&horizonpts[1]), vx, vy);
- dist = sqrtf(powf(vx - gr_viewx, 2) + powf(vy - gr_viewy, 2));
- vx = (vx - gr_viewx) * renderdist / dist + gr_viewx;
- vy = (vy - gr_viewy) * renderdist / dist + gr_viewy;
+ dist = sqrtf(powf(vx - gl_viewx, 2) + powf(vy - gl_viewy, 2));
+ vx = (vx - gl_viewx) * renderdist / dist + gl_viewx;
+ vy = (vy - gl_viewy) * renderdist / dist + gl_viewy;
SETUP3DVERT((&horizonpts[0]), vx, vy);
// Right side
@@ -617,21 +617,21 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
vy = y1 + yd * (j+1) / numplanes;
SETUP3DVERT((&horizonpts[2]), vx, vy);
- dist = sqrtf(powf(vx - gr_viewx, 2) + powf(vy - gr_viewy, 2));
- vx = (vx - gr_viewx) * renderdist / dist + gr_viewx;
- vy = (vy - gr_viewy) * renderdist / dist + gr_viewy;
+ dist = sqrtf(powf(vx - gl_viewx, 2) + powf(vy - gl_viewy, 2));
+ vx = (vx - gl_viewx) * renderdist / dist + gl_viewx;
+ vy = (vy - gl_viewy) * renderdist / dist + gl_viewy;
SETUP3DVERT((&horizonpts[3]), vx, vy);
// Horizon fills
- vx = (horizonpts[0].x - gr_viewx) * farrenderdist / renderdist + gr_viewx;
- vy = (horizonpts[0].z - gr_viewy) * farrenderdist / renderdist + gr_viewy;
+ vx = (horizonpts[0].x - gl_viewx) * farrenderdist / renderdist + gl_viewx;
+ vy = (horizonpts[0].z - gl_viewy) * farrenderdist / renderdist + gl_viewy;
SETUP3DVERT((&horizonpts[5]), vx, vy);
- horizonpts[5].y = gr_viewz;
+ horizonpts[5].y = gl_viewz;
- vx = (horizonpts[3].x - gr_viewx) * farrenderdist / renderdist + gr_viewx;
- vy = (horizonpts[3].z - gr_viewy) * farrenderdist / renderdist + gr_viewy;
+ vx = (horizonpts[3].x - gl_viewx) * farrenderdist / renderdist + gl_viewx;
+ vy = (horizonpts[3].z - gl_viewy) * farrenderdist / renderdist + gl_viewy;
SETUP3DVERT((&horizonpts[4]), vx, vy);
- horizonpts[4].y = gr_viewz;
+ horizonpts[4].y = gl_viewz;
// Draw
HWR_ProcessPolygon(&Surf, horizonpts, 6, PolyFlags, shader, true);
@@ -712,13 +712,13 @@ static void HWR_DrawSegsSplats(FSurfaceInfo * pSurf)
M_ClearBox(segbbox);
M_AddToBox(segbbox,
- FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv1)->x),
- FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv1)->y));
+ FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv1)->x),
+ FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv1)->y));
M_AddToBox(segbbox,
- FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv2)->x),
- FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv2)->y));
+ FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv2)->x),
+ FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv2)->y));
- splat = (wallsplat_t *)gr_curline->linedef->splats;
+ splat = (wallsplat_t *)gl_curline->linedef->splats;
for (; splat; splat = splat->next)
{
//BP: don't draw splat extern to this seg
@@ -799,7 +799,7 @@ static void HWR_ProjectWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIEL
HWR_ProcessPolygon(pSurf, wallVerts, 4, blendmode|PF_Modulated|PF_Occlude, 2, false); // wall shader
#ifdef WALLSPLATS
- if (gr_curline->linedef->splats && cv_splats.value)
+ if (gl_curline->linedef->splats && cv_splats.value)
HWR_DrawSegsSplats(pSurf);
#endif
}
@@ -817,7 +817,7 @@ static float HWR_ClipViewSegment(INT32 x, polyvertex_t *v1, polyvertex_t *v2)
{
float num, den;
float v1x, v1y, v1dx, v1dy, v2dx, v2dy;
- angle_t pclipangle = gr_xtoviewangle[x];
+ angle_t pclipangle = gl_xtoviewangle[x];
// a segment of a polygon
v1x = v1->x;
@@ -837,7 +837,7 @@ static float HWR_ClipViewSegment(INT32 x, polyvertex_t *v1, polyvertex_t *v2)
// calc the frac along the polygon segment,
//num = (v2x - v1x)*v2dy + (v1y - v2y)*v2dx;
//num = -v1x * v2dy + v1y * v2dx;
- num = (gr_viewx - v1x)*v2dy + (v1y - gr_viewy)*v2dx;
+ num = (gl_viewx - v1x)*v2dy + (v1y - gl_viewy)*v2dx;
return num / den;
}
@@ -1055,9 +1055,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
fixed_t worldhighslope = 0, worldlowslope = 0;
fixed_t v1x, v1y, v2x, v2y;
- GLTexture_t *grTex = NULL;
+ GLMapTexture_t *grTex = NULL;
float cliplow = 0.0f, cliphigh = 0.0f;
- INT32 gr_midtexture;
+ INT32 gl_midtexture;
fixed_t h, l; // 3D sides and 2s middle textures
fixed_t hS, lS;
@@ -1065,13 +1065,13 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
extracolormap_t *colormap;
FSurfaceInfo Surf;
- gr_sidedef = gr_curline->sidedef;
- gr_linedef = gr_curline->linedef;
+ gl_sidedef = gl_curline->sidedef;
+ gl_linedef = gl_curline->linedef;
- vs.x = ((polyvertex_t *)gr_curline->pv1)->x;
- vs.y = ((polyvertex_t *)gr_curline->pv1)->y;
- ve.x = ((polyvertex_t *)gr_curline->pv2)->x;
- ve.y = ((polyvertex_t *)gr_curline->pv2)->y;
+ vs.x = ((polyvertex_t *)gl_curline->pv1)->x;
+ vs.y = ((polyvertex_t *)gl_curline->pv1)->y;
+ ve.x = ((polyvertex_t *)gl_curline->pv2)->x;
+ ve.y = ((polyvertex_t *)gl_curline->pv2)->y;
v1x = FLOAT_TO_FIXED(vs.x);
v1y = FLOAT_TO_FIXED(vs.y);
@@ -1082,8 +1082,8 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
end1 = P_GetZAt(slope, v1x, v1y, normalheight); \
end2 = P_GetZAt(slope, v2x, v2y, normalheight);
- SLOPEPARAMS(gr_frontsector->c_slope, worldtop, worldtopslope, gr_frontsector->ceilingheight)
- SLOPEPARAMS(gr_frontsector->f_slope, worldbottom, worldbottomslope, gr_frontsector->floorheight)
+ SLOPEPARAMS(gl_frontsector->c_slope, worldtop, worldtopslope, gl_frontsector->ceilingheight)
+ SLOPEPARAMS(gl_frontsector->f_slope, worldbottom, worldbottomslope, gl_frontsector->floorheight)
// remember vertices ordering
// 3--2
@@ -1099,84 +1099,84 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
// x offset the texture
{
- fixed_t texturehpeg = gr_sidedef->textureoffset + gr_curline->offset;
+ fixed_t texturehpeg = gl_sidedef->textureoffset + gl_curline->offset;
cliplow = (float)texturehpeg;
- cliphigh = (float)(texturehpeg + (gr_curline->flength*FRACUNIT));
+ cliphigh = (float)(texturehpeg + (gl_curline->flength*FRACUNIT));
}
- lightnum = HWR_CalcWallLight(gr_frontsector->lightlevel, vs.x, vs.y, ve.x, ve.y);
- colormap = gr_frontsector->extra_colormap;
+ lightnum = HWR_CalcWallLight(gl_frontsector->lightlevel, vs.x, vs.y, ve.x, ve.y);
+ colormap = gl_frontsector->extra_colormap;
- if (gr_frontsector)
+ if (gl_frontsector)
Surf.PolyColor.s.alpha = 255;
- if (gr_backsector)
+ if (gl_backsector)
{
- INT32 gr_toptexture = 0, gr_bottomtexture = 0;
+ INT32 gl_toptexture = 0, gl_bottomtexture = 0;
// two sided line
boolean bothceilingssky = false; // turned on if both back and front ceilings are sky
boolean bothfloorssky = false; // likewise, but for floors
- SLOPEPARAMS(gr_backsector->c_slope, worldhigh, worldhighslope, gr_backsector->ceilingheight)
- SLOPEPARAMS(gr_backsector->f_slope, worldlow, worldlowslope, gr_backsector->floorheight)
+ SLOPEPARAMS(gl_backsector->c_slope, worldhigh, worldhighslope, gl_backsector->ceilingheight)
+ SLOPEPARAMS(gl_backsector->f_slope, worldlow, worldlowslope, gl_backsector->floorheight)
#undef SLOPEPARAMS
// hack to allow height changes in outdoor areas
// This is what gets rid of the upper textures if there should be sky
- if (gr_frontsector->ceilingpic == skyflatnum
- && gr_backsector->ceilingpic == skyflatnum)
+ if (gl_frontsector->ceilingpic == skyflatnum
+ && gl_backsector->ceilingpic == skyflatnum)
{
bothceilingssky = true;
}
// likewise, but for floors and upper textures
- if (gr_frontsector->floorpic == skyflatnum
- && gr_backsector->floorpic == skyflatnum)
+ if (gl_frontsector->floorpic == skyflatnum
+ && gl_backsector->floorpic == skyflatnum)
{
bothfloorssky = true;
}
if (!bothceilingssky)
- gr_toptexture = R_GetTextureNum(gr_sidedef->toptexture);
+ gl_toptexture = R_GetTextureNum(gl_sidedef->toptexture);
if (!bothfloorssky)
- gr_bottomtexture = R_GetTextureNum(gr_sidedef->bottomtexture);
+ gl_bottomtexture = R_GetTextureNum(gl_sidedef->bottomtexture);
// check TOP TEXTURE
- if ((worldhighslope < worldtopslope || worldhigh < worldtop) && gr_toptexture)
+ if ((worldhighslope < worldtopslope || worldhigh < worldtop) && gl_toptexture)
{
{
fixed_t texturevpegtop; // top
- grTex = HWR_GetTexture(gr_toptexture);
+ grTex = HWR_GetTexture(gl_toptexture);
// PEGGING
- if (gr_linedef->flags & ML_DONTPEGTOP)
+ if (gl_linedef->flags & ML_DONTPEGTOP)
texturevpegtop = 0;
- else if (gr_linedef->flags & ML_EFFECT1)
- texturevpegtop = worldhigh + textureheight[gr_sidedef->toptexture] - worldtop;
+ else if (gl_linedef->flags & ML_EFFECT1)
+ texturevpegtop = worldhigh + textureheight[gl_sidedef->toptexture] - worldtop;
else
- texturevpegtop = gr_backsector->ceilingheight + textureheight[gr_sidedef->toptexture] - gr_frontsector->ceilingheight;
+ texturevpegtop = gl_backsector->ceilingheight + textureheight[gl_sidedef->toptexture] - gl_frontsector->ceilingheight;
- texturevpegtop += gr_sidedef->rowoffset;
+ texturevpegtop += gl_sidedef->rowoffset;
// This is so that it doesn't overflow and screw up the wall, it doesn't need to go higher than the texture's height anyway
- texturevpegtop %= SHORT(textures[gr_toptexture]->height)<<FRACBITS;
+ texturevpegtop %= SHORT(textures[gl_toptexture]->height)<<FRACBITS;
wallVerts[3].t = wallVerts[2].t = texturevpegtop * grTex->scaleY;
- wallVerts[0].t = wallVerts[1].t = (texturevpegtop + gr_frontsector->ceilingheight - gr_backsector->ceilingheight) * grTex->scaleY;
+ wallVerts[0].t = wallVerts[1].t = (texturevpegtop + gl_frontsector->ceilingheight - gl_backsector->ceilingheight) * grTex->scaleY;
wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX;
wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX;
// Adjust t value for sloped walls
- if (!(gr_linedef->flags & ML_EFFECT1))
+ if (!(gl_linedef->flags & ML_EFFECT1))
{
// Unskewed
- wallVerts[3].t -= (worldtop - gr_frontsector->ceilingheight) * grTex->scaleY;
- wallVerts[2].t -= (worldtopslope - gr_frontsector->ceilingheight) * grTex->scaleY;
- wallVerts[0].t -= (worldhigh - gr_backsector->ceilingheight) * grTex->scaleY;
- wallVerts[1].t -= (worldhighslope - gr_backsector->ceilingheight) * grTex->scaleY;
+ wallVerts[3].t -= (worldtop - gl_frontsector->ceilingheight) * grTex->scaleY;
+ wallVerts[2].t -= (worldtopslope - gl_frontsector->ceilingheight) * grTex->scaleY;
+ wallVerts[0].t -= (worldhigh - gl_backsector->ceilingheight) * grTex->scaleY;
+ wallVerts[1].t -= (worldhighslope - gl_backsector->ceilingheight) * grTex->scaleY;
}
- else if (gr_linedef->flags & ML_DONTPEGTOP)
+ else if (gl_linedef->flags & ML_DONTPEGTOP)
{
// Skewed by top
wallVerts[0].t = (texturevpegtop + worldtop - worldhigh) * grTex->scaleY;
@@ -1197,10 +1197,10 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[2].y = FIXED_TO_FLOAT(worldtopslope);
wallVerts[1].y = FIXED_TO_FLOAT(worldhighslope);
- if (gr_frontsector->numlights)
- HWR_SplitWall(gr_frontsector, wallVerts, gr_toptexture, &Surf, FF_CUTLEVEL, NULL);
+ if (gl_frontsector->numlights)
+ HWR_SplitWall(gl_frontsector, wallVerts, gl_toptexture, &Surf, FF_CUTLEVEL, NULL);
else if (grTex->mipmap.flags & TF_TRANSPARENT)
- HWR_AddTransparentWall(wallVerts, &Surf, gr_toptexture, PF_Environment, false, lightnum, colormap);
+ HWR_AddTransparentWall(wallVerts, &Surf, gl_toptexture, PF_Environment, false, lightnum, colormap);
else
HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
}
@@ -1208,41 +1208,41 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
// check BOTTOM TEXTURE
if ((
worldlowslope > worldbottomslope ||
- worldlow > worldbottom) && gr_bottomtexture) //only if VISIBLE!!!
+ worldlow > worldbottom) && gl_bottomtexture) //only if VISIBLE!!!
{
{
fixed_t texturevpegbottom = 0; // bottom
- grTex = HWR_GetTexture(gr_bottomtexture);
+ grTex = HWR_GetTexture(gl_bottomtexture);
// PEGGING
- if (!(gr_linedef->flags & ML_DONTPEGBOTTOM))
+ if (!(gl_linedef->flags & ML_DONTPEGBOTTOM))
texturevpegbottom = 0;
- else if (gr_linedef->flags & ML_EFFECT1)
+ else if (gl_linedef->flags & ML_EFFECT1)
texturevpegbottom = worldbottom - worldlow;
else
- texturevpegbottom = gr_frontsector->floorheight - gr_backsector->floorheight;
+ texturevpegbottom = gl_frontsector->floorheight - gl_backsector->floorheight;
- texturevpegbottom += gr_sidedef->rowoffset;
+ texturevpegbottom += gl_sidedef->rowoffset;
// This is so that it doesn't overflow and screw up the wall, it doesn't need to go higher than the texture's height anyway
- texturevpegbottom %= SHORT(textures[gr_bottomtexture]->height)<<FRACBITS;
+ texturevpegbottom %= SHORT(textures[gl_bottomtexture]->height)<<FRACBITS;
wallVerts[3].t = wallVerts[2].t = texturevpegbottom * grTex->scaleY;
- wallVerts[0].t = wallVerts[1].t = (texturevpegbottom + gr_backsector->floorheight - gr_frontsector->floorheight) * grTex->scaleY;
+ wallVerts[0].t = wallVerts[1].t = (texturevpegbottom + gl_backsector->floorheight - gl_frontsector->floorheight) * grTex->scaleY;
wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX;
wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX;
// Adjust t value for sloped walls
- if (!(gr_linedef->flags & ML_EFFECT1))
+ if (!(gl_linedef->flags & ML_EFFECT1))
{
// Unskewed
- wallVerts[0].t -= (worldbottom - gr_frontsector->floorheight) * grTex->scaleY;
- wallVerts[1].t -= (worldbottomslope - gr_frontsector->floorheight) * grTex->scaleY;
- wallVerts[3].t -= (worldlow - gr_backsector->floorheight) * grTex->scaleY;
- wallVerts[2].t -= (worldlowslope - gr_backsector->floorheight) * grTex->scaleY;
+ wallVerts[0].t -= (worldbottom - gl_frontsector->floorheight) * grTex->scaleY;
+ wallVerts[1].t -= (worldbottomslope - gl_frontsector->floorheight) * grTex->scaleY;
+ wallVerts[3].t -= (worldlow - gl_backsector->floorheight) * grTex->scaleY;
+ wallVerts[2].t -= (worldlowslope - gl_backsector->floorheight) * grTex->scaleY;
}
- else if (gr_linedef->flags & ML_DONTPEGBOTTOM)
+ else if (gl_linedef->flags & ML_DONTPEGBOTTOM)
{
// Skewed by bottom
wallVerts[0].t = wallVerts[1].t = (texturevpegbottom + worldlow - worldbottom) * grTex->scaleY;
@@ -1263,15 +1263,15 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[2].y = FIXED_TO_FLOAT(worldlowslope);
wallVerts[1].y = FIXED_TO_FLOAT(worldbottomslope);
- if (gr_frontsector->numlights)
- HWR_SplitWall(gr_frontsector, wallVerts, gr_bottomtexture, &Surf, FF_CUTLEVEL, NULL);
+ if (gl_frontsector->numlights)
+ HWR_SplitWall(gl_frontsector, wallVerts, gl_bottomtexture, &Surf, FF_CUTLEVEL, NULL);
else if (grTex->mipmap.flags & TF_TRANSPARENT)
- HWR_AddTransparentWall(wallVerts, &Surf, gr_bottomtexture, PF_Environment, false, lightnum, colormap);
+ HWR_AddTransparentWall(wallVerts, &Surf, gl_bottomtexture, PF_Environment, false, lightnum, colormap);
else
HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
}
- gr_midtexture = R_GetTextureNum(gr_sidedef->midtexture);
- if (gr_midtexture)
+ gl_midtexture = R_GetTextureNum(gl_sidedef->midtexture);
+ if (gl_midtexture)
{
FBITFIELD blendmode;
sector_t *front, *back;
@@ -1279,19 +1279,19 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
fixed_t texturevpeg = 0;
INT32 repeats;
- if (gr_linedef->frontsector->heightsec != -1)
- front = §ors[gr_linedef->frontsector->heightsec];
+ if (gl_linedef->frontsector->heightsec != -1)
+ front = §ors[gl_linedef->frontsector->heightsec];
else
- front = gr_linedef->frontsector;
+ front = gl_linedef->frontsector;
- if (gr_linedef->backsector->heightsec != -1)
- back = §ors[gr_linedef->backsector->heightsec];
+ if (gl_linedef->backsector->heightsec != -1)
+ back = §ors[gl_linedef->backsector->heightsec];
else
- back = gr_linedef->backsector;
+ back = gl_linedef->backsector;
- if (gr_sidedef->repeatcnt)
- repeats = 1 + gr_sidedef->repeatcnt;
- else if (gr_linedef->flags & ML_EFFECT5)
+ if (gl_sidedef->repeatcnt)
+ repeats = 1 + gl_sidedef->repeatcnt;
+ else if (gl_linedef->flags & ML_EFFECT5)
{
fixed_t high, low;
@@ -1305,8 +1305,8 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
else
low = back->floorheight;
- repeats = (high - low)/textureheight[gr_sidedef->midtexture];
- if ((high-low)%textureheight[gr_sidedef->midtexture])
+ repeats = (high - low)/textureheight[gl_sidedef->midtexture];
+ if ((high-low)%textureheight[gl_sidedef->midtexture])
repeats++; // tile an extra time to fill the gap -- Monster Iestyn
}
else
@@ -1322,7 +1322,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
// NOTE: With polyobjects, whenever you need to check the properties of the polyobject sector it belongs to,
// you must use the linedef's backsector to be correct
// From CB
- if (gr_curline->polyseg)
+ if (gl_curline->polyseg)
{
popentop = back->ceilingheight;
popenbottom = back->floorheight;
@@ -1333,33 +1333,33 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
popenbottom = max(worldbottom, worldlow);
}
- if (gr_linedef->flags & ML_EFFECT2)
+ if (gl_linedef->flags & ML_EFFECT2)
{
- if (!!(gr_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gr_linedef->flags & ML_EFFECT3))
+ if (!!(gl_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gl_linedef->flags & ML_EFFECT3))
{
- polybottom = max(front->floorheight, back->floorheight) + gr_sidedef->rowoffset;
- polytop = polybottom + textureheight[gr_midtexture]*repeats;
+ polybottom = max(front->floorheight, back->floorheight) + gl_sidedef->rowoffset;
+ polytop = polybottom + textureheight[gl_midtexture]*repeats;
}
else
{
- polytop = min(front->ceilingheight, back->ceilingheight) + gr_sidedef->rowoffset;
- polybottom = polytop - textureheight[gr_midtexture]*repeats;
+ polytop = min(front->ceilingheight, back->ceilingheight) + gl_sidedef->rowoffset;
+ polybottom = polytop - textureheight[gl_midtexture]*repeats;
}
}
- else if (!!(gr_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gr_linedef->flags & ML_EFFECT3))
+ else if (!!(gl_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gl_linedef->flags & ML_EFFECT3))
{
- polybottom = popenbottom + gr_sidedef->rowoffset;
- polytop = polybottom + textureheight[gr_midtexture]*repeats;
+ polybottom = popenbottom + gl_sidedef->rowoffset;
+ polytop = polybottom + textureheight[gl_midtexture]*repeats;
}
else
{
- polytop = popentop + gr_sidedef->rowoffset;
- polybottom = polytop - textureheight[gr_midtexture]*repeats;
+ polytop = popentop + gl_sidedef->rowoffset;
+ polybottom = polytop - textureheight[gl_midtexture]*repeats;
}
// CB
// NOTE: With polyobjects, whenever you need to check the properties of the polyobject sector it belongs to,
// you must use the linedef's backsector to be correct
- if (gr_curline->polyseg)
+ if (gl_curline->polyseg)
{
lowcut = polybottom;
highcut = polytop;
@@ -1376,12 +1376,12 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{
// PEGGING
- if (!!(gr_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gr_linedef->flags & ML_EFFECT3))
- texturevpeg = textureheight[gr_sidedef->midtexture]*repeats - h + polybottom;
+ if (!!(gl_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gl_linedef->flags & ML_EFFECT3))
+ texturevpeg = textureheight[gl_sidedef->midtexture]*repeats - h + polybottom;
else
texturevpeg = polytop - h;
- grTex = HWR_GetTexture(gr_midtexture);
+ grTex = HWR_GetTexture(gl_midtexture);
wallVerts[3].t = wallVerts[2].t = texturevpeg * grTex->scaleY;
wallVerts[0].t = wallVerts[1].t = (h - l + texturevpeg) * grTex->scaleY;
@@ -1399,9 +1399,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{
fixed_t midtextureslant;
- if (gr_linedef->flags & ML_EFFECT2)
+ if (gl_linedef->flags & ML_EFFECT2)
midtextureslant = 0;
- else if (!!(gr_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gr_linedef->flags & ML_EFFECT3))
+ else if (!!(gl_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gl_linedef->flags & ML_EFFECT3))
midtextureslant = worldlow < worldbottom
? worldbottomslope-worldbottom
: worldlowslope-worldlow;
@@ -1426,8 +1426,8 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{
// PEGGING
- if (!!(gr_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gr_linedef->flags & ML_EFFECT3))
- texturevpeg = textureheight[gr_sidedef->midtexture]*repeats - h + polybottom;
+ if (!!(gl_linedef->flags & ML_DONTPEGBOTTOM) ^ !!(gl_linedef->flags & ML_EFFECT3))
+ texturevpeg = textureheight[gl_sidedef->midtexture]*repeats - h + polybottom;
else
texturevpeg = polytop - h;
wallVerts[2].t = texturevpeg * grTex->scaleY;
@@ -1440,7 +1440,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
// set alpha for transparent walls (new boom and legacy linedef types)
// ooops ! this do not work at all because render order we should render it in backtofront order
- switch (gr_linedef->special)
+ switch (gl_linedef->special)
{
case 900:
blendmode = HWR_TranstableToAlpha(tr_trans10, &Surf);
@@ -1493,39 +1493,39 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
break;
}
- if (gr_curline->polyseg && gr_curline->polyseg->translucency > 0)
+ if (gl_curline->polyseg && gl_curline->polyseg->translucency > 0)
{
- if (gr_curline->polyseg->translucency >= NUMTRANSMAPS) // wall not drawn
+ if (gl_curline->polyseg->translucency >= NUMTRANSMAPS) // wall not drawn
{
Surf.PolyColor.s.alpha = 0x00; // This shouldn't draw anything regardless of blendmode
blendmode = PF_Masked;
}
else
- blendmode = HWR_TranstableToAlpha(gr_curline->polyseg->translucency, &Surf);
+ blendmode = HWR_TranstableToAlpha(gl_curline->polyseg->translucency, &Surf);
}
- if (gr_frontsector->numlights)
+ if (gl_frontsector->numlights)
{
if (!(blendmode & PF_Masked))
- HWR_SplitWall(gr_frontsector, wallVerts, gr_midtexture, &Surf, FF_TRANSLUCENT, NULL);
+ HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_TRANSLUCENT, NULL);
else
{
- HWR_SplitWall(gr_frontsector, wallVerts, gr_midtexture, &Surf, FF_CUTLEVEL, NULL);
+ HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_CUTLEVEL, NULL);
}
}
else if (!(blendmode & PF_Masked))
- HWR_AddTransparentWall(wallVerts, &Surf, gr_midtexture, blendmode, false, lightnum, colormap);
+ HWR_AddTransparentWall(wallVerts, &Surf, gl_midtexture, blendmode, false, lightnum, colormap);
else
HWR_ProjectWall(wallVerts, &Surf, blendmode, lightnum, colormap);
}
// Sky culling
// No longer so much a mess as before!
- if (!gr_curline->polyseg) // Don't do it for polyobjects
+ if (!gl_curline->polyseg) // Don't do it for polyobjects
{
- if (gr_frontsector->ceilingpic == skyflatnum)
+ if (gl_frontsector->ceilingpic == skyflatnum)
{
- if (gr_backsector->ceilingpic != skyflatnum) // don't cull if back sector is also sky
+ if (gl_backsector->ceilingpic != skyflatnum) // don't cull if back sector is also sky
{
wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(INT32_MAX); // draw to top of map space
wallVerts[0].y = FIXED_TO_FLOAT(worldtop);
@@ -1534,9 +1534,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
}
}
- if (gr_frontsector->floorpic == skyflatnum)
+ if (gl_frontsector->floorpic == skyflatnum)
{
- if (gr_backsector->floorpic != skyflatnum) // don't cull if back sector is also sky
+ if (gl_backsector->floorpic != skyflatnum) // don't cull if back sector is also sky
{
wallVerts[3].y = FIXED_TO_FLOAT(worldbottom);
wallVerts[2].y = FIXED_TO_FLOAT(worldbottomslope);
@@ -1549,34 +1549,34 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
else
{
// Single sided line... Deal only with the middletexture (if one exists)
- gr_midtexture = R_GetTextureNum(gr_sidedef->midtexture);
- if (gr_midtexture && gr_linedef->special != 41) // (Ignore horizon line for OGL)
+ gl_midtexture = R_GetTextureNum(gl_sidedef->midtexture);
+ if (gl_midtexture && gl_linedef->special != 41) // (Ignore horizon line for OGL)
{
{
fixed_t texturevpeg;
// PEGGING
- if ((gr_linedef->flags & (ML_DONTPEGBOTTOM|ML_EFFECT2)) == (ML_DONTPEGBOTTOM|ML_EFFECT2))
- texturevpeg = gr_frontsector->floorheight + textureheight[gr_sidedef->midtexture] - gr_frontsector->ceilingheight + gr_sidedef->rowoffset;
- else if (gr_linedef->flags & ML_DONTPEGBOTTOM)
- texturevpeg = worldbottom + textureheight[gr_sidedef->midtexture] - worldtop + gr_sidedef->rowoffset;
+ if ((gl_linedef->flags & (ML_DONTPEGBOTTOM|ML_EFFECT2)) == (ML_DONTPEGBOTTOM|ML_EFFECT2))
+ texturevpeg = gl_frontsector->floorheight + textureheight[gl_sidedef->midtexture] - gl_frontsector->ceilingheight + gl_sidedef->rowoffset;
+ else if (gl_linedef->flags & ML_DONTPEGBOTTOM)
+ texturevpeg = worldbottom + textureheight[gl_sidedef->midtexture] - worldtop + gl_sidedef->rowoffset;
else
// top of texture at top
- texturevpeg = gr_sidedef->rowoffset;
+ texturevpeg = gl_sidedef->rowoffset;
- grTex = HWR_GetTexture(gr_midtexture);
+ grTex = HWR_GetTexture(gl_midtexture);
wallVerts[3].t = wallVerts[2].t = texturevpeg * grTex->scaleY;
- wallVerts[0].t = wallVerts[1].t = (texturevpeg + gr_frontsector->ceilingheight - gr_frontsector->floorheight) * grTex->scaleY;
+ wallVerts[0].t = wallVerts[1].t = (texturevpeg + gl_frontsector->ceilingheight - gl_frontsector->floorheight) * grTex->scaleY;
wallVerts[0].s = wallVerts[3].s = cliplow * grTex->scaleX;
wallVerts[2].s = wallVerts[1].s = cliphigh * grTex->scaleX;
// Texture correction for slopes
- if (gr_linedef->flags & ML_EFFECT2) {
- wallVerts[3].t += (gr_frontsector->ceilingheight - worldtop) * grTex->scaleY;
- wallVerts[2].t += (gr_frontsector->ceilingheight - worldtopslope) * grTex->scaleY;
- wallVerts[0].t += (gr_frontsector->floorheight - worldbottom) * grTex->scaleY;
- wallVerts[1].t += (gr_frontsector->floorheight - worldbottomslope) * grTex->scaleY;
- } else if (gr_linedef->flags & ML_DONTPEGBOTTOM) {
+ if (gl_linedef->flags & ML_EFFECT2) {
+ wallVerts[3].t += (gl_frontsector->ceilingheight - worldtop) * grTex->scaleY;
+ wallVerts[2].t += (gl_frontsector->ceilingheight - worldtopslope) * grTex->scaleY;
+ wallVerts[0].t += (gl_frontsector->floorheight - worldbottom) * grTex->scaleY;
+ wallVerts[1].t += (gl_frontsector->floorheight - worldbottomslope) * grTex->scaleY;
+ } else if (gl_linedef->flags & ML_DONTPEGBOTTOM) {
wallVerts[3].t = wallVerts[0].t + (worldbottom-worldtop) * grTex->scaleY;
wallVerts[2].t = wallVerts[1].t + (worldbottomslope-worldtopslope) * grTex->scaleY;
} else {
@@ -1592,27 +1592,27 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[1].y = FIXED_TO_FLOAT(worldbottomslope);
// I don't think that solid walls can use translucent linedef types...
- if (gr_frontsector->numlights)
- HWR_SplitWall(gr_frontsector, wallVerts, gr_midtexture, &Surf, FF_CUTLEVEL, NULL);
+ if (gl_frontsector->numlights)
+ HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_CUTLEVEL, NULL);
else
{
if (grTex->mipmap.flags & TF_TRANSPARENT)
- HWR_AddTransparentWall(wallVerts, &Surf, gr_midtexture, PF_Environment, false, lightnum, colormap);
+ HWR_AddTransparentWall(wallVerts, &Surf, gl_midtexture, PF_Environment, false, lightnum, colormap);
else
HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
}
}
- if (!gr_curline->polyseg)
+ if (!gl_curline->polyseg)
{
- if (gr_frontsector->ceilingpic == skyflatnum) // It's a single-sided line with sky for its sector
+ if (gl_frontsector->ceilingpic == skyflatnum) // It's a single-sided line with sky for its sector
{
wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(INT32_MAX); // draw to top of map space
wallVerts[0].y = FIXED_TO_FLOAT(worldtop);
wallVerts[1].y = FIXED_TO_FLOAT(worldtopslope);
HWR_DrawSkyWall(wallVerts, &Surf);
}
- if (gr_frontsector->floorpic == skyflatnum)
+ if (gl_frontsector->floorpic == skyflatnum)
{
wallVerts[3].y = FIXED_TO_FLOAT(worldbottom);
wallVerts[2].y = FIXED_TO_FLOAT(worldbottomslope);
@@ -1624,7 +1624,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
//Hurdler: 3d-floors test
- if (gr_frontsector && gr_backsector && gr_frontsector->tag != gr_backsector->tag && (gr_backsector->ffloors || gr_frontsector->ffloors))
+ if (gl_frontsector && gl_backsector && gl_frontsector->tag != gl_backsector->tag && (gl_backsector->ffloors || gl_frontsector->ffloors))
{
ffloor_t * rover;
fixed_t highcut = 0, lowcut = 0;
@@ -1634,12 +1634,12 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
///TODO add slope support (fixing cutoffs, proper wall clipping) - maybe just disable highcut/lowcut if either sector or FOF has a slope
/// to allow fun plane intersecting in OGL? But then people would abuse that and make software look bad. :C
- highcut = gr_frontsector->ceilingheight < gr_backsector->ceilingheight ? gr_frontsector->ceilingheight : gr_backsector->ceilingheight;
- lowcut = gr_frontsector->floorheight > gr_backsector->floorheight ? gr_frontsector->floorheight : gr_backsector->floorheight;
+ highcut = gl_frontsector->ceilingheight < gl_backsector->ceilingheight ? gl_frontsector->ceilingheight : gl_backsector->ceilingheight;
+ lowcut = gl_frontsector->floorheight > gl_backsector->floorheight ? gl_frontsector->floorheight : gl_backsector->floorheight;
- if (gr_backsector->ffloors)
+ if (gl_backsector->ffloors)
{
- for (rover = gr_backsector->ffloors; rover; rover = rover->next)
+ for (rover = gl_backsector->ffloors; rover; rover = rover->next)
{
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERSIDES))
continue;
@@ -1652,7 +1652,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
if (rover->master->flags & ML_TFERLINE)
{
- size_t linenum = gr_curline->linedef-gr_backsector->lines[0];
+ size_t linenum = gl_curline->linedef-gl_backsector->lines[0];
newline = rover->master->frontsector->lines[0] + linenum;
texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture);
}
@@ -1661,9 +1661,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
hS = P_GetFFloorTopZAt (rover, v2x, v2y);
l = P_GetFFloorBottomZAt(rover, v1x, v1y);
lS = P_GetFFloorBottomZAt(rover, v2x, v2y);
- if (!(*rover->t_slope) && !gr_frontsector->c_slope && !gr_backsector->c_slope && h > highcut)
+ if (!(*rover->t_slope) && !gl_frontsector->c_slope && !gl_backsector->c_slope && h > highcut)
h = hS = highcut;
- if (!(*rover->b_slope) && !gr_frontsector->f_slope && !gr_backsector->f_slope && l < lowcut)
+ if (!(*rover->b_slope) && !gl_frontsector->f_slope && !gl_backsector->f_slope && l < lowcut)
l = lS = lowcut;
//Hurdler: HW code starts here
//FIXME: check if peging is correct
@@ -1698,7 +1698,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
else
{
texturevpeg = sides[rover->master->sidenum[0]].rowoffset;
- attachtobottom = !!(gr_linedef->flags & ML_DONTPEGBOTTOM);
+ attachtobottom = !!(gl_linedef->flags & ML_DONTPEGBOTTOM);
slopeskew = !!(rover->master->flags & ML_DONTPEGTOP);
}
@@ -1743,8 +1743,8 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(rover->master->frontsector->lightlevel, rover->master->frontsector->extra_colormap);
- if (gr_frontsector->numlights)
- HWR_SplitWall(gr_frontsector, wallVerts, 0, &Surf, rover->flags, rover);
+ if (gl_frontsector->numlights)
+ HWR_SplitWall(gl_frontsector, wallVerts, 0, &Surf, rover->flags, rover);
else
HWR_AddTransparentWall(wallVerts, &Surf, 0, blendmode, true, lightnum, colormap);
}
@@ -1758,8 +1758,8 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
Surf.PolyColor.s.alpha = (UINT8)rover->alpha-1 > 255 ? 255 : rover->alpha-1;
}
- if (gr_frontsector->numlights)
- HWR_SplitWall(gr_frontsector, wallVerts, texnum, &Surf, rover->flags, rover);
+ if (gl_frontsector->numlights)
+ HWR_SplitWall(gl_frontsector, wallVerts, texnum, &Surf, rover->flags, rover);
else
{
if (blendmode != PF_Masked)
@@ -1771,9 +1771,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
}
}
- if (gr_frontsector->ffloors) // Putting this seperate should allow 2 FOF sectors to be connected without too many errors? I think?
+ if (gl_frontsector->ffloors) // Putting this seperate should allow 2 FOF sectors to be connected without too many errors? I think?
{
- for (rover = gr_frontsector->ffloors; rover; rover = rover->next)
+ for (rover = gl_frontsector->ffloors; rover; rover = rover->next)
{
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERSIDES))
continue;
@@ -1786,7 +1786,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
if (rover->master->flags & ML_TFERLINE)
{
- size_t linenum = gr_curline->linedef-gr_backsector->lines[0];
+ size_t linenum = gl_curline->linedef-gl_backsector->lines[0];
newline = rover->master->frontsector->lines[0] + linenum;
texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture);
}
@@ -1794,9 +1794,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
hS = P_GetFFloorTopZAt (rover, v2x, v2y);
l = P_GetFFloorBottomZAt(rover, v1x, v1y);
lS = P_GetFFloorBottomZAt(rover, v2x, v2y);
- if (!(*rover->t_slope) && !gr_frontsector->c_slope && !gr_backsector->c_slope && h > highcut)
+ if (!(*rover->t_slope) && !gl_frontsector->c_slope && !gl_backsector->c_slope && h > highcut)
h = hS = highcut;
- if (!(*rover->b_slope) && !gr_frontsector->f_slope && !gr_backsector->f_slope && l < lowcut)
+ if (!(*rover->b_slope) && !gl_frontsector->f_slope && !gl_backsector->f_slope && l < lowcut)
l = lS = lowcut;
//Hurdler: HW code starts here
//FIXME: check if peging is correct
@@ -1843,8 +1843,8 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(rover->master->frontsector->lightlevel, rover->master->frontsector->extra_colormap);
- if (gr_backsector->numlights)
- HWR_SplitWall(gr_backsector, wallVerts, 0, &Surf, rover->flags, rover);
+ if (gl_backsector->numlights)
+ HWR_SplitWall(gl_backsector, wallVerts, 0, &Surf, rover->flags, rover);
else
HWR_AddTransparentWall(wallVerts, &Surf, 0, blendmode, true, lightnum, colormap);
}
@@ -1858,8 +1858,8 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
Surf.PolyColor.s.alpha = (UINT8)rover->alpha-1 > 255 ? 255 : rover->alpha-1;
}
- if (gr_backsector->numlights)
- HWR_SplitWall(gr_backsector, wallVerts, texnum, &Surf, rover->flags, rover);
+ if (gl_backsector->numlights)
+ HWR_SplitWall(gl_backsector, wallVerts, texnum, &Surf, rover->flags, rover);
else
{
if (blendmode != PF_Masked)
@@ -1898,10 +1898,10 @@ static boolean CheckClip(seg_t * seg, sector_t * afrontsector, sector_t * abacks
if (afrontsector->f_slope || afrontsector->c_slope || abacksector->f_slope || abacksector->c_slope)
{
fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t
- v1x = FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv1)->x);
- v1y = FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv1)->y);
- v2x = FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv2)->x);
- v2y = FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv2)->y);
+ v1x = FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv1)->x);
+ v1y = FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv1)->y);
+ v2x = FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv2)->x);
+ v2y = FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv2)->y);
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
end1 = P_GetZAt(slope, v1x, v1y, normalheight); \
end2 = P_GetZAt(slope, v2x, v2y, normalheight);
@@ -1972,17 +1972,17 @@ static boolean CheckClip(seg_t * seg, sector_t * afrontsector, sector_t * abacks
// hw_newend is one past the last valid seg
static cliprange_t * hw_newend;
-static cliprange_t gr_solidsegs[MAXSEGS];
+static cliprange_t gl_solidsegs[MAXSEGS];
// needs fix: walls are incorrectly clipped one column less
-static consvar_t cv_grclipwalls = {"gr_clipwalls", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cv_glclipwalls = {"gr_clipwalls", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
static void printsolidsegs(void)
{
cliprange_t * start;
if (!hw_newend)
return;
- for (start = gr_solidsegs;start != hw_newend;start++)
+ for (start = gl_solidsegs;start != hw_newend;start++)
{
CONS_Debug(DBG_RENDER, "%d-%d|",start->first,start->last);
}
@@ -2000,7 +2000,7 @@ static void HWR_ClipSolidWallSegment(INT32 first, INT32 last)
// Find the first range that touches the range
// (adjacent pixels are touching).
- start = gr_solidsegs;
+ start = gl_solidsegs;
while (start->last < first-1)
start++;
@@ -2028,14 +2028,14 @@ static void HWR_ClipSolidWallSegment(INT32 first, INT32 last)
}
// There is a fragment above *start.
- if (!cv_grclipwalls.value)
+ if (!cv_glclipwalls.value)
{
if (!poorhack) HWR_StoreWallRange(first, last);
poorhack = true;
}
else
{
- highfrac = HWR_ClipViewSegment(start->first+1, (polyvertex_t *)gr_curline->pv1, (polyvertex_t *)gr_curline->pv2);
+ highfrac = HWR_ClipViewSegment(start->first+1, (polyvertex_t *)gl_curline->pv1, (polyvertex_t *)gl_curline->pv2);
HWR_StoreWallRange(0, highfrac);
}
// Now adjust the clip size.
@@ -2052,15 +2052,15 @@ static void HWR_ClipSolidWallSegment(INT32 first, INT32 last)
while (last >= (next+1)->first-1)
{
// There is a fragment between two posts.
- if (!cv_grclipwalls.value)
+ if (!cv_glclipwalls.value)
{
if (!poorhack) HWR_StoreWallRange(first,last);
poorhack = true;
}
else
{
- lowfrac = HWR_ClipViewSegment(next->last-1, (polyvertex_t *)gr_curline->pv1, (polyvertex_t *)gr_curline->pv2);
- highfrac = HWR_ClipViewSegment((next+1)->first+1, (polyvertex_t *)gr_curline->pv1, (polyvertex_t *)gr_curline->pv2);
+ lowfrac = HWR_ClipViewSegment(next->last-1, (polyvertex_t *)gl_curline->pv1, (polyvertex_t *)gl_curline->pv2);
+ highfrac = HWR_ClipViewSegment((next+1)->first+1, (polyvertex_t *)gl_curline->pv1, (polyvertex_t *)gl_curline->pv2);
HWR_StoreWallRange(lowfrac, highfrac);
}
next++;
@@ -2076,7 +2076,7 @@ static void HWR_ClipSolidWallSegment(INT32 first, INT32 last)
if (first == next->first+1) // 1 line texture
{
- if (!cv_grclipwalls.value)
+ if (!cv_glclipwalls.value)
{
if (!poorhack) HWR_StoreWallRange(first,last);
poorhack = true;
@@ -2087,14 +2087,14 @@ static void HWR_ClipSolidWallSegment(INT32 first, INT32 last)
else
{
// There is a fragment after *next.
- if (!cv_grclipwalls.value)
+ if (!cv_glclipwalls.value)
{
if (!poorhack) HWR_StoreWallRange(first,last);
poorhack = true;
}
else
{
- lowfrac = HWR_ClipViewSegment(next->last-1, (polyvertex_t *)gr_curline->pv1, (polyvertex_t *)gr_curline->pv2);
+ lowfrac = HWR_ClipViewSegment(next->last-1, (polyvertex_t *)gl_curline->pv1, (polyvertex_t *)gl_curline->pv2);
HWR_StoreWallRange(lowfrac, 1);
}
}
@@ -2135,7 +2135,7 @@ static void HWR_ClipPassWallSegment(INT32 first, INT32 last)
// Find the first range that touches the range
// (adjacent pixels are touching).
- start = gr_solidsegs;
+ start = gl_solidsegs;
while (start->last < first - 1)
start++;
@@ -2149,7 +2149,7 @@ static void HWR_ClipPassWallSegment(INT32 first, INT32 last)
}
// There is a fragment above *start.
- if (!cv_grclipwalls.value)
+ if (!cv_glclipwalls.value)
{ //20/08/99: Changed by Hurdler (taken from faB's code)
if (!poorhack) HWR_StoreWallRange(0, 1);
poorhack = true;
@@ -2157,8 +2157,8 @@ static void HWR_ClipPassWallSegment(INT32 first, INT32 last)
else
{
highfrac = HWR_ClipViewSegment(min(start->first + 1,
- start->last), (polyvertex_t *)gr_curline->pv1,
- (polyvertex_t *)gr_curline->pv2);
+ start->last), (polyvertex_t *)gl_curline->pv1,
+ (polyvertex_t *)gl_curline->pv2);
HWR_StoreWallRange(0, highfrac);
}
}
@@ -2170,15 +2170,15 @@ static void HWR_ClipPassWallSegment(INT32 first, INT32 last)
while (last >= (start+1)->first-1)
{
// There is a fragment between two posts.
- if (!cv_grclipwalls.value)
+ if (!cv_glclipwalls.value)
{
if (!poorhack) HWR_StoreWallRange(0, 1);
poorhack = true;
}
else
{
- lowfrac = HWR_ClipViewSegment(max(start->last-1,start->first), (polyvertex_t *)gr_curline->pv1, (polyvertex_t *)gr_curline->pv2);
- highfrac = HWR_ClipViewSegment(min((start+1)->first+1,(start+1)->last), (polyvertex_t *)gr_curline->pv1, (polyvertex_t *)gr_curline->pv2);
+ lowfrac = HWR_ClipViewSegment(max(start->last-1,start->first), (polyvertex_t *)gl_curline->pv1, (polyvertex_t *)gl_curline->pv2);
+ highfrac = HWR_ClipViewSegment(min((start+1)->first+1,(start+1)->last), (polyvertex_t *)gl_curline->pv1, (polyvertex_t *)gl_curline->pv2);
HWR_StoreWallRange(lowfrac, highfrac);
}
start++;
@@ -2189,7 +2189,7 @@ static void HWR_ClipPassWallSegment(INT32 first, INT32 last)
if (first == start->first+1) // 1 line texture
{
- if (!cv_grclipwalls.value)
+ if (!cv_glclipwalls.value)
{
if (!poorhack) HWR_StoreWallRange(0, 1);
poorhack = true;
@@ -2200,7 +2200,7 @@ static void HWR_ClipPassWallSegment(INT32 first, INT32 last)
else
{
// There is a fragment after *next.
- if (!cv_grclipwalls.value)
+ if (!cv_glclipwalls.value)
{
if (!poorhack) HWR_StoreWallRange(0,1);
poorhack = true;
@@ -2208,8 +2208,8 @@ static void HWR_ClipPassWallSegment(INT32 first, INT32 last)
else
{
lowfrac = HWR_ClipViewSegment(max(start->last - 1,
- start->first), (polyvertex_t *)gr_curline->pv1,
- (polyvertex_t *)gr_curline->pv2);
+ start->first), (polyvertex_t *)gl_curline->pv1,
+ (polyvertex_t *)gl_curline->pv2);
HWR_StoreWallRange(lowfrac, 1);
}
}
@@ -2224,7 +2224,7 @@ static boolean HWR_ClipToSolidSegs(INT32 first, INT32 last)
// Find the first range that touches the range
// (adjacent pixels are touching).
- start = gr_solidsegs;
+ start = gl_solidsegs;
while (start->last < first-1)
start++;
@@ -2243,17 +2243,17 @@ static boolean HWR_ClipToSolidSegs(INT32 first, INT32 last)
//
static void HWR_ClearClipSegs(void)
{
- gr_solidsegs[0].first = -0x7fffffff;
- gr_solidsegs[0].last = -1;
- gr_solidsegs[1].first = vid.width; //viewwidth;
- gr_solidsegs[1].last = 0x7fffffff;
- hw_newend = gr_solidsegs+2;
+ gl_solidsegs[0].first = -0x7fffffff;
+ gl_solidsegs[0].last = -1;
+ gl_solidsegs[1].first = vid.width; //viewwidth;
+ gl_solidsegs[1].last = 0x7fffffff;
+ hw_newend = gl_solidsegs+2;
}
#endif // NEWCLIP
// -----------------+
// HWR_AddLine : Clips the given segment and adds any visible pieces to the line list.
-// Notes : gr_cursectorlight is set to the current subsector -> sector -> light value
+// Notes : gl_cursectorlight is set to the current subsector -> sector -> light value
// : (it may be mixed with the wall's own flat colour in the future ...)
// -----------------+
static void HWR_AddLine(seg_t * line)
@@ -2272,12 +2272,12 @@ static void HWR_AddLine(seg_t * line)
if (line->polyseg && !(line->polyseg->flags & POF_RENDERSIDES))
return;
- gr_curline = line;
+ gl_curline = line;
- v1x = FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv1)->x);
- v1y = FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv1)->y);
- v2x = FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv2)->x);
- v2y = FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv2)->y);
+ v1x = FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv1)->x);
+ v1y = FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv1)->y);
+ v2x = FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv2)->x);
+ v2y = FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv2)->y);
// OPTIMIZE: quickly reject orthogonal back sides.
angle1 = R_PointToAngle(v1x, v1y);
@@ -2309,27 +2309,27 @@ static void HWR_AddLine(seg_t * line)
angle1 -= dup_viewangle;
angle2 -= dup_viewangle;
- tspan = angle1 + gr_clipangle;
- if (tspan > 2*gr_clipangle)
+ tspan = angle1 + gl_clipangle;
+ if (tspan > 2*gl_clipangle)
{
- tspan -= 2*gr_clipangle;
+ tspan -= 2*gl_clipangle;
// Totally off the left edge?
if (tspan >= span)
return;
- angle1 = gr_clipangle;
+ angle1 = gl_clipangle;
}
- tspan = gr_clipangle - angle2;
- if (tspan > 2*gr_clipangle)
+ tspan = gl_clipangle - angle2;
+ if (tspan > 2*gl_clipangle)
{
- tspan -= 2*gr_clipangle;
+ tspan -= 2*gl_clipangle;
// Totally off the left edge?
if (tspan >= span)
return;
- angle2 = (angle_t)-(signed)gr_clipangle;
+ angle2 = (angle_t)-(signed)gl_clipangle;
}
#if 0
@@ -2337,23 +2337,23 @@ static void HWR_AddLine(seg_t * line)
float fx1,fx2,fy1,fy2;
//BP: test with a better projection than viewangletox[R_PointToAngle(angle)]
// do not enable this at release 4 mul and 2 div
- fx1 = ((polyvertex_t *)(line->pv1))->x-gr_viewx;
- fy1 = ((polyvertex_t *)(line->pv1))->y-gr_viewy;
- fy2 = (fx1 * gr_viewcos + fy1 * gr_viewsin);
+ fx1 = ((polyvertex_t *)(line->pv1))->x-gl_viewx;
+ fy1 = ((polyvertex_t *)(line->pv1))->y-gl_viewy;
+ fy2 = (fx1 * gl_viewcos + fy1 * gl_viewsin);
if (fy2 < 0)
// the point is back
fx1 = 0;
else
- fx1 = gr_windowcenterx + (fx1 * gr_viewsin - fy1 * gr_viewcos) * gr_centerx / fy2;
+ fx1 = gl_windowcenterx + (fx1 * gl_viewsin - fy1 * gl_viewcos) * gl_centerx / fy2;
- fx2 = ((polyvertex_t *)(line->pv2))->x-gr_viewx;
- fy2 = ((polyvertex_t *)(line->pv2))->y-gr_viewy;
- fy1 = (fx2 * gr_viewcos + fy2 * gr_viewsin);
+ fx2 = ((polyvertex_t *)(line->pv2))->x-gl_viewx;
+ fy2 = ((polyvertex_t *)(line->pv2))->y-gl_viewy;
+ fy1 = (fx2 * gl_viewcos + fy2 * gl_viewsin);
if (fy1 < 0)
// the point is back
fx2 = vid.width;
else
- fx2 = gr_windowcenterx + (fx2 * gr_viewsin - fy2 * gr_viewcos) * gr_centerx / fy1;
+ fx2 = gl_windowcenterx + (fx2 * gl_viewsin - fy2 * gl_viewcos) * gl_centerx / fy1;
x1 = fx1+0.5f;
x2 = fx2+0.5f;
@@ -2364,8 +2364,8 @@ static void HWR_AddLine(seg_t * line)
angle1 = (angle1+ANGLE_90)>>ANGLETOFINESHIFT;
angle2 = (angle2+ANGLE_90)>>ANGLETOFINESHIFT;
- x1 = gr_viewangletox[angle1];
- x2 = gr_viewangletox[angle2];
+ x1 = gl_viewangletox[angle1];
+ x2 = gl_viewangletox[angle2];
#endif
// Does not cross a pixel?
// if (x1 == x2)
@@ -2377,7 +2377,7 @@ static void HWR_AddLine(seg_t * line)
*/
#endif
- gr_backsector = line->backsector;
+ gl_backsector = line->backsector;
#ifdef NEWCLIP
if (!line->backsector)
@@ -2388,26 +2388,26 @@ static void HWR_AddLine(seg_t * line)
{
boolean bothceilingssky = false, bothfloorssky = false;
- gr_backsector = R_FakeFlat(gr_backsector, &tempsec, NULL, NULL, true);
+ gl_backsector = R_FakeFlat(gl_backsector, &tempsec, NULL, NULL, true);
- if (gr_backsector->ceilingpic == skyflatnum && gr_frontsector->ceilingpic == skyflatnum)
+ if (gl_backsector->ceilingpic == skyflatnum && gl_frontsector->ceilingpic == skyflatnum)
bothceilingssky = true;
- if (gr_backsector->floorpic == skyflatnum && gr_frontsector->floorpic == skyflatnum)
+ if (gl_backsector->floorpic == skyflatnum && gl_frontsector->floorpic == skyflatnum)
bothfloorssky = true;
if (bothceilingssky && bothfloorssky) // everything's sky? let's save us a bit of time then
{
if (!line->polyseg &&
!line->sidedef->midtexture
- && ((!gr_frontsector->ffloors && !gr_backsector->ffloors)
- || (gr_frontsector->tag == gr_backsector->tag)))
+ && ((!gl_frontsector->ffloors && !gl_backsector->ffloors)
+ || (gl_frontsector->tag == gl_backsector->tag)))
return; // line is empty, don't even bother
// treat like wide open window instead
HWR_ProcessSeg(); // Doesn't need arguments because they're defined globally :D
return;
}
- if (CheckClip(line, gr_frontsector, gr_backsector))
+ if (CheckClip(line, gl_frontsector, gl_backsector))
{
gld_clipper_SafeAddClipRange(angle2, angle1);
checkforemptylines = false;
@@ -2416,7 +2416,7 @@ static void HWR_AddLine(seg_t * line)
// Identical floor and ceiling on both sides,
// identical light levels on both sides,
// and no middle texture.
- if (checkforemptylines && R_IsEmptyLine(line, gr_frontsector, gr_backsector))
+ if (checkforemptylines && R_IsEmptyLine(line, gl_frontsector, gl_backsector))
return;
}
@@ -2424,28 +2424,28 @@ static void HWR_AddLine(seg_t * line)
return;
#else
// Single sided line?
- if (!gr_backsector)
+ if (!gl_backsector)
goto clipsolid;
- gr_backsector = R_FakeFlat(gr_backsector, &tempsec, NULL, NULL, true);
+ gl_backsector = R_FakeFlat(gl_backsector, &tempsec, NULL, NULL, true);
- if (gr_backsector->ceilingpic == skyflatnum && gr_frontsector->ceilingpic == skyflatnum)
+ if (gl_backsector->ceilingpic == skyflatnum && gl_frontsector->ceilingpic == skyflatnum)
bothceilingssky = true;
- if (gr_backsector->floorpic == skyflatnum && gr_frontsector->floorpic == skyflatnum)
+ if (gl_backsector->floorpic == skyflatnum && gl_frontsector->floorpic == skyflatnum)
bothfloorssky = true;
if (bothceilingssky && bothfloorssky) // everything's sky? let's save us a bit of time then
{
if (!line->polyseg &&
!line->sidedef->midtexture
- && ((!gr_frontsector->ffloors && !gr_backsector->ffloors)
- || (gr_frontsector->tag == gr_backsector->tag)))
+ && ((!gl_frontsector->ffloors && !gl_backsector->ffloors)
+ || (gl_frontsector->tag == gl_backsector->tag)))
return; // line is empty, don't even bother
goto clippass; // treat like wide open window instead
}
- if (gr_frontsector->f_slope || gr_frontsector->c_slope || gr_backsector->f_slope || gr_backsector->c_slope)
+ if (gl_frontsector->f_slope || gl_frontsector->c_slope || gl_backsector->f_slope || gl_backsector->c_slope)
{
fixed_t frontf1,frontf2, frontc1, frontc2; // front floor/ceiling ends
fixed_t backf1, backf2, backc1, backc2; // back floor ceiling ends
@@ -2454,10 +2454,10 @@ static void HWR_AddLine(seg_t * line)
end1 = P_GetZAt(slope, v1x, v1y, normalheight); \
end2 = P_GetZAt(slope, v2x, v2y, normalheight);
- SLOPEPARAMS(gr_frontsector->f_slope, frontf1, frontf2, gr_frontsector-> floorheight)
- SLOPEPARAMS(gr_frontsector->c_slope, frontc1, frontc2, gr_frontsector->ceilingheight)
- SLOPEPARAMS( gr_backsector->f_slope, backf1, backf2, gr_backsector-> floorheight)
- SLOPEPARAMS( gr_backsector->c_slope, backc1, backc2, gr_backsector->ceilingheight)
+ SLOPEPARAMS(gl_frontsector->f_slope, frontf1, frontf2, gl_frontsector-> floorheight)
+ SLOPEPARAMS(gl_frontsector->c_slope, frontc1, frontc2, gl_frontsector->ceilingheight)
+ SLOPEPARAMS( gl_backsector->f_slope, backf1, backf2, gl_backsector-> floorheight)
+ SLOPEPARAMS( gl_backsector->c_slope, backc1, backc2, gl_backsector->ceilingheight)
#undef SLOPEPARAMS
// if both ceilings are skies, consider it always "open"
// same for floors
@@ -2472,8 +2472,8 @@ static void HWR_AddLine(seg_t * line)
// Check for automap fix.
if (backc1 <= backf1 && backc2 <= backf2
- && ((backc1 >= frontc1 && backc2 >= frontc2) || gr_curline->sidedef->toptexture)
- && ((backf1 <= frontf1 && backf2 >= frontf2) || gr_curline->sidedef->bottomtexture))
+ && ((backc1 >= frontc1 && backc2 >= frontc2) || gl_curline->sidedef->toptexture)
+ && ((backf1 <= frontf1 && backf2 >= frontf2) || gl_curline->sidedef->bottomtexture))
goto clipsolid;
}
@@ -2492,23 +2492,23 @@ static void HWR_AddLine(seg_t * line)
if (!bothceilingssky && !bothfloorssky)
{
// Closed door.
- if (gr_backsector->ceilingheight <= gr_frontsector->floorheight ||
- gr_backsector->floorheight >= gr_frontsector->ceilingheight)
+ if (gl_backsector->ceilingheight <= gl_frontsector->floorheight ||
+ gl_backsector->floorheight >= gl_frontsector->ceilingheight)
goto clipsolid;
// Check for automap fix.
- if (gr_backsector->ceilingheight <= gr_backsector->floorheight
- && ((gr_backsector->ceilingheight >= gr_frontsector->ceilingheight) || gr_curline->sidedef->toptexture)
- && ((gr_backsector->floorheight <= gr_backsector->floorheight) || gr_curline->sidedef->bottomtexture))
+ if (gl_backsector->ceilingheight <= gl_backsector->floorheight
+ && ((gl_backsector->ceilingheight >= gl_frontsector->ceilingheight) || gl_curline->sidedef->toptexture)
+ && ((gl_backsector->floorheight <= gl_backsector->floorheight) || gl_curline->sidedef->bottomtexture))
goto clipsolid;
}
// Window.
if (!bothceilingssky) // ceilings are always the "same" when sky
- if (gr_backsector->ceilingheight != gr_frontsector->ceilingheight)
+ if (gl_backsector->ceilingheight != gl_frontsector->ceilingheight)
goto clippass;
if (!bothfloorssky) // floors are always the "same" when sky
- if (gr_backsector->floorheight != gr_frontsector->floorheight)
+ if (gl_backsector->floorheight != gl_frontsector->floorheight)
goto clippass;
}
@@ -2516,7 +2516,7 @@ static void HWR_AddLine(seg_t * line)
// Identical floor and ceiling on both sides,
// identical light levels on both sides,
// and no middle texture.
- if (R_IsEmptyLine(gr_curline, gr_frontsector, gr_backsector))
+ if (R_IsEmptyLine(gl_curline, gl_frontsector, gl_backsector))
return;
clippass:
@@ -2588,28 +2588,28 @@ static boolean HWR_CheckBBox(fixed_t *bspcoord)
if (span >= ANGLE_180)
return true;
- tspan = angle1 + gr_clipangle;
+ tspan = angle1 + gl_clipangle;
- if (tspan > 2*gr_clipangle)
+ if (tspan > 2*gl_clipangle)
{
- tspan -= 2*gr_clipangle;
+ tspan -= 2*gl_clipangle;
// Totally off the left edge?
if (tspan >= span)
return false;
- angle1 = gr_clipangle;
+ angle1 = gl_clipangle;
}
- tspan = gr_clipangle - angle2;
- if (tspan > 2*gr_clipangle)
+ tspan = gl_clipangle - angle2;
+ if (tspan > 2*gl_clipangle)
{
- tspan -= 2*gr_clipangle;
+ tspan -= 2*gl_clipangle;
// Totally off the left edge?
if (tspan >= span)
return false;
- angle2 = (angle_t)-(signed)gr_clipangle;
+ angle2 = (angle_t)-(signed)gl_clipangle;
}
// Find the first clippost
@@ -2617,8 +2617,8 @@ static boolean HWR_CheckBBox(fixed_t *bspcoord)
// (adjacent pixels are touching).
angle1 = (angle1+ANGLE_90)>>ANGLETOFINESHIFT;
angle2 = (angle2+ANGLE_90)>>ANGLETOFINESHIFT;
- sx1 = gr_viewangletox[angle1];
- sx2 = gr_viewangletox[angle2];
+ sx1 = gl_viewangletox[angle1];
+ sx2 = gl_viewangletox[angle2];
// Does not cross a pixel.
if (sx1 == sx2)
@@ -2638,7 +2638,7 @@ static boolean HWR_CheckBBox(fixed_t *bspcoord)
static inline void HWR_AddPolyObjectSegs(void)
{
size_t i, j;
- seg_t *gr_fakeline = Z_Calloc(sizeof(seg_t), PU_STATIC, NULL);
+ seg_t *gl_fakeline = Z_Calloc(sizeof(seg_t), PU_STATIC, NULL);
polyvertex_t *pv1 = Z_Calloc(sizeof(polyvertex_t), PU_STATIC, NULL);
polyvertex_t *pv2 = Z_Calloc(sizeof(polyvertex_t), PU_STATIC, NULL);
@@ -2649,25 +2649,25 @@ static inline void HWR_AddPolyObjectSegs(void)
for (j = 0; j < po_ptrs[i]->segCount; ++j)
{
// Copy the info of a polyobject's seg, then convert it to OpenGL floating point
- M_Memcpy(gr_fakeline, po_ptrs[i]->segs[j], sizeof(seg_t));
+ M_Memcpy(gl_fakeline, po_ptrs[i]->segs[j], sizeof(seg_t));
// Now convert the line to float and add it to be rendered
- pv1->x = FIXED_TO_FLOAT(gr_fakeline->v1->x);
- pv1->y = FIXED_TO_FLOAT(gr_fakeline->v1->y);
- pv2->x = FIXED_TO_FLOAT(gr_fakeline->v2->x);
- pv2->y = FIXED_TO_FLOAT(gr_fakeline->v2->y);
+ pv1->x = FIXED_TO_FLOAT(gl_fakeline->v1->x);
+ pv1->y = FIXED_TO_FLOAT(gl_fakeline->v1->y);
+ pv2->x = FIXED_TO_FLOAT(gl_fakeline->v2->x);
+ pv2->y = FIXED_TO_FLOAT(gl_fakeline->v2->y);
- gr_fakeline->pv1 = pv1;
- gr_fakeline->pv2 = pv2;
+ gl_fakeline->pv1 = pv1;
+ gl_fakeline->pv2 = pv2;
- HWR_AddLine(gr_fakeline);
+ HWR_AddLine(gl_fakeline);
}
}
// Free temporary data no longer needed
Z_Free(pv2);
Z_Free(pv1);
- Z_Free(gr_fakeline);
+ Z_Free(gl_fakeline);
}
static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling, fixed_t fixedheight,
@@ -2778,19 +2778,19 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
angle = FOFsector->ceilingpic_angle>>ANGLETOFINESHIFT;
}
}
- else if (gr_frontsector)
+ else if (gl_frontsector)
{
if (!isceiling) // it's a floor
{
- scrollx = FIXED_TO_FLOAT(gr_frontsector->floor_xoffs)/fflatwidth;
- scrolly = FIXED_TO_FLOAT(gr_frontsector->floor_yoffs)/fflatheight;
- angle = gr_frontsector->floorpic_angle>>ANGLETOFINESHIFT;
+ scrollx = FIXED_TO_FLOAT(gl_frontsector->floor_xoffs)/fflatwidth;
+ scrolly = FIXED_TO_FLOAT(gl_frontsector->floor_yoffs)/fflatheight;
+ angle = gl_frontsector->floorpic_angle>>ANGLETOFINESHIFT;
}
else // it's a ceiling
{
- scrollx = FIXED_TO_FLOAT(gr_frontsector->ceiling_xoffs)/fflatwidth;
- scrolly = FIXED_TO_FLOAT(gr_frontsector->ceiling_yoffs)/fflatheight;
- angle = gr_frontsector->ceilingpic_angle>>ANGLETOFINESHIFT;
+ scrollx = FIXED_TO_FLOAT(gl_frontsector->ceiling_xoffs)/fflatwidth;
+ scrolly = FIXED_TO_FLOAT(gl_frontsector->ceiling_yoffs)/fflatheight;
+ angle = gl_frontsector->ceilingpic_angle>>ANGLETOFINESHIFT;
}
}
@@ -2874,11 +2874,11 @@ static void HWR_AddPolyObjectPlanes(void)
if (po_ptrs[i]->translucency >= NUMTRANSMAPS)
continue;
- if (polyobjsector->floorheight <= gr_frontsector->ceilingheight
- && polyobjsector->floorheight >= gr_frontsector->floorheight
+ if (polyobjsector->floorheight <= gl_frontsector->ceilingheight
+ && polyobjsector->floorheight >= gl_frontsector->floorheight
&& (viewz < polyobjsector->floorheight))
{
- light = R_GetPlaneLight(gr_frontsector, polyobjsector->floorheight, true);
+ light = R_GetPlaneLight(gl_frontsector, polyobjsector->floorheight, true);
if (po_ptrs[i]->translucency > 0)
{
FSurfaceInfo Surf;
@@ -2886,22 +2886,22 @@ static void HWR_AddPolyObjectPlanes(void)
memset(&Surf, 0x00, sizeof(Surf));
blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
HWR_AddTransparentPolyobjectFloor(&levelflats[polyobjsector->floorpic], po_ptrs[i], false, polyobjsector->floorheight,
- (light == -1 ? gr_frontsector->lightlevel : *gr_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gr_frontsector->extra_colormap : *gr_frontsector->lightlist[light].extra_colormap));
+ (light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : *gl_frontsector->lightlist[light].extra_colormap));
}
else
{
HWR_GetLevelFlat(&levelflats[polyobjsector->floorpic]);
HWR_RenderPolyObjectPlane(po_ptrs[i], false, polyobjsector->floorheight, PF_Occlude,
- (light == -1 ? gr_frontsector->lightlevel : *gr_frontsector->lightlist[light].lightlevel), &levelflats[polyobjsector->floorpic],
- polyobjsector, 255, (light == -1 ? gr_frontsector->extra_colormap : *gr_frontsector->lightlist[light].extra_colormap));
+ (light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), &levelflats[polyobjsector->floorpic],
+ polyobjsector, 255, (light == -1 ? gl_frontsector->extra_colormap : *gl_frontsector->lightlist[light].extra_colormap));
}
}
- if (polyobjsector->ceilingheight >= gr_frontsector->floorheight
- && polyobjsector->ceilingheight <= gr_frontsector->ceilingheight
+ if (polyobjsector->ceilingheight >= gl_frontsector->floorheight
+ && polyobjsector->ceilingheight <= gl_frontsector->ceilingheight
&& (viewz > polyobjsector->ceilingheight))
{
- light = R_GetPlaneLight(gr_frontsector, polyobjsector->ceilingheight, true);
+ light = R_GetPlaneLight(gl_frontsector, polyobjsector->ceilingheight, true);
if (po_ptrs[i]->translucency > 0)
{
FSurfaceInfo Surf;
@@ -2909,14 +2909,14 @@ static void HWR_AddPolyObjectPlanes(void)
memset(&Surf, 0x00, sizeof(Surf));
blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
HWR_AddTransparentPolyobjectFloor(&levelflats[polyobjsector->ceilingpic], po_ptrs[i], true, polyobjsector->ceilingheight,
- (light == -1 ? gr_frontsector->lightlevel : *gr_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gr_frontsector->extra_colormap : *gr_frontsector->lightlist[light].extra_colormap));
+ (light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : *gl_frontsector->lightlist[light].extra_colormap));
}
else
{
HWR_GetLevelFlat(&levelflats[polyobjsector->ceilingpic]);
HWR_RenderPolyObjectPlane(po_ptrs[i], true, polyobjsector->ceilingheight, PF_Occlude,
- (light == -1 ? gr_frontsector->lightlevel : *gr_frontsector->lightlist[light].lightlevel), &levelflats[polyobjsector->ceilingpic],
- polyobjsector, 255, (light == -1 ? gr_frontsector->extra_colormap : *gr_frontsector->lightlist[light].extra_colormap));
+ (light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), &levelflats[polyobjsector->ceilingpic],
+ polyobjsector, 255, (light == -1 ? gl_frontsector->extra_colormap : *gl_frontsector->lightlist[light].extra_colormap));
}
}
}
@@ -2926,7 +2926,7 @@ static void HWR_AddPolyObjectPlanes(void)
// HWR_Subsector : Determine floor/ceiling planes.
// : Add sprites of things in sector.
// : Draw one or more line segments.
-// Notes : Sets gr_cursectorlight to the light of the parent sector, to modulate wall textures
+// Notes : Sets gl_cursectorlight to the light of the parent sector, to modulate wall textures
// -----------------+
static void HWR_Subsector(size_t num)
{
@@ -2958,7 +2958,7 @@ static void HWR_Subsector(size_t num)
// subsector
sub = &subsectors[num];
// sector
- gr_frontsector = sub->sector;
+ gl_frontsector = sub->sector;
// how many linedefs
count = sub->numlines;
// first line seg
@@ -2968,72 +2968,73 @@ static void HWR_Subsector(size_t num)
{
// there are no segs but only planes
sub = &subsectors[0];
- gr_frontsector = sub->sector;
+ gl_frontsector = sub->sector;
count = 0;
line = NULL;
}
//SoM: 4/7/2000: Test to make Boom water work in Hardware mode.
- gr_frontsector = R_FakeFlat(gr_frontsector, &tempsec, &floorlightlevel,
+ gl_frontsector = R_FakeFlat(gl_frontsector, &tempsec, &floorlightlevel,
&ceilinglightlevel, false);
//FIXME: Use floorlightlevel and ceilinglightlevel insted of lightlevel.
- floorcolormap = ceilingcolormap = gr_frontsector->extra_colormap;
+ floorcolormap = ceilingcolormap = gl_frontsector->extra_colormap;
// ------------------------------------------------------------------------
// sector lighting, DISABLED because it's done in HWR_StoreWallRange
// ------------------------------------------------------------------------
/// \todo store a RGBA instead of just intensity, allow coloured sector lighting
//light = (FUBYTE)(sub->sector->lightlevel & 0xFF) / 255.0f;
- //gr_cursectorlight.red = light;
- //gr_cursectorlight.green = light;
- //gr_cursectorlight.blue = light;
- //gr_cursectorlight.alpha = light;
+ //gl_cursectorlight.red = light;
+ //gl_cursectorlight.green = light;
+ //gl_cursectorlight.blue = light;
+ //gl_cursectorlight.alpha = light;
- cullFloorHeight = P_GetSectorFloorZAt (gr_frontsector, viewx, viewy);
- cullCeilingHeight = P_GetSectorCeilingZAt(gr_frontsector, viewx, viewy);
- locFloorHeight = P_GetSectorFloorZAt (gr_frontsector, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
- locCeilingHeight = P_GetSectorCeilingZAt(gr_frontsector, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
+// ----- end special tricks -----
+ cullFloorHeight = P_GetSectorFloorZAt (gl_frontsector, viewx, viewy);
+ cullCeilingHeight = P_GetSectorCeilingZAt(gl_frontsector, viewx, viewy);
+ locFloorHeight = P_GetSectorFloorZAt (gl_frontsector, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
+ locCeilingHeight = P_GetSectorCeilingZAt(gl_frontsector, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
- if (gr_frontsector->ffloors)
+ if (gl_frontsector->ffloors)
{
- if (gr_frontsector->moved)
+ if (gl_frontsector->moved)
{
- gr_frontsector->numlights = sub->sector->numlights = 0;
- R_Prep3DFloors(gr_frontsector);
- sub->sector->lightlist = gr_frontsector->lightlist;
- sub->sector->numlights = gr_frontsector->numlights;
- sub->sector->moved = gr_frontsector->moved = false;
+ gl_frontsector->numlights = sub->sector->numlights = 0;
+ R_Prep3DFloors(gl_frontsector);
+ sub->sector->lightlist = gl_frontsector->lightlist;
+ sub->sector->numlights = gl_frontsector->numlights;
+ sub->sector->moved = gl_frontsector->moved = false;
}
- light = R_GetPlaneLight(gr_frontsector, locFloorHeight, false);
- if (gr_frontsector->floorlightsec == -1)
- floorlightlevel = *gr_frontsector->lightlist[light].lightlevel;
- floorcolormap = *gr_frontsector->lightlist[light].extra_colormap;
+ light = R_GetPlaneLight(gl_frontsector, locFloorHeight, false);
+ if (gl_frontsector->floorlightsec == -1)
+ floorlightlevel = *gl_frontsector->lightlist[light].lightlevel;
+ floorcolormap = *gl_frontsector->lightlist[light].extra_colormap;
- light = R_GetPlaneLight(gr_frontsector, locCeilingHeight, false);
- if (gr_frontsector->ceilinglightsec == -1)
- ceilinglightlevel = *gr_frontsector->lightlist[light].lightlevel;
- ceilingcolormap = *gr_frontsector->lightlist[light].extra_colormap;
+ light = R_GetPlaneLight(gl_frontsector, locCeilingHeight, false);
+ if (gl_frontsector->ceilinglightsec == -1)
+ ceilinglightlevel = *gl_frontsector->lightlist[light].lightlevel;
+ ceilingcolormap = *gl_frontsector->lightlist[light].extra_colormap;
}
- sub->sector->extra_colormap = gr_frontsector->extra_colormap;
+ sub->sector->extra_colormap = gl_frontsector->extra_colormap;
// render floor ?
#ifdef DOPLANES
// yeah, easy backface cull! :)
if (cullFloorHeight < dup_viewz)
{
- if (gr_frontsector->floorpic != skyflatnum)
+ if (gl_frontsector->floorpic != skyflatnum)
{
if (sub->validcount != validcount)
{
- HWR_GetLevelFlat(&levelflats[gr_frontsector->floorpic]);
+ HWR_GetLevelFlat(&levelflats[gl_frontsector->floorpic]);
HWR_RenderPlane(sub, &extrasubsectors[num], false,
// Hack to make things continue to work around slopes.
- locFloorHeight == cullFloorHeight ? locFloorHeight : gr_frontsector->floorheight,
+ locFloorHeight == cullFloorHeight ? locFloorHeight : gl_frontsector->floorheight,
// We now return you to your regularly scheduled rendering.
- PF_Occlude, floorlightlevel, &levelflats[gr_frontsector->floorpic], NULL, 255, floorcolormap);
+ PF_Occlude, floorlightlevel, &levelflats[gl_frontsector->floorpic], NULL, 255, floorcolormap);
}
}
else
@@ -3046,16 +3047,16 @@ static void HWR_Subsector(size_t num)
if (cullCeilingHeight > dup_viewz)
{
- if (gr_frontsector->ceilingpic != skyflatnum)
+ if (gl_frontsector->ceilingpic != skyflatnum)
{
if (sub->validcount != validcount)
{
- HWR_GetLevelFlat(&levelflats[gr_frontsector->ceilingpic]);
+ HWR_GetLevelFlat(&levelflats[gl_frontsector->ceilingpic]);
HWR_RenderPlane(sub, &extrasubsectors[num], true,
// Hack to make things continue to work around slopes.
- locCeilingHeight == cullCeilingHeight ? locCeilingHeight : gr_frontsector->ceilingheight,
+ locCeilingHeight == cullCeilingHeight ? locCeilingHeight : gl_frontsector->ceilingheight,
// We now return you to your regularly scheduled rendering.
- PF_Occlude, ceilinglightlevel, &levelflats[gr_frontsector->ceilingpic], NULL, 255, ceilingcolormap);
+ PF_Occlude, ceilinglightlevel, &levelflats[gl_frontsector->ceilingpic], NULL, 255, ceilingcolormap);
}
}
else
@@ -3068,23 +3069,23 @@ static void HWR_Subsector(size_t num)
#ifndef POLYSKY
// Moved here because before, when above the ceiling and the floor does not have the sky flat, it doesn't draw the sky
- if (gr_frontsector->ceilingpic == skyflatnum || gr_frontsector->floorpic == skyflatnum)
+ if (gl_frontsector->ceilingpic == skyflatnum || gl_frontsector->floorpic == skyflatnum)
drawsky = true;
#endif
#ifdef R_FAKEFLOORS
- if (gr_frontsector->ffloors)
+ if (gl_frontsector->ffloors)
{
/// \todo fix light, xoffs, yoffs, extracolormap ?
ffloor_t * rover;
- for (rover = gr_frontsector->ffloors;
+ for (rover = gl_frontsector->ffloors;
rover; rover = rover->next)
{
fixed_t cullHeight, centerHeight;
// bottom plane
cullHeight = P_GetFFloorBottomZAt(rover, viewx, viewy);
- centerHeight = P_GetFFloorBottomZAt(rover, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
+ centerHeight = P_GetFFloorBottomZAt(rover, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES))
continue;
@@ -3100,41 +3101,41 @@ static void HWR_Subsector(size_t num)
{
UINT8 alpha;
- light = R_GetPlaneLight(gr_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
- alpha = HWR_FogBlockAlpha(*gr_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap);
+ light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
+ alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap);
HWR_AddTransparentFloor(0,
&extrasubsectors[num],
false,
*rover->bottomheight,
- *gr_frontsector->lightlist[light].lightlevel,
+ *gl_frontsector->lightlist[light].lightlevel,
alpha, rover->master->frontsector, PF_Fog|PF_NoTexture,
true, rover->master->frontsector->extra_colormap);
}
else if (rover->flags & FF_TRANSLUCENT && rover->alpha < 256) // SoM: Flags are more efficient
{
- light = R_GetPlaneLight(gr_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
+ light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
HWR_AddTransparentFloor(&levelflats[*rover->bottompic],
&extrasubsectors[num],
false,
*rover->bottomheight,
- *gr_frontsector->lightlist[light].lightlevel,
+ *gl_frontsector->lightlist[light].lightlevel,
rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Translucent,
- false, *gr_frontsector->lightlist[light].extra_colormap);
+ false, *gl_frontsector->lightlist[light].extra_colormap);
}
else
{
HWR_GetLevelFlat(&levelflats[*rover->bottompic]);
- light = R_GetPlaneLight(gr_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
- HWR_RenderPlane(sub, &extrasubsectors[num], false, *rover->bottomheight, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Occlude, *gr_frontsector->lightlist[light].lightlevel, &levelflats[*rover->bottompic],
- rover->master->frontsector, 255, *gr_frontsector->lightlist[light].extra_colormap);
+ light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
+ HWR_RenderPlane(sub, &extrasubsectors[num], false, *rover->bottomheight, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, &levelflats[*rover->bottompic],
+ rover->master->frontsector, 255, *gl_frontsector->lightlist[light].extra_colormap);
}
}
// top plane
cullHeight = P_GetFFloorTopZAt(rover, viewx, viewy);
- centerHeight = P_GetFFloorTopZAt(rover, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
+ centerHeight = P_GetFFloorTopZAt(rover, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
if (centerHeight >= locFloorHeight &&
centerHeight <= locCeilingHeight &&
@@ -3145,35 +3146,35 @@ static void HWR_Subsector(size_t num)
{
UINT8 alpha;
- light = R_GetPlaneLight(gr_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
- alpha = HWR_FogBlockAlpha(*gr_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap);
+ light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
+ alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap);
HWR_AddTransparentFloor(0,
&extrasubsectors[num],
true,
*rover->topheight,
- *gr_frontsector->lightlist[light].lightlevel,
+ *gl_frontsector->lightlist[light].lightlevel,
alpha, rover->master->frontsector, PF_Fog|PF_NoTexture,
true, rover->master->frontsector->extra_colormap);
}
else if (rover->flags & FF_TRANSLUCENT && rover->alpha < 256)
{
- light = R_GetPlaneLight(gr_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
+ light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
HWR_AddTransparentFloor(&levelflats[*rover->toppic],
&extrasubsectors[num],
true,
*rover->topheight,
- *gr_frontsector->lightlist[light].lightlevel,
+ *gl_frontsector->lightlist[light].lightlevel,
rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Translucent,
- false, *gr_frontsector->lightlist[light].extra_colormap);
+ false, *gl_frontsector->lightlist[light].extra_colormap);
}
else
{
HWR_GetLevelFlat(&levelflats[*rover->toppic]);
- light = R_GetPlaneLight(gr_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
- HWR_RenderPlane(sub, &extrasubsectors[num], true, *rover->topheight, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Occlude, *gr_frontsector->lightlist[light].lightlevel, &levelflats[*rover->toppic],
- rover->master->frontsector, 255, *gr_frontsector->lightlist[light].extra_colormap);
+ light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
+ HWR_RenderPlane(sub, &extrasubsectors[num], true, *rover->topheight, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, &levelflats[*rover->toppic],
+ rover->master->frontsector, 255, *gl_frontsector->lightlist[light].extra_colormap);
}
}
}
@@ -3219,11 +3220,11 @@ static void HWR_Subsector(size_t num)
{
// draw sprites first, coz they are clipped to the solidsegs of
// subsectors more 'in front'
- HWR_AddSprites(gr_frontsector);
+ HWR_AddSprites(gl_frontsector);
//Hurdler: at this point validcount must be the same, but is not because
- // gr_frontsector doesn't point anymore to sub->sector due to
- // the call gr_frontsector = R_FakeFlat(...)
+ // gl_frontsector doesn't point anymore to sub->sector due to
+ // the call gl_frontsector = R_FakeFlat(...)
// if it's not done, the sprite is drawn more than once,
// what looks really bad with translucency or dynamic light,
// without talking about the overdraw of course.
@@ -3311,12 +3312,12 @@ static void HWR_RenderBSPNode(INT32 bspnum)
{
if (bspnum == -1)
{
- //*(gr_drawsubsector_p++) = 0;
+ //*(gl_drawsubsector_p++) = 0;
HWR_Subsector(0);
}
else
{
- //*(gr_drawsubsector_p++) = bspnum&(~NF_SUBSECTOR);
+ //*(gl_drawsubsector_p++) = bspnum&(~NF_SUBSECTOR);
HWR_Subsector(bspnum&(~NF_SUBSECTOR));
}
return;
@@ -3346,7 +3347,7 @@ static void HWR_RenderBSPNode(INT32 bspnum)
//
static void HWR_ClearDrawSubsectors(void)
{
- gr_drawsubsector_p = gr_drawsubsectors;
+ gl_drawsubsector_p = gl_drawsubsectors;
}
//
@@ -3354,7 +3355,7 @@ static void HWR_ClearDrawSubsectors(void)
//
static void HWR_RenderSubsectors(void)
{
- while (gr_drawsubsector_p > gr_drawsubsectors)
+ while (gl_drawsubsector_p > gl_drawsubsectors)
{
HWR_RenderBSPNode(
lastsubsec->nextsubsec = bspnum & (~NF_SUBSECTOR);
@@ -3408,7 +3409,7 @@ void HWR_InitTextureMapping(void)
else if (t > grviewwidth+1)
t = grviewwidth+1;
}
- gr_viewangletox[i] = t;
+ gl_viewangletox[i] = t;
}
// Scan viewangletox[] to generate xtoviewangle[]:
@@ -3417,32 +3418,32 @@ void HWR_InitTextureMapping(void)
for (x = 0; x <= grviewwidth; x++)
{
i = 0;
- while (gr_viewangletox[i]>x)
+ while (gl_viewangletox[i]>x)
i++;
- gr_xtoviewangle[x] = (i<<ANGLETOFINESHIFT) - ANGLE_90;
+ gl_xtoviewangle[x] = (i<<ANGLETOFINESHIFT) - ANGLE_90;
}
// Take out the fencepost cases from viewangletox.
for (i = 0; i < FINEANGLES/2; i++)
{
- if (gr_viewangletox[i] == -1)
- gr_viewangletox[i] = 0;
- else if (gr_viewangletox[i] == grviewwidth+1)
- gr_viewangletox[i] = grviewwidth;
+ if (gl_viewangletox[i] == -1)
+ gl_viewangletox[i] = 0;
+ else if (gl_viewangletox[i] == grviewwidth+1)
+ gl_viewangletox[i] = grviewwidth;
}
- gr_clipangle = gr_xtoviewangle[0];
+ gl_clipangle = gl_xtoviewangle[0];
}
// ==========================================================================
-// gr_things.c
+// gl_things.c
// ==========================================================================
// sprites are drawn after all wall and planes are rendered, so that
// sprite translucency effects apply on the rendered view (instead of the background sky!!)
-static UINT32 gr_visspritecount;
-static gr_vissprite_t *gr_visspritechunks[MAXVISSPRITES >> VISSPRITECHUNKBITS] = {NULL};
+static UINT32 gl_visspritecount;
+static gl_vissprite_t *gl_visspritechunks[MAXVISSPRITES >> VISSPRITECHUNKBITS] = {NULL};
// --------------------------------------------------------------------------
// HWR_ClearSprites
@@ -3450,31 +3451,79 @@ static gr_vissprite_t *gr_visspritechunks[MAXVISSPRITES >> VISSPRITECHUNKBITS] =
// --------------------------------------------------------------------------
static void HWR_ClearSprites(void)
{
- gr_visspritecount = 0;
+ gl_visspritecount = 0;
}
// --------------------------------------------------------------------------
// HWR_NewVisSprite
// --------------------------------------------------------------------------
-static gr_vissprite_t gr_overflowsprite;
+static gl_vissprite_t gl_overflowsprite;
-static gr_vissprite_t *HWR_GetVisSprite(UINT32 num)
+static gl_vissprite_t *HWR_GetVisSprite(UINT32 num)
{
UINT32 chunk = num >> VISSPRITECHUNKBITS;
// Allocate chunk if necessary
- if (!gr_visspritechunks[chunk])
- Z_Malloc(sizeof(gr_vissprite_t) * VISSPRITESPERCHUNK, PU_LEVEL, &gr_visspritechunks[chunk]);
+ if (!gl_visspritechunks[chunk])
+ Z_Malloc(sizeof(gl_vissprite_t) * VISSPRITESPERCHUNK, PU_LEVEL, &gl_visspritechunks[chunk]);
- return gr_visspritechunks[chunk] + (num & VISSPRITEINDEXMASK);
+ return gl_visspritechunks[chunk] + (num & VISSPRITEINDEXMASK);
}
-static gr_vissprite_t *HWR_NewVisSprite(void)
+static gl_vissprite_t *HWR_NewVisSprite(void)
{
- if (gr_visspritecount == MAXVISSPRITES)
- return &gr_overflowsprite;
+ if (gl_visspritecount == MAXVISSPRITES)
+ return &gl_overflowsprite;
- return HWR_GetVisSprite(gr_visspritecount++);
+ return HWR_GetVisSprite(gl_visspritecount++);
+}
+
+// A hack solution for transparent surfaces appearing on top of linkdraw sprites.
+// Keep a list of linkdraw sprites and draw their shapes to the z-buffer after all other
+// sprite drawing is done. (effectively the z-buffer drawing of linkdraw sprites is delayed)
+// NOTE: This will no longer be necessary once full translucent sorting is implemented, where
+// translucent sprites and surfaces are sorted together.
+
+typedef struct
+{
+ FOutVector verts[4];
+ gl_vissprite_t *spr;
+} zbuffersprite_t;
+
+// this list is used to store data about linkdraw sprites
+zbuffersprite_t linkdrawlist[MAXVISSPRITES];
+UINT32 linkdrawcount = 0;
+
+// add the necessary data to the list for delayed z-buffer drawing
+static void HWR_LinkDrawHackAdd(FOutVector *verts, gl_vissprite_t *spr)
+{
+ if (linkdrawcount < MAXVISSPRITES)
+ {
+ memcpy(linkdrawlist[linkdrawcount].verts, verts, sizeof(FOutVector) * 4);
+ linkdrawlist[linkdrawcount].spr = spr;
+ linkdrawcount++;
+ }
+}
+
+// process and clear the list of sprites for delayed z-buffer drawing
+static void HWR_LinkDrawHackFinish(void)
+{
+ UINT32 i;
+ FSurfaceInfo surf;
+ surf.PolyColor.rgba = 0xFFFFFFFF;
+ surf.TintColor.rgba = 0xFFFFFFFF;
+ surf.FadeColor.rgba = 0xFFFFFFFF;
+ surf.LightInfo.light_level = 0;
+ surf.LightInfo.fade_start = 0;
+ surf.LightInfo.fade_end = 31;
+ for (i = 0; i < linkdrawcount; i++)
+ {
+ // draw sprite shape, only to z-buffer
+ HWR_GetPatch(linkdrawlist[i].spr->gpatch);
+ HWR_ProcessPolygon(&surf, linkdrawlist[i].verts, 4, PF_Translucent|PF_Occlude|PF_Invisible|PF_Clip, 0, false);
+ }
+ // reset list
+ linkdrawcount = 0;
}
//
@@ -3537,7 +3586,7 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
groundz = R_GetShadowZ(thing, &groundslope);
- //if (abs(groundz - gr_viewz) / tz > 4) return; // Prevent stretchy shadows and possible crashes
+ //if (abs(groundz - gl_viewz) / tz > 4) return; // Prevent stretchy shadows and possible crashes
floordiff = abs((flip < 0 ? thing->height : 0) + thing->z - groundz);
@@ -3546,7 +3595,7 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
alpha = 255 - alpha;
gpatch = (GLPatch_t *)W_CachePatchName("DSHADOW", PU_CACHE);
- if (!(gpatch && gpatch->mipmap->grInfo.format)) return;
+ if (!(gpatch && gpatch->mipmap->format)) return;
HWR_GetPatch(gpatch);
scalemul = FixedMul(FRACUNIT - floordiff/640, scale);
@@ -3575,8 +3624,8 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
{
float oldx = shadowVerts[i].x;
float oldy = shadowVerts[i].z;
- shadowVerts[i].x = fx + ((oldx - fx) * gr_viewcos) - ((oldy - fy) * gr_viewsin);
- shadowVerts[i].z = fy + ((oldx - fx) * gr_viewsin) + ((oldy - fy) * gr_viewcos);
+ shadowVerts[i].x = fx + ((oldx - fx) * gl_viewcos) - ((oldy - fy) * gl_viewsin);
+ shadowVerts[i].z = fy + ((oldx - fx) * gl_viewsin) + ((oldy - fy) * gl_viewcos);
}
if (groundslope)
@@ -3619,9 +3668,9 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
}
// This is expecting a pointer to an array containing 4 wallVerts for a sprite
-static void HWR_RotateSpritePolyToAim(gr_vissprite_t *spr, FOutVector *wallVerts, const boolean precip)
+static void HWR_RotateSpritePolyToAim(gl_vissprite_t *spr, FOutVector *wallVerts, const boolean precip)
{
- if (cv_grspritebillboarding.value
+ if (cv_glspritebillboarding.value
&& spr && spr->mobj && !(spr->mobj->frame & FF_PAPERSPRITE)
&& wallVerts)
{
@@ -3635,24 +3684,24 @@ static void HWR_RotateSpritePolyToAim(gr_vissprite_t *spr, FOutVector *wallVerts
// X, Y, AND Z need to be manipulated for the polys to rotate around the
// origin, because of how the origin setting works I believe that should
// be mobj->z or mobj->z + mobj->height
- wallVerts[2].y = wallVerts[3].y = (spr->ty - basey) * gr_viewludsin + basey;
- wallVerts[0].y = wallVerts[1].y = (lowy - basey) * gr_viewludsin + basey;
+ wallVerts[2].y = wallVerts[3].y = (spr->ty - basey) * gl_viewludsin + basey;
+ wallVerts[0].y = wallVerts[1].y = (lowy - basey) * gl_viewludsin + basey;
// translate back to be around 0 before translating back
- wallVerts[3].x += ((spr->ty - basey) * gr_viewludcos) * gr_viewcos;
- wallVerts[2].x += ((spr->ty - basey) * gr_viewludcos) * gr_viewcos;
+ wallVerts[3].x += ((spr->ty - basey) * gl_viewludcos) * gl_viewcos;
+ wallVerts[2].x += ((spr->ty - basey) * gl_viewludcos) * gl_viewcos;
- wallVerts[0].x += ((lowy - basey) * gr_viewludcos) * gr_viewcos;
- wallVerts[1].x += ((lowy - basey) * gr_viewludcos) * gr_viewcos;
+ wallVerts[0].x += ((lowy - basey) * gl_viewludcos) * gl_viewcos;
+ wallVerts[1].x += ((lowy - basey) * gl_viewludcos) * gl_viewcos;
- wallVerts[3].z += ((spr->ty - basey) * gr_viewludcos) * gr_viewsin;
- wallVerts[2].z += ((spr->ty - basey) * gr_viewludcos) * gr_viewsin;
+ wallVerts[3].z += ((spr->ty - basey) * gl_viewludcos) * gl_viewsin;
+ wallVerts[2].z += ((spr->ty - basey) * gl_viewludcos) * gl_viewsin;
- wallVerts[0].z += ((lowy - basey) * gr_viewludcos) * gr_viewsin;
- wallVerts[1].z += ((lowy - basey) * gr_viewludcos) * gr_viewsin;
+ wallVerts[0].z += ((lowy - basey) * gl_viewludcos) * gl_viewsin;
+ wallVerts[1].z += ((lowy - basey) * gl_viewludcos) * gl_viewsin;
}
}
-static void HWR_SplitSprite(gr_vissprite_t *spr)
+static void HWR_SplitSprite(gl_vissprite_t *spr)
{
float this_scale = 1.0f;
FOutVector wallVerts[4];
@@ -3663,6 +3712,8 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
extracolormap_t *colormap;
FUINT lightlevel;
FBITFIELD blend = 0;
+ FBITFIELD occlusion;
+ boolean use_linkdraw_hack = false;
UINT8 alpha;
INT32 i;
@@ -3731,8 +3782,8 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
// if it has a dispoffset, push it a little towards the camera
if (spr->dispoffset) {
- float co = -gr_viewcos*(0.05f*spr->dispoffset);
- float si = -gr_viewsin*(0.05f*spr->dispoffset);
+ float co = -gl_viewcos*(0.05f*spr->dispoffset);
+ float si = -gl_viewsin*(0.05f*spr->dispoffset);
baseWallVerts[0].z = baseWallVerts[3].z = baseWallVerts[0].z+si;
baseWallVerts[1].z = baseWallVerts[2].z = baseWallVerts[1].z+si;
baseWallVerts[0].x = baseWallVerts[3].x = baseWallVerts[0].x+co;
@@ -3756,10 +3807,18 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
// co-ordinates
memcpy(wallVerts, baseWallVerts, sizeof(baseWallVerts));
+ // if sprite has linkdraw, then dont write to z-buffer (by not using PF_Occlude)
+ // this will result in sprites drawn afterwards to be drawn on top like intended when using linkdraw.
+ if ((spr->mobj->flags2 & MF2_LINKDRAW) && spr->mobj->tracer)
+ occlusion = 0;
+ else
+ occlusion = PF_Occlude;
+
if (!cv_translucency.value) // translucency disabled
{
Surf.PolyColor.s.alpha = 0xFF;
- blend = PF_Translucent|PF_Occlude;
+ blend = PF_Translucent|occlusion;
+ if (!occlusion) use_linkdraw_hack = true;
}
else if (spr->mobj->flags2 & MF2_SHADOW)
{
@@ -3775,7 +3834,8 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
// Hurdler: PF_Environement would be cool, but we need to fix
// the issue with the fog before
Surf.PolyColor.s.alpha = 0xFF;
- blend = PF_Translucent|PF_Occlude;
+ blend = PF_Translucent|occlusion;
+ if (!occlusion) use_linkdraw_hack = true;
}
alpha = Surf.PolyColor.s.alpha;
@@ -3851,7 +3911,7 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
wallVerts[1].y = endbot;
// The x and y only need to be adjusted in the case that it's not a papersprite
- if (cv_grspritebillboarding.value
+ if (cv_glspritebillboarding.value
&& spr->mobj && !(spr->mobj->frame & FF_PAPERSPRITE))
{
// Get the x and z of the vertices so billboarding draws correctly
@@ -3880,6 +3940,9 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated|PF_Clip, 3, false); // sprite shader
+ if (use_linkdraw_hack)
+ HWR_LinkDrawHackAdd(wallVerts, spr);
+
top = bot;
endtop = endbot;
}
@@ -3905,6 +3968,9 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
Surf.PolyColor.s.alpha = alpha;
HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated|PF_Clip, 3, false); // sprite shader
+
+ if (use_linkdraw_hack)
+ HWR_LinkDrawHackAdd(wallVerts, spr);
}
// -----------------+
@@ -3912,7 +3978,7 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
// : (monsters, bonuses, weapons, lights, ...)
// Returns :
// -----------------+
-static void HWR_DrawSprite(gr_vissprite_t *spr)
+static void HWR_DrawSprite(gl_vissprite_t *spr)
{
float this_scale = 1.0f;
FOutVector wallVerts[4];
@@ -3998,8 +4064,8 @@ static void HWR_DrawSprite(gr_vissprite_t *spr)
// if it has a dispoffset, push it a little towards the camera
if (spr->dispoffset) {
- float co = -gr_viewcos*(0.05f*spr->dispoffset);
- float si = -gr_viewsin*(0.05f*spr->dispoffset);
+ float co = -gl_viewcos*(0.05f*spr->dispoffset);
+ float si = -gl_viewsin*(0.05f*spr->dispoffset);
wallVerts[0].z = wallVerts[3].z = wallVerts[0].z+si;
wallVerts[1].z = wallVerts[2].z = wallVerts[1].z+si;
wallVerts[0].x = wallVerts[3].x = wallVerts[0].x+co;
@@ -4027,10 +4093,21 @@ static void HWR_DrawSprite(gr_vissprite_t *spr)
{
FBITFIELD blend = 0;
+ FBITFIELD occlusion;
+ boolean use_linkdraw_hack = false;
+
+ // if sprite has linkdraw, then dont write to z-buffer (by not using PF_Occlude)
+ // this will result in sprites drawn afterwards to be drawn on top like intended when using linkdraw.
+ if ((spr->mobj->flags2 & MF2_LINKDRAW) && spr->mobj->tracer)
+ occlusion = 0;
+ else
+ occlusion = PF_Occlude;
+
if (!cv_translucency.value) // translucency disabled
{
Surf.PolyColor.s.alpha = 0xFF;
- blend = PF_Translucent|PF_Occlude;
+ blend = PF_Translucent|occlusion;
+ if (!occlusion) use_linkdraw_hack = true;
}
else if (spr->mobj->flags2 & MF2_SHADOW)
{
@@ -4046,16 +4123,20 @@ static void HWR_DrawSprite(gr_vissprite_t *spr)
// Hurdler: PF_Environement would be cool, but we need to fix
// the issue with the fog before
Surf.PolyColor.s.alpha = 0xFF;
- blend = PF_Translucent|PF_Occlude;
+ blend = PF_Translucent|occlusion;
+ if (!occlusion) use_linkdraw_hack = true;
}
HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated|PF_Clip, 3, false); // sprite shader
+
+ if (use_linkdraw_hack)
+ HWR_LinkDrawHackAdd(wallVerts, spr);
}
}
#ifdef HWPRECIP
// Sprite drawer for precipitation
-static inline void HWR_DrawPrecipitationSprite(gr_vissprite_t *spr)
+static inline void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
{
FBITFIELD blend = 0;
FOutVector wallVerts[4];
@@ -4155,16 +4236,17 @@ static inline void HWR_DrawPrecipitationSprite(gr_vissprite_t *spr)
// --------------------------------------------------------------------------
// Sort vissprites by distance
// --------------------------------------------------------------------------
-gr_vissprite_t* gr_vsprorder[MAXVISSPRITES];
+gl_vissprite_t* gl_vsprorder[MAXVISSPRITES];
// Note: For more correct transparency the transparent sprites would need to be
// sorted and drawn together with transparent surfaces.
static int CompareVisSprites(const void *p1, const void *p2)
{
- gr_vissprite_t* spr1 = *(gr_vissprite_t*const*)p1;
- gr_vissprite_t* spr2 = *(gr_vissprite_t*const*)p2;
+ gl_vissprite_t* spr1 = *(gl_vissprite_t*const*)p1;
+ gl_vissprite_t* spr2 = *(gl_vissprite_t*const*)p2;
int idiff;
float fdiff;
+ float tz1, tz2;
// Make transparent sprites last. Comment from the previous sort implementation:
// Sryder: Oh boy, while it's nice having ALL the sprites sorted properly, it fails when we bring MD2's into the
@@ -4172,12 +4254,53 @@ static int CompareVisSprites(const void *p1, const void *p2)
// everything else, but still ordered of course, the depth buffer can handle the opaque ones plenty fine.
// We just need to move all translucent ones to the end in order
// TODO: Fully sort all sprites and MD2s with walls and floors, this part will be unnecessary after that
- int transparency1 = (spr1->mobj->flags2 & MF2_SHADOW) || (spr1->mobj->frame & FF_TRANSMASK);
- int transparency2 = (spr2->mobj->flags2 & MF2_SHADOW) || (spr2->mobj->frame & FF_TRANSMASK);
+ int transparency1;
+ int transparency2;
+
+ // check for precip first, because then sprX->mobj is actually a precipmobj_t and does not have flags2 or tracer
+ int linkdraw1 = !spr1->precip && (spr1->mobj->flags2 & MF2_LINKDRAW) && spr1->mobj->tracer;
+ int linkdraw2 = !spr2->precip && (spr2->mobj->flags2 & MF2_LINKDRAW) && spr2->mobj->tracer;
+
+ // ^ is the XOR operation
+ // if comparing a linkdraw and non-linkdraw sprite or 2 linkdraw sprites with different tracers, then use
+ // the tracer's properties instead of the main sprite's.
+ if ((linkdraw1 && linkdraw2 && spr1->mobj->tracer != spr2->mobj->tracer) || (linkdraw1 ^ linkdraw2))
+ {
+ if (linkdraw1)
+ {
+ tz1 = spr1->tracertz;
+ transparency1 = (spr1->mobj->tracer->flags2 & MF2_SHADOW) || (spr1->mobj->tracer->frame & FF_TRANSMASK);
+ }
+ else
+ {
+ tz1 = spr1->tz;
+ transparency1 = (!spr1->precip && (spr1->mobj->flags2 & MF2_SHADOW)) || (spr1->mobj->frame & FF_TRANSMASK);
+ }
+ if (linkdraw2)
+ {
+ tz2 = spr2->tracertz;
+ transparency2 = (spr2->mobj->tracer->flags2 & MF2_SHADOW) || (spr2->mobj->tracer->frame & FF_TRANSMASK);
+ }
+ else
+ {
+ tz2 = spr2->tz;
+ transparency2 = (!spr2->precip && (spr2->mobj->flags2 & MF2_SHADOW)) || (spr2->mobj->frame & FF_TRANSMASK);
+ }
+ }
+ else
+ {
+ tz1 = spr1->tz;
+ transparency1 = (!spr1->precip && (spr1->mobj->flags2 & MF2_SHADOW)) || (spr1->mobj->frame & FF_TRANSMASK);
+ tz2 = spr2->tz;
+ transparency2 = (!spr2->precip && (spr2->mobj->flags2 & MF2_SHADOW)) || (spr2->mobj->frame & FF_TRANSMASK);
+ }
+
+ // first compare transparency flags, then compare tz, then compare dispoffset
+
idiff = transparency1 - transparency2;
if (idiff != 0) return idiff;
- fdiff = spr2->tz - spr1->tz; // this order seems correct when checking with apitrace. Back to front.
+ fdiff = tz2 - tz1; // this order seems correct when checking with apitrace. Back to front.
if (fabsf(fdiff) < 1.0E-36f)
return spr1->dispoffset - spr2->dispoffset; // smallest dispoffset first if sprites are at (almost) same location.
else if (fdiff > 0)
@@ -4189,11 +4312,11 @@ static int CompareVisSprites(const void *p1, const void *p2)
static void HWR_SortVisSprites(void)
{
UINT32 i;
- for (i = 0; i < gr_visspritecount; i++)
+ for (i = 0; i < gl_visspritecount; i++)
{
- gr_vsprorder[i] = HWR_GetVisSprite(i);
+ gl_vsprorder[i] = HWR_GetVisSprite(i);
}
- qsort(gr_vsprorder, gr_visspritecount, sizeof(gr_vissprite_t*), CompareVisSprites);
+ qsort(gl_vsprorder, gl_visspritecount, sizeof(gl_vissprite_t*), CompareVisSprites);
}
// A drawnode is something that points to a 3D floor, 3D side, or masked
@@ -4253,16 +4376,16 @@ static size_t numpolyplanes = 0; // a list of transparent poyobject floors to be
static polyplaneinfo_t *polyplaneinfo = NULL;
//Hurdler: 3D water sutffs
-typedef struct gr_drawnode_s
+typedef struct gl_drawnode_s
{
planeinfo_t *plane;
polyplaneinfo_t *polyplane;
wallinfo_t *wall;
- gr_vissprite_t *sprite;
+ gl_vissprite_t *sprite;
-// struct gr_drawnode_s *next;
-// struct gr_drawnode_s *prev;
-} gr_drawnode_t;
+// struct gl_drawnode_s *next;
+// struct gl_drawnode_s *prev;
+} gl_drawnode_t;
static INT32 drawcount = 0;
@@ -4328,7 +4451,7 @@ void HWR_AddTransparentPolyobjectFloor(levelflat_t *levelflat, polyobj_t *polyse
}
// putting sortindex and sortnode here so the comparator function can see them
-gr_drawnode_t *sortnode;
+gl_drawnode_t *sortnode;
size_t *sortindex;
static int CompareDrawNodes(const void *p1, const void *p2)
@@ -4455,8 +4578,8 @@ static void HWR_CreateDrawNodes(void)
{
if (sortnode[sortindex[i]].plane)
{
- // We aren't traversing the BSP tree, so make gr_frontsector null to avoid crashes.
- gr_frontsector = NULL;
+ // We aren't traversing the BSP tree, so make gl_frontsector null to avoid crashes.
+ gl_frontsector = NULL;
if (!(sortnode[sortindex[i]].plane->blend & PF_NoTexture))
HWR_GetLevelFlat(sortnode[sortindex[i]].plane->levelflat);
@@ -4465,8 +4588,8 @@ static void HWR_CreateDrawNodes(void)
}
else if (sortnode[sortindex[i]].polyplane)
{
- // We aren't traversing the BSP tree, so make gr_frontsector null to avoid crashes.
- gr_frontsector = NULL;
+ // We aren't traversing the BSP tree, so make gl_frontsector null to avoid crashes.
+ gl_frontsector = NULL;
if (!(sortnode[sortindex[i]].polyplane->blend & PF_NoTexture))
HWR_GetLevelFlat(sortnode[sortindex[i]].polyplane->levelflat);
@@ -4501,24 +4624,46 @@ static void HWR_CreateDrawNodes(void)
static void HWR_DrawSprites(void)
{
UINT32 i;
- HWD.pfnSetSpecialState(HWD_SET_MODEL_LIGHTING, cv_grmodellighting.value);
- for (i = 0; i < gr_visspritecount; i++)
+ boolean skipshadow = false; // skip shadow if it was drawn already for a linkdraw sprite encountered earlier in the list
+ HWD.pfnSetSpecialState(HWD_SET_MODEL_LIGHTING, cv_glmodellighting.value);
+ for (i = 0; i < gl_visspritecount; i++)
{
- gr_vissprite_t *spr = gr_vsprorder[i];
+ gl_vissprite_t *spr = gl_vsprorder[i];
#ifdef HWPRECIP
if (spr->precip)
HWR_DrawPrecipitationSprite(spr);
else
#endif
{
- if (spr->mobj && spr->mobj->shadowscale && cv_shadow.value)
+ if (spr->mobj && spr->mobj->shadowscale && cv_shadow.value && !skipshadow)
{
HWR_DrawDropShadow(spr->mobj, spr->mobj->shadowscale);
}
+ if ((spr->mobj->flags2 & MF2_LINKDRAW) && spr->mobj->tracer)
+ {
+ // If this linkdraw sprite is behind a sprite that has a shadow,
+ // then that shadow has to be drawn first, otherwise the shadow ends up on top of
+ // the linkdraw sprite because the linkdraw sprite does not modify the z-buffer.
+ // The !skipshadow check is there in case there are multiple linkdraw sprites connected
+ // to the same tracer, so the tracer's shadow only gets drawn once.
+ if (cv_shadow.value && !skipshadow && spr->dispoffset < 0 && spr->mobj->tracer->shadowscale)
+ {
+ HWR_DrawDropShadow(spr->mobj->tracer, spr->mobj->tracer->shadowscale);
+ skipshadow = true;
+ // The next sprite in this loop should be either another linkdraw sprite or the tracer.
+ // When the tracer is inevitably encountered, skipshadow will cause it's shadow
+ // to get skipped and skipshadow will get set to false by the 'else' clause below.
+ }
+ }
+ else
+ {
+ skipshadow = false;
+ }
+
if (spr->mobj && spr->mobj->skin && spr->mobj->sprite == SPR_PLAY)
{
- if (!cv_grmodels.value || md2_playermodels[(skin_t*)spr->mobj->skin-skins].notfound || md2_playermodels[(skin_t*)spr->mobj->skin-skins].scale < 0.0f)
+ if (!cv_glmodels.value || md2_playermodels[(skin_t*)spr->mobj->skin-skins].notfound || md2_playermodels[(skin_t*)spr->mobj->skin-skins].scale < 0.0f)
HWR_DrawSprite(spr);
else
{
@@ -4528,7 +4673,7 @@ static void HWR_DrawSprites(void)
}
else
{
- if (!cv_grmodels.value || md2_models[spr->mobj->sprite].notfound || md2_models[spr->mobj->sprite].scale < 0.0f)
+ if (!cv_glmodels.value || md2_models[spr->mobj->sprite].notfound || md2_models[spr->mobj->sprite].scale < 0.0f)
HWR_DrawSprite(spr);
else
{
@@ -4539,6 +4684,16 @@ static void HWR_DrawSprites(void)
}
}
HWD.pfnSetSpecialState(HWD_SET_MODEL_LIGHTING, 0);
+
+ // At the end of sprite drawing, draw shapes of linkdraw sprites to z-buffer, so they
+ // don't get drawn over by transparent surfaces.
+ HWR_LinkDrawHackFinish();
+ // Work around a r_opengl.c bug with PF_Invisible by making this SetBlend call
+ // where PF_Invisible is off and PF_Masked is on.
+ // (Other states probably don't matter. Here I left them same as in LinkDrawHackFinish)
+ // Without this workaround the rest of the draw calls in this frame (including UI, screen texture)
+ // can get drawn using an incorrect glBlendFunc, resulting in a occasional black screen.
+ HWD.pfnSetBlend(PF_Translucent|PF_Occlude|PF_Clip|PF_Masked);
}
// --------------------------------------------------------------------------
@@ -4597,9 +4752,10 @@ static void HWR_AddSprites(sector_t *sec)
// BP why not use xtoviexangle/viewangletox like in bsp ?....
static void HWR_ProjectSprite(mobj_t *thing)
{
- gr_vissprite_t *vis;
+ gl_vissprite_t *vis;
float tr_x, tr_y;
float tz;
+ float tracertz = 0.0f;
float x1, x2;
float rightsin, rightcos;
float this_scale;
@@ -4614,6 +4770,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
boolean vflip = (!(thing->eflags & MFE_VERTICALFLIP) != !(thing->frame & FF_VERTICALFLIP));
boolean mirrored = thing->mirrored;
boolean hflip = (!(thing->frame & FF_HORIZONTALFLIP) != !mirrored);
+ INT32 dispoffset;
angle_t ang;
INT32 heightsec, phs;
@@ -4631,19 +4788,21 @@ static void HWR_ProjectSprite(mobj_t *thing)
if (!thing)
return;
+ dispoffset = thing->info->dispoffset;
+
this_scale = FIXED_TO_FLOAT(thing->scale);
// transform the origin point
- tr_x = FIXED_TO_FLOAT(thing->x) - gr_viewx;
- tr_y = FIXED_TO_FLOAT(thing->y) - gr_viewy;
+ tr_x = FIXED_TO_FLOAT(thing->x) - gl_viewx;
+ tr_y = FIXED_TO_FLOAT(thing->y) - gl_viewy;
// rotation around vertical axis
- tz = (tr_x * gr_viewcos) + (tr_y * gr_viewsin);
+ tz = (tr_x * gl_viewcos) + (tr_y * gl_viewsin);
// thing is behind view plane?
if (tz < ZCLIP_PLANE && !papersprite)
{
- if (cv_grmodels.value) //Yellow: Only MD2's dont disappear
+ if (cv_glmodels.value) //Yellow: Only MD2's dont disappear
{
if (thing->skin && thing->sprite == SPR_PLAY)
md2 = &md2_playermodels[( (skin_t *)thing->skin - skins )];
@@ -4819,7 +4978,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
if (thing->subsector->sector->cullheight)
{
- if (HWR_DoCulling(thing->subsector->sector->cullheight, viewsector->cullheight, gr_viewz, gz, gzt))
+ if (HWR_DoCulling(thing->subsector->sector->cullheight, viewsector->cullheight, gl_viewz, gz, gzt))
return;
}
@@ -4831,21 +4990,40 @@ static void HWR_ProjectSprite(mobj_t *thing)
if (heightsec != -1 && phs != -1) // only clip things which are in special sectors
{
- if (gr_viewz < FIXED_TO_FLOAT(sectors[phs].floorheight) ?
+ if (gl_viewz < FIXED_TO_FLOAT(sectors[phs].floorheight) ?
FIXED_TO_FLOAT(thing->z) >= FIXED_TO_FLOAT(sectors[heightsec].floorheight) :
gzt < FIXED_TO_FLOAT(sectors[heightsec].floorheight))
return;
- if (gr_viewz > FIXED_TO_FLOAT(sectors[phs].ceilingheight) ?
- gzt < FIXED_TO_FLOAT(sectors[heightsec].ceilingheight) && gr_viewz >= FIXED_TO_FLOAT(sectors[heightsec].ceilingheight) :
+ if (gl_viewz > FIXED_TO_FLOAT(sectors[phs].ceilingheight) ?
+ gzt < FIXED_TO_FLOAT(sectors[heightsec].ceilingheight) && gl_viewz >= FIXED_TO_FLOAT(sectors[heightsec].ceilingheight) :
FIXED_TO_FLOAT(thing->z) >= FIXED_TO_FLOAT(sectors[heightsec].ceilingheight))
return;
}
if ((thing->flags2 & MF2_LINKDRAW) && thing->tracer)
{
- // bodge support - not nearly as comprehensive as r_things.c, but better than nothing
if (! R_ThingVisible(thing->tracer))
return;
+
+ // calculate tz for tracer, same way it is calculated for this sprite
+ // transform the origin point
+ tr_x = FIXED_TO_FLOAT(thing->tracer->x) - gl_viewx;
+ tr_y = FIXED_TO_FLOAT(thing->tracer->y) - gl_viewy;
+
+ // rotation around vertical axis
+ tracertz = (tr_x * gl_viewcos) + (tr_y * gl_viewsin);
+
+ // Software does not render the linkdraw sprite if the tracer is behind the view plane,
+ // so do the same check here.
+ // NOTE: This check has the same flaw as the view plane check at the beginning of HWR_ProjectSprite:
+ // the view aiming angle is not taken into account, leading to sprites disappearing too early when they
+ // can still be seen when looking down/up at steep angles.
+ if (tracertz < ZCLIP_PLANE)
+ return;
+
+ // if the sprite is behind the tracer, invert dispoffset, putting the sprite behind the tracer
+ if (tz > tracertz)
+ dispoffset *= -1;
}
// store information in a vissprite
@@ -4853,7 +5031,8 @@ static void HWR_ProjectSprite(mobj_t *thing)
vis->x1 = x1;
vis->x2 = x2;
vis->tz = tz; // Keep tz for the simple sprite sorting that happens
- vis->dispoffset = thing->info->dispoffset; // Monster Iestyn: 23/11/15: HARDWARE SUPPORT AT LAST
+ vis->tracertz = tracertz;
+ vis->dispoffset = dispoffset; // Monster Iestyn: 23/11/15: HARDWARE SUPPORT AT LAST
//vis->patchlumpnum = sprframe->lumppat[rot];
#ifdef ROTSPRITE
if (rotsprite)
@@ -4916,7 +5095,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
// Precipitation projector for hardware mode
static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
{
- gr_vissprite_t *vis;
+ gl_vissprite_t *vis;
float tr_x, tr_y;
float tz;
float x1, x2;
@@ -4929,11 +5108,11 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
UINT8 flip;
// transform the origin point
- tr_x = FIXED_TO_FLOAT(thing->x) - gr_viewx;
- tr_y = FIXED_TO_FLOAT(thing->y) - gr_viewy;
+ tr_x = FIXED_TO_FLOAT(thing->x) - gl_viewx;
+ tr_y = FIXED_TO_FLOAT(thing->y) - gl_viewy;
// rotation around vertical axis
- tz = (tr_x * gr_viewcos) + (tr_y * gr_viewsin);
+ tz = (tr_x * gl_viewcos) + (tr_y * gl_viewsin);
// thing is behind view plane?
if (tz < ZCLIP_PLANE)
@@ -5024,7 +5203,7 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
// ==========================================================================
static void HWR_DrawSkyBackground(player_t *player)
{
- if (cv_grskydome.value)
+ if (cv_glskydome.value)
{
FTransform dometransform;
const float fpov = FIXED_TO_FLOAT(cv_fov.value+player->fovadd);
@@ -5038,7 +5217,7 @@ static void HWR_DrawSkyBackground(player_t *player)
memset(&dometransform, 0x00, sizeof(FTransform));
//04/01/2000: Hurdler: added for T&L
- // It should replace all other gr_viewxxx when finished
+ // It should replace all other gl_viewxxx when finished
HWR_SetTransformAiming(&dometransform, player, false);
dometransform.angley = (float)((viewangle-ANGLE_270)>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES);
@@ -5096,7 +5275,7 @@ static void HWR_DrawSkyBackground(player_t *player)
// software doesn't draw any further than 1024 for skies anyway, but this doesn't overlap properly
// The only time this will probably be an issue is when a sky wider than 1024 is used as a sky AND a regular wall texture
- angle = (dup_viewangle + gr_xtoviewangle[0]);
+ angle = (dup_viewangle + gl_xtoviewangle[0]);
dimensionmultiply = ((float)textures[texturetranslation[skytexture]]->width/256.0f);
@@ -5161,10 +5340,10 @@ static inline void HWR_ClearView(void)
/// \bug faB - enable depth mask, disable color mask
- HWD.pfnGClipRect((INT32)gr_viewwindowx,
- (INT32)gr_viewwindowy,
- (INT32)(gr_viewwindowx + gr_viewwidth),
- (INT32)(gr_viewwindowy + gr_viewheight),
+ HWD.pfnGClipRect((INT32)gl_viewwindowx,
+ (INT32)gl_viewwindowy,
+ (INT32)(gl_viewwindowx + gl_viewwidth),
+ (INT32)(gl_viewwindowy + gl_viewheight),
ZCLIP_PLANE);
HWD.pfnClearBuffer(false, true, 0);
@@ -5180,30 +5359,30 @@ static inline void HWR_ClearView(void)
void HWR_SetViewSize(void)
{
// setup view size
- gr_viewwidth = (float)vid.width;
- gr_viewheight = (float)vid.height;
+ gl_viewwidth = (float)vid.width;
+ gl_viewheight = (float)vid.height;
if (splitscreen)
- gr_viewheight /= 2;
+ gl_viewheight /= 2;
- gr_centerx = gr_viewwidth / 2;
- gr_basecentery = gr_viewheight / 2; //note: this is (gr_centerx * gr_viewheight / gr_viewwidth)
+ gl_centerx = gl_viewwidth / 2;
+ gl_basecentery = gl_viewheight / 2; //note: this is (gl_centerx * gl_viewheight / gl_viewwidth)
- gr_viewwindowx = (vid.width - gr_viewwidth) / 2;
- gr_windowcenterx = (float)(vid.width / 2);
- if (fabsf(gr_viewwidth - vid.width) < 1.0E-36f)
+ gl_viewwindowx = (vid.width - gl_viewwidth) / 2;
+ gl_windowcenterx = (float)(vid.width / 2);
+ if (fabsf(gl_viewwidth - vid.width) < 1.0E-36f)
{
- gr_baseviewwindowy = 0;
- gr_basewindowcentery = gr_viewheight / 2; // window top left corner at 0,0
+ gl_baseviewwindowy = 0;
+ gl_basewindowcentery = gl_viewheight / 2; // window top left corner at 0,0
}
else
{
- gr_baseviewwindowy = (vid.height-gr_viewheight) / 2;
- gr_basewindowcentery = (float)(vid.height / 2);
+ gl_baseviewwindowy = (vid.height-gl_viewheight) / 2;
+ gl_basewindowcentery = (float)(vid.height / 2);
}
- gr_pspritexscale = gr_viewwidth / BASEVIDWIDTH;
- gr_pspriteyscale = ((vid.height*gr_pspritexscale*BASEVIDWIDTH)/BASEVIDHEIGHT)/vid.width;
+ gl_pspritexscale = gl_viewwidth / BASEVIDWIDTH;
+ gl_pspriteyscale = ((vid.height*gl_pspritexscale*BASEVIDWIDTH)/BASEVIDHEIGHT)/vid.width;
HWD.pfnFlushScreenTextures();
}
@@ -5214,20 +5393,20 @@ static void HWR_SetTransformAiming(FTransform *trans, player_t *player, boolean
{
// 1 = always on
// 2 = chasecam only
- if (cv_grshearing.value == 1 || (cv_grshearing.value == 2 && R_IsViewpointThirdPerson(player, skybox)))
+ if (cv_glshearing.value == 1 || (cv_glshearing.value == 2 && R_IsViewpointThirdPerson(player, skybox)))
{
fixed_t fixedaiming = AIMINGTODY(aimingangle);
trans->viewaiming = FIXED_TO_FLOAT(fixedaiming);
trans->shearing = true;
- gr_aimingangle = 0;
+ gl_aimingangle = 0;
}
else
{
trans->shearing = false;
- gr_aimingangle = aimingangle;
+ gl_aimingangle = aimingangle;
}
- trans->anglex = (float)(gr_aimingangle>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES);
+ trans->anglex = (float)(gl_aimingangle>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES);
}
// ==========================================================================
@@ -5264,42 +5443,42 @@ void HWR_RenderSkyboxView(INT32 viewnumber, player_t *player)
dup_viewangle = viewangle;
// set window position
- gr_centery = gr_basecentery;
- gr_viewwindowy = gr_baseviewwindowy;
- gr_windowcentery = gr_basewindowcentery;
+ gl_centery = gl_basecentery;
+ gl_viewwindowy = gl_baseviewwindowy;
+ gl_windowcentery = gl_basewindowcentery;
if (splitscreen && viewnumber == 1)
{
- gr_viewwindowy += (vid.height/2);
- gr_windowcentery += (vid.height/2);
+ gl_viewwindowy += (vid.height/2);
+ gl_windowcentery += (vid.height/2);
}
// check for new console commands.
NetUpdate();
- gr_viewx = FIXED_TO_FLOAT(dup_viewx);
- gr_viewy = FIXED_TO_FLOAT(dup_viewy);
- gr_viewz = FIXED_TO_FLOAT(dup_viewz);
- gr_viewsin = FIXED_TO_FLOAT(viewsin);
- gr_viewcos = FIXED_TO_FLOAT(viewcos);
+ gl_viewx = FIXED_TO_FLOAT(dup_viewx);
+ gl_viewy = FIXED_TO_FLOAT(dup_viewy);
+ gl_viewz = FIXED_TO_FLOAT(dup_viewz);
+ gl_viewsin = FIXED_TO_FLOAT(viewsin);
+ gl_viewcos = FIXED_TO_FLOAT(viewcos);
//04/01/2000: Hurdler: added for T&L
- // It should replace all other gr_viewxxx when finished
+ // It should replace all other gl_viewxxx when finished
memset(&atransform, 0x00, sizeof(FTransform));
HWR_SetTransformAiming(&atransform, player, true);
atransform.angley = (float)(viewangle>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES);
- gr_viewludsin = FIXED_TO_FLOAT(FINECOSINE(gr_aimingangle>>ANGLETOFINESHIFT));
- gr_viewludcos = FIXED_TO_FLOAT(-FINESINE(gr_aimingangle>>ANGLETOFINESHIFT));
+ gl_viewludsin = FIXED_TO_FLOAT(FINECOSINE(gl_aimingangle>>ANGLETOFINESHIFT));
+ gl_viewludcos = FIXED_TO_FLOAT(-FINESINE(gl_aimingangle>>ANGLETOFINESHIFT));
if (*type == postimg_flip)
atransform.flip = true;
else
atransform.flip = false;
- atransform.x = gr_viewx; // FIXED_TO_FLOAT(viewx)
- atransform.y = gr_viewy; // FIXED_TO_FLOAT(viewy)
- atransform.z = gr_viewz; // FIXED_TO_FLOAT(viewz)
+ atransform.x = gl_viewx; // FIXED_TO_FLOAT(viewx)
+ atransform.y = gl_viewy; // FIXED_TO_FLOAT(viewy)
+ atransform.z = gl_viewz; // FIXED_TO_FLOAT(viewz)
atransform.scalex = 1;
atransform.scaley = (float)vid.width/vid.height;
atransform.scalez = 1;
@@ -5314,7 +5493,7 @@ void HWR_RenderSkyboxView(INT32 viewnumber, player_t *player)
}
atransform.splitscreen = splitscreen;
- gr_fovlud = (float)(1.0l/tan((double)(fpov*M_PIl/360l)));
+ gl_fovlud = (float)(1.0l/tan((double)(fpov*M_PIl/360l)));
//------------------------------------------------------------------------
HWR_ClearView();
@@ -5332,7 +5511,7 @@ void HWR_RenderSkyboxView(INT32 viewnumber, player_t *player)
#ifdef NEWCLIP
if (rendermode == render_opengl)
{
- angle_t a1 = gld_FrustumAngle(gr_aimingangle);
+ angle_t a1 = gld_FrustumAngle(gl_aimingangle);
gld_clipper_Clear();
gld_clipper_SafeAddClipRange(viewangle + a1, viewangle - a1);
#ifdef HAVE_SPHEREFRUSTRUM
@@ -5348,12 +5527,12 @@ void HWR_RenderSkyboxView(INT32 viewnumber, player_t *player)
HWD.pfnSetTransform(&atransform);
// Reset the shader state.
- HWD.pfnSetSpecialState(HWD_SET_SHADERS, cv_grshaders.value);
+ HWD.pfnSetSpecialState(HWD_SET_SHADERS, cv_glshaders.value);
HWD.pfnSetShader(0);
validcount++;
- if (cv_grbatching.value)
+ if (cv_glbatching.value)
HWR_StartBatching();
HWR_RenderBSPNode((INT32)numnodes-1);
@@ -5366,14 +5545,14 @@ void HWR_RenderSkyboxView(INT32 viewnumber, player_t *player)
viewangle = localaiming2;
// Handle stuff when you are looking farther up or down.
- if ((gr_aimingangle || cv_fov.value+player->fovadd > 90*FRACUNIT))
+ if ((gl_aimingangle || cv_fov.value+player->fovadd > 90*FRACUNIT))
{
dup_viewangle += ANGLE_90;
HWR_ClearClipSegs();
HWR_RenderBSPNode((INT32)numnodes-1); //left
dup_viewangle += ANGLE_90;
- if (((INT32)gr_aimingangle > ANGLE_45 || (INT32)gr_aimingangle<-ANGLE_45))
+ if (((INT32)gl_aimingangle > ANGLE_45 || (INT32)gl_aimingangle<-ANGLE_45))
{
HWR_ClearClipSegs();
HWR_RenderBSPNode((INT32)numnodes-1); //back
@@ -5387,7 +5566,7 @@ void HWR_RenderSkyboxView(INT32 viewnumber, player_t *player)
}
#endif
- if (cv_grbatching.value)
+ if (cv_glbatching.value)
HWR_RenderBatches();
// Check for new console commands.
@@ -5446,7 +5625,7 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
ClearColor.blue = 0.0f;
ClearColor.alpha = 1.0f;
- if (cv_grshaders.value)
+ if (cv_glshaders.value)
HWD.pfnSetShaderInfo(HWD_SHADERINFO_LEVELTIME, (INT32)leveltime); // The water surface shader needs the leveltime.
if (viewnumber == 0) // Only do it if it's the first screen being rendered
@@ -5477,42 +5656,42 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
dup_viewangle = viewangle;
// set window position
- gr_centery = gr_basecentery;
- gr_viewwindowy = gr_baseviewwindowy;
- gr_windowcentery = gr_basewindowcentery;
+ gl_centery = gl_basecentery;
+ gl_viewwindowy = gl_baseviewwindowy;
+ gl_windowcentery = gl_basewindowcentery;
if (splitscreen && viewnumber == 1)
{
- gr_viewwindowy += (vid.height/2);
- gr_windowcentery += (vid.height/2);
+ gl_viewwindowy += (vid.height/2);
+ gl_windowcentery += (vid.height/2);
}
// check for new console commands.
NetUpdate();
- gr_viewx = FIXED_TO_FLOAT(dup_viewx);
- gr_viewy = FIXED_TO_FLOAT(dup_viewy);
- gr_viewz = FIXED_TO_FLOAT(dup_viewz);
- gr_viewsin = FIXED_TO_FLOAT(viewsin);
- gr_viewcos = FIXED_TO_FLOAT(viewcos);
+ gl_viewx = FIXED_TO_FLOAT(dup_viewx);
+ gl_viewy = FIXED_TO_FLOAT(dup_viewy);
+ gl_viewz = FIXED_TO_FLOAT(dup_viewz);
+ gl_viewsin = FIXED_TO_FLOAT(viewsin);
+ gl_viewcos = FIXED_TO_FLOAT(viewcos);
//04/01/2000: Hurdler: added for T&L
- // It should replace all other gr_viewxxx when finished
+ // It should replace all other gl_viewxxx when finished
memset(&atransform, 0x00, sizeof(FTransform));
HWR_SetTransformAiming(&atransform, player, false);
atransform.angley = (float)(viewangle>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES);
- gr_viewludsin = FIXED_TO_FLOAT(FINECOSINE(gr_aimingangle>>ANGLETOFINESHIFT));
- gr_viewludcos = FIXED_TO_FLOAT(-FINESINE(gr_aimingangle>>ANGLETOFINESHIFT));
+ gl_viewludsin = FIXED_TO_FLOAT(FINECOSINE(gl_aimingangle>>ANGLETOFINESHIFT));
+ gl_viewludcos = FIXED_TO_FLOAT(-FINESINE(gl_aimingangle>>ANGLETOFINESHIFT));
if (*type == postimg_flip)
atransform.flip = true;
else
atransform.flip = false;
- atransform.x = gr_viewx; // FIXED_TO_FLOAT(viewx)
- atransform.y = gr_viewy; // FIXED_TO_FLOAT(viewy)
- atransform.z = gr_viewz; // FIXED_TO_FLOAT(viewz)
+ atransform.x = gl_viewx; // FIXED_TO_FLOAT(viewx)
+ atransform.y = gl_viewy; // FIXED_TO_FLOAT(viewy)
+ atransform.z = gl_viewz; // FIXED_TO_FLOAT(viewz)
atransform.scalex = 1;
atransform.scaley = (float)vid.width/vid.height;
atransform.scalez = 1;
@@ -5527,7 +5706,7 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
}
atransform.splitscreen = splitscreen;
- gr_fovlud = (float)(1.0l/tan((double)(fpov*M_PIl/360l)));
+ gl_fovlud = (float)(1.0l/tan((double)(fpov*M_PIl/360l)));
//------------------------------------------------------------------------
HWR_ClearView(); // Clears the depth buffer and resets the view I believe
@@ -5545,7 +5724,7 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
#ifdef NEWCLIP
if (rendermode == render_opengl)
{
- angle_t a1 = gld_FrustumAngle(gr_aimingangle);
+ angle_t a1 = gld_FrustumAngle(gl_aimingangle);
gld_clipper_Clear();
gld_clipper_SafeAddClipRange(viewangle + a1, viewangle - a1);
#ifdef HAVE_SPHEREFRUSTRUM
@@ -5561,7 +5740,7 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
HWD.pfnSetTransform(&atransform);
// Reset the shader state.
- HWD.pfnSetSpecialState(HWD_SET_SHADERS, cv_grshaders.value);
+ HWD.pfnSetSpecialState(HWD_SET_SHADERS, cv_glshaders.value);
HWD.pfnSetShader(0);
rs_numbspcalls = 0;
@@ -5570,7 +5749,7 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
validcount++;
- if (cv_grbatching.value)
+ if (cv_glbatching.value)
HWR_StartBatching();
HWR_RenderBSPNode((INT32)numnodes-1);
@@ -5583,14 +5762,14 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
viewangle = localaiming2;
// Handle stuff when you are looking farther up or down.
- if ((gr_aimingangle || cv_fov.value+player->fovadd > 90*FRACUNIT))
+ if ((gl_aimingangle || cv_fov.value+player->fovadd > 90*FRACUNIT))
{
dup_viewangle += ANGLE_90;
HWR_ClearClipSegs();
HWR_RenderBSPNode((INT32)numnodes-1); //left
dup_viewangle += ANGLE_90;
- if (((INT32)gr_aimingangle > ANGLE_45 || (INT32)gr_aimingangle<-ANGLE_45))
+ if (((INT32)gl_aimingangle > ANGLE_45 || (INT32)gl_aimingangle<-ANGLE_45))
{
HWR_ClearClipSegs();
HWR_RenderBSPNode((INT32)numnodes-1); //back
@@ -5606,7 +5785,7 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
rs_bsptime = I_GetTimeMicros() - rs_bsptime;
- if (cv_grbatching.value)
+ if (cv_glbatching.value)
HWR_RenderBatches();
// Check for new console commands.
@@ -5619,7 +5798,7 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
#endif
// Draw MD2 and sprites
- rs_numsprites = gr_visspritecount;
+ rs_numsprites = gl_visspritecount;
rs_hw_spritesorttime = I_GetTimeMicros();
HWR_SortVisSprites();
rs_hw_spritesorttime = I_GetTimeMicros() - rs_hw_spritesorttime;
@@ -5661,10 +5840,10 @@ static CV_PossibleValue_t grmodelinterpolation_cons_t[] = {{0, "Off"}, {1, "Some
static CV_PossibleValue_t grfakecontrast_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Smooth"}, {0, NULL}};
static CV_PossibleValue_t grshearing_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Third-person"}, {0, NULL}};
-static void CV_grfiltermode_OnChange(void);
-static void CV_granisotropic_OnChange(void);
+static void CV_glfiltermode_OnChange(void);
+static void CV_glanisotropic_OnChange(void);
-static CV_PossibleValue_t grfiltermode_cons_t[]= {{HWD_SET_TEXTUREFILTER_POINTSAMPLED, "Nearest"},
+static CV_PossibleValue_t glfiltermode_cons_t[]= {{HWD_SET_TEXTUREFILTER_POINTSAMPLED, "Nearest"},
{HWD_SET_TEXTUREFILTER_BILINEAR, "Bilinear"}, {HWD_SET_TEXTUREFILTER_TRILINEAR, "Trilinear"},
{HWD_SET_TEXTUREFILTER_MIXED1, "Linear_Nearest"},
{HWD_SET_TEXTUREFILTER_MIXED2, "Nearest_Linear"},
@@ -5672,45 +5851,45 @@ static CV_PossibleValue_t grfiltermode_cons_t[]= {{HWD_SET_TEXTUREFILTER_POINTSA
{0, NULL}};
CV_PossibleValue_t granisotropicmode_cons_t[] = {{1, "MIN"}, {16, "MAX"}, {0, NULL}};
-consvar_t cv_grshaders = {"gr_shaders", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glshaders = {"gr_shaders", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_fovchange = {"gr_fovchange", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
#ifdef ALAM_LIGHTING
-consvar_t cv_grdynamiclighting = {"gr_dynamiclighting", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_grstaticlighting = {"gr_staticlighting", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_grcoronas = {"gr_coronas", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_grcoronasize = {"gr_coronasize", "1", CV_SAVE|CV_FLOAT, 0, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_gldynamiclighting = {"gr_dynamiclighting", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glstaticlighting = {"gr_staticlighting", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glcoronas = {"gr_coronas", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glcoronasize = {"gr_coronasize", "1", CV_SAVE|CV_FLOAT, 0, NULL, 0, NULL, NULL, 0, 0, NULL};
#endif
-consvar_t cv_grmodels = {"gr_models", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_grmodelinterpolation = {"gr_modelinterpolation", "Sometimes", CV_SAVE, grmodelinterpolation_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_grmodellighting = {"gr_modellighting", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glmodels = {"gr_models", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glmodelinterpolation = {"gr_modelinterpolation", "Sometimes", CV_SAVE, grmodelinterpolation_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glmodellighting = {"gr_modellighting", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_grshearing = {"gr_shearing", "Off", CV_SAVE, grshearing_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_grspritebillboarding = {"gr_spritebillboarding", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_grskydome = {"gr_skydome", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_grfakecontrast = {"gr_fakecontrast", "Smooth", CV_SAVE, grfakecontrast_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_grslopecontrast = {"gr_slopecontrast", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glshearing = {"gr_shearing", "Off", CV_SAVE, grshearing_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glspritebillboarding = {"gr_spritebillboarding", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glskydome = {"gr_skydome", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glfakecontrast = {"gr_fakecontrast", "Smooth", CV_SAVE, grfakecontrast_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glslopecontrast = {"gr_slopecontrast", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_grfiltermode = {"gr_filtermode", "Nearest", CV_SAVE|CV_CALL, grfiltermode_cons_t,
- CV_grfiltermode_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_granisotropicmode = {"gr_anisotropicmode", "1", CV_CALL, granisotropicmode_cons_t,
- CV_granisotropic_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glfiltermode = {"gr_filtermode", "Nearest", CV_SAVE|CV_CALL, glfiltermode_cons_t,
+ CV_glfiltermode_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glanisotropicmode = {"gr_anisotropicmode", "1", CV_CALL, granisotropicmode_cons_t,
+ CV_glanisotropic_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_grsolvetjoin = {"gr_solvetjoin", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glsolvetjoin = {"gr_solvetjoin", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_grbatching = {"gr_batching", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glbatching = {"gr_batching", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-static void CV_grfiltermode_OnChange(void)
+static void CV_glfiltermode_OnChange(void)
{
if (rendermode == render_opengl)
- HWD.pfnSetSpecialState(HWD_SET_TEXTUREFILTERMODE, cv_grfiltermode.value);
+ HWD.pfnSetSpecialState(HWD_SET_TEXTUREFILTERMODE, cv_glfiltermode.value);
}
-static void CV_granisotropic_OnChange(void)
+static void CV_glanisotropic_OnChange(void)
{
if (rendermode == render_opengl)
- HWD.pfnSetSpecialState(HWD_SET_TEXTUREANISOTROPICMODE, cv_granisotropicmode.value);
+ HWD.pfnSetSpecialState(HWD_SET_TEXTUREANISOTROPICMODE, cv_glanisotropicmode.value);
}
//added by Hurdler: console varibale that are saved
@@ -5719,30 +5898,30 @@ void HWR_AddCommands(void)
CV_RegisterVar(&cv_fovchange);
#ifdef ALAM_LIGHTING
- CV_RegisterVar(&cv_grstaticlighting);
- CV_RegisterVar(&cv_grdynamiclighting);
- CV_RegisterVar(&cv_grcoronasize);
- CV_RegisterVar(&cv_grcoronas);
+ CV_RegisterVar(&cv_glstaticlighting);
+ CV_RegisterVar(&cv_gldynamiclighting);
+ CV_RegisterVar(&cv_glcoronasize);
+ CV_RegisterVar(&cv_glcoronas);
#endif
- CV_RegisterVar(&cv_grmodellighting);
- CV_RegisterVar(&cv_grmodelinterpolation);
- CV_RegisterVar(&cv_grmodels);
+ CV_RegisterVar(&cv_glmodellighting);
+ CV_RegisterVar(&cv_glmodelinterpolation);
+ CV_RegisterVar(&cv_glmodels);
- CV_RegisterVar(&cv_grskydome);
- CV_RegisterVar(&cv_grspritebillboarding);
- CV_RegisterVar(&cv_grfakecontrast);
- CV_RegisterVar(&cv_grshearing);
- CV_RegisterVar(&cv_grshaders);
+ CV_RegisterVar(&cv_glskydome);
+ CV_RegisterVar(&cv_glspritebillboarding);
+ CV_RegisterVar(&cv_glfakecontrast);
+ CV_RegisterVar(&cv_glshearing);
+ CV_RegisterVar(&cv_glshaders);
- CV_RegisterVar(&cv_grfiltermode);
- CV_RegisterVar(&cv_grsolvetjoin);
+ CV_RegisterVar(&cv_glfiltermode);
+ CV_RegisterVar(&cv_glsolvetjoin);
CV_RegisterVar(&cv_renderstats);
- CV_RegisterVar(&cv_grbatching);
+ CV_RegisterVar(&cv_glbatching);
#ifndef NEWCLIP
- CV_RegisterVar(&cv_grclipwalls);
+ CV_RegisterVar(&cv_glclipwalls);
#endif
}
@@ -5752,7 +5931,7 @@ void HWR_AddSessionCommands(void)
if (alreadycalled)
return;
- CV_RegisterVar(&cv_granisotropicmode);
+ CV_RegisterVar(&cv_glanisotropicmode);
alreadycalled = true;
}
@@ -5782,11 +5961,11 @@ void HWR_Startup(void)
for (i = 0; i < numwadfiles; i++)
HWR_ReadShaders(i, (wadfiles[i]->type == RET_PK3));
if (!HWR_LoadShaders())
- gr_shadersavailable = false;
+ gl_shadersavailable = false;
}
if (rendermode == render_opengl)
- textureformat = patchformat = GR_RGBA;
+ textureformat = patchformat = GL_TEXFMT_RGBA;
startupdone = true;
}
@@ -5797,8 +5976,8 @@ void HWR_Startup(void)
void HWR_Switch(void)
{
// Set special states from CVARs
- HWD.pfnSetSpecialState(HWD_SET_TEXTUREFILTERMODE, cv_grfiltermode.value);
- HWD.pfnSetSpecialState(HWD_SET_TEXTUREANISOTROPICMODE, cv_granisotropicmode.value);
+ HWD.pfnSetSpecialState(HWD_SET_TEXTUREFILTERMODE, cv_glfiltermode.value);
+ HWD.pfnSetSpecialState(HWD_SET_TEXTUREANISOTROPICMODE, cv_glanisotropicmode.value);
}
// --------------------------------------------------------------------------
@@ -5817,23 +5996,23 @@ void transform(float *cx, float *cy, float *cz)
{
float tr_x,tr_y;
// translation
- tr_x = *cx - gr_viewx;
- tr_y = *cz - gr_viewy;
+ tr_x = *cx - gl_viewx;
+ tr_y = *cz - gl_viewy;
// *cy = *cy;
// rotation around vertical y axis
- *cx = (tr_x * gr_viewsin) - (tr_y * gr_viewcos);
- tr_x = (tr_x * gr_viewcos) + (tr_y * gr_viewsin);
+ *cx = (tr_x * gl_viewsin) - (tr_y * gl_viewcos);
+ tr_x = (tr_x * gl_viewcos) + (tr_y * gl_viewsin);
//look up/down ----TOTAL SUCKS!!!--- do the 2 in one!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- tr_y = *cy - gr_viewz;
+ tr_y = *cy - gl_viewz;
- *cy = (tr_x * gr_viewludcos) + (tr_y * gr_viewludsin);
- *cz = (tr_x * gr_viewludsin) - (tr_y * gr_viewludcos);
+ *cy = (tr_x * gl_viewludcos) + (tr_y * gl_viewludsin);
+ *cz = (tr_x * gl_viewludsin) - (tr_y * gl_viewludcos);
//scale y before frustum so that frustum can be scaled to screen height
- *cy *= ORIGINAL_ASPECT * gr_fovlud;
- *cx *= gr_fovlud;
+ *cy *= ORIGINAL_ASPECT * gl_fovlud;
+ *cx *= gl_fovlud;
}
void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, INT32 texnum, FBITFIELD blend, boolean fogwall, INT32 lightlevel, extracolormap_t *wallcolormap)
@@ -5889,7 +6068,7 @@ void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blend,
HWR_ProcessPolygon(pSurf, wallVerts, 4, blendmode, shader, false);
#ifdef WALLSPLATS
- if (gr_curline->linedef->splats && cv_splats.value)
+ if (gl_curline->linedef->splats && cv_splats.value)
HWR_DrawSegsSplats(pSurf);
#endif
}
diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h
index 7336bba0f524a41aaee196ab57e8834fe254c6a1..ddb3696b6f6810339b9f0170ddaaa09a552c0fc5 100644
--- a/src/hardware/hw_main.h
+++ b/src/hardware/hw_main.h
@@ -74,31 +74,31 @@ boolean HWR_LoadShaders(void);
extern CV_PossibleValue_t granisotropicmode_cons_t[];
#ifdef ALAM_LIGHTING
-extern consvar_t cv_grdynamiclighting;
-extern consvar_t cv_grstaticlighting;
-extern consvar_t cv_grcoronas;
-extern consvar_t cv_grcoronasize;
+extern consvar_t cv_gldynamiclighting;
+extern consvar_t cv_glstaticlighting;
+extern consvar_t cv_glcoronas;
+extern consvar_t cv_glcoronasize;
#endif
-extern consvar_t cv_grshaders;
-extern consvar_t cv_grmodels;
-extern consvar_t cv_grmodelinterpolation;
-extern consvar_t cv_grmodellighting;
-extern consvar_t cv_grfiltermode;
-extern consvar_t cv_granisotropicmode;
+extern consvar_t cv_glshaders;
+extern consvar_t cv_glmodels;
+extern consvar_t cv_glmodelinterpolation;
+extern consvar_t cv_glmodellighting;
+extern consvar_t cv_glfiltermode;
+extern consvar_t cv_glanisotropicmode;
extern consvar_t cv_fovchange;
-extern consvar_t cv_grsolvetjoin;
-extern consvar_t cv_grshearing;
-extern consvar_t cv_grspritebillboarding;
-extern consvar_t cv_grskydome;
-extern consvar_t cv_grfakecontrast;
-extern consvar_t cv_grslopecontrast;
+extern consvar_t cv_glsolvetjoin;
+extern consvar_t cv_glshearing;
+extern consvar_t cv_glspritebillboarding;
+extern consvar_t cv_glskydome;
+extern consvar_t cv_glfakecontrast;
+extern consvar_t cv_glslopecontrast;
-extern consvar_t cv_grbatching;
+extern consvar_t cv_glbatching;
-extern float gr_viewwidth, gr_viewheight, gr_baseviewwindowy;
+extern float gl_viewwidth, gl_viewheight, gl_baseviewwindowy;
-extern float gr_viewwindowx, gr_basewindowcentery;
+extern float gl_viewwindowx, gl_basewindowcentery;
// BP: big hack for a test in lighting ref : 1249753487AB
extern fixed_t *hwbbox;
@@ -122,6 +122,6 @@ extern int rs_hw_numcolors;
extern int rs_hw_batchsorttime;
extern int rs_hw_batchdrawtime;
-extern boolean gr_shadersavailable;
+extern boolean gl_shadersavailable;
#endif
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 80c01f98cb78e7f3b81aa47da9144798eed9860a..fa5156758e50a7b2bd1c1e4cef68ab0812f8b9bd 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -141,7 +141,7 @@ static void PNG_warn(png_structp PNG, png_const_charp pngtext)
CONS_Debug(DBG_RENDER, "libpng warning at %p: %s", PNG, pngtext);
}
-static GrTextureFormat_t PNG_Load(const char *filename, int *w, int *h, GLPatch_t *grpatch)
+static GLTextureFormat_t PNG_Load(const char *filename, int *w, int *h, GLPatch_t *grpatch)
{
png_structp png_ptr;
png_infop png_info_ptr;
@@ -191,7 +191,7 @@ static GrTextureFormat_t PNG_Load(const char *filename, int *w, int *h, GLPatch_
//CONS_Debug(DBG_RENDER, "libpng load error on %s\n", filename);
png_destroy_read_struct(&png_ptr, &png_info_ptr, NULL);
fclose(png_FILE);
- Z_Free(grpatch->mipmap->grInfo.data);
+ Z_Free(grpatch->mipmap->data);
return 0;
}
#ifdef USE_FAR_KEYWORD
@@ -232,7 +232,7 @@ static GrTextureFormat_t PNG_Load(const char *filename, int *w, int *h, GLPatch_
{
png_uint_32 i, pitch = png_get_rowbytes(png_ptr, png_info_ptr);
- png_bytep PNG_image = Z_Malloc(pitch*height, PU_HWRMODELTEXTURE, &grpatch->mipmap->grInfo.data);
+ png_bytep PNG_image = Z_Malloc(pitch*height, PU_HWRMODELTEXTURE, &grpatch->mipmap->data);
png_bytepp row_pointers = png_malloc(png_ptr, height * sizeof (png_bytep));
for (i = 0; i < height; i++)
row_pointers[i] = PNG_image + i*pitch;
@@ -245,7 +245,7 @@ static GrTextureFormat_t PNG_Load(const char *filename, int *w, int *h, GLPatch_
fclose(png_FILE);
*w = (int)width;
*h = (int)height;
- return GR_RGBA;
+ return GL_TEXFMT_RGBA;
}
#endif
@@ -271,7 +271,7 @@ typedef struct
UINT8 filler[54];
} PcxHeader;
-static GrTextureFormat_t PCX_Load(const char *filename, int *w, int *h,
+static GLTextureFormat_t PCX_Load(const char *filename, int *w, int *h,
GLPatch_t *grpatch)
{
PcxHeader header;
@@ -306,7 +306,7 @@ static GrTextureFormat_t PCX_Load(const char *filename, int *w, int *h,
pw = *w = header.xmax - header.xmin + 1;
ph = *h = header.ymax - header.ymin + 1;
- image = Z_Malloc(pw*ph*4, PU_HWRMODELTEXTURE, &grpatch->mipmap->grInfo.data);
+ image = Z_Malloc(pw*ph*4, PU_HWRMODELTEXTURE, &grpatch->mipmap->data);
if (fread(palette, sizeof (UINT8), PALSIZE, file) != PALSIZE)
{
@@ -340,7 +340,7 @@ static GrTextureFormat_t PCX_Load(const char *filename, int *w, int *h,
}
}
fclose(file);
- return GR_RGBA;
+ return GL_TEXFMT_RGBA;
}
// -----------------+
@@ -354,7 +354,7 @@ static void md2_loadTexture(md2_t *model)
if (model->grpatch)
{
grpatch = model->grpatch;
- Z_Free(grpatch->mipmap->grInfo.data);
+ Z_Free(grpatch->mipmap->data);
}
else
{
@@ -363,18 +363,18 @@ static void md2_loadTexture(md2_t *model)
grpatch->mipmap = Z_Calloc(sizeof (GLMipmap_t), PU_HWRPATCHINFO, NULL);
}
- if (!grpatch->mipmap->downloaded && !grpatch->mipmap->grInfo.data)
+ if (!grpatch->mipmap->downloaded && !grpatch->mipmap->data)
{
int w = 0, h = 0;
UINT32 size;
RGBA_t *image;
#ifdef HAVE_PNG
- grpatch->mipmap->grInfo.format = PNG_Load(filename, &w, &h, grpatch);
- if (grpatch->mipmap->grInfo.format == 0)
+ grpatch->mipmap->format = PNG_Load(filename, &w, &h, grpatch);
+ if (grpatch->mipmap->format == 0)
#endif
- grpatch->mipmap->grInfo.format = PCX_Load(filename, &w, &h, grpatch);
- if (grpatch->mipmap->grInfo.format == 0)
+ grpatch->mipmap->format = PCX_Load(filename, &w, &h, grpatch);
+ if (grpatch->mipmap->format == 0)
{
model->notexturefile = true; // mark it so its not searched for again repeatedly
return;
@@ -389,7 +389,7 @@ static void md2_loadTexture(md2_t *model)
grpatch->mipmap->height = (UINT16)h;
// Lactozilla: Apply colour cube
- image = grpatch->mipmap->grInfo.data;
+ image = grpatch->mipmap->data;
size = w*h;
while (size--)
{
@@ -414,7 +414,7 @@ static void md2_loadBlendTexture(md2_t *model)
if (model->blendgrpatch)
{
grpatch = model->blendgrpatch;
- Z_Free(grpatch->mipmap->grInfo.data);
+ Z_Free(grpatch->mipmap->data);
}
else
{
@@ -423,15 +423,15 @@ static void md2_loadBlendTexture(md2_t *model)
grpatch->mipmap = Z_Calloc(sizeof (GLMipmap_t), PU_HWRPATCHINFO, NULL);
}
- if (!grpatch->mipmap->downloaded && !grpatch->mipmap->grInfo.data)
+ if (!grpatch->mipmap->downloaded && !grpatch->mipmap->data)
{
int w = 0, h = 0;
#ifdef HAVE_PNG
- grpatch->mipmap->grInfo.format = PNG_Load(filename, &w, &h, grpatch);
- if (grpatch->mipmap->grInfo.format == 0)
+ grpatch->mipmap->format = PNG_Load(filename, &w, &h, grpatch);
+ if (grpatch->mipmap->format == 0)
#endif
- grpatch->mipmap->grInfo.format = PCX_Load(filename, &w, &h, grpatch);
- if (grpatch->mipmap->grInfo.format == 0)
+ grpatch->mipmap->format = PCX_Load(filename, &w, &h, grpatch);
+ if (grpatch->mipmap->format == 0)
{
model->noblendfile = true; // mark it so its not searched for again repeatedly
Z_Free(filename);
@@ -686,20 +686,20 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch,
// no wrap around, no chroma key
grmip->flags = 0;
// setup the texture info
- grmip->grInfo.format = GR_RGBA;
+ grmip->format = GL_TEXFMT_RGBA;
}
- if (grmip->grInfo.data)
+ if (grmip->data)
{
- Z_Free(grmip->grInfo.data);
- grmip->grInfo.data = NULL;
+ Z_Free(grmip->data);
+ grmip->data = NULL;
}
- cur = Z_Malloc(size*4, PU_HWRMODELTEXTURE, &grmip->grInfo.data);
+ cur = Z_Malloc(size*4, PU_HWRMODELTEXTURE, &grmip->data);
memset(cur, 0x00, size*4);
- image = gpatch->mipmap->grInfo.data;
- blendimage = blendgpatch->mipmap->grInfo.data;
+ image = gpatch->mipmap->data;
+ blendimage = blendgpatch->mipmap->data;
// TC_METALSONIC includes an actual skincolor translation, on top of its flashing.
if (skinnum == TC_METALSONIC)
@@ -1050,7 +1050,7 @@ static void HWR_GetBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, INT
return;
}
- if ((blendgpatch && blendgpatch->mipmap->grInfo.format)
+ if ((blendgpatch && blendgpatch->mipmap->format)
&& (gpatch->width != blendgpatch->width || gpatch->height != blendgpatch->height))
{
// Blend image exists, but it's bad.
@@ -1065,10 +1065,10 @@ static void HWR_GetBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, INT
grmip = grmip->nextcolormap;
if (grmip->colormap == colormap)
{
- if (grmip->downloaded && grmip->grInfo.data)
+ if (grmip->downloaded && grmip->data)
{
HWD.pfnSetTexture(grmip); // found the colormap, set it to the correct texture
- Z_ChangeTag(grmip->grInfo.data, PU_HWRMODELTEXTURE_UNLOCKED);
+ Z_ChangeTag(grmip->data, PU_HWRMODELTEXTURE_UNLOCKED);
return;
}
}
@@ -1090,7 +1090,7 @@ static void HWR_GetBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, INT
HWR_CreateBlendedTexture(gpatch, blendgpatch, newmip, skinnum, color);
HWD.pfnSetTexture(newmip);
- Z_ChangeTag(newmip->grInfo.data, PU_HWRMODELTEXTURE_UNLOCKED);
+ Z_ChangeTag(newmip->data, PU_HWRMODELTEXTURE_UNLOCKED);
}
#define NORMALFOG 0x00000000
@@ -1108,14 +1108,14 @@ static boolean HWR_AllowModel(mobj_t *mobj)
static boolean HWR_CanInterpolateModel(mobj_t *mobj, model_t *model)
{
- if (cv_grmodelinterpolation.value == 2) // Always interpolate
+ if (cv_glmodelinterpolation.value == 2) // Always interpolate
return true;
return model->interpolate[(mobj->frame & FF_FRAMEMASK)];
}
static boolean HWR_CanInterpolateSprite2(modelspr2frames_t *spr2frame)
{
- if (cv_grmodelinterpolation.value == 2) // Always interpolate
+ if (cv_glmodelinterpolation.value == 2) // Always interpolate
return true;
return spr2frame->interpolate;
}
@@ -1209,7 +1209,7 @@ static void adjustTextureCoords(model_t *model, GLPatch_t *gpatch)
// HWR_DrawModel
//
-boolean HWR_DrawModel(gr_vissprite_t *spr)
+boolean HWR_DrawModel(gl_vissprite_t *spr)
{
md2_t *md2;
@@ -1220,7 +1220,7 @@ boolean HWR_DrawModel(gr_vissprite_t *spr)
FTransform p;
FSurfaceInfo Surf;
- if (!cv_grmodels.value)
+ if (!cv_glmodels.value)
return false;
if (spr->precip)
@@ -1309,13 +1309,13 @@ boolean HWR_DrawModel(gr_vissprite_t *spr)
// texture loading before model init, so it knows if sprite graphics are used, which
// means that texture coordinates have to be adjusted
gpatch = md2->grpatch;
- if (!gpatch || ((!gpatch->mipmap->grInfo.format || !gpatch->mipmap->downloaded) && !md2->notexturefile))
+ if (!gpatch || ((!gpatch->mipmap->format || !gpatch->mipmap->downloaded) && !md2->notexturefile))
md2_loadTexture(md2);
gpatch = md2->grpatch; // Load it again, because it isn't being loaded into gpatch after md2_loadtexture...
- if ((gpatch && gpatch->mipmap->grInfo.format) // don't load the blend texture if the base texture isn't available
+ if ((gpatch && gpatch->mipmap->format) // don't load the blend texture if the base texture isn't available
&& (!md2->blendgrpatch
- || ((!((GLPatch_t *)md2->blendgrpatch)->mipmap->grInfo.format || !((GLPatch_t *)md2->blendgrpatch)->mipmap->downloaded)
+ || ((!((GLPatch_t *)md2->blendgrpatch)->mipmap->format || !((GLPatch_t *)md2->blendgrpatch)->mipmap->downloaded)
&& !md2->noblendfile)))
md2_loadBlendTexture(md2);
@@ -1332,7 +1332,7 @@ boolean HWR_DrawModel(gr_vissprite_t *spr)
md2_printModelInfo(md2->model);
// if model uses sprite patch as texture, then
// adjust texture coordinates to take power of two textures into account
- if (!gpatch || !gpatch->mipmap->grInfo.format)
+ if (!gpatch || !gpatch->mipmap->format)
adjustTextureCoords(md2->model, spr->gpatch);
HWD.pfnCreateModelVBOs(md2->model);
}
@@ -1352,7 +1352,7 @@ boolean HWR_DrawModel(gr_vissprite_t *spr)
finalscale = md2->scale;
//Hurdler: arf, I don't like that implementation at all... too much crappy
- if (gpatch && gpatch->mipmap->grInfo.format) // else if meant that if a texture couldn't be loaded, it would just end up using something else's texture
+ if (gpatch && gpatch->mipmap->format) // else if meant that if a texture couldn't be loaded, it would just end up using something else's texture
{
INT32 skinnum = TC_DEFAULT;
@@ -1423,7 +1423,7 @@ boolean HWR_DrawModel(gr_vissprite_t *spr)
#ifdef USE_MODEL_NEXTFRAME
#define INTERPOLERATION_LIMIT TICRATE/4
- if (cv_grmodelinterpolation.value && tics <= durs && tics <= INTERPOLERATION_LIMIT)
+ if (cv_glmodelinterpolation.value && tics <= durs && tics <= INTERPOLERATION_LIMIT)
{
if (durs > INTERPOLERATION_LIMIT)
durs = INTERPOLERATION_LIMIT;
diff --git a/src/hardware/hw_md2.h b/src/hardware/hw_md2.h
index 42a9d7c634d3643fd198372e87b5250d8c5f9068..0f4d2c7bc925f45005757c09a80cabaf103a8a3a 100644
--- a/src/hardware/hw_md2.h
+++ b/src/hardware/hw_md2.h
@@ -42,7 +42,7 @@ extern md2_t md2_playermodels[MAXSKINS];
void HWR_InitModels(void);
void HWR_AddPlayerModel(INT32 skin);
void HWR_AddSpriteModel(size_t spritenum);
-boolean HWR_DrawModel(gr_vissprite_t *spr);
+boolean HWR_DrawModel(gl_vissprite_t *spr);
#define PLAYERMODELPREFIX "PLAYER"
diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c
index b7baa4eb0bdd0389338e61e58201bfa21bb6bd27..08d688e1dd9036524f48c10da59b13c412977529 100644
--- a/src/hardware/r_opengl/r_opengl.c
+++ b/src/hardware/r_opengl/r_opengl.c
@@ -58,8 +58,8 @@ static GLuint tex_downloaded = 0;
static GLfloat fov = 90.0f;
static FBITFIELD CurrentPolyFlags;
-static FTextureInfo *gr_cachetail = NULL;
-static FTextureInfo *gr_cachehead = NULL;
+static FTextureInfo *gl_cachetail = NULL;
+static FTextureInfo *gl_cachehead = NULL;
RGBA_t myPaletteData[256];
GLint screen_width = 0; // used by Draw2DLine()
@@ -1200,7 +1200,7 @@ void SetModelView(GLint w, GLint h)
pglLoadIdentity();
GLPerspective(fov, ASPECT_RATIO);
- //pglScalef(1.0f, 320.0f/200.0f, 1.0f); // gr_scalefrustum (ORIGINAL_ASPECT)
+ //pglScalef(1.0f, 320.0f/200.0f, 1.0f); // gl_scalefrustum (ORIGINAL_ASPECT)
// added for new coronas' code (without depth buffer)
pglGetIntegerv(GL_VIEWPORT, viewport);
@@ -1277,14 +1277,14 @@ void Flush(void)
{
//GL_DBG_Printf ("HWR_Flush()\n");
- while (gr_cachehead)
+ while (gl_cachehead)
{
- if (gr_cachehead->downloaded)
- pglDeleteTextures(1, (GLuint *)&gr_cachehead->downloaded);
- gr_cachehead->downloaded = 0;
- gr_cachehead = gr_cachehead->nextmipmap;
+ if (gl_cachehead->downloaded)
+ pglDeleteTextures(1, (GLuint *)&gl_cachehead->downloaded);
+ gl_cachehead->downloaded = 0;
+ gl_cachehead = gl_cachehead->nextmipmap;
}
- gr_cachetail = gr_cachehead = NULL; //Hurdler: well, gr_cachehead is already NULL
+ gl_cachetail = gl_cachehead = NULL; //Hurdler: well, gl_cachehead is already NULL
tex_downloaded = 0;
}
@@ -1657,15 +1657,15 @@ EXPORT void HWRAPI(UpdateTexture) (FTextureInfo *pTexInfo)
else
texnum = pTexInfo->downloaded;
- //GL_DBG_Printf ("DownloadMipmap %d %x\n",(INT32)texnum,pTexInfo->grInfo.data);
+ //GL_DBG_Printf ("DownloadMipmap %d %x\n",(INT32)texnum,pTexInfo->data);
w = pTexInfo->width;
h = pTexInfo->height;
- if ((pTexInfo->grInfo.format == GR_TEXFMT_P_8) ||
- (pTexInfo->grInfo.format == GR_TEXFMT_AP_88))
+ if ((pTexInfo->format == GL_TEXFMT_P_8) ||
+ (pTexInfo->format == GL_TEXFMT_AP_88))
{
- const GLubyte *pImgData = (const GLubyte *)pTexInfo->grInfo.data;
+ const GLubyte *pImgData = (const GLubyte *)pTexInfo->data;
INT32 i, j;
for (j = 0; j < h; j++)
@@ -1691,7 +1691,7 @@ EXPORT void HWRAPI(UpdateTexture) (FTextureInfo *pTexInfo)
pImgData++;
- if (pTexInfo->grInfo.format == GR_TEXFMT_AP_88)
+ if (pTexInfo->format == GL_TEXFMT_AP_88)
{
if (!(pTexInfo->flags & TF_CHROMAKEYED))
tex[w*j+i].s.alpha = *pImgData;
@@ -1701,15 +1701,15 @@ EXPORT void HWRAPI(UpdateTexture) (FTextureInfo *pTexInfo)
}
}
}
- else if (pTexInfo->grInfo.format == GR_RGBA)
+ else if (pTexInfo->format == GL_TEXFMT_RGBA)
{
// corona test : passed as ARGB 8888, which is not in glide formats
// Hurdler: not used for coronas anymore, just for dynamic lighting
- ptex = pTexInfo->grInfo.data;
+ ptex = pTexInfo->data;
}
- else if (pTexInfo->grInfo.format == GR_TEXFMT_ALPHA_INTENSITY_88)
+ else if (pTexInfo->format == GL_TEXFMT_ALPHA_INTENSITY_88)
{
- const GLubyte *pImgData = (const GLubyte *)pTexInfo->grInfo.data;
+ const GLubyte *pImgData = (const GLubyte *)pTexInfo->data;
INT32 i, j;
for (j = 0; j < h; j++)
@@ -1725,9 +1725,9 @@ EXPORT void HWRAPI(UpdateTexture) (FTextureInfo *pTexInfo)
}
}
}
- else if (pTexInfo->grInfo.format == GR_TEXFMT_ALPHA_8) // Used for fade masks
+ else if (pTexInfo->format == GL_TEXFMT_ALPHA_8) // Used for fade masks
{
- const GLubyte *pImgData = (const GLubyte *)pTexInfo->grInfo.data;
+ const GLubyte *pImgData = (const GLubyte *)pTexInfo->data;
INT32 i, j;
for (j = 0; j < h; j++)
@@ -1743,7 +1743,7 @@ EXPORT void HWRAPI(UpdateTexture) (FTextureInfo *pTexInfo)
}
}
else
- GL_MSG_Warning ("SetTexture(bad format) %ld\n", pTexInfo->grInfo.format);
+ GL_MSG_Warning ("SetTexture(bad format) %ld\n", pTexInfo->format);
// the texture number was already generated by pglGenTextures
pglBindTexture(GL_TEXTURE_2D, texnum);
@@ -1761,7 +1761,7 @@ EXPORT void HWRAPI(UpdateTexture) (FTextureInfo *pTexInfo)
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
}
- if (pTexInfo->grInfo.format == GR_TEXFMT_ALPHA_INTENSITY_88)
+ if (pTexInfo->format == GL_TEXFMT_ALPHA_INTENSITY_88)
{
//pglTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
if (MipMap)
@@ -1782,7 +1782,7 @@ EXPORT void HWRAPI(UpdateTexture) (FTextureInfo *pTexInfo)
pglTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
}
}
- else if (pTexInfo->grInfo.format == GR_TEXFMT_ALPHA_8)
+ else if (pTexInfo->format == GL_TEXFMT_ALPHA_8)
{
//pglTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, ptex);
if (MipMap)
@@ -1860,13 +1860,13 @@ EXPORT void HWRAPI(SetTexture) (FTextureInfo *pTexInfo)
{
UpdateTexture(pTexInfo);
pTexInfo->nextmipmap = NULL;
- if (gr_cachetail)
+ if (gl_cachetail)
{ // insertion at the tail
- gr_cachetail->nextmipmap = pTexInfo;
- gr_cachetail = pTexInfo;
+ gl_cachetail->nextmipmap = pTexInfo;
+ gl_cachetail = pTexInfo;
}
else // initialization of the linked list
- gr_cachetail = gr_cachehead = pTexInfo;
+ gl_cachetail = gl_cachehead = pTexInfo;
}
}
@@ -2961,7 +2961,7 @@ EXPORT void HWRAPI(SetTransform) (FTransform *stransform)
EXPORT INT32 HWRAPI(GetTextureUsed) (void)
{
- FTextureInfo *tmp = gr_cachehead;
+ FTextureInfo *tmp = gl_cachehead;
INT32 res = 0;
while (tmp)
@@ -2970,14 +2970,10 @@ EXPORT INT32 HWRAPI(GetTextureUsed) (void)
// I don't know which one the game actually _uses_ but this
// follows format2bpp in hw_cache.c
int bpp = 1;
- int format = tmp->grInfo.format;
- if (format == GR_RGBA)
+ int format = tmp->format;
+ if (format == GL_TEXFMT_RGBA)
bpp = 4;
- else if (format == GR_TEXFMT_RGB_565
- || format == GR_TEXFMT_ARGB_1555
- || format == GR_TEXFMT_ARGB_4444
- || format == GR_TEXFMT_ALPHA_INTENSITY_88
- || format == GR_TEXFMT_AP_88)
+ else if (format == GL_TEXFMT_ALPHA_INTENSITY_88 || format == GL_TEXFMT_AP_88)
bpp = 2;
// Add it up!
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 7b84784e58102c690f37c21e6a79d07d54adfc86..b611925330ffd96c1c29354694160c55a442bdf2 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -1880,7 +1880,7 @@ static inline void HU_DrawCrosshair(void)
#ifdef HWRENDER
if (rendermode != render_soft)
- y = (INT32)gr_basewindowcentery;
+ y = (INT32)gl_basewindowcentery;
else
#endif
y = viewwindowy + (viewheight>>1);
@@ -1901,7 +1901,7 @@ static inline void HU_DrawCrosshair2(void)
#ifdef HWRENDER
if (rendermode != render_soft)
- y = (INT32)gr_basewindowcentery;
+ y = (INT32)gl_basewindowcentery;
else
#endif
y = viewwindowy + (viewheight>>1);
@@ -1910,7 +1910,7 @@ static inline void HU_DrawCrosshair2(void)
{
#ifdef HWRENDER
if (rendermode != render_soft)
- y += (INT32)gr_viewheight;
+ y += (INT32)gl_viewheight;
else
#endif
y += viewheight;
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 775d9ec0213a8f076e1e573ce0712f516ab3fe68..23aa060fe72a2507f0484d5c795ae04192c4fae6 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -902,6 +902,94 @@ static int lib_pMaceRotate(lua_State *L)
return 0;
}
+static int lib_pRailThinker(lua_State *L)
+{
+ mobj_t *mobj = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ NOHUD
+ INLEVEL
+ if (!mobj)
+ return LUA_ErrInvalid(L, "mobj_t");
+ lua_pushboolean(L, P_RailThinker(mobj));
+ return 1;
+}
+
+static int lib_pXYMovement(lua_State *L)
+{
+ mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ NOHUD
+ INLEVEL
+ if (!actor)
+ return LUA_ErrInvalid(L, "mobj_t");
+ P_XYMovement(actor);
+ return 0;
+}
+
+static int lib_pRingXYMovement(lua_State *L)
+{
+ mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ NOHUD
+ INLEVEL
+ if (!actor)
+ return LUA_ErrInvalid(L, "mobj_t");
+ P_RingXYMovement(actor);
+ return 0;
+}
+
+static int lib_pSceneryXYMovement(lua_State *L)
+{
+ mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ NOHUD
+ INLEVEL
+ if (!actor)
+ return LUA_ErrInvalid(L, "mobj_t");
+ P_SceneryXYMovement(actor);
+ return 0;
+}
+
+static int lib_pZMovement(lua_State *L)
+{
+ mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ NOHUD
+ INLEVEL
+ if (!actor)
+ return LUA_ErrInvalid(L, "mobj_t");
+ lua_pushboolean(L, P_ZMovement(actor));
+ return 1;
+}
+
+static int lib_pRingZMovement(lua_State *L)
+{
+ mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ NOHUD
+ INLEVEL
+ if (!actor)
+ return LUA_ErrInvalid(L, "mobj_t");
+ P_RingZMovement(actor);
+ return 0;
+}
+
+static int lib_pSceneryZMovement(lua_State *L)
+{
+ mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ NOHUD
+ INLEVEL
+ if (!actor)
+ return LUA_ErrInvalid(L, "mobj_t");
+ lua_pushboolean(L, P_SceneryZMovement(actor));
+ return 1;
+}
+
+static int lib_pPlayerZMovement(lua_State *L)
+{
+ mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ NOHUD
+ INLEVEL
+ if (!actor)
+ return LUA_ErrInvalid(L, "mobj_t");
+ P_PlayerZMovement(actor);
+ return 0;
+}
+
// P_USER
////////////
@@ -1272,6 +1360,17 @@ static int lib_pSpawnSkidDust(lua_State *L)
return 0;
}
+static int lib_pMovePlayer(lua_State *L)
+{
+ player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ NOHUD
+ INLEVEL
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ P_MovePlayer(player);
+ return 0;
+}
+
static int lib_pDoPlayerFinish(lua_State *L)
{
player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
@@ -3259,6 +3358,14 @@ static luaL_Reg lib[] = {
{"P_CheckSolidLava",lib_pCheckSolidLava},
{"P_CanRunOnWater",lib_pCanRunOnWater},
{"P_MaceRotate",lib_pMaceRotate},
+ {"P_RailThinker",lib_pRailThinker},
+ {"P_XYMovement",lib_pXYMovement},
+ {"P_RingXYMovement",lib_pRingXYMovement},
+ {"P_SceneryXYMovement",lib_pSceneryXYMovement},
+ {"P_ZMovement",lib_pZMovement},
+ {"P_RingZMovement",lib_pRingZMovement},
+ {"P_SceneryZMovement",lib_pSceneryZMovement},
+ {"P_PlayerZMovement",lib_pPlayerZMovement},
// p_user
{"P_GetPlayerHeight",lib_pGetPlayerHeight},
@@ -3290,6 +3397,7 @@ static luaL_Reg lib[] = {
{"P_BlackOw",lib_pBlackOw},
{"P_ElementalFire",lib_pElementalFire},
{"P_SpawnSkidDust", lib_pSpawnSkidDust},
+ {"P_MovePlayer",lib_pMovePlayer},
{"P_DoPlayerFinish",lib_pDoPlayerFinish},
{"P_DoPlayerExit",lib_pDoPlayerExit},
{"P_InstaThrust",lib_pInstaThrust},
diff --git a/src/lua_script.c b/src/lua_script.c
index 5fb153c0efec3064eefdad29284be901ebfc2216..9d7d536b971a45da3f45ee7022e06daf636e4edf 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -344,6 +344,12 @@ int LUA_PushGlobals(lua_State *L, const char *word)
} else if (fastcmp(word,"gravity")) {
lua_pushinteger(L, gravity);
return 1;
+ } else if (fastcmp(word,"VERSION")) {
+ lua_pushinteger(L, VERSION);
+ return 1;
+ } else if (fastcmp(word,"SUBVERSION")) {
+ lua_pushinteger(L, SUBVERSION);
+ return 1;
} else if (fastcmp(word,"VERSIONSTRING")) {
lua_pushstring(L, VERSIONSTRING);
return 1;
diff --git a/src/m_menu.c b/src/m_menu.c
index a2e535f28a0e062a6da9d355b1bd9f46d3784f9a..41f663c19a99918834057dcad8badc919748e87b 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1453,19 +1453,19 @@ static menuitem_t OP_ColorOptionsMenu[] =
static menuitem_t OP_OpenGLOptionsMenu[] =
{
{IT_HEADER, NULL, "3D Models", NULL, 0},
- {IT_STRING|IT_CVAR, NULL, "Models", &cv_grmodels, 12},
- {IT_STRING|IT_CVAR, NULL, "Frame interpolation", &cv_grmodelinterpolation, 22},
- {IT_STRING|IT_CVAR, NULL, "Ambient lighting", &cv_grmodellighting, 32},
+ {IT_STRING|IT_CVAR, NULL, "Models", &cv_glmodels, 12},
+ {IT_STRING|IT_CVAR, NULL, "Frame interpolation", &cv_glmodelinterpolation, 22},
+ {IT_STRING|IT_CVAR, NULL, "Ambient lighting", &cv_glmodellighting, 32},
{IT_HEADER, NULL, "General", NULL, 51},
- {IT_STRING|IT_CVAR, NULL, "Shaders", &cv_grshaders, 63},
- {IT_STRING|IT_CVAR, NULL, "Lack of perspective", &cv_grshearing, 73},
+ {IT_STRING|IT_CVAR, NULL, "Shaders", &cv_glshaders, 63},
+ {IT_STRING|IT_CVAR, NULL, "Lack of perspective", &cv_glshearing, 73},
{IT_STRING|IT_CVAR, NULL, "Field of view", &cv_fov, 83},
{IT_HEADER, NULL, "Miscellaneous", NULL, 102},
{IT_STRING|IT_CVAR, NULL, "Bit depth", &cv_scr_depth, 114},
- {IT_STRING|IT_CVAR, NULL, "Texture filter", &cv_grfiltermode, 124},
- {IT_STRING|IT_CVAR, NULL, "Anisotropic", &cv_granisotropicmode, 134},
+ {IT_STRING|IT_CVAR, NULL, "Texture filter", &cv_glfiltermode, 124},
+ {IT_STRING|IT_CVAR, NULL, "Anisotropic", &cv_glanisotropicmode, 134},
#ifdef ALAM_LIGHTING
{IT_SUBMENU|IT_STRING, NULL, "Lighting...", &OP_OpenGLLightingDef, 144},
#endif
@@ -1477,10 +1477,10 @@ static menuitem_t OP_OpenGLOptionsMenu[] =
#ifdef ALAM_LIGHTING
static menuitem_t OP_OpenGLLightingMenu[] =
{
- {IT_STRING|IT_CVAR, NULL, "Coronas", &cv_grcoronas, 0},
- {IT_STRING|IT_CVAR, NULL, "Coronas size", &cv_grcoronasize, 10},
- {IT_STRING|IT_CVAR, NULL, "Dynamic lighting", &cv_grdynamiclighting, 20},
- {IT_STRING|IT_CVAR, NULL, "Static lighting", &cv_grstaticlighting, 30},
+ {IT_STRING|IT_CVAR, NULL, "Coronas", &cv_glcoronas, 0},
+ {IT_STRING|IT_CVAR, NULL, "Coronas size", &cv_glcoronasize, 10},
+ {IT_STRING|IT_CVAR, NULL, "Dynamic lighting", &cv_gldynamiclighting, 20},
+ {IT_STRING|IT_CVAR, NULL, "Static lighting", &cv_glstaticlighting, 30},
};
#endif // ALAM_LIGHTING
@@ -2313,9 +2313,9 @@ void Nextmap_OnChange(void)
// Check if file exists, if not, disable REPLAY option
sprintf(tabase,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-%s",srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value), skins[cv_chooseskin.value-1].name);
-#ifdef OLDNREPLAYNAME
+#ifdef OLDNREPLAYNAME
sprintf(tabaseold,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s",srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value));
-#endif
+#endif
for (i = 0; i < 4; i++) {
SP_NightsReplayMenu[i].status = IT_DISABLED;
@@ -2343,7 +2343,7 @@ void Nextmap_OnChange(void)
active = true;
}
- // Old style name compatibility
+ // Old style name compatibility
#ifdef OLDNREPLAYNAME
if (FIL_FileExists(va("%s-score-best.lmp", tabaseold))) {
SP_NightsReplayMenu[0].status = IT_WHITESTRING|IT_CALL;
diff --git a/src/p_local.h b/src/p_local.h
index 9873a20af5de11ce97c20d840121ff70a82704ec..b6c34f357a18e2ca55211cca139eb429c5d871af 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -177,6 +177,7 @@ void P_BlackOw(player_t *player);
void P_ElementalFire(player_t *player, boolean cropcircle);
void P_SpawnSkidDust(player_t *player, fixed_t radius, boolean sound);
+void P_MovePlayer(player_t *player);
void P_DoPityCheck(player_t *player);
void P_PlayerThink(player_t *player);
void P_PlayerAfterThink(player_t *player);
diff --git a/src/p_mobj.c b/src/p_mobj.c
index c26308a59d653353ecb324e24c2a0f26070815de..6f3f53559103b4bc16143d0cc727e53152744f35 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -2102,7 +2102,7 @@ void P_XYMovement(mobj_t *mo)
P_XYFriction(mo, oldx, oldy);
}
-static void P_RingXYMovement(mobj_t *mo)
+void P_RingXYMovement(mobj_t *mo)
{
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo));
@@ -2111,7 +2111,7 @@ static void P_RingXYMovement(mobj_t *mo)
P_SlideMove(mo);
}
-static void P_SceneryXYMovement(mobj_t *mo)
+void P_SceneryXYMovement(mobj_t *mo)
{
fixed_t oldx, oldy; // reducing bobbing/momentum on ice when up against walls
@@ -2270,7 +2270,7 @@ static void P_AdjustMobjFloorZ_PolyObjs(mobj_t *mo, subsector_t *subsec)
}
}
-static void P_RingZMovement(mobj_t *mo)
+void P_RingZMovement(mobj_t *mo)
{
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo));
@@ -2337,7 +2337,7 @@ boolean P_CheckSolidLava(ffloor_t *rover)
// P_ZMovement
// Returns false if the mobj was killed/exploded/removed, true otherwise.
//
-static boolean P_ZMovement(mobj_t *mo)
+boolean P_ZMovement(mobj_t *mo)
{
fixed_t dist, delta;
boolean onground;
@@ -2891,7 +2891,7 @@ static boolean P_PlayerPolyObjectZMovement(mobj_t *mo)
return stopmovecut;
}
-static void P_PlayerZMovement(mobj_t *mo)
+void P_PlayerZMovement(mobj_t *mo)
{
boolean onground;
@@ -3069,7 +3069,7 @@ nightsdone:
}
}
-static boolean P_SceneryZMovement(mobj_t *mo)
+boolean P_SceneryZMovement(mobj_t *mo)
{
// Intercept the stupid 'fall through 3dfloors' bug
if (mo->subsector->sector->ffloors)
diff --git a/src/p_mobj.h b/src/p_mobj.h
index c94dbd650310a2393ae3129bf028f8e5757c48c3..643e3d04c0b58d440f426f40aafffbb18e078952 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -471,6 +471,12 @@ void P_NullPrecipThinker(precipmobj_t *mobj);
void P_RemovePrecipMobj(precipmobj_t *mobj);
void P_SetScale(mobj_t *mobj, fixed_t newscale);
void P_XYMovement(mobj_t *mo);
+void P_RingXYMovement(mobj_t *mo);
+void P_SceneryXYMovement(mobj_t *mo);
+boolean P_ZMovement(mobj_t *mo);
+void P_RingZMovement(mobj_t *mo);
+boolean P_SceneryZMovement(mobj_t *mo);
+void P_PlayerZMovement(mobj_t *mo);
void P_EmeraldManager(void);
extern INT32 modulothing;
diff --git a/src/p_setup.c b/src/p_setup.c
index b16e13faad56535afaca2a46bc76f511aa2ec614..2fd7ba5b095207db4cd1838bbaa1e17f693f85ef 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -3756,7 +3756,7 @@ boolean P_LoadLevel(boolean fromnetsave)
if (!lastmaploaded) // Start a new game?
{
// I'd love to do this in the menu code instead of here, but everything's a mess and I can't guarantee saving proper player struct info before the first act's started. You could probably refactor it, but it'd be a lot of effort. Easier to just work off known good code. ~toast 22/06/2020
- if (!(ultimatemode || netgame || multiplayer || demoplayback || demorecording || metalrecording || modeattacking)
+ if (!(ultimatemode || netgame || multiplayer || demoplayback || demorecording || metalrecording || modeattacking || marathonmode)
&& (!modifiedgame || savemoddata) && cursaveslot > 0)
G_SaveGame((UINT32)cursaveslot, gamemap);
// If you're looking for saving sp file progression (distinct from G_SaveGameOver), check G_DoCompleted.
diff --git a/src/p_user.c b/src/p_user.c
index d426277ff06099189ba7d6148c1b53153f82029c..679f4064b4950378769df1c2cbf785e175d530c9 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -7889,7 +7889,7 @@ static void P_SkidStuff(player_t *player)
//
// P_MovePlayer
-static void P_MovePlayer(player_t *player)
+void P_MovePlayer(player_t *player)
{
ticcmd_t *cmd;
INT32 i;
@@ -10046,7 +10046,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
if (camorbit) //Sev here, I'm guessing this is where orbital cam lives
{
#ifdef HWRENDER
- if (rendermode == render_opengl && !cv_grshearing.value)
+ if (rendermode == render_opengl && !cv_glshearing.value)
distxy = FixedMul(dist, FINECOSINE((focusaiming>>ANGLETOFINESHIFT) & FINEMASK));
else
#endif
diff --git a/src/r_data.c b/src/r_data.c
index b7221499650a9048c892dafbabff76264fd7b2f9..d10919d81891fe04a4dff8d458afb0ba1da0ad0d 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -227,6 +227,8 @@ static inline void R_DrawFlippedColumnInCache(column_t *patch, UINT8 *cache, tex
}
}
+// Blends two pixels together, using the equation
+// that matches the specified alpha style.
UINT32 ASTBlendPixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha)
{
RGBA_t output;
@@ -245,7 +247,13 @@ UINT32 ASTBlendPixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alph
// if the background pixel is empty,
// match software and don't blend anything
if (!background.s.alpha)
- output.s.alpha = 0;
+ {
+ // ...unless the foreground pixel ISN'T actually translucent.
+ if (alpha == 0xFF)
+ output.rgba = foreground.rgba;
+ else
+ output.rgba = 0;
+ }
else
{
UINT8 beta = (0xFF - alpha);
@@ -302,18 +310,46 @@ UINT32 ASTBlendPixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alph
return 0;
}
-UINT8 ASTBlendPixel_8bpp(UINT8 background, UINT8 foreground, int style, UINT8 alpha)
+INT32 ASTTextureBlendingThreshold[2] = {255/11, (10*255/11)};
+
+// Blends a pixel for a texture patch.
+UINT32 ASTBlendTexturePixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha)
+{
+ // Alpha style set to translucent?
+ if (style == AST_TRANSLUCENT)
+ {
+ // Is the alpha small enough for translucency?
+ if (alpha <= ASTTextureBlendingThreshold[1])
+ {
+ // Is the patch way too translucent? Don't blend then.
+ if (alpha < ASTTextureBlendingThreshold[0])
+ return background.rgba;
+
+ return ASTBlendPixel(background, foreground, style, alpha);
+ }
+ else // just copy the pixel
+ return foreground.rgba;
+ }
+ else
+ return ASTBlendPixel(background, foreground, style, alpha);
+}
+
+// Blends two palette indexes for a texture patch, then
+// finds the nearest palette index from the blended output.
+UINT8 ASTBlendPaletteIndexes(UINT8 background, UINT8 foreground, int style, UINT8 alpha)
{
// Alpha style set to translucent?
if (style == AST_TRANSLUCENT)
{
// Is the alpha small enough for translucency?
- if (alpha <= (10*255/11))
+ if (alpha <= ASTTextureBlendingThreshold[1])
{
UINT8 *mytransmap;
+
// Is the patch way too translucent? Don't blend then.
- if (alpha < 255/11)
+ if (alpha < ASTTextureBlendingThreshold[0])
return background;
+
// The equation's not exact but it works as intended. I'll call it a day for now.
mytransmap = transtables + ((8*(alpha) + 255/8)/(255 - 255/11) << FF_TRANSSHIFT);
if (background != 0xFF)
@@ -378,7 +414,7 @@ static inline void R_DrawBlendColumnInCache(column_t *patch, UINT8 *cache, texpa
{
for (; dest < cache + position + count; source++, dest++)
if (*source != 0xFF)
- *dest = ASTBlendPixel_8bpp(*dest, *source, originPatch->style, originPatch->alpha);
+ *dest = ASTBlendPaletteIndexes(*dest, *source, originPatch->style, originPatch->alpha);
}
patch = (column_t *)((UINT8 *)patch + patch->length + 4);
@@ -422,7 +458,7 @@ static inline void R_DrawBlendFlippedColumnInCache(column_t *patch, UINT8 *cache
{
for (; dest < cache + position + count; --source, dest++)
if (*source != 0xFF)
- *dest = ASTBlendPixel_8bpp(*dest, *source, originPatch->style, originPatch->alpha);
+ *dest = ASTBlendPaletteIndexes(*dest, *source, originPatch->style, originPatch->alpha);
}
patch = (column_t *)((UINT8 *)patch + patch->length + 4);
diff --git a/src/r_data.h b/src/r_data.h
index 78ce35a4139567da1fa395634c3d1d32da91e907..8b8d08c52e35a959a981c58388ac07e655f35b9d 100644
--- a/src/r_data.h
+++ b/src/r_data.h
@@ -26,7 +26,10 @@
enum patchalphastyle {AST_COPY, AST_TRANSLUCENT, AST_ADD, AST_SUBTRACT, AST_REVERSESUBTRACT, AST_MODULATE, AST_OVERLAY};
UINT32 ASTBlendPixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha);
-UINT8 ASTBlendPixel_8bpp(UINT8 background, UINT8 foreground, int style, UINT8 alpha);
+UINT32 ASTBlendTexturePixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha);
+UINT8 ASTBlendPaletteIndexes(UINT8 background, UINT8 foreground, int style, UINT8 alpha);
+
+extern INT32 ASTTextureBlendingThreshold[2];
UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b);
diff --git a/src/r_main.c b/src/r_main.c
index cf7360804338b1e9e9c20f068307b98ea3151fbd..ead1403becb93140c3265ea652f19784bbab6daa 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -1064,7 +1064,7 @@ static void R_SetupFreelook(void)
// (lmps, network and use F12...)
if (rendermode == render_soft
#ifdef HWRENDER
- || cv_grshearing.value
+ || cv_glshearing.value
#endif
)
{
diff --git a/src/r_patch.c b/src/r_patch.c
index ad4b3329a439daf4a5605fb3e8569b2fdc0bd680..8980eda582b8692b1a4a8b28bb75a9aeacdfa81b 100644
--- a/src/r_patch.c
+++ b/src/r_patch.c
@@ -1426,10 +1426,10 @@ void R_FreeSingleRotSprite(spritedef_t *spritedef)
}
if (grPatch->mipmap)
{
- if (grPatch->mipmap->grInfo.data)
+ if (grPatch->mipmap->data)
{
- Z_Free(grPatch->mipmap->grInfo.data);
- grPatch->mipmap->grInfo.data = NULL;
+ Z_Free(grPatch->mipmap->data);
+ grPatch->mipmap->data = NULL;
}
Z_Free(grPatch->mipmap);
grPatch->mipmap = NULL;
diff --git a/src/sdl/Srb2SDL-vc10.vcxproj b/src/sdl/Srb2SDL-vc10.vcxproj
index 38b3d1538733c6aa8f764d671c8225aa13e5bfc9..5592de86b39510debd1ec1582048e56e159ebb7a 100644
--- a/src/sdl/Srb2SDL-vc10.vcxproj
+++ b/src/sdl/Srb2SDL-vc10.vcxproj
@@ -226,7 +226,6 @@
<ClInclude Include="..\hardware\hw_defs.h" />
<ClInclude Include="..\hardware\hw_dll.h" />
<ClInclude Include="..\hardware\hw_drv.h" />
- <ClInclude Include="..\hardware\hw_glide.h" />
<ClInclude Include="..\hardware\hw_glob.h" />
<ClInclude Include="..\hardware\hw_light.h" />
<ClInclude Include="..\hardware\hw_main.h" />
diff --git a/src/sdl/Srb2SDL-vc10.vcxproj.filters b/src/sdl/Srb2SDL-vc10.vcxproj.filters
index e49074d3becad90724f0a8f2f3209d69aa28af1d..db1aa123fbbbcee61984f5d05db423be5974e24b 100644
--- a/src/sdl/Srb2SDL-vc10.vcxproj.filters
+++ b/src/sdl/Srb2SDL-vc10.vcxproj.filters
@@ -237,9 +237,6 @@
<ClInclude Include="..\hardware\hw_drv.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
- <ClInclude Include="..\hardware\hw_glide.h">
- <Filter>Hw_Hardware</Filter>
- </ClInclude>
<ClInclude Include="..\hardware\hw_glob.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
diff --git a/src/sdl/Srb2SDL-vc9.vcproj b/src/sdl/Srb2SDL-vc9.vcproj
index 39184f4094882786baeede4c9b0763db684dd026..cfa49ea502873a6dbe393544a61f77c2aed52010 100644
--- a/src/sdl/Srb2SDL-vc9.vcproj
+++ b/src/sdl/Srb2SDL-vc9.vcproj
@@ -2410,10 +2410,6 @@
RelativePath="..\hardware\hw_drv.h"
>
</File>
- <File
- RelativePath="..\hardware\hw_glide.h"
- >
- </File>
<File
RelativePath="..\hardware\hw_glob.h"
>
diff --git a/src/sdl/Srb2SDL.dsp b/src/sdl/Srb2SDL.dsp
index 435820cb050ca1cf0e1778e94234e4950bf35ac5..9f6dd7b330e924a1026a00e48b10415eda233d79 100644
--- a/src/sdl/Srb2SDL.dsp
+++ b/src/sdl/Srb2SDL.dsp
@@ -576,10 +576,6 @@ SOURCE=..\hardware\hw_drv.h
# End Source File
# Begin Source File
-SOURCE=..\hardware\hw_glide.h
-# End Source File
-# Begin Source File
-
SOURCE=..\hardware\hw_glob.h
# End Source File
# Begin Source File
diff --git a/src/sdl/macosx/Srb2mac.pbproj/project.pbxproj b/src/sdl/macosx/Srb2mac.pbproj/project.pbxproj
index 5ceb0540811715f8ed89c200bf4d3b8b5210bdb3..909bb2ced72d7f3cc7a157d87fea0eac37dfd178 100644
--- a/src/sdl/macosx/Srb2mac.pbproj/project.pbxproj
+++ b/src/sdl/macosx/Srb2mac.pbproj/project.pbxproj
@@ -1064,13 +1064,6 @@
path = ../../hardware/hw_drv.h;
refType = 2;
};
- 8417773B085A106C000C01D8 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- name = hw_glide.h;
- path = ../../hardware/hw_glide.h;
- refType = 2;
- };
8417773C085A106C000C01D8 = {
fileEncoding = 30;
isa = PBXFileReference;
diff --git a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
index eeae1c2de7518e8c2d6678a06adcd09d7b84b9aa..04f8ecc0aaea916da6795d9841caa8451bd3397c 100644
--- a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
+++ b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
@@ -180,7 +180,6 @@
1E44AE640B67CC2B00BAD059 /* hw_cache.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hw_cache.c; path = ../../hardware/hw_cache.c; sourceTree = SOURCE_ROOT; };
1E44AE650B67CC2B00BAD059 /* hw_dll.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw_dll.h; path = ../../hardware/hw_dll.h; sourceTree = SOURCE_ROOT; };
1E44AE660B67CC2B00BAD059 /* hw_drv.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw_drv.h; path = ../../hardware/hw_drv.h; sourceTree = SOURCE_ROOT; };
- 1E44AE670B67CC2B00BAD059 /* hw_glide.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw_glide.h; path = ../../hardware/hw_glide.h; sourceTree = SOURCE_ROOT; };
1E44AE680B67CC2B00BAD059 /* hw_light.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = hw_light.c; path = ../../hardware/hw_light.c; sourceTree = SOURCE_ROOT; };
1E44AE690B67CC2B00BAD059 /* hw_light.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw_light.h; path = ../../hardware/hw_light.h; sourceTree = SOURCE_ROOT; };
1E44AE6A0B67CC2B00BAD059 /* hw3sound.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = hw3sound.h; path = ../../hardware/hw3sound.h; sourceTree = SOURCE_ROOT; };
@@ -533,7 +532,6 @@
1E44AE640B67CC2B00BAD059 /* hw_cache.c */,
1E44AE650B67CC2B00BAD059 /* hw_dll.h */,
1E44AE660B67CC2B00BAD059 /* hw_drv.h */,
- 1E44AE670B67CC2B00BAD059 /* hw_glide.h */,
1E44AE680B67CC2B00BAD059 /* hw_light.c */,
1E44AE690B67CC2B00BAD059 /* hw_light.h */,
1E44AE6A0B67CC2B00BAD059 /* hw3sound.h */,
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 53d98891339d22c41bb4152667e33e671e0e33e0..d5aa5fbac8fb30e25fbcd000f269896812fe86d3 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -240,8 +240,8 @@ void ST_LoadGraphics(void)
int i;
// SRB2 border patch
- st_borderpatchnum = W_GetNumForName("GFZFLR01");
- scr_borderpatch = W_CacheLumpNum(st_borderpatchnum, PU_HUDGFX);
+ // st_borderpatchnum = W_GetNumForName("GFZFLR01");
+ // scr_borderpatch = W_CacheLumpNum(st_borderpatchnum, PU_HUDGFX);
// the original Doom uses 'STF' as base name for all face graphics
// Graue 04-08-2004: face/name graphics are now indexed by skins
diff --git a/src/version.h b/src/version.h
new file mode 100644
index 0000000000000000000000000000000000000000..31cf85bdcdfae7d462bc1786f752bf3bd673eb82
--- /dev/null
+++ b/src/version.h
@@ -0,0 +1,12 @@
+#define SRB2VERSION "2.2.6"/* this must be the first line, for cmake !! */
+
+// The Modification ID; must be obtained from a Master Server Admin ( https://mb.srb2.org/showgroups.php ).
+// DO NOT try to set this otherwise, or your modification will be unplayable through the Master Server.
+// "18" is the default mod ID for version 2.2
+#define MODID 18
+
+// The Modification Version, starting from 1. Do not follow your version string for this,
+// it's only for detection of the version the player is using so the MS can alert them of an update.
+// Only set it higher, not lower, obviously.
+// Note that we use this to help keep internal testing in check; this is why v2.2.0 is not version "1".
+#define MODVERSION 47
diff --git a/src/w_wad.c b/src/w_wad.c
index 9af661b5762c01530ee2c0e4f9cfe22d177768f1..e6dedba227122c00093a5231fca071c2132db8da 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -1732,11 +1732,11 @@ void *W_CachePatchNumPwad(UINT16 wad, UINT16 lump, INT32 tag)
grPatch = HWR_GetCachedGLPatchPwad(wad, lump);
- if (grPatch->mipmap->grInfo.data)
+ if (grPatch->mipmap->data)
{
if (tag == PU_CACHE)
tag = PU_HWRCACHE;
- Z_ChangeTag(grPatch->mipmap->grInfo.data, tag);
+ Z_ChangeTag(grPatch->mipmap->data, tag);
}
else
{
diff --git a/src/win32/Srb2win-vc10.vcxproj b/src/win32/Srb2win-vc10.vcxproj
index 5fe723f37b85001b708caf560d1ae2def0a2e682..6855a4135b000fdae1b56d19fe9a237ec293cbc2 100644
--- a/src/win32/Srb2win-vc10.vcxproj
+++ b/src/win32/Srb2win-vc10.vcxproj
@@ -398,7 +398,6 @@
<ClInclude Include="..\hardware\hw_defs.h" />
<ClInclude Include="..\hardware\hw_dll.h" />
<ClInclude Include="..\hardware\hw_drv.h" />
- <ClInclude Include="..\hardware\hw_glide.h" />
<ClInclude Include="..\hardware\hw_glob.h" />
<ClInclude Include="..\hardware\hw_light.h" />
<ClInclude Include="..\hardware\hw_main.h" />
diff --git a/src/win32/Srb2win-vc10.vcxproj.filters b/src/win32/Srb2win-vc10.vcxproj.filters
index 7b96bf16b11966134e93647a4a15754d537e21ba..4a980c6bd298eb8526626f9552055522093fa644 100644
--- a/src/win32/Srb2win-vc10.vcxproj.filters
+++ b/src/win32/Srb2win-vc10.vcxproj.filters
@@ -513,9 +513,6 @@
<ClInclude Include="..\hardware\hw_drv.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
- <ClInclude Include="..\hardware\hw_glide.h">
- <Filter>Hw_Hardware</Filter>
- </ClInclude>
<ClInclude Include="..\hardware\hw_glob.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
diff --git a/src/win32/Srb2win-vc9.vcproj b/src/win32/Srb2win-vc9.vcproj
index b3ba54c10a63e2cbf864c349370cb448b6e8a7fb..c1c6b5bc43e3e99139bef441da8bf3b3c48bdbb2 100644
--- a/src/win32/Srb2win-vc9.vcproj
+++ b/src/win32/Srb2win-vc9.vcproj
@@ -2151,10 +2151,6 @@
RelativePath="..\hardware\hw_drv.h"
>
</File>
- <File
- RelativePath="..\hardware\hw_glide.h"
- >
- </File>
<File
RelativePath="..\hardware\hw_glob.h"
>
diff --git a/src/win32/Srb2win.dsp b/src/win32/Srb2win.dsp
index d87230a39010f39f427ce4d1b055456918fb50bc..661f3eaf90bcb354898fd9a4a3b1252c4fee014e 100644
--- a/src/win32/Srb2win.dsp
+++ b/src/win32/Srb2win.dsp
@@ -535,10 +535,6 @@ SOURCE=..\hardware\hw_drv.h
# End Source File
# Begin Source File
-SOURCE=..\hardware\hw_glide.h
-# End Source File
-# Begin Source File
-
SOURCE=..\hardware\hw_glob.h
# End Source File
# Begin Source File