Compare commits

..
Author SHA1 Message Date
Alug 21920112ee a thousand curses upon you polyobjects! 2025-10-02 18:37:18 +02:00
Alug 9b7bf5e7d8 Merge remote-tracking branch 'origin/Saturn-Next' into deletglseg 2025-10-02 18:00:59 +02:00
Alug 524168b20b experiment: remove opengl adjusted segs
in theory this should improve levelload times and reduce memory usage?
gotta see if it really does, visually so far there seems to be no difference at all
2025-10-02 17:57:52 +02:00
108 changed files with 2762 additions and 2502 deletions

No files matched your search

+4 -4
View File
@@ -5,13 +5,13 @@
# met: # met:
# (1) Redistributions of source code must retain the above copyright # (1) Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer. # notice, this list of conditions and the following disclaimer.
# (2) Redistributions in binary form must reproduce the above copyright # (2) Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in # notice, this list of conditions and the following disclaimer in
# the documentation and/or other materials provided with the # the documentation and/or other materials provided with the
# distribution. # distribution.
# (3) The name of the author may not be used to # (3) The name of the author may not be used to
# endorse or promote products derived from this software without # endorse or promote products derived from this software without
# specific prior written permission. # specific prior written permission.
@@ -26,4 +26,4 @@
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
+1 -11
View File
@@ -10,18 +10,8 @@ The libbacktrace library may be linked into a program or library and
used to produce symbolic backtraces. used to produce symbolic backtraces.
Sample uses would be to print a detailed backtrace when an error Sample uses would be to print a detailed backtrace when an error
occurs or to gather detailed profiling information. occurs or to gather detailed profiling information.
In general the functions provided by this library are async-signal-safe, In general the functions provided by this library are async-signal-safe,
meaning that they may be safely called from a signal handler. meaning that they may be safely called from a signal handler.
That said, on systems that use `dl_iterate_phdr`, such as GNU/Linux,
the first call to a libbacktrace function will call `dl_iterate_phdr`,
which is not in general async-signal-safe. Therefore, programs
that call libbacktrace from a signal handler should ensure that they
make an initial call from outside of a signal handler.
Similar considerations apply when arranging to call libbacktrace
from within malloc; `dl_iterate_phdr` can also call malloc,
so make an initial call to a libbacktrace function outside of
malloc before trying to call libbacktrace functions within malloc.
The libbacktrace library is provided under a BSD license. The libbacktrace library is provided under a BSD license.
See the source files for the exact license text. See the source files for the exact license text.
@@ -35,7 +25,7 @@ will work.
See the source file backtrace-supported.h.in for the macros that it See the source file backtrace-supported.h.in for the macros that it
defines. defines.
As of July 2024, libbacktrace supports ELF, PE/COFF, Mach-O, and As of October 2020, libbacktrace supports ELF, PE/COFF, Mach-O, and
XCOFF executables with DWARF debugging information. XCOFF executables with DWARF debugging information.
In other words, it supports GNU/Linux, *BSD, macOS, Windows, and AIX. In other words, it supports GNU/Linux, *BSD, macOS, Windows, and AIX.
The library is written to make it straightforward to add support for The library is written to make it straightforward to add support for
Binary file not shown.
@@ -1,41 +0,0 @@
# libbacktrace.la - a libtool library file
# Generated by libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
# The name that we can dlopen(3).
dlname=''
# Names of this library.
library_names=''
# The name of the static archive.
old_library='libbacktrace.a'
# Linker flags that can not go in dependency_libs.
inherited_linker_flags=''
# Libraries that this one depends upon.
dependency_libs=''
# Names of additional weak libraries provided by this library
weak_library_names=''
# Version information for libbacktrace.
current=0
age=0
revision=0
# Is this an already installed library?
installed=no
# Should we warn about portability when linking against -modules?
shouldnotlink=no
# Files to dlopen/dlpreopen
dlopen=''
dlpreopen=''
# Directory that this library needs to be installed in:
libdir='/mingw64/lib'
@@ -1,41 +0,0 @@
# libbacktrace.la - a libtool library file
# Generated by libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
# The name that we can dlopen(3).
dlname=''
# Names of this library.
library_names=''
# The name of the static archive.
old_library='libbacktrace.a'
# Linker flags that can not go in dependency_libs.
inherited_linker_flags=''
# Libraries that this one depends upon.
dependency_libs=''
# Names of additional weak libraries provided by this library
weak_library_names=''
# Version information for libbacktrace.
current=0
age=0
revision=0
# Is this an already installed library?
installed=yes
# Should we warn about portability when linking against -modules?
shouldnotlink=no
# Files to dlopen/dlpreopen
dlopen=''
dlpreopen=''
# Directory that this library needs to be installed in:
libdir='/mingw64/lib'
+13 -21
View File
@@ -69,7 +69,6 @@
# VALGRIND=1 - Enable Valgrind memory debugging support. # VALGRIND=1 - Enable Valgrind memory debugging support.
# PROFILEMODE=1 - Enable performance profiling (gprof). # PROFILEMODE=1 - Enable performance profiling (gprof).
# USEASAN=1 - Enable building with Address Sanitizer. # USEASAN=1 - Enable building with Address Sanitizer.
# USEUBSAN=1 - Enable building with Undefined Behavior Sanitizer.
# NOLIBBACKTRACE=1 - Disable using Libbacktrace for crashlog traces. # NOLIBBACKTRACE=1 - Disable using Libbacktrace for crashlog traces.
# #
# General flags for building: # General flags for building:
@@ -244,14 +243,10 @@ ifdef STATIC
libs+=-static libs+=-static
endif endif
ifneq (,$(filter $(CC) $(CXX),gcc g++))
opts+=-mno-ms-bitfields
endif
# build with profiling information # build with profiling information
ifdef PROFILEMODE ifdef PROFILEMODE
opts+=-pg opts+=-pg
libs+=-pg LDFLAGS+=-pg
endif endif
ifdef DEBUGMODE ifdef DEBUGMODE
@@ -261,32 +256,29 @@ debug_opts=-DNDEBUG
opts+=-O3 opts+=-O3
ifdef USELTO ifdef USELTO
# compile with LTO # compile with LTO
ifdef MINGW
opts+=-flto=auto -g
LDFLAGS+=-flto=auto -g
else
opts+=-flto=auto opts+=-flto=auto
libs+=-flto=auto LDFLAGS+=-flto=auto
endif
endif endif
endif endif
ifdef USEASAN ifdef USEASAN
# compile with asan # compile with asan
ifdef MINGW
opts+=-fsanitize=address -g
libs+=-fsanitize=address -g
else
opts+=-fsanitize=address opts+=-fsanitize=address
libs+=-fsanitize=address libs+=-fsanitize=address
endif endif
ifdef USEUBSAN
# compile with asan
opts+=-fsanitize=undefined
libs+=-fsanitize=undefined
endif endif
ifneq (,$(filter $(CC) $(CXX),clang clang++)) ifeq ($(CC),clang)
libs+=-fuse-ld=lld LDFLAGS+= -fuse-ld=lld
endif
ifdef MINGW
# mingw needs this passed AFTER lto and the likes were passed
# otherwise libbacktrace may break
opts+=-g
libs+=-g
endif endif
# debug_opts also get passed to windres # debug_opts also get passed to windres
+1 -1
View File
@@ -10,7 +10,7 @@
makedir:=$(makedir)/SDL makedir:=$(makedir)/SDL
opts+=-DHAVE_SDL opts+=-DDIRECTFULLSCREEN -DHAVE_SDL
sources+=$(call List,sdl/Sourcefile) sources+=$(call List,sdl/Sourcefile)
NOUPNP=1 NOUPNP=1
+1 -3
View File
@@ -2,8 +2,6 @@
# Mingw, if you don't know, that's Win32/Win64 # Mingw, if you don't know, that's Win32/Win64
# #
sources+=$(call List,win32/Sourcefile)
ifndef MINGW64 ifndef MINGW64
EXENAME?=srb2kart-saturn_32bit.exe EXENAME?=srb2kart-saturn_32bit.exe
else else
@@ -97,7 +95,7 @@ LIBBACKTRACE_libs:=-L$(lib)/lib/x86_64 -lbacktrace
$(eval $(call _set,LIBBACKTRACE)) $(eval $(call _set,LIBBACKTRACE))
else else
lib:=../libs/drmingw lib:=../libs/drmingw
opts+=-I$(lib)/include -DHAVE_DRMINGW opts+=-I$(lib)/include
libs+=-L$(lib)/lib/win32 -lmgwhelp -lexchndl libs+=-L$(lib)/lib/win32 -lmgwhelp -lexchndl
endif endif
+1 -1
View File
@@ -53,7 +53,7 @@ r_data.c
r_draw.c r_draw.c
r_fps.cpp r_fps.cpp
r_main.cpp r_main.cpp
r_patch.cpp r_patch.c
r_patchrotation.c r_patchrotation.c
r_plane.cpp r_plane.cpp
r_segs.cpp r_segs.cpp
+2 -2
View File
@@ -110,7 +110,7 @@ void I_Error(const char *error, ...)
char logbuf[8192]; char logbuf[8192];
va_start(argptr, error); va_start(argptr, error);
vsnprintf(logbuf, 8192, error, argptr); vsprintf(logbuf, error, argptr);
va_end(argptr); va_end(argptr);
LOGE(logbuf); LOGE(logbuf);
@@ -166,7 +166,7 @@ void I_OutputMsg(const char *fmt, ...)
char logbuf[8192]; char logbuf[8192];
va_start(argptr, fmt); va_start(argptr, fmt);
vsnprintf(logbuf, 8192, fmt, argptr); vsprintf(logbuf, fmt, argptr);
va_end(argptr); va_end(argptr);
LOGD(logbuf); LOGD(logbuf);
-5
View File
@@ -10,13 +10,8 @@
/// \file b_bot.h /// \file b_bot.h
/// \brief Basic bot handling /// \brief Basic bot handling
#ifndef __B_BOT__
#define __B_BOT__
void B_BuildTiccmd(player_t *player, ticcmd_t *cmd); void B_BuildTiccmd(player_t *player, ticcmd_t *cmd);
void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward, boolean left, boolean right, boolean strafeleft, boolean straferight, boolean jump, boolean spin); void B_KeysToTiccmd(mobj_t *mo, ticcmd_t *cmd, boolean forward, boolean backward, boolean left, boolean right, boolean strafeleft, boolean straferight, boolean jump, boolean spin);
boolean B_CheckRespawn(player_t *player); boolean B_CheckRespawn(player_t *player);
void B_MoveBlocked(player_t *player); void B_MoveBlocked(player_t *player);
void B_RespawnBot(INT32 playernum); void B_RespawnBot(INT32 playernum);
#endif
+18 -18
View File
@@ -1650,13 +1650,13 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
UINT8 *p = buf; UINT8 *p = buf;
if (!(server || (IsPlayerAdmin(consoleplayer)))) if (!(server || (IsPlayerAdmin(consoleplayer))))
{ {
CONS_Alert(CONS_NOTICE, "Only the server or admin can change: %s %s\n", var->name, var->string); CONS_Printf(M_GetText("Only the server or admin can change: %s %s\n"), var->name, var->string);
return; return;
} }
if (var == &cv_kartencore && !M_SecretUnlocked(SECRET_ENCORE)) if (var == &cv_kartencore && !M_SecretUnlocked(SECRET_ENCORE))
{ {
CONS_Alert(CONS_NOTICE, "You haven't unlocked Encore Mode yet!\n"); CONS_Printf(M_GetText("You haven't unlocked Encore Mode yet!\n"));
return; return;
} }
@@ -1664,7 +1664,7 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
{ {
if (!stricmp(value, "Hard") || atoi(value) == 2) if (!stricmp(value, "Hard") || atoi(value) == 2)
{ {
CONS_Alert(CONS_NOTICE, "You haven't unlocked this yet!\n"); CONS_Printf(M_GetText("You haven't unlocked this yet!\n"));
return; return;
} }
} }
@@ -1681,13 +1681,14 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
else else
Setvalue(var, value, stealth); Setvalue(var, value, stealth);
} }
else if ((var->flags & CV_NOTINNET) && netgame)
{
CONS_Alert(CONS_NOTICE, "This variable can't be changed while in netgame: %s %s\n", var->name, var->string);
return;
}
else else
Setvalue(var, value, stealth); if ((var->flags & CV_NOTINNET) && netgame)
{
CONS_Printf(M_GetText("This variable can't be changed while in netgame: %s %s\n"), var->name, var->string);
return;
}
else
Setvalue(var, value, stealth);
} }
/** Sets a value to a variable without calling its callback function. /** Sets a value to a variable without calling its callback function.
@@ -1770,7 +1771,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
newvalue = var->value - 1; newvalue = var->value - 1;
do do
{ {
if (increment > 0) // Going up! if(increment > 0) // Going up!
{ {
if (++newvalue == NUMMAPS) if (++newvalue == NUMMAPS)
newvalue = -1; newvalue = -1;
@@ -1784,7 +1785,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
if (newvalue == oldvalue) if (newvalue == oldvalue)
break; // don't loop forever if there's none of a certain gametype break; // don't loop forever if there's none of a certain gametype
if (newvalue >= 0 && !mapheaderinfo[newvalue]) if(!mapheaderinfo[newvalue])
continue; // Don't allocate the header. That just makes memory usage skyrocket. continue; // Don't allocate the header. That just makes memory usage skyrocket.
} while (!M_CanShowLevelInList(newvalue, gt)); } while (!M_CanShowLevelInList(newvalue, gt));
@@ -1913,14 +1914,13 @@ void CV_AddValue(consvar_t *var, INT32 increment)
max = (M_SecretUnlocked(SECRET_HARDSPEED) ? 3 : 2); max = (M_SecretUnlocked(SECRET_HARDSPEED) ? 3 : 2);
} }
#ifdef PARANOIA #ifdef PARANOIA
if (currentindice == -1 || max == 0) if (currentindice == -1)
I_Error("CV_AddValue: current value %d not found in possible value\n", var->value); I_Error("CV_AddValue: current value %d not found in possible value\n",
var->value);
#endif #endif
if (max > 0)
{ newindice = (currentindice + increment + max) % max;
newindice = (currentindice + increment + max) % max; CV_Set(var, var->PossibleValue[newindice].strvalue);
CV_Set(var, var->PossibleValue[newindice].strvalue);
}
} }
} }
else else
+33 -2
View File
@@ -69,9 +69,14 @@ static boolean consoleready; // console prompt is ready
INT32 con_destlines; // vid lines used by console at final position INT32 con_destlines; // vid lines used by console at final position
static INT32 con_curlines; // vid lines currently used by console static INT32 con_curlines; // vid lines currently used by console
INT32 con_clipviewtop; // (useless)
static UINT8 con_hudlines; // number of console heads up message lines static UINT8 con_hudlines; // number of console heads up message lines
static UINT32 con_hudtime[MAXHUDLINES]; // remaining time of display for hud msg lines static UINT32 con_hudtime[MAXHUDLINES]; // remaining time of display for hud msg lines
INT32 con_clearlines; // top screen lines to refresh when view reduced
boolean con_hudupdate; // when messages scroll, we need a backgrnd refresh
// console text output // console text output
static char *con_line; // console text output current line static char *con_line; // console text output current line
static size_t con_cx; // cursor position in current line static size_t con_cx; // cursor position in current line
@@ -388,6 +393,9 @@ void CON_Init(void)
Lock_state(); Lock_state();
//note: CON_Ticker should always execute at least once before D_Display()
con_clipviewtop = -1; // -1 does not clip
con_hudlines = atoi(cons_hudlines.defaultvalue); con_hudlines = atoi(cons_hudlines.defaultvalue);
Unlock_state(); Unlock_state();
@@ -719,6 +727,7 @@ void CON_ToggleOff(void)
con_curlines = 0; con_curlines = 0;
CON_ClearHUD(); CON_ClearHUD();
con_forcepic = 0; con_forcepic = 0;
con_clipviewtop = -1; // remove console clipping of view
I_SetTextInput(false); I_SetTextInput(false);
@@ -770,6 +779,18 @@ void CON_Ticker(void)
} }
} }
// clip the view, so that the part under the console is not drawn
con_clipviewtop = -1;
if (cons_backpic.value) // clip only when using an opaque background
{
if (con_curlines > 0)
con_clipviewtop = con_curlines - viewwindowy - 1 - 10;
// NOTE: BIG HACK::SUBTRACT 10, SO THAT WATER DON'T COPY LINES OF THE CONSOLE
// WINDOW!!! (draw some more lines behind the bottom of the console)
if (con_clipviewtop < 0)
con_clipviewtop = -1; // maybe not necessary, provided it's < 0
}
// check if console ready for prompt // check if console ready for prompt
if (con_destlines >= minheight) if (con_destlines >= minheight)
{ {
@@ -1079,6 +1100,9 @@ static void CON_Linefeed(void)
con_line = &con_buffer[(con_cy%con_totallines)*con_width]; con_line = &con_buffer[(con_cy%con_totallines)*con_width];
memset(con_line, ' ', con_width); memset(con_line, ' ', con_width);
// make sure the view borders are refreshed if hud messages scroll
con_hudupdate = true; // see HU_Erase()
} }
// Outputs text into the console text buffer // Outputs text into the console text buffer
@@ -1258,7 +1282,7 @@ void CONS_Alert(alerttype_t level, const char *fmt, ...)
txt = malloc(8192); txt = malloc(8192);
va_start(argptr, fmt); va_start(argptr, fmt);
vsnprintf(txt, 8192, fmt, argptr); vsprintf(txt, fmt, argptr);
va_end(argptr); va_end(argptr);
switch (level) switch (level)
@@ -1294,7 +1318,7 @@ void CONS_Debug(INT32 debugflags, const char *fmt, ...)
txt = malloc(8192); txt = malloc(8192);
va_start(argptr, fmt); va_start(argptr, fmt);
vsnprintf(txt, 8192, fmt, argptr); vsprintf(txt, fmt, argptr);
va_end(argptr); va_end(argptr);
// Again I am lazy, oh well // Again I am lazy, oh well
@@ -1465,6 +1489,9 @@ static void CON_DrawHudlines(void)
//V_DrawCharacter(x, y, (p[c]&0xff) | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value); //V_DrawCharacter(x, y, (p[c]&0xff) | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
y += charheight; y += charheight;
} }
// top screen lines that might need clearing when view is reduced
con_clearlines = y; // this is handled by HU_Erase();
} }
// draw the console background, text, and prompt if enough place // draw the console background, text, and prompt if enough place
@@ -1482,6 +1509,10 @@ static void CON_DrawConsole(void)
if (con_curlines <= 0) if (con_curlines <= 0)
return; return;
//FIXME: refresh borders only when console bg is translucent
con_clearlines = con_curlines; // clear console draw from view borders
con_hudupdate = true; // always refresh while console is on
// draw console background // draw console background
if (cons_backpic.value || con_forcepic) if (cons_backpic.value || con_forcepic)
{ {
+5
View File
@@ -30,9 +30,14 @@ extern boolean con_recalc;
extern boolean con_startup; extern boolean con_startup;
// top clip value for view render: do not draw part of view hidden by console
extern INT32 con_clipviewtop;
// 0 means console if off, or moving out // 0 means console if off, or moving out
extern INT32 con_destlines; extern INT32 con_destlines;
extern INT32 con_clearlines; // lines of top of screen to refresh
extern boolean con_hudupdate; // hud messages have changed, need refresh
extern UINT32 con_scalefactor; // console text scale factor extern UINT32 con_scalefactor; // console text scale factor
extern consvar_t cons_backcolor, cons_menuhighlight; extern consvar_t cons_backcolor, cons_menuhighlight;
+1 -1
View File
@@ -1,4 +1,4 @@
// SONIC ROBO BLAST 2 KART // BLANKART
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (C) 2024 by Ronald "Eidolon" Kinard // Copyright (C) 2024 by Ronald "Eidolon" Kinard
// Copyright (C) 2024 by Kart Krew // Copyright (C) 2024 by Kart Krew
+1 -1
View File
@@ -1,4 +1,4 @@
// SONIC ROBO BLAST 2 KART // BLANKART
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (C) 2024 by Ronald "Eidolon" Kinard // Copyright (C) 2024 by Ronald "Eidolon" Kinard
// Copyright (C) 2024 by Kart Krew // Copyright (C) 2024 by Kart Krew
+1 -1
View File
@@ -1,4 +1,4 @@
// SONIC ROBO BLAST 2 KART // BLANKART
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Copyright (C) 2024 by Ronald "Eidolon" Kinard // Copyright (C) 2024 by Ronald "Eidolon" Kinard
// Copyright (C) 2024 by Kart Krew // Copyright (C) 2024 by Kart Krew
-3
View File
@@ -4161,10 +4161,7 @@ static void Joinable_OnChange(void)
UINT8 maxplayer; UINT8 maxplayer;
if (!server) if (!server)
{
CONS_Alert(CONS_NOTICE, ("Only the server can change: %s %s\n"), cv_allownewplayer.name, cv_allownewplayer.string);
return; return;
}
#ifdef SATURNJOIN #ifdef SATURNJOIN
// disabling joins should also disable saturn joins unless its called with CV_StealthSet and vice versa to make life a bit easier // disabling joins should also disable saturn joins unless its called with CV_StealthSet and vice versa to make life a bit easier
+76 -57
View File
@@ -347,65 +347,11 @@ static void D_Renderview(void)
} }
} }
for (i = 0; i <= splitscreen; i++)
{
if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD)
{
viewssnum = i;
switch (i)
{
case 1:
if (splitscreen > 1)
{
viewwindowx = viewwidth;
viewwindowy = 0;
}
else
{
viewwindowx = 0;
viewwindowy = viewheight;
}
break;
case 2:
viewwindowx = 0;
viewwindowy = viewheight;
break;
case 3:
viewwindowx = viewwidth;
viewwindowy = viewheight;
break;
default: // Initialize for P1
viewwindowy = viewwindowx = 0;
objectsdrawn = 0;
break;
}
#ifdef HWRENDER
if (rendermode == render_opengl)
{
HWR_RenderPlayerView();
}
else if (rendermode == render_soft)
#endif
R_RenderPlayerView(&players[displayplayers[i]]);
}
if (rendermode == render_soft)
{
if (i == 0)
R_ApplyViewMorph();
V_DoPostProcessor(i, postimgparam[i]);
}
}
// Draw over the fourth screen so you don't have to stare at a HOM :V // Draw over the fourth screen so you don't have to stare at a HOM :V
if (splitscreen == 2) if (splitscreen == 2)
{ {
// V_DrawPatchFill, but for the fourth screen only // V_DrawPatchFill, but for the fourth screen only
patch_t *pat = W_CachePatchName("SRB2BACK", PU_PATCH); patch_t *pat = W_CachePatchName("SRB2BACK", PU_CACHE);
INT32 x, y, pw = SHORT(pat->width) * vid.dup, ph = SHORT(pat->height) * vid.dup; INT32 x, y, pw = SHORT(pat->width) * vid.dup, ph = SHORT(pat->height) * vid.dup;
for (x = vid.width>>1; x < vid.width; x += pw) for (x = vid.width>>1; x < vid.width; x += pw)
@@ -415,6 +361,65 @@ static void D_Renderview(void)
} }
} }
for (i = 0; i <= splitscreen; i++)
{
const boolean issplitscreen = (i > 0);
if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD)
{
viewssnum = i;
if (!issplitscreen) // Initialize for P1
{
viewwindowy = viewwindowx = 0;
objectsdrawn = 0;
}
#ifdef HWRENDER
if (rendermode == render_opengl)
{
HWR_RenderPlayerView();
R_RestoreLevelInterpolators();
continue;
}
#endif
if (issplitscreen) // Splitscreen-specific
{
switch (i)
{
case 1:
if (splitscreen > 1)
{
viewwindowx = viewwidth;
viewwindowy = 0;
}
else
{
viewwindowx = 0;
viewwindowy = viewheight;
}
break;
case 2:
viewwindowx = 0;
viewwindowy = viewheight;
break;
case 3:
viewwindowx = viewwidth;
viewwindowy = viewheight;
default:
break;
}
}
R_RenderPlayerView(&players[displayplayers[i]]);
}
if (!issplitscreen)
R_ApplyViewMorph();
V_DoPostProcessor(i, postimgparam[i]);
}
R_RestoreLevelInterpolators(); R_RestoreLevelInterpolators();
} }
@@ -517,16 +522,19 @@ static boolean D_Display(void)
case GS_LEVEL: case GS_LEVEL:
if (!gametic) if (!gametic)
break; break;
HU_Erase();
AM_Drawer(); AM_Drawer();
break; break;
case GS_INTERMISSION: case GS_INTERMISSION:
Y_IntermissionDrawer(); Y_IntermissionDrawer();
HU_Erase();
HU_Drawer(); HU_Drawer();
break; break;
case GS_VOTING: case GS_VOTING:
Y_VoteDrawer(); Y_VoteDrawer();
HU_Erase();
HU_Drawer(); HU_Drawer();
break; break;
@@ -541,6 +549,7 @@ static boolean D_Display(void)
case GS_CUTSCENE: case GS_CUTSCENE:
F_CutsceneDrawer(); F_CutsceneDrawer();
HU_Erase();
HU_Drawer(); HU_Drawer();
break; break;
@@ -550,6 +559,7 @@ static boolean D_Display(void)
case GS_EVALUATION: case GS_EVALUATION:
F_GameEvaluationDrawer(); F_GameEvaluationDrawer();
HU_Erase();
HU_Drawer(); HU_Drawer();
break; break;
@@ -559,6 +569,7 @@ static boolean D_Display(void)
case GS_CREDITS: case GS_CREDITS:
F_CreditDrawer(); F_CreditDrawer();
HU_Erase();
HU_Drawer(); HU_Drawer();
break; break;
@@ -575,6 +586,7 @@ static boolean D_Display(void)
{ {
// I don't think HOM from nothing drawing is independent... // I don't think HOM from nothing drawing is independent...
F_WaitingPlayersDrawer(); F_WaitingPlayersDrawer();
HU_Erase();
HU_Drawer(); HU_Drawer();
} }
case GS_TIMEATTACK: case GS_TIMEATTACK:
@@ -762,7 +774,6 @@ void D_SRB2Loop(void)
precise_t capbudget; precise_t capbudget;
precise_t enterprecise = I_GetPreciseTime(); precise_t enterprecise = I_GetPreciseTime();
memset(&g_dc, 0, sizeof(g_dc));
Z_Frame_Reset(); Z_Frame_Reset();
// Casting the return value of a function is bad practice (apparently) // Casting the return value of a function is bad practice (apparently)
@@ -878,6 +889,12 @@ void D_SRB2Loop(void)
// always update console and hud // always update console and hud
// otherwise it may take minutes to open it // otherwise it may take minutes to open it
CON_Drawer(); CON_Drawer();
if (gamestate == GS_LEVEL)
{
ST_Drawer();
HU_Drawer();
}
} }
} }
@@ -1009,7 +1026,7 @@ void D_ClearState(void)
S_StopSounds(); S_StopSounds();
S_ResetKeepAndSpecialMus(); // just in case S_ResetKeepAndSpecialMus(); // just in case
//P_FreeLevelState(); P_FreeLevelState();
G_SetGamestate(GS_NULL); G_SetGamestate(GS_NULL);
wipegamestate = GS_NULL; wipegamestate = GS_NULL;
@@ -1913,7 +1930,9 @@ void D_SRB2Main(void)
G_LoadGameData(); G_LoadGameData();
#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
VID_PrepareModeList(); // Regenerate Modelist according to cv_fullscreen VID_PrepareModeList(); // Regenerate Modelist according to cv_fullscreen
#endif
// set user default mode or mode set at cmdline // set user default mode or mode set at cmdline
SCR_CheckDefaultMode(); SCR_CheckDefaultMode();
+6 -4
View File
@@ -964,11 +964,10 @@ void D_RegisterClientCommands(void)
// g_input.c // g_input.c
CV_RegisterVar(&cv_controlperkey); CV_RegisterVar(&cv_controlperkey);
CV_RegisterVar(&cv_turnsmooth);
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
{ {
CV_RegisterVar(&cv_turnsmooth[i]);
CV_RegisterVar(&cv_turnaxis[i]); CV_RegisterVar(&cv_turnaxis[i]);
CV_RegisterVar(&cv_moveaxis[i]); CV_RegisterVar(&cv_moveaxis[i]);
CV_RegisterVar(&cv_camturnaxis[i]); CV_RegisterVar(&cv_camturnaxis[i]);
@@ -985,8 +984,6 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_xdeadzone[i]); CV_RegisterVar(&cv_xdeadzone[i]);
CV_RegisterVar(&cv_ydeadzone[i]); CV_RegisterVar(&cv_ydeadzone[i]);
CV_RegisterVar(&cv_litesteer[i]);
CV_RegisterVar(&cv_usejoystick[i]); CV_RegisterVar(&cv_usejoystick[i]);
CV_RegisterVar(&cv_joyscale[i]); CV_RegisterVar(&cv_joyscale[i]);
CV_RegisterVar(&cv_rumble[i]); CV_RegisterVar(&cv_rumble[i]);
@@ -1994,6 +1991,11 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
} }
else else
SetPlayerSkinByNum(playernum, skin); SetPlayerSkinByNum(playernum, skin);
#ifdef HAVE_DISCORDRPC
if (playernum == consoleplayer)
DRPC_UpdatePresence();
#endif
} }
void SendWeaponPref(void) void SendWeaponPref(void)
-5
View File
@@ -9,9 +9,6 @@
/// \file d_protocol.h /// \file d_protocol.h
/// \brief srb2kart:// protocol stuff /// \brief srb2kart:// protocol stuff
#ifndef __D_PROTOCOL__
#define __D_PROTOCOL__
void D_SetupProtocol(void); void D_SetupProtocol(void);
void D_CreateProtocol(void); void D_CreateProtocol(void);
@@ -19,5 +16,3 @@ void D_DeleteProtocol(void);
#ifdef HAVE_CURL #ifdef HAVE_CURL
void D_DownloadReplay(const char *url, const char *path); void D_DownloadReplay(const char *url, const char *path);
#endif #endif
#endif //__D_PROTOCOL__
+2 -2
View File
@@ -1468,7 +1468,7 @@ void I_Error(const char *error, ...)
if (errorcount > 20) if (errorcount > 20)
{ {
va_start(argptr, error); va_start(argptr, error);
vsnprintf(buffer, 8192, error, argptr); vsprintf(buffer, error, argptr);
va_end(argptr); va_end(argptr);
I_OutputMsg("SRB2Kart %s Recursive Error", buffer); I_OutputMsg("SRB2Kart %s Recursive Error", buffer);
@@ -1482,7 +1482,7 @@ void I_Error(const char *error, ...)
// Display error message in the console before we start shutting it down // Display error message in the console before we start shutting it down
va_start(argptr, error); va_start(argptr, error);
vsnprintf(buffer, 8192, error, argptr); vsprintf(buffer, error, argptr);
va_end(argptr); va_end(argptr);
I_OutputMsg("\nI_Error(): %s\n", buffer); I_OutputMsg("\nI_Error(): %s\n", buffer);
+1 -27
View File
@@ -49,27 +49,6 @@ discordRequest_t *discordRequestList = NULL;
static char self_ip[IP_SIZE+1]; static char self_ip[IP_SIZE+1];
/*--------------------------------------------------
* const char *DRPC_HideUsername(const char *input)
*
* See header file for description.
* --------------------------------------------------*/
const char *DRPC_HideUsername(const char *input)
{
static char buffer[5];
int i;
buffer[0] = input[0];
for (i = 1; i < 4; ++i)
{
buffer[i] = '.';
}
buffer[4] = '\0';
return buffer;
}
boolean drpc_init = false; boolean drpc_init = false;
/*-------------------------------------------------- /*--------------------------------------------------
@@ -126,7 +105,7 @@ static void DRPC_HandleReady(const DiscordUser *user)
} }
else else
{ {
CONS_Printf("Discord: connected to %s (%s)\n", user->username, user->userId); CONS_Printf("Discord: connected to %s#%s (%s)\n", user->username, user->discriminator, user->userId);
} }
} }
@@ -262,10 +241,8 @@ static void DRPC_HandleJoinRequest(const DiscordUser *requestUser)
newRequest->username = Z_Calloc(344, PU_STATIC, NULL); newRequest->username = Z_Calloc(344, PU_STATIC, NULL);
snprintf(newRequest->username, 344, "%s", requestUser->username); snprintf(newRequest->username, 344, "%s", requestUser->username);
#if 0
newRequest->discriminator = Z_Calloc(8, PU_STATIC, NULL); newRequest->discriminator = Z_Calloc(8, PU_STATIC, NULL);
snprintf(newRequest->discriminator, 8, "%s", requestUser->discriminator); snprintf(newRequest->discriminator, 8, "%s", requestUser->discriminator);
#endif
newRequest->userID = Z_Calloc(32, PU_STATIC, NULL); newRequest->userID = Z_Calloc(32, PU_STATIC, NULL);
snprintf(newRequest->userID, 32, "%s", requestUser->userId); snprintf(newRequest->userID, 32, "%s", requestUser->userId);
@@ -331,9 +308,6 @@ void DRPC_RemoveRequest(discordRequest_t *removeRequest)
} }
Z_Free(removeRequest->username); Z_Free(removeRequest->username);
#if 0
Z_Free(removeRequest->discriminator);
#endif
Z_Free(removeRequest->userID); Z_Free(removeRequest->userID);
Z_Free(removeRequest); Z_Free(removeRequest);
} }
-11
View File
@@ -29,9 +29,7 @@ extern struct discordInfo_s {
typedef struct discordRequest_s { typedef struct discordRequest_s {
char *username; // Discord user name. char *username; // Discord user name.
#if 0 // Good night, sweet prince...
char *discriminator; // Discord discriminator (The little hashtag thing after the username). Separated for a "hide discriminators" cvar. char *discriminator; // Discord discriminator (The little hashtag thing after the username). Separated for a "hide discriminators" cvar.
#endif
char *userID; // The ID of the Discord user, gets used with Discord_Respond() char *userID; // The ID of the Discord user, gets used with Discord_Respond()
// HAHAHA, no. // HAHAHA, no.
@@ -46,15 +44,6 @@ typedef struct discordRequest_s {
extern discordRequest_t *discordRequestList; extern discordRequest_t *discordRequestList;
/*--------------------------------------------------
* const char *DRPC_HideUsername(const char *input);
*
* Handle usernames while cv_discordstreamer is activated.
* (The loss of discriminators is still a dumbass regression
* that I will never forgive the Discord developers for.)
* --------------------------------------------------*/
const char *DRPC_HideUsername(const char *input);
/*-------------------------------------------------- /*--------------------------------------------------
void DRPC_RemoveRequest(void); void DRPC_RemoveRequest(void);
+6 -3
View File
@@ -90,6 +90,12 @@ extern FILE *logstream;
extern char logfilename[1024]; extern char logfilename[1024];
#endif #endif
// not sure if this belongs here lul
// TODO: figure out whats preventing 32bit windows from working with libbacktrace
#if defined(_WIN32) && !defined(MINGW64)
#define HAVE_DRMINGW
#endif
#if defined (HAVE_LIBBACKTRACE) #if defined (HAVE_LIBBACKTRACE)
#define CRASH_LOGFILE_NAME "srb2kart-crash-log.txt" #define CRASH_LOGFILE_NAME "srb2kart-crash-log.txt"
#elif defined (HAVE_DRMINGW) #elif defined (HAVE_DRMINGW)
@@ -114,9 +120,6 @@ extern char logfilename[1024];
#define SUBVERSION 6 // more precise version number #define SUBVERSION 6 // more precise version number
#define VERSIONSTRING "Saturn v9" #define VERSIONSTRING "Saturn v9"
#define VERSIONSTRINGW L"Saturn v9" #define VERSIONSTRINGW L"Saturn v9"
#define SATURN_TESTING // comment out for saturn release builds!
// Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates! // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates!
// And change CMakeLists.txt (not src/, but in root), for CMake users! // And change CMakeLists.txt (not src/, but in root), for CMake users!
#endif #endif
+1
View File
@@ -43,6 +43,7 @@ extern "C" {
#define UINT64 uint64_t #define UINT64 uint64_t
#ifdef __APPLE_CC__ #ifdef __APPLE_CC__
#define DIRECTFULLSCREEN 1
#define DEBUG_LOG #define DEBUG_LOG
#define NOIPX #define NOIPX
#endif #endif
+2 -2
View File
@@ -44,7 +44,7 @@ consvar_t cv_addons_search_case = {"addons_search_case", "No", CV_SAVE, CV_YesNo
static CV_PossibleValue_t addons_search_type_cons_t[] = {{0, "Start"}, {1, "Anywhere"}, {0, NULL}}; static CV_PossibleValue_t addons_search_type_cons_t[] = {{0, "Start"}, {1, "Anywhere"}, {0, NULL}};
consvar_t cv_addons_search_type = {"addons_search_type", "Anywhere", CV_SAVE, addons_search_type_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_addons_search_type = {"addons_search_type", "Anywhere", CV_SAVE, addons_search_type_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
char menupath[MAXFILEPATH]; char menupath[1024];
size_t menupathindex[menudepth]; size_t menupathindex[menudepth];
size_t menudepthleft = menudepth; size_t menudepthleft = menudepth;
@@ -111,7 +111,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
int found = 0; int found = 0;
char *searchname; char *searchname;
int depthleft = maxsearchdepth; int depthleft = maxsearchdepth;
char searchpath[MAXFILEPATH]; char searchpath[1024];
size_t *searchpathindex; size_t *searchpathindex;
dirhandle = (DIR**)malloc(maxsearchdepth * sizeof(DIR*)); dirhandle = (DIR**)malloc(maxsearchdepth * sizeof(DIR*));
+1 -2
View File
@@ -34,8 +34,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
#define menudepth 20 #define menudepth 20
#define MAXFILEPATH 1024 extern char menupath[1024];
extern char menupath[MAXFILEPATH];
extern size_t menupathindex[menudepth]; extern size_t menupathindex[menudepth];
extern size_t menudepthleft; extern size_t menudepthleft;
+8 -21
View File
@@ -630,7 +630,7 @@ void G_GhostAddHit(INT32 playernum, mobj_t *victim)
ghostext[playernum].flags |= EZT_HIT; ghostext[playernum].flags |= EZT_HIT;
ghostext[playernum].hits++; ghostext[playernum].hits++;
ghostext[playernum].hitlist = Z_Realloc(ghostext[playernum].hitlist, ghostext[playernum].hits * sizeof(mobj_t *), PU_LEVEL, &ghostext[playernum].hitlist); Z_Realloc(ghostext[playernum].hitlist, ghostext[playernum].hits * sizeof(mobj_t *), PU_STATIC, &ghostext[playernum].hitlist);
P_SetTarget(ghostext[playernum].hitlist + (ghostext[playernum].hits-1), victim); P_SetTarget(ghostext[playernum].hitlist + (ghostext[playernum].hits-1), victim);
} }
@@ -3569,8 +3569,7 @@ void G_SaveDemo(void)
size_t i, strindex = 0; size_t i, strindex = 0;
boolean dash = true; boolean dash = true;
//for (i = 0; demo.titlename[i] && i < 127; i++) ????? for (i = 0; demo.titlename[i] && i < 127; i++)
for (i = 0; i < 64 && demo.titlename[i]; i++)
{ {
if ((demo.titlename[i] >= 'a' && demo.titlename[i] <= 'z') || if ((demo.titlename[i] >= 'a' && demo.titlename[i] <= 'z') ||
(demo.titlename[i] >= '0' && demo.titlename[i] <= '9')) (demo.titlename[i] >= '0' && demo.titlename[i] <= '9'))
@@ -3585,7 +3584,7 @@ void G_SaveDemo(void)
strindex++; strindex++;
dash = false; dash = false;
} }
else if (strindex && !dash) else if (!dash)
{ {
demo_slug[strindex] = '-'; demo_slug[strindex] = '-';
strindex++; strindex++;
@@ -3593,24 +3592,12 @@ void G_SaveDemo(void)
} }
} }
if (dash && strindex) demo_slug[strindex] = 0;
{ if (dash) demo_slug[strindex-1] = 0;
strindex--;
}
demo_slug[strindex] = '\0';
if (demo_slug[0] != '\0') writepoint = strstr(demoname, "-") + 1;
{ demo_slug[128 - (writepoint - demoname) - 4] = 0;
// Slug is valid, write the chosen filename. sprintf(writepoint, "%s.lmp", demo_slug);
writepoint = strstr(demoname, "-");
if (!writepoint)
return;
writepoint++;
size_t flen = 128 - (writepoint - demoname) - 4;
snprintf(writepoint, flen, "%s.lmp", demo_slug);
}
} }
length = *(UINT32 *)demoinfo_p; length = *(UINT32 *)demoinfo_p;
+1 -1
View File
@@ -67,7 +67,7 @@ typedef enum {
} menudemotype_e; } menudemotype_e;
typedef struct menudemo_s { typedef struct menudemo_s {
char filepath[1023 + 256]; // see M_PrepReplayList and sizeof menupath char filepath[256];
menudemotype_e type; menudemotype_e type;
char title[65]; // Null-terminated for string prints char title[65]; // Null-terminated for string prints
+16 -23
View File
@@ -452,13 +452,6 @@ consvar_t cv_ydeadzone[MAXSPLITSCREENPLAYERS] = {
{"joy4_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL} {"joy4_ydeadzone", "0.5", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
}; };
consvar_t cv_litesteer[MAXSPLITSCREENPLAYERS] = {
{"litesteer", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
{"litesteer2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
{"litesteer3", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
{"litesteer4", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}
};
static CV_PossibleValue_t driftsparkpulse_t[] = {{0, "MIN"}, {FRACUNIT*3, "MAX"}, {0, NULL}}; static CV_PossibleValue_t driftsparkpulse_t[] = {{0, "MIN"}, {FRACUNIT*3, "MAX"}, {0, NULL}};
consvar_t cv_driftsparkpulse = {"driftsparkpulse", "1.4", CV_FLOAT | CV_SAVE, driftsparkpulse_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_driftsparkpulse = {"driftsparkpulse", "1.4", CV_FLOAT | CV_SAVE, driftsparkpulse_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -1021,8 +1014,8 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
else else
th = 0; th = 0;
if (th < (cv_turnsmooth[forplayer].value * 3)) if (th < SLOWTURNTICS)
tspeed = cv_turnsmooth[forplayer].value == 2 ? 2 : 0; // slow turn tspeed = cv_turnsmooth.value == 2 ? 2 : 0; // slow turn
else else
tspeed = 1; tspeed = 1;
@@ -1031,32 +1024,30 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
// let movement keys cancel each other out // let movement keys cancel each other out
if (turnright && !(turnleft)) if (turnright && !(turnleft))
{ {
cmd->angleturn -= angleturn[tspeed]; cmd->angleturn = (INT16)(cmd->angleturn - (angleturn[tspeed]));
cmd->driftturn = (INT16)(cmd->driftturn - (angleturn[tspeed]));
side += sidemove[1]; side += sidemove[1];
} }
else if (turnleft && !(turnright)) else if (turnleft && !(turnright))
{ {
cmd->angleturn += angleturn[tspeed]; cmd->angleturn = (INT16)(cmd->angleturn + (angleturn[tspeed]));
cmd->driftturn = (INT16)(cmd->driftturn + (angleturn[tspeed]));
side -= sidemove[1]; side -= sidemove[1];
} }
if (analogjoystickmove && axis != 0) if (analogjoystickmove && axis != 0)
{ {
cmd->angleturn -= (axis * KART_FULLTURN) / JOYAXISRANGE; // JOYAXISRANGE should be 1023 (divide by 1024)
side += (axis * sidemove[0]) / JOYAXISRANGE; cmd->angleturn = (INT16)(cmd->angleturn - (((axis * angleturn[1]) >> 10))); // ANALOG!
cmd->driftturn = (INT16)(cmd->driftturn - (((axis * angleturn[1]) >> 10)));
side += ((axis * sidemove[0]) >> 10);
} }
if (cv_mouseturn.value) if (cv_mouseturn.value)
{ {
//THIS WORKS WTF???????? //THIS WORKS WTF????????
cmd->angleturn -= (mousex*(encoremode ? -1 : 1)*8); cmd->angleturn = (INT16)(cmd->angleturn - ((mousex*(encoremode ? -1 : 1)*8)));
} cmd->driftturn = (INT16)(cmd->driftturn - ((mousex*(encoremode ? -1 : 1)*8)));
// Digital users can input diagonal-back for shallow turns.
if (cv_litesteer[forplayer].value && InputDown(gc_aimbackward, ssplayer)
&& abs(cmd->angleturn) == KART_FULLTURN) // My keyboard hits 1024 but my keyboard only hits 1023, video games
{
cmd->angleturn /= 2;
} }
if (objectplacing) // SRB2Kart: spectators need special controls // not anymore huehuehue if (objectplacing) // SRB2Kart: spectators need special controls // not anymore huehuehue
@@ -1169,8 +1160,10 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
else if (cmd->angleturn < (-angleturn[1])) else if (cmd->angleturn < (-angleturn[1]))
cmd->angleturn = (-angleturn[1]); cmd->angleturn = (-angleturn[1]);
// until here both are the very same if (cmd->driftturn > (angleturn[1]))
cmd->driftturn = cmd->angleturn; cmd->driftturn = (angleturn[1]);
else if (cmd->driftturn < (-angleturn[1]))
cmd->driftturn = (-angleturn[1]);
if (player->mo) if (player->mo)
cmd->angleturn = K_GetKartTurnValue(player, cmd->angleturn); cmd->angleturn = K_GetKartTurnValue(player, cmd->angleturn);
+1 -2
View File
@@ -72,8 +72,6 @@ extern consvar_t cv_custom3axis[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_xdeadzone[MAXSPLITSCREENPLAYERS]; extern consvar_t cv_xdeadzone[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_ydeadzone[MAXSPLITSCREENPLAYERS]; extern consvar_t cv_ydeadzone[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_litesteer[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_ghost_besttime, cv_ghost_bestlap, cv_ghost_last, cv_ghost_guest, cv_ghost_staff; extern consvar_t cv_ghost_besttime, cv_ghost_bestlap, cv_ghost_last, cv_ghost_guest, cv_ghost_staff;
// Hud offsets // Hud offsets
@@ -155,6 +153,7 @@ typedef enum
// mouseaiming (looking up/down with the mouse or keyboard) // mouseaiming (looking up/down with the mouse or keyboard)
#define KB_LOOKSPEED (1<<25) #define KB_LOOKSPEED (1<<25)
#define MAXPLMOVE (50) #define MAXPLMOVE (50)
#define SLOWTURNTICS (cv_turnsmooth.value * 3)
// build an internal map name MAPxx from map number // build an internal map name MAPxx from map number
const char *G_BuildMapName(INT32 map); const char *G_BuildMapName(INT32 map);
+1 -7
View File
@@ -37,13 +37,7 @@ static CV_PossibleValue_t turnsmooth_cons_t[] = {{2, "Slow"}, {1, "Fast"}, {0, "
consvar_t cv_mousesens = {"mousesens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_mousesens = {"mousesens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_mouseysens = {"mouseysens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_mouseysens = {"mouseysens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_controlperkey = {"controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_controlperkey = {"controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_turnsmooth = {"turnsmoothing", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS] = {
{"turnsmoothing", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
{"turnsmoothing2", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
{"turnsmoothing3", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
{"turnsmoothing4", "Slow", CV_SAVE, turnsmooth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
};
static void G_ResetPlayerDeviceRumble(INT32 player); static void G_ResetPlayerDeviceRumble(INT32 player);
static void rumble_off_handle(void); static void rumble_off_handle(void);
+1 -2
View File
@@ -110,8 +110,7 @@ typedef enum
// mouse values are used once // mouse values are used once
extern consvar_t cv_mousesens, cv_mouseysens; extern consvar_t cv_mousesens, cv_mouseysens;
extern consvar_t cv_controlperkey; extern consvar_t cv_controlperkey, cv_turnsmooth;
extern consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS]; extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS]; extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
-103
View File
@@ -80,14 +80,6 @@ static poly_t *HWR_AllocPoly(INT32 numpts)
return p; return p;
} }
static polyvertex_t *HWR_AllocVertex(void)
{
polyvertex_t *p;
size_t size = sizeof(polyvertex_t);
p = Z_Malloc(size, PU_HWRPLANE, NULL);
return p;
}
/// \todo polygons should be freed in reverse order for efficiency, /// \todo polygons should be freed in reverse order for efficiency,
/// for now don't free because it doesn't free in reverse order /// for now don't free because it doesn't free in reverse order
static void HWR_FreePoly(poly_t *poly) static void HWR_FreePoly(poly_t *poly)
@@ -855,100 +847,6 @@ static INT32 SolveTProblem(void)
return numsplitpoly; return numsplitpoly;
} }
#define NEARDIST (0.75f)
#define MYMAX (10000000000000.0f)
/* Adjust true segs (from the segs lump) to be exactely the same as
* plane polygone segs
* This also convert fixed_t point of segs in float (in moste case
* it share the same vertice
*/
static void AdjustSegs(void)
{
size_t i, count;
INT32 j;
seg_t *lseg;
poly_t *p;
INT32 v1found = 0, v2found = 0;
float nearv1, nearv2;
for (i = 0; i < numsubsectors; i++)
{
count = subsectors[i].numlines;
lseg = &segs[subsectors[i].firstline];
p = extrasubsectors[i].planepoly;
if (!p)
continue;
for (; count--; lseg++)
{
float distv1,distv2,tmp;
nearv1 = nearv2 = MYMAX;
// Don't touch polyobject segs. We'll compensate
// for this when we go about drawing them.
if (lseg->polyseg)
continue;
for (j = 0; j < p->numpts; j++)
{
distv1 = p->pts[j].x - FIXED_TO_FLOAT(lseg->v1->x);
tmp = p->pts[j].y - FIXED_TO_FLOAT(lseg->v1->y);
distv1 = distv1*distv1+tmp*tmp;
if (distv1 <= nearv1)
{
v1found = j;
nearv1 = distv1;
}
// the same with v2
distv2 = p->pts[j].x - FIXED_TO_FLOAT(lseg->v2->x);
tmp = p->pts[j].y - FIXED_TO_FLOAT(lseg->v2->y);
distv2 = distv2*distv2+tmp*tmp;
if (distv2 <= nearv2)
{
v2found = j;
nearv2 = distv2;
}
}
if (nearv1 <= NEARDIST*NEARDIST)
// share vertice with segs
lseg->pv1 = &(p->pts[v1found]);
else
{
// BP: here we can do better, using PointInSeg and compute
// the right point position also split a polygone side to
// solve a T-intersection, but too mush work
// convert fixed vertex to float vertex
polyvertex_t *pv = HWR_AllocVertex();
pv->x = FIXED_TO_FLOAT(lseg->v1->x);
pv->y = FIXED_TO_FLOAT(lseg->v1->y);
lseg->pv1 = pv;
}
if (nearv2 <= NEARDIST*NEARDIST)
lseg->pv2 = &(p->pts[v2found]);
else
{
polyvertex_t *pv = HWR_AllocVertex();
pv->x = FIXED_TO_FLOAT(lseg->v2->x);
pv->y = FIXED_TO_FLOAT(lseg->v2->y);
lseg->pv2 = pv;
}
lseg->pv1->x2 = FloatToFixed(lseg->pv1->x);
lseg->pv1->y2 = FloatToFixed(lseg->pv1->y);
lseg->pv2->x2 = FloatToFixed(lseg->pv2->x);
lseg->pv2->y2 = FloatToFixed(lseg->pv2->y);
}
}
}
// call this routine after the BSP of a Doom wad file is loaded, // call this routine after the BSP of a Doom wad file is loaded,
// and it will generate all the convex polys for the hardware renderer // and it will generate all the convex polys for the hardware renderer
@@ -1017,7 +915,6 @@ void HWR_CreatePlanePolygons(INT32 bspnum)
#else #else
SolveTProblem(); SolveTProblem();
#endif #endif
AdjustSegs();
#ifdef DEBUG_HWBSP #ifdef DEBUG_HWBSP
//debug debug.. //debug debug..
+1 -1
View File
@@ -804,7 +804,7 @@ static void HWR_PrecacheLevelSprites(void)
void HWR_PrecacheLevel(void) void HWR_PrecacheLevel(void)
{ {
if (gamestate != GS_LEVEL) if (rendermode != render_opengl)
return; return;
// Precache flats. // Precache flats.
+195 -1
View File
@@ -31,6 +31,11 @@
#include "../st_stuff.h" #include "../st_stuff.h"
#include <fcntl.h> #include <fcntl.h>
#include "../i_video.h" // for rendermode != render_glide
#ifndef O_BINARY
#define O_BINARY 0
#endif
typedef struct typedef struct
{ {
@@ -53,6 +58,68 @@ static UINT8 softwaretranstogl_lo[11] = { 0, 12, 24, 36, 48, 60, 71, 83, 95,111
static const float FLOATBASEVIDWIDTH = (float)BASEVIDWIDTH; static const float FLOATBASEVIDWIDTH = (float)BASEVIDWIDTH;
static const float FLOATBASEVIDHEIGHT = (float)BASEVIDHEIGHT; static const float FLOATBASEVIDHEIGHT = (float)BASEVIDHEIGHT;
//
// -----------------+
// HWR_DrawPatch : Draw a 'tile' graphic
// Notes : x,y : positions relative to the original Doom resolution
// : textes(console+score) + menus + status bar
// -----------------+
void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option)
{
FOutVector v[4];
FBITFIELD flags;
GLPatch_t *hwrPatch;
// 3--2
// | /|
// |/ |
// 0--1
float sdup = FIXED_TO_FLOAT(vid.fdup)*2.0f;
float pdup = FIXED_TO_FLOAT(vid.fdup)*2.0f;
// make patch ready in hardware cache
HWR_GetPatch(gpatch);
hwrPatch = ((GLPatch_t *)gpatch->hardware);
switch (option & V_SCALEPATCHMASK)
{
case V_NOSCALEPATCH:
pdup = 2.0f;
break;
case V_SMALLSCALEPATCH:
pdup = 2.0f * FIXED_TO_FLOAT(vid.smalldup*FRACUNIT);
break;
case V_MEDSCALEPATCH:
pdup = 2.0f * FIXED_TO_FLOAT(vid.meddup*FRACUNIT);
break;
}
if (option & V_NOSCALESTART)
sdup = 2.0f;
v[0].x = v[3].x = (x*sdup-gpatch->leftoffset*pdup)/vid.width - 1;
v[2].x = v[1].x = (x*sdup+(gpatch->width - gpatch->leftoffset)*pdup)/vid.width - 1;
v[0].y = v[1].y = 1-(y*sdup-gpatch->topoffset*pdup)/vid.height;
v[2].y = v[3].y = 1-(y*sdup+(gpatch->height - gpatch->topoffset)*pdup)/vid.height;
v[0].z = v[1].z = v[2].z = v[3].z = 1.0f;
v[0].s = v[3].s = 0.0f;
v[2].s = v[1].s = hwrPatch->max_s;
v[0].t = v[1].t = 0.0f;
v[2].t = v[3].t = hwrPatch->max_t;
flags = PF_Translucent|PF_NoDepthTest;
if (option & V_WRAPX)
flags |= PF_ForceWrapX;
if (option & V_WRAPY)
flags |= PF_ForceWrapY;
// clip it since it is used for bunny scroll in doom I
GL_DrawPolygon(NULL, v, 4, flags);
}
void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap, INT32 bflags) void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap, INT32 bflags)
{ {
FOutVector v[4]; FOutVector v[4];
@@ -569,6 +636,133 @@ void HWR_DrawConsoleBack(UINT32 color, INT32 height)
} }
// ==========================================================================
// R_DRAW.C STUFF
// ==========================================================================
// ------------------
// HWR_DrawViewBorder
// Fill the space around the view window with a Doom flat texture, draw the
// beveled edges.
// 'clearlines' is useful to clear the heads up messages, when the view
// window is reduced, it doesn't refresh all the view borders.
// ------------------
void HWR_DrawViewBorder(INT32 clearlines)
{
INT32 x, y;
INT32 top, side;
INT32 baseviewwidth, baseviewheight;
INT32 basewindowx, basewindowy;
patch_t *patch;
if (!clearlines)
clearlines = BASEVIDHEIGHT; // refresh all
// calc view size based on original game resolution
baseviewwidth = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewwidth), vid.fdup)); //(cv_viewsize.value * BASEVIDWIDTH/10)&~7;
baseviewheight = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_viewheight), vid.fdup));
top = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_baseviewwindowy), vid.fdup));
side = FixedInt(FixedDiv(FLOAT_TO_FIXED(gl_baseviewwindowx), vid.fdup));
// top
HWR_DrawFlatFill(0, 0,
BASEVIDWIDTH, (top < clearlines ? top : clearlines),
st_borderpatchnum);
// left
if (top < clearlines)
HWR_DrawFlatFill(0, top, side,
(clearlines-top < baseviewheight ? clearlines-top : baseviewheight),
st_borderpatchnum);
// right
if (top < clearlines)
HWR_DrawFlatFill(side + baseviewwidth, top, side,
(clearlines-top < baseviewheight ? clearlines-top : baseviewheight),
st_borderpatchnum);
// bottom
if (top + baseviewheight < clearlines)
HWR_DrawFlatFill(0, top + baseviewheight,
BASEVIDWIDTH, BASEVIDHEIGHT, st_borderpatchnum);
//
// draw the view borders
//
basewindowx = (BASEVIDWIDTH - baseviewwidth)>>1;
if (baseviewwidth == BASEVIDWIDTH)
basewindowy = 0;
else
basewindowy = top;
// top edge
if (clearlines > basewindowy - 8)
{
patch = W_CachePatchNum(viewborderlump[BRDR_T], PU_PATCH);
for (x = 0; x < baseviewwidth; x += 8)
HWR_DrawPatch(patch, basewindowx + x, basewindowy - 8,
0);
}
// bottom edge
if (clearlines > basewindowy + baseviewheight)
{
patch = W_CachePatchNum(viewborderlump[BRDR_B], PU_PATCH);
for (x = 0; x < baseviewwidth; x += 8)
HWR_DrawPatch(patch, basewindowx + x,
basewindowy + baseviewheight, 0);
}
// left edge
if (clearlines > basewindowy)
{
patch = W_CachePatchNum(viewborderlump[BRDR_L], PU_PATCH);
for (y = 0; y < baseviewheight && basewindowy + y < clearlines;
y += 8)
{
HWR_DrawPatch(patch, basewindowx - 8, basewindowy + y,
0);
}
}
// right edge
if (clearlines > basewindowy)
{
patch = W_CachePatchNum(viewborderlump[BRDR_R], PU_PATCH);
for (y = 0; y < baseviewheight && basewindowy+y < clearlines;
y += 8)
{
HWR_DrawPatch(patch, basewindowx + baseviewwidth,
basewindowy + y, 0);
}
}
// Draw beveled corners.
if (clearlines > basewindowy - 8)
HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_TL],
PU_PATCH),
basewindowx - 8, basewindowy - 8, 0);
if (clearlines > basewindowy - 8)
HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_TR],
PU_PATCH),
basewindowx + baseviewwidth, basewindowy - 8, 0);
if (clearlines > basewindowy+baseviewheight)
HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_BL],
PU_PATCH),
basewindowx - 8, basewindowy + baseviewheight, 0);
if (clearlines > basewindowy + baseviewheight)
HWR_DrawPatch(W_CachePatchNum(viewborderlump[BRDR_BR],
PU_PATCH),
basewindowx + baseviewwidth,
basewindowy + baseviewheight, 0);
}
// ========================================================================== // ==========================================================================
// AM_MAP.C DRAWING STUFF // AM_MAP.C DRAWING STUFF
// ========================================================================== // ==========================================================================
@@ -974,7 +1168,7 @@ static inline boolean saveTGA(const char *file_name, void *buffer,
INT32 i; INT32 i;
UINT8 *buf8 = buffer; UINT8 *buf8 = buffer;
fd = open(file_name, O_WRONLY | O_CREAT | O_TRUNC, 0666); fd = open(file_name, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
if (fd < 0) if (fd < 0)
return false; return false;
+102 -125
View File
@@ -65,6 +65,8 @@
// Globals // Globals
// ========================================================================== // ==========================================================================
#define ABS(x) ((x) < 0 ? -(x) : (x))
// false if shaders have not been initialized yet, or if shaders are not available // false if shaders have not been initialized yet, or if shaders are not available
boolean gl_shadersavailable = false; boolean gl_shadersavailable = false;
@@ -75,6 +77,11 @@ boolean gl_drawing_stencil = false;
static INT32 current_bsp_culling_distance = 0; static INT32 current_bsp_culling_distance = 0;
// base values set at SetViewSize
float gl_baseviewwindowy, gl_baseviewwindowx;
static float gl_viewwindowy, gl_viewwindowx; // top left corner of view window
float gl_viewwidth, gl_viewheight; // viewport clipping boundaries (screen coords)
FTransform atransform; FTransform atransform;
// Float variants of viewx, viewy, viewz, etc. // Float variants of viewx, viewy, viewz, etc.
@@ -277,7 +284,6 @@ static void CV_glshaders_OnChange(void)
{ {
// can't do palette rendering without shaders, so update the state if needed // can't do palette rendering without shaders, so update the state if needed
HWR_TogglePaletteRendering(); HWR_TogglePaletteRendering();
HWR_PrecacheLevel();
} }
M_UpdateOGLMenu(); M_UpdateOGLMenu();
} }
@@ -295,21 +301,18 @@ static void CV_gltextureformat_OnChange(void)
{ {
ONLY_IF_GL_LOADED ONLY_IF_GL_LOADED
GL_SetSpecialState(HWD_SET_TEXTURE_FORMAT, cv_gltexturedepth.value); GL_SetSpecialState(HWD_SET_TEXTURE_FORMAT, cv_gltexturedepth.value);
HWR_PrecacheLevel();
} }
static void CV_filtermode_OnChange(void) static void CV_filtermode_OnChange(void)
{ {
ONLY_IF_GL_LOADED ONLY_IF_GL_LOADED
GL_SetSpecialState(HWD_SET_TEXTUREFILTERMODE, cv_glfiltermode.value); GL_SetSpecialState(HWD_SET_TEXTUREFILTERMODE, cv_glfiltermode.value);
HWR_PrecacheLevel();
} }
static void CV_anisotropic_OnChange(void) static void CV_anisotropic_OnChange(void)
{ {
ONLY_IF_GL_LOADED ONLY_IF_GL_LOADED
GL_SetSpecialState(HWD_SET_TEXTUREANISOTROPICMODE, cv_glanisotropicmode.value); GL_SetSpecialState(HWD_SET_TEXTUREANISOTROPICMODE, cv_glanisotropicmode.value);
HWR_PrecacheLevel();
} }
static void CV_glpaletterendering_OnChange(void) static void CV_glpaletterendering_OnChange(void)
@@ -322,9 +325,7 @@ static void CV_glpaletterendering_OnChange(void)
{ {
HWR_CompileShaders(); HWR_CompileShaders();
HWR_TogglePaletteRendering(); HWR_TogglePaletteRendering();
HWR_PrecacheLevel();
} }
M_UpdateOGLMenu(); M_UpdateOGLMenu();
} }
@@ -728,6 +729,9 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
for (i = 0; i < subsector->numlines; i++, line++) for (i = 0; i < subsector->numlines; i++, line++)
{ {
if (line->polyseg)
continue;
line_t* ld = line->linedef; line_t* ld = line->linedef;
// this check sucks and is a hotspot lel // this check sucks and is a hotspot lel
@@ -740,27 +744,11 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
P_ClosestPointOnLine(viewx, viewy, ld, &v); P_ClosestPointOnLine(viewx, viewy, ld, &v);
dist = FixedToFloat(R_PointToDist(v.x, v.y)); dist = FixedToFloat(R_PointToDist(v.x, v.y));
if (line->pv1) x1 = (line->fv1.x);
{ y1 = (line->fv1.y);
x1 = line->pv1->x;
y1 = line->pv1->y;
}
else
{
x1 = FixedToFloat(line->v1->x);
y1 = FixedToFloat(line->v1->y);
}
if (line->pv2) xd = (line->fv2.x) - x1;
{ yd = (line->fv2.y) - y1;
xd = line->pv2->x - x1;
yd = line->pv2->y - y1;
}
else
{
xd = FixedToFloat(line->v2->x) - x1;
yd = FixedToFloat(line->v2->y) - y1;
}
// Based on the seg length and the distance from the line, split horizon into multiple poly sets to reduce distortion // Based on the seg length and the distance from the line, split horizon into multiple poly sets to reduce distortion
dist = sqrtf((xd*xd) + (yd*yd)) / dist / 16.0f; dist = sqrtf((xd*xd) + (yd*yd)) / dist / 16.0f;
@@ -824,11 +812,11 @@ static void HWR_DrawSegsSplats(FSurfaceInfo * pSurf)
M_ClearBox(segbbox); M_ClearBox(segbbox);
M_AddToBox(segbbox, M_AddToBox(segbbox,
FloatToFixed(gl_curline->pv1->x), FloatToFixed(gl_curline->fv1.x),
FloatToFixed(gl_curline->pv1->y)); FloatToFixed(gl_curline->fv1.y));
M_AddToBox(segbbox, M_AddToBox(segbbox,
FloatToFixed(gl_curline->pv2->x), FloatToFixed(gl_curline->fv2.x),
FloatToFixed(gl_curline->pv2->y)); FloatToFixed(gl_curline->fv2.y));
splat = (wallsplat_t *)gl_curline->linedef->splats; splat = (wallsplat_t *)gl_curline->linedef->splats;
for (; splat; splat = splat->next) for (; splat; splat = splat->next)
@@ -1323,34 +1311,24 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
const boolean noencore = (gl_linedef->flags & ML_TFERLINE); const boolean noencore = (gl_linedef->flags & ML_TFERLINE);
if (LIKELY(gl_curline->pv1)) v1x = gl_curline->v1->x;
{ v1y = gl_curline->v1->y;
vs.x = gl_curline->pv1->x; v2x = gl_curline->v2->x;
vs.y = gl_curline->pv1->y; v2y = gl_curline->v2->y;
v1x = gl_curline->pv1->x2;
v1y = gl_curline->pv1->y2;
}
else
{
vs.x = FixedToFloat(gl_curline->v1->x);
vs.y = FixedToFloat(gl_curline->v1->y);
v1x = gl_curline->v1->x;
v1y = gl_curline->v1->y;
}
if (LIKELY(gl_curline->pv2)) if (gl_curline->polyseg)
{ {
ve.x = gl_curline->pv2->x; vs.x = FixedToFloat(v1x);
ve.y = gl_curline->pv2->y; vs.y = FixedToFloat(v1y);
v2x = gl_curline->pv2->x2; ve.x = FixedToFloat(v2x);
v2y = gl_curline->pv2->y2; ve.y = FixedToFloat(v2y);
} }
else else
{ {
ve.x = FixedToFloat(gl_curline->v2->x); vs.x = gl_curline->fv1.x;
ve.y = FixedToFloat(gl_curline->v2->y); vs.y = gl_curline->fv1.y;
v2x = gl_curline->v2->x; ve.x = gl_curline->fv2.x;
v2y = gl_curline->v2->y; ve.y = gl_curline->fv2.y;
} }
#define SLOPEPARAMS(slope, end1, end2, normalheight) \ #define SLOPEPARAMS(slope, end1, end2, normalheight) \
@@ -2202,27 +2180,11 @@ static boolean CheckClip(sector_t * afrontsector, sector_t * abacksector)
{ {
fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t
if (LIKELY(gl_curline->pv1)) v1x = gl_curline->v1->x;
{ v1y = gl_curline->v1->y;
v1x = gl_curline->pv1->x2;
v1y = gl_curline->pv1->y2;
}
else
{
v1x = gl_curline->v1->x;
v1y = gl_curline->v1->y;
}
if (LIKELY(gl_curline->pv2)) v2x = gl_curline->v2->x;
{ v2y = gl_curline->v2->y;
v2x = gl_curline->pv2->x2;
v2y = gl_curline->pv2->y2;
}
else
{
v2x = gl_curline->v2->x;
v2y = gl_curline->v2->y;
}
#define SLOPEPARAMS(slope, end1, end2, normalheight) \ #define SLOPEPARAMS(slope, end1, end2, normalheight) \
end1 = P_GetZAt(slope, v1x, v1y, normalheight); \ end1 = P_GetZAt(slope, v1x, v1y, normalheight); \
@@ -2427,27 +2389,11 @@ static void HWR_AddLine(seg_t *line)
gl_curline = line; gl_curline = line;
if (LIKELY(gl_curline->pv1)) v1x = gl_curline->v1->x;
{ v1y = gl_curline->v1->y;
v1x = gl_curline->pv1->x2;
v1y = gl_curline->pv1->y2;
}
else
{
v1x = gl_curline->v1->x;
v1y = gl_curline->v1->y;
}
if (LIKELY(gl_curline->pv2)) v2x = gl_curline->v2->x;
{ v2y = gl_curline->v2->y;
v2x = gl_curline->pv2->x2;
v2y = gl_curline->pv2->y2;
}
else
{
v2x = gl_curline->v2->x;
v2y = gl_curline->v2->y;
}
// OPTIMIZE: quickly reject orthogonal back sides. // OPTIMIZE: quickly reject orthogonal back sides.
angle1 = R_PointToAngle64(v1x, v1y); angle1 = R_PointToAngle64(v1x, v1y);
@@ -3376,9 +3322,6 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
fixed_t slopez; fixed_t slopez;
float offset = 0; float offset = 0;
if (!spr->mobj)
return;
R_GetShadowZ(spr->mobj, &floorslope); R_GetShadowZ(spr->mobj, &floorslope);
mobjfloor = HWR_OpaqueFloorAtPos( mobjfloor = HWR_OpaqueFloorAtPos(
@@ -3390,7 +3333,14 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
angle_t shadowdir; angle_t shadowdir;
// Set direction // Set direction
shadowdir = localangle[viewssnum] + FixedAngle(cv_cam_rotate[viewssnum].value); if (splitscreen && R_GetViewNumber() == 1)
shadowdir = localangle[1] + FixedAngle(cv_cam_rotate[1].value);
else if (splitscreen > 1 && R_GetViewNumber() == 2)
shadowdir = localangle[2] + FixedAngle(cv_cam_rotate[2].value);
else if (splitscreen > 2 && R_GetViewNumber() == 3)
shadowdir = localangle[3] + FixedAngle(cv_cam_rotate[3].value);
else
shadowdir = localangle[0] + FixedAngle(cv_cam_rotate[0].value);
// Find floorheight // Find floorheight
floorheight = HWR_OpaqueFloorAtPos( floorheight = HWR_OpaqueFloorAtPos(
@@ -3402,17 +3352,18 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
// Don't draw it, then! // Don't draw it, then!
if (spr->mobj->z < floorheight) if (spr->mobj->z < floorheight)
return; return;
else
fixed_t floorz; {
floorz = HWR_OpaqueFloorAtPos( fixed_t floorz;
spr->mobj->x + P_ReturnThrustX(spr->mobj, shadowdir, spr->mobj->z - floorheight), floorz = HWR_OpaqueFloorAtPos(
spr->mobj->y + P_ReturnThrustY(spr->mobj, shadowdir, spr->mobj->z - floorheight), spr->mobj->x + P_ReturnThrustX(spr->mobj, shadowdir, spr->mobj->z - floorheight),
spr->mobj->z, spr->mobj->height); spr->mobj->y + P_ReturnThrustY(spr->mobj, shadowdir, spr->mobj->z - floorheight),
spr->mobj->z, spr->mobj->height);
// The shadow would be falling on a wall? Don't draw it, then. // The shadow would be falling on a wall? Don't draw it, then.
// Would draw midair otherwise. // Would draw midair otherwise.
if (floorz < floorheight) if (floorz < floorheight)
return; return;
}
floorheight = FixedInt(spr->mobj->z - floorheight); floorheight = FixedInt(spr->mobj->z - floorheight);
@@ -3422,11 +3373,12 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
floorheight = FixedInt(spr->mobj->z - mobjfloor); floorheight = FixedInt(spr->mobj->z - mobjfloor);
// technically this_scale gets multiplied and added to sprite y/x scale, but this thing needs it for some crap so ill just throw it in here again // technically this_scale gets multiplied and added to sprite y/x scale, but this thing needs it for some crap so ill just throw it in here again
this_scale = FixedToFloat(spr->mobj->scale); const boolean hires = (spr->mobj && spr->mobj->skin && K_GetMobjSkin(spr->mobj)->flags & SF_HIRES);
const skin_t *moskin = K_GetMobjSkin(spr->mobj); if (spr->mobj)
if (moskin && moskin->flags & SF_HIRES) this_scale = FixedToFloat(spr->mobj->scale);
this_scale *= FixedToFloat(moskin->highresscale); if (hires)
this_scale = this_scale * FixedToFloat(K_GetMobjSkin(spr->mobj)->highresscale);
// create the sprite billboard // create the sprite billboard
// //
@@ -4047,7 +3999,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
const precipmobj_t *sprmo = spr->precip; const precipmobj_t *sprmo = spr->precip;
if (UNLIKELY(!sprmo->subsector)) if (UNLIKELY(!sprmo || !sprmo->subsector))
return; return;
// cache sprite graphics // cache sprite graphics
@@ -4328,7 +4280,7 @@ static int CompareDrawNodePlanes(const void *p1, const void *p2)
const INT32 n1 = *(const INT32*)p1; const INT32 n1 = *(const INT32*)p1;
const INT32 n2 = *(const INT32*)p2; const INT32 n2 = *(const INT32*)p2;
return abs(drawnodes[n2].u.plane.fixedheight - viewz) - abs(drawnodes[n1].u.plane.fixedheight - viewz); return ABS(drawnodes[n2].u.plane.fixedheight - viewz) - ABS(drawnodes[n1].u.plane.fixedheight - viewz);
} }
// //
@@ -5309,10 +5261,10 @@ static void HWR_DrawSkyBackground(void)
// -----------------+ // -----------------+
static inline void HWR_ClearView(void) static inline void HWR_ClearView(void)
{ {
GL_GClipRect(viewwindowx, GL_GClipRect((INT32)gl_viewwindowx,
viewwindowy, (INT32)gl_viewwindowy,
(viewwindowx + viewwidth), (INT32)(gl_viewwindowx + gl_viewwidth),
(viewwindowy + viewheight), (INT32)(gl_viewwindowy + gl_viewheight),
ZCLIP_PLANE, FAR_ZCLIP_DEFAULT); ZCLIP_PLANE, FAR_ZCLIP_DEFAULT);
GL_ClearBuffer(false, true, true, NULL); GL_ClearBuffer(false, true, true, NULL);
} }
@@ -5322,6 +5274,19 @@ static inline void HWR_ClearView(void)
// -----------------+ // -----------------+
void HWR_SetViewSize(void) void HWR_SetViewSize(void)
{ {
// setup view size
gl_viewwidth = (float)vid.width;
gl_viewheight = (float)vid.height;
if (splitscreen)
gl_viewheight /= 2;
if (splitscreen > 1)
gl_viewwidth /= 2;
gl_baseviewwindowy = 0;
gl_baseviewwindowx = 0;
GL_FlushScreenTextures(); GL_FlushScreenTextures();
} }
@@ -5332,9 +5297,7 @@ static void HWR_SetTransformAiming(FTransform *trans)
if (cv_glshearing.value) if (cv_glshearing.value)
{ {
fixed_t fixedaiming = AIMINGTODY(aimingangle); fixed_t fixedaiming = AIMINGTODY(aimingangle);
trans->viewaiming = FixedToFloat(fixedaiming) * ((float)vid.width / vid.height) / ((float)BASEVIDWIDTH / BASEVIDHEIGHT); trans->viewaiming = FixedToFloat(fixedaiming);
if (splitscreen == 1) // only for 2 player splitscreen
trans->viewaiming *= 2.125; // splitscreen adjusts fov with 0.8, so compensate (but only halfway, since splitscreen means only half the screen is used)
trans->shearing = true; trans->shearing = true;
gl_aimingangle = 0; gl_aimingangle = 0;
} }
@@ -5576,6 +5539,20 @@ extern "C" {
// ========================================================================== // ==========================================================================
static void HWR_RenderFrame(player_t *player, boolean skybox) static void HWR_RenderFrame(player_t *player, boolean skybox)
{ {
// set window position
gl_viewwindowx = gl_baseviewwindowx;
gl_viewwindowy = gl_baseviewwindowy;
if ((splitscreen == 1 && viewssnum == 1) || (splitscreen > 1 && viewssnum > 1))
{
gl_viewwindowy += gl_viewheight;
}
if (splitscreen > 1 && viewssnum & 1)
{
gl_viewwindowx += gl_viewwidth;
}
// check for new console commands. // check for new console commands.
NetUpdate(); NetUpdate();
@@ -5591,10 +5568,10 @@ static void HWR_RenderFrame(player_t *player, boolean skybox)
if (!skybox && cv_glrenderdistance.value) if (!skybox && cv_glrenderdistance.value)
{ {
GL_GClipRect(viewwindowx, GL_GClipRect((INT32)gl_viewwindowx,
viewwindowy, (INT32)gl_viewwindowy,
(viewwindowx + viewwidth), (INT32)(gl_viewwindowx + gl_viewwidth),
(viewwindowy + viewheight), (INT32)(gl_viewwindowy + gl_viewheight),
ZCLIP_PLANE, clipping_distances[cv_glrenderdistance.value - 1]); ZCLIP_PLANE, clipping_distances[cv_glrenderdistance.value - 1]);
current_bsp_culling_distance = bsp_culling_distances[cv_glrenderdistance.value - 1]; current_bsp_culling_distance = bsp_culling_distances[cv_glrenderdistance.value - 1];
} }
+6
View File
@@ -42,6 +42,10 @@ extern "C" {
void HWR_Startup(void); void HWR_Startup(void);
void HWR_Shutdown(void); void HWR_Shutdown(void);
extern float gl_viewwidth, gl_viewheight, gl_baseviewwindowx, gl_baseviewwindowy;
extern float gl_basewindowcenterx, gl_basewindowcentery;
extern unsigned msaa; extern unsigned msaa;
extern boolean a2c; extern boolean a2c;
@@ -85,6 +89,7 @@ extern ps_metric_t ps_hw_batchdrawtime;
extern boolean gl_shadersavailable; extern boolean gl_shadersavailable;
// hw_draw.c // hw_draw.c
void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option);
void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap, INT32 bflags); void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap, INT32 bflags);
void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, INT32 option, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h); void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, INT32 option, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h);
void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color); void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color);
@@ -93,6 +98,7 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color);
void HWR_drawAMline(const fline_t *fl, INT32 color); void HWR_drawAMline(const fline_t *fl, INT32 color);
void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength); void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength);
void HWR_DrawConsoleBack(UINT32 color, INT32 height); void HWR_DrawConsoleBack(UINT32 color, INT32 height);
void HWR_DrawViewBorder(INT32 clearlines);
void HWR_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum); void HWR_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum);
UINT8 *HWR_GetScreenshot(INT32 scale); UINT8 *HWR_GetScreenshot(INT32 scale);
+145
View File
@@ -114,6 +114,7 @@ void UnloadModel(model_t *model)
if (model->materials) if (model->materials)
Z_Free(model->materials); Z_Free(model->materials);
DeleteVBOs(model);
Z_Free(model); Z_Free(model);
} }
@@ -193,6 +194,7 @@ model_t *LoadModel(const char *filename, int ztag)
strcpy(model->mdlFilename, filename); strcpy(model->mdlFilename, filename);
Optimize(model); Optimize(model);
GeneratePolygonNormals(model, ztag);
// Default material properties // Default material properties
for (i = 0 ; i < model->numMaterials; i++) for (i = 0 ; i < model->numMaterials; i++)
@@ -244,6 +246,13 @@ void GenerateVertexNormals(model_t *model)
M_Memcpy(newNormals, frame->normals, sizeof(float)*3*mesh->numTriangles*3); M_Memcpy(newNormals, frame->normals, sizeof(float)*3*mesh->numTriangles*3);
/* if (!systemSucks)
{
memTag = Z_GetTag(frame->tangents);
float *newTangents = (float*)Z_Malloc(sizeof(float)*3*mesh->numTriangles*3, memTag);
M_Memcpy(newTangents, frame->tangents, sizeof(float)*3*mesh->numTriangles*3);
}*/
for (k = 0; k < mesh->numVertices; k++) for (k = 0; k < mesh->numVertices; k++)
{ {
float x, y, z; float x, y, z;
@@ -279,15 +288,32 @@ void GenerateVertexNormals(model_t *model)
if (vCount > 1) if (vCount > 1)
{ {
// Vector::Normalize(&normal);
newNormals[3 * k + 0] = (float)normal.x; newNormals[3 * k + 0] = (float)normal.x;
newNormals[3 * k + 1] = (float)normal.y; newNormals[3 * k + 1] = (float)normal.y;
newNormals[3 * k + 2] = (float)normal.z; newNormals[3 * k + 2] = (float)normal.z;
/* if (!systemSucks)
{
Vector::vector_t tangent;
Vector::Tangent(&normal, &tangent);
newTangents[3 * k + 0] = tangent.x;
newTangents[3 * k + 1] = tangent.y;
newTangents[3 * k + 2] = tangent.z;
}*/
} }
} }
oldNormals = frame->normals; oldNormals = frame->normals;
frame->normals = newNormals; frame->normals = newNormals;
Z_Free(oldNormals); Z_Free(oldNormals);
/* if (!systemSucks)
{
float *oldTangents = frame->tangents;
frame->tangents = newTangents;
Z_Free(oldTangents);
}*/
} }
} }
} }
@@ -378,11 +404,15 @@ void Optimize(model_t *model)
newMesh->numTriangles = numTriangles; newMesh->numTriangles = numTriangles;
newMesh->numVertices = numTriangles * 3; newMesh->numVertices = numTriangles * 3;
newMesh->uvs = (float*)Z_Malloc(sizeof(float)*2*numTriangles*3, memTag, 0); newMesh->uvs = (float*)Z_Malloc(sizeof(float)*2*numTriangles*3, memTag, 0);
// if (node->material->lightmap)
// newMesh->lightuvs = (float*)Z_Malloc(sizeof(float)*2*numTriangles*3, memTag, 0);
newMesh->frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t), memTag, 0); newMesh->frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t), memTag, 0);
curFrame = &newMesh->frames[0]; curFrame = &newMesh->frames[0];
curFrame->material = curMat; curFrame->material = curMat;
curFrame->normals = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, 0); curFrame->normals = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, 0);
// if (!systemSucks)
// curFrame->tangents = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, 0);
curFrame->vertices = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, 0); curFrame->vertices = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, 0);
curFrame->colors = (char*)Z_Malloc(sizeof(char)*4*numTriangles*3, memTag, 0); curFrame->colors = (char*)Z_Malloc(sizeof(char)*4*numTriangles*3, memTag, 0);
@@ -406,6 +436,12 @@ void Optimize(model_t *model)
curMesh->uvs, curMesh->uvs,
sizeof(float)*2*curMesh->numTriangles*3); sizeof(float)*2*curMesh->numTriangles*3);
/* if (node->material->lightmap)
{
M_Memcpy(&newMesh->lightuvs[uvCount],
curMesh->lightuvs,
sizeof(float)*2*curMesh->numTriangles*3);
}*/
uvCount += 2*curMesh->numTriangles*3; uvCount += 2*curMesh->numTriangles*3;
dest = (float*)newMesh->frames[0].vertices; dest = (float*)newMesh->frames[0].vertices;
@@ -420,6 +456,15 @@ void Optimize(model_t *model)
src, src,
sizeof(float)*3*curMesh->numTriangles*3); sizeof(float)*3*curMesh->numTriangles*3);
/* if (!systemSucks)
{
dest = (float*)newMesh->frames[0].tangents;
src = (float*)curMesh->frames[0].tangents;
M_Memcpy(&dest[vertCount],
src,
sizeof(float)*3*curMesh->numTriangles*3);
}*/
vertCount += 3 * curMesh->numTriangles * 3; vertCount += 3 * curMesh->numTriangles * 3;
destByte = (char*)newMesh->frames[0].colors; destByte = (char*)newMesh->frames[0].colors;
@@ -449,3 +494,103 @@ void Optimize(model_t *model)
model->meshes = newMeshes; model->meshes = newMeshes;
model->numMeshes = numMeshes; model->numMeshes = numMeshes;
} }
void GeneratePolygonNormals(model_t *model, int ztag)
{
int i;
for (i = 0; i < model->numMeshes; i++)
{
int j;
mesh_t *mesh = &model->meshes[i];
if (!mesh->frames)
continue;
for (j = 0; j < mesh->numFrames; j++)
{
int k;
mdlframe_t *frame = &mesh->frames[j];
const float *vertices = frame->vertices;
vector_t *polyNormals;
frame->polyNormals = (vector_t*)Z_Malloc(sizeof(vector_t) * mesh->numTriangles, ztag, 0);
polyNormals = frame->polyNormals;
for (k = 0; k < mesh->numTriangles; k++)
{
/// TODO: normalize vectors
(void)vertices;
(void)polyNormals;
// Vector::Normal(vertices, polyNormals);
vertices += 3 * 3;
polyNormals++;
}
}
}
}
//
// Reload
//
// Reload VBOs
//
#if 0
static void Reload(void)
{
/* model_t *node;
for (node = modelHead; node; node = node->next)
{
int i;
for (i = 0; i < node->numMeshes; i++)
{
mesh_t *mesh = &node->meshes[i];
if (mesh->frames)
{
int j;
for (j = 0; j < mesh->numFrames; j++)
CreateVBO(mesh, &mesh->frames[j]);
}
else if (mesh->tinyframes)
{
int j;
for (j = 0; j < mesh->numFrames; j++)
CreateVBO(mesh, &mesh->tinyframes[j]);
}
}
}*/
}
#endif
void DeleteVBOs(model_t *model)
{
(void)model;
/* for (int i = 0; i < model->numMeshes; i++)
{
mesh_t *mesh = &model->meshes[i];
if (mesh->frames)
{
for (int j = 0; j < mesh->numFrames; j++)
{
mdlframe_t *frame = &mesh->frames[j];
if (!frame->vboID)
continue;
bglDeleteBuffers(1, &frame->vboID);
frame->vboID = 0;
}
}
else if (mesh->tinyframes)
{
for (int j = 0; j < mesh->numFrames; j++)
{
tinyframe_t *frame = &mesh->tinyframes[j];
if (!frame->vboID)
continue;
bglDeleteBuffers(1, &frame->vboID);
frame->vboID = 0;
}
}
}*/
}
+6
View File
@@ -28,6 +28,8 @@ typedef struct
float ambient[4], diffuse[4], specular[4], emissive[4]; float ambient[4], diffuse[4], specular[4], emissive[4];
float shininess; float shininess;
boolean spheremap; boolean spheremap;
// Texture::texture_t *texture;
// Texture::texture_t *lightmap;
} material_t; } material_t;
typedef struct typedef struct
@@ -38,6 +40,7 @@ typedef struct
float *tangents; float *tangents;
char *colors; char *colors;
unsigned int vboID; unsigned int vboID;
vector_t *polyNormals;
} mdlframe_t; } mdlframe_t;
typedef struct typedef struct
@@ -67,6 +70,7 @@ typedef struct mesh_s
typedef struct tag_s typedef struct tag_s
{ {
char name[64]; char name[64];
// matrix_t transform;
} tag_t; } tag_t;
typedef struct model_s typedef struct model_s
@@ -92,7 +96,9 @@ model_t *LoadModel(const char *filename, int ztag);
void UnloadModel(model_t *model); void UnloadModel(model_t *model);
void Optimize(model_t *model); void Optimize(model_t *model);
void GenerateVertexNormals(model_t *model); void GenerateVertexNormals(model_t *model);
void GeneratePolygonNormals(model_t *model, int ztag);
void CreateVBOTiny(mesh_t *mesh, tinyframe_t *frame); void CreateVBOTiny(mesh_t *mesh, tinyframe_t *frame);
void CreateVBO(mesh_t *mesh, mdlframe_t *frame); void CreateVBO(mesh_t *mesh, mdlframe_t *frame);
void DeleteVBOs(model_t *model);
#endif #endif
-3
View File
@@ -253,9 +253,6 @@ HMS_connect (const char *format, ...)
cc = curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)cv_masterserver_timeout.value); cc = curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)cv_masterserver_timeout.value);
if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf); if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);
cc = curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 30L);
if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);
cc = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, HMS_on_read); cc = curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, HMS_on_read);
if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf); if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);
+144 -85
View File
@@ -2391,6 +2391,76 @@ void HU_Drawer(void)
} }
} }
//======================================================================
// HUD MESSAGES CLEARING FROM SCREEN
//======================================================================
// Clear old messages from the borders around the view window
// (only for reduced view, refresh the borders when needed)
//
// startline: y coord to start clear,
// clearlines: how many lines to clear.
//
static INT32 oldclearlines;
void HU_Erase(void)
{
INT32 topline, bottomline;
INT32 y, yoffset;
#ifdef HWRENDER
// clear hud msgs on double buffer (OpenGL mode)
boolean secondframe;
static INT32 secondframelines;
#endif
if (con_clearlines == oldclearlines && !con_hudupdate && !chat_on)
return;
#ifdef HWRENDER
// clear the other frame in double-buffer modes
secondframe = (con_clearlines != oldclearlines);
if (secondframe)
secondframelines = oldclearlines;
#endif
// clear the message lines that go away, so use _oldclearlines_
bottomline = oldclearlines;
oldclearlines = con_clearlines;
if (chat_on && OLDCHAT)
if (bottomline < 8)
bottomline = 8; // only do it for consolechat. consolechat is gay.
if (automapactive || viewwindowx == 0) // hud msgs don't need to be cleared
return;
// software mode copies view border pattern & beveled edges from the backbuffer
if (rendermode == render_soft)
{
topline = 0;
for (y = topline, yoffset = y*vid.width; y < bottomline; y++, yoffset += vid.width)
{
if (y < viewwindowy || y >= viewwindowy + viewheight)
R_VideoErase(yoffset, vid.width); // erase entire line
else
{
R_VideoErase(yoffset, viewwindowx); // erase left border
// erase right border
R_VideoErase(yoffset + viewwindowx + viewwidth, viewwindowx);
}
}
con_hudupdate = false; // if it was set..
}
#ifdef HWRENDER
else if (rendermode != render_none)
{
// refresh just what is needed from the view borders
HWR_DrawViewBorder(secondframelines);
con_hudupdate = secondframe;
}
#endif
}
//====================================================================== //======================================================================
// IN-LEVEL MULTIPLAYER RANKINGS // IN-LEVEL MULTIPLAYER RANKINGS
//====================================================================== //======================================================================
@@ -2470,91 +2540,17 @@ Ping_conversion (UINT32 lag)
// HU_drawPing // HU_drawPing
// //
static void HU_drawOldPing(INT32 x, INT32 y, UINT32 lag, INT32 flags, boolean gentleman)
{
const INT32 measureid = cv_pingmeasurement.value ? 1 : 0;
if (vid.width >= 640) // how sad, we're using a shit resolution.
{
if (measureid == 1)
{
V_DrawRightAlignedSmallString(x+12, y+13, V_ALLOWLOWERCASE|flags, va("%dms", Ping_conversion(lag)));
}
else if (measureid == 0)
{
V_DrawRightAlignedSmallString(x+12, y+13, flags, va("d%d", Ping_conversion(lag)));
}
}
if (cv_pingicon.value)
{
UINT8 numbars = 0; // how many ping bars do we draw?
UINT8 barcolor = 31; // color we use for the bars (green, yellow, red or black)
SINT8 i = 0;
SINT8 yoffset = 6;
switch (lag)
{
case 0 ... 1:
numbars = 3;
barcolor = 215; // Blue
break;
case 2 ... 3:
numbars = 3;
barcolor = 184; // Green
break;
case 4 ... 6:
numbars = 2; // Apparently ternaries w/ multiple statements don't look good in C so I decided against it.
barcolor = 103; // Yellow
break;
case 7 ... 9:
numbars = 1;
barcolor = 155; // Red
break;
default: // Brazil
numbars = 0;
barcolor = 31; // black
break;
}
if (gentleman)
{
barcolor = 194; // make it purplish
// bars get indirectly set earlier
}
for (i = 0; (i < 3); i++) // Draw the ping bar
{
V_DrawFill(x+2 *(i-1)+7, y+8+yoffset-4, 2, 8-yoffset, 31|flags);
if (i < numbars)
V_DrawFill(x+2 *(i-1)+7, y+8+yoffset-3, 1, 8-yoffset-1, barcolor|flags);
yoffset -= 2;
}
}
}
static void HU_drawKartPing(INT32 x, INT32 y, UINT32 lag, INT32 flags, boolean gentleman)
{
const INT32 measureid = cv_pingmeasurement.value ? 1 : 0;
if (measureid == 1)
V_DrawScaledPatch(x+11 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]);
if (cv_pingicon.value)
{
INT32 gfxnum = Ping_gfx_num(lag); // gfx to draw
V_DrawScaledPatch(x+2, y, flags, pinggfx[gfxnum]);
}
x = V_DrawPingNum(x + (measureid == 1 ? 11 - pingmeasure[measureid]->width : 10), y+9, flags, Ping_conversion(lag), Ping_gfx_colormap(lag, gentleman));
if (measureid == 0)
V_DrawScaledPatch(x+1 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]);
}
void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags) void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags)
{ {
INT32 measureid = cv_pingmeasurement.value ? 1 : 0;
INT32 gfxnum; // gfx to draw
//SRB2/Kart v1.0 style
UINT8 numbars = 0; // how many ping bars do we draw?
UINT8 barcolor = 31; // color we use for the bars (green, yellow, red or black)
SINT8 i = 0;
SINT8 yoffset = 6;
UINT32 lag = playerpingtable[pnum]; UINT32 lag = playerpingtable[pnum];
const boolean gentleman = (cv_mindelay.value && (lag < (tic_t)simulated_lag)); const boolean gentleman = (cv_mindelay.value && (lag < (tic_t)simulated_lag));
@@ -2565,11 +2561,74 @@ void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags)
if (cv_pingstyle.value == 0) // kart if (cv_pingstyle.value == 0) // kart
{ {
HU_drawKartPing(x, y, lag, flags, gentleman); gfxnum = Ping_gfx_num(lag);
if (measureid == 1)
V_DrawScaledPatch(x+11 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]);
if (cv_pingicon.value)
V_DrawScaledPatch(x+2, y, flags, pinggfx[gfxnum]);
x = V_DrawPingNum(x + (measureid == 1 ? 11 - pingmeasure[measureid]->width : 10), y+9, flags, Ping_conversion(lag), Ping_gfx_colormap(lag, gentleman));
if (measureid == 0)
V_DrawScaledPatch(x+1 - pingmeasure[measureid]->width, y+9, flags, pingmeasure[measureid]);
} }
else if (cv_pingstyle.value == 1) // old style ping else if (cv_pingstyle.value == 1) // old style ping
{ {
HU_drawOldPing(x, y, lag, flags, gentleman); if (vid.width >= 640) // how sad, we're using a shit resolution.
{
if (measureid == 1)
{
V_DrawRightAlignedSmallString(x+12, y+13, V_ALLOWLOWERCASE|flags, va("%dms", Ping_conversion(lag)));
}
else if (measureid == 0)
{
V_DrawRightAlignedSmallString(x+12, y+13, flags, va("d%d", Ping_conversion(lag)));
}
}
if (cv_pingicon.value)
{
switch (lag)
{
case 0 ... 1:
numbars = 3;
barcolor = 215; // Blue
break;
case 2 ... 3:
numbars = 3;
barcolor = 184; // Green
break;
case 4 ... 6:
numbars = 2; // Apparently ternaries w/ multiple statements don't look good in C so I decided against it.
barcolor = 103; // Yellow
break;
case 7 ... 9:
numbars = 1;
barcolor = 155; // Red
break;
default: // Brazil
numbars = 0;
barcolor = 31; // black
break;
}
if (gentleman)
{
barcolor = 194; // make it purplish
// bars get indirectly set earlier
}
for (i = 0; (i < 3); i++) // Draw the ping bar
{
V_DrawFill(x+2 *(i-1)+7, y+8+yoffset-4, 2, 8-yoffset, 31|flags);
if (i < numbars)
V_DrawFill(x+2 *(i-1)+7, y+8+yoffset-3, 1, 8-yoffset-1, barcolor|flags);
yoffset -= 2;
}
}
} }
} }
+1
View File
@@ -117,6 +117,7 @@ void HU_TickSongCredits(void);
void HU_DrawSongCredits(void); void HU_DrawSongCredits(void);
void HU_Drawer(void); void HU_Drawer(void);
char HU_dequeueChatChar(void); char HU_dequeueChatChar(void);
void HU_Erase(void);
void HU_clearChatChars(void); void HU_clearChatChars(void);
void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags); // Lat': Ping drawer for scoreboard. void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags); // Lat': Ping drawer for scoreboard.
//void HU_DrawTeamTabRankings(playersort_t *tab, INT32 whiteplayer); //void HU_DrawTeamTabRankings(playersort_t *tab, INT32 whiteplayer);
+680
View File
@@ -0,0 +1,680 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2011-2018 by Sonic Team Junior.
//
// 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 i_addrinfo.c
/// \brief getaddr stubs, for lesser OSes
///
/// Some systems/SDKs, like PSL1GHT v2 does not have addrinfo functions
/// So a stub is needed
#include <string.h>
#include <stdlib.h>
#include <sys/types.h>
#ifdef _WIN32
#ifdef USE_WINSOCK2
#include <ws2tcpip.h>
#else
#include <winsock.h>
#endif
#else
#include <sys/socket.h>
#include <arpa/inet.h>
#include <netdb.h>
#endif
#include "i_addrinfo.h"
/*
* This addrinfo stub have a testcases:
* To test the stub, use this command to compile the stub testcase:
* gcc -g -DTESTCASE -Dtest_stub -Wall -W i_addrinfo.c -o stub
* To test the real getaddrinfo API, use this command to get real one:
* gcc -g -DTESTCASE -Utest_stub -Wall -W i_addrinfo.c -o real
* For Win32,you need the WinSock library, version 1.1 or 2.2
* for 1.1, add -lwsock32
* i686-w64-mingw32-gcc -g -DTESTCASE -Dtest_stub -UUSE_WINSOCK2 -Wall -W i_addrinfo.c -o stub.exe -lwsock32
* for 2.2, add -DUSE_WINSOCK2 -lws2_32
* i686-w64-mingw32-gcc -g -DTESTCASE -Utest_stub -DUSE_WINSOCK2 -Wall -W i_addrinfo.c -o real.exe -lws2_32
*/
#ifndef I_getaddrinfo
#include <stdbool.h>
#ifdef _WIN32
// it seems windows doesn't define that... maybe some other OS? OS/2
static int inet_aton(const char *cp, struct in_addr *addr)
{
if( cp == NULL || addr == NULL )
{
return(0);
}
if (strcmp(cp, "255.255.255.225") == 0)
{
addr->s_addr = htonl(INADDR_BROADCAST);
return 0;
}
return (addr->s_addr = inet_addr(cp)) != htonl(INADDR_NONE);
}
#endif
#ifdef USE_WINSOCK2
static HMODULE ipv6dll = NULL;
typedef int (WSAAPI *p_getaddrinfo) (const char *, const char *,
const struct my_addrinfo *,
struct my_addrinfo **);
typedef void (WSAAPI *p_freeaddrinfo) (struct my_addrinfo *);
static p_getaddrinfo WS_getaddrinfo = NULL;
static p_freeaddrinfo WS_freeaddrinfo = NULL;
static HMODULE WS_getfunctions(HMODULE tmp)
{
if (tmp != NULL)
{
WS_getaddrinfo = (p_getaddrinfo)(LPVOID)GetProcAddress(tmp, "getaddrinfo");
if (WS_getaddrinfo == NULL)
return NULL;
WS_freeaddrinfo = (p_freeaddrinfo)(LPVOID)GetProcAddress(tmp, "freeaddrinfo");
if (WS_freeaddrinfo == NULL)
{
WS_getaddrinfo = NULL;
return NULL;
}
}
return tmp;
}
static void WS_addrinfosetup(void)
{
if (WS_getaddrinfo && WS_freeaddrinfo)
return; // already have the functions
// why not hold it into ipv6dll? becase we already link with ws2_32, silly!
if (WS_getfunctions(GetModuleHandleA("ws2_32.dll")) == NULL)
ipv6dll = WS_getfunctions(LoadLibraryA("wship6.dll"));
}
void WS_addrinfocleanup(void)
{
if (ipv6dll)
FreeLibrary(ipv6dll);
ipv6dll = NULL;
WS_getaddrinfo = NULL;
WS_freeaddrinfo = NULL;
}
#else
void WS_addrinfocleanup(void) {}
#endif
int I_getaddrinfo(const char *node, const char *service,
const struct my_addrinfo *hints,
struct my_addrinfo **res)
{
struct hostent *nodename = NULL;
bool hostlookup = true, passivemode = false;
int flags = 0;
int socktype = 0;
int sockport = 0;
struct my_addrinfo *ai;
struct sockaddr_in *addr;
struct in_addr ipv4;
size_t addrlen = 1;
size_t ailen = 1, i = 0, j;
size_t famsize = sizeof(struct sockaddr_in);
#ifdef USE_WINSOCK2
WS_addrinfosetup();
if (WS_getaddrinfo)
return WS_getaddrinfo(node, service, hints, res);
#endif
// param check
if (node == NULL && service == NULL)
return EAI_NONAME;
//note: testcase show NULL as res crashes libc
if (res == NULL)
return -1;
// check hints
if (hints)
{
// no support for IPv6
if (hints->ai_family != AF_INET && hints->ai_family != AF_UNSPEC)
return -1; //EAI_FAMILY
#ifdef AI_NUMERICHOST
// do not look up hostnames
if ((hints->ai_flags & AI_NUMERICHOST) == AI_NUMERICHOST)
{
hostlookup = false;
flags |= AI_NUMERICHOST;
}
#endif
#ifdef AI_PASSIVE
// return loopback or any address?
if ((hints->ai_flags & AI_PASSIVE) == AI_PASSIVE)
{
passivemode = true;
flags |= AI_PASSIVE;
}
#endif
// why no support for canon names? lazy
//AI_CANONNAME
// what kind of socket?
socktype = hints->ai_socktype;
}
else
{
#ifdef AI_V4MAPPED
flags |= AI_V4MAPPED;
#endif
#ifdef AI_ADDRCONFIG
flags |= AI_ADDRCONFIG;
#endif
}
// we need gethostbyname to convert numeric strings
if (node && hostlookup)
{
if (node == NULL)
return -1;
nodename = gethostbyname(node);
if (nodename == NULL)
{
if (inet_aton(node, &ipv4) != 0)
addrlen = 1;
else
return -1;
}
else while (nodename->h_addr_list[addrlen] != NULL)
addrlen++;
}
else if (node)
{
if (inet_aton(node, &ipv4) != 0)
addrlen = 1;
else if (!hostlookup)
return EAI_NONAME;
}
else
addrlen = 1;
if (service) //AI_NUMERICSERV
sockport = atoi(service);
if (socktype == 0)
ailen = addrlen*3;
else
ailen = addrlen;
ai = calloc(ailen, sizeof(struct my_addrinfo));
if (ai == NULL)
return -1;
else
*res = ai;
addr = calloc(ailen*2, famsize);
if (addr == NULL)
{
free(ai);
return -1;
}
else
ai->ai_addr = memset(addr, 0x00, ailen*ai->ai_addrlen);
for (i = 0; i < ailen; i++)
{
ai = *res+i;
ai->ai_flags = flags;
ai->ai_family = AF_INET;
ai->ai_socktype = socktype;
switch (ai->ai_socktype)
{
case SOCK_STREAM:
ai->ai_protocol = IPPROTO_TCP;
break;
case SOCK_DGRAM:
ai->ai_protocol = IPPROTO_UDP;
break;
default:
ai->ai_protocol = 0;
}
ai->ai_addrlen = famsize;
ai->ai_addr = (struct sockaddr *)&addr[i];
//ai_cannonname
ai->ai_next = ai+1;
}
ai->ai_next = NULL;
ai = *res;
for (i = 0, j = 0; i < ailen; i++, j++)
{
ai = *res+i;
addr[i].sin_port = htons((UINT16)sockport);
if (nodename)
{
memcpy(&addr[i].sin_addr, nodename->h_addr_list[j], ai->ai_addrlen);
addr[i].sin_family = nodename->h_addrtype;
}
else if (node)
{
memcpy(&addr[i].sin_addr, &ipv4, ai->ai_addrlen);
addr[i].sin_family = AF_INET;
}
else
{
if (passivemode)
addr[i].sin_addr.s_addr = htonl(INADDR_ANY);
else
addr[i].sin_addr.s_addr = htonl(INADDR_LOOPBACK);
addr[i].sin_family = AF_INET;
}
if (socktype == 0)
{
ai->ai_socktype = SOCK_STREAM;
ai->ai_protocol = IPPROTO_TCP;
memcpy(&addr[i+1], &addr[i], ai->ai_addrlen);
i++; ai++;
ai->ai_socktype = SOCK_DGRAM;
ai->ai_protocol = IPPROTO_UDP;
memcpy(&addr[i+1], &addr[i], ai->ai_addrlen);
i++; ai++;
ai->ai_socktype = SOCK_RAW;
ai->ai_protocol = IPPROTO_IP;
}
}
return 0;
}
#endif
#ifndef I_freeaddrinfo
void I_freeaddrinfo(struct my_addrinfo *res)
{
#ifdef USE_WINSOCK2
if (WS_freeaddrinfo)
{
WS_freeaddrinfo(res);
return;
}
#endif
if (!res)
return;
free(res->ai_addr);
free(res);
}
#endif
#ifdef TESTCASE
#include <stdio.h>
#ifdef USE_WINSOCK2
#define inet_ntop inet_ntopA
#define HAVE_NTOP
static const char* inet_ntopA(int af, const void *cp, char *buf, socklen_t len)
{
DWORD Dlen = len, AFlen = 0;
SOCKADDR_STORAGE any;
LPSOCKADDR anyp = (LPSOCKADDR)&any;
LPSOCKADDR_IN any4 = (LPSOCKADDR_IN)&any;
LPSOCKADDR_IN6 any6 = (LPSOCKADDR_IN6)&any;
if (!buf)
{
WSASetLastError(STATUS_INVALID_PARAMETER);
return NULL;
}
if (af != AF_INET && af != AF_INET6)
{
WSASetLastError(WSAEAFNOSUPPORT);
return NULL;
}
ZeroMemory(&any, sizeof(SOCKADDR_STORAGE));
any.ss_family = af;
switch (af)
{
case AF_INET:
{
CopyMemory(&any4->sin_addr, cp, sizeof(IN_ADDR));
AFlen = sizeof(SOCKADDR_IN);
break;
}
case AF_INET6:
{
CopyMemory(&any6->sin6_addr, cp, sizeof(IN6_ADDR));
AFlen = sizeof(SOCKADDR_IN6);
break;
}
}
if (WSAAddressToStringA(anyp, AFlen, NULL, buf, &Dlen) == SOCKET_ERROR)
return NULL;
return buf;
}
#elif defined (_WIN32)
// w32api, ws2tcpip.h, r1.12
static inline char* gai_strerror(int ecode)
{
static char message[1024+1];
DWORD dwFlags = FORMAT_MESSAGE_FROM_SYSTEM
| FORMAT_MESSAGE_IGNORE_INSERTS
| FORMAT_MESSAGE_MAX_WIDTH_MASK;
DWORD dwLanguageId = MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT);
FormatMessageA(dwFlags, NULL, ecode, dwLanguageId, message, 1024, NULL);
return message;
}
#else
#define HAVE_NTOP
#endif
#ifndef INET_ADDRSTRLEN
#define INET_ADDRSTRLEN 16
#endif
static inline void printflags(int ai_flags)
{
printf("flags: %x(", ai_flags);
if (ai_flags == 0)
printf("NONE|");
#ifdef AI_PASSIVE
if ((ai_flags & AI_PASSIVE) == AI_PASSIVE)
printf("AI_PASSIVE|");
ai_flags &= ~AI_PASSIVE;
#endif
#ifdef AI_CANONNAME
if ((ai_flags & AI_CANONNAME) == AI_CANONNAME)
printf("AI_CANONNAME|");
ai_flags &= ~AI_CANONNAME;
#endif
#ifdef AI_NUMERICHOST
if ((ai_flags & AI_NUMERICHOST) == AI_NUMERICHOST)
printf("AI_NUMERICHOST|");
ai_flags &= ~AI_NUMERICHOST;
#endif
#ifdef AI_V4MAPPED
if ((ai_flags & AI_V4MAPPED) == AI_V4MAPPED)
printf("AI_V4MAPPED|");
ai_flags &= ~AI_V4MAPPED;
#endif
#ifdef AI_ALL
if ((ai_flags & AI_ALL) == AI_ALL)
printf("AI_ALL|");
ai_flags &= ~AI_ALL;
#endif
#ifdef AI_ADDRCONFIG
if ((ai_flags & AI_ADDRCONFIG) == AI_ADDRCONFIG)
printf("AI_ADDRCONFIG|");
ai_flags &= ~AI_ADDRCONFIG;
#endif
#ifdef AI_IDN
if ((ai_flags & AI_IDN) == AI_IDN)
printf("AI_IDN|");
ai_flags &= ~AI_IDN;
#endif
#ifdef AI_CANONIDN
if ((ai_flags & AI_CANONIDN) == AI_CANONIDN)
printf("AI_CANONIDN|");
ai_flags &= ~AI_CANONIDN;
#endif
#ifdef AI_IDN_ALLOW_UNASSIGNED
if ((ai_flags & AI_IDN_ALLOW_UNASSIGNED) == AI_IDN_ALLOW_UNASSIGNED)
printf("AI_IDN_ALLOW_UNASSIGNED|");
ai_flags &= ~AI_IDN_ALLOW_UNASSIGNED;
#endif
#ifdef AI_IDN_USE_STD3_ASCII_RULES
if ((ai_flags & AI_IDN_USE_STD3_ASCII_RULES) == AI_IDN_USE_STD3_ASCII_RULES)
printf("AI_IDN_USE_STD3_ASCII_RULES|");
ai_flags &= ~AI_PASSIVE;
#endif
#ifdef AI_NUMERICSERV
if ((ai_flags & AI_NUMERICSERV) == AI_NUMERICSERV)
printf("AI_NUMERICSERV|");
ai_flags &= ~AI_NUMERICSERV;
#endif
printf("%x", ai_flags);
printf(")\n");
}
static inline void printsocktype(int ai_socktype)
{
printf("socktype: %d(", ai_socktype);
switch (ai_socktype)
{
case 0:
printf("SOCK_ Woe32");
break;
case SOCK_STREAM:
printf("SOCK_STREAM");
break;
case SOCK_DGRAM:
printf("SOCK_DGRAM");
break;
case SOCK_RAW:
printf("SOCK_RAW");
break;
default:
printf("SOCK_ERROR\n");
exit(-1);
}
printf(")\n");
}
static inline void printprotocol(int ai_protocol)
{
printf("protocol: %d(", ai_protocol);
switch (ai_protocol)
{
case IPPROTO_IP:
printf("IPPROTO_IP");
break;
case IPPROTO_TCP:
printf("IPPROTO_TCP");
break;
case IPPROTO_UDP:
printf("IPPROTO_UDP");
break;
default:
printf("IPPROTO_ERROR\n");
exit(-1);
}
printf(")\n");
}
static inline void printaddr(int ai_family, const struct sockaddr *ai_addr)
{
char str[INET_ADDRSTRLEN+1] = "FAKE";
printf("family: %d(", ai_family);
switch (ai_family)
{
case AF_UNSPEC:
printf("AF_UNSPEC");
break;
case AF_INET:
printf("AF_INET");
break;
#ifdef AF_INET6
case AF_INET6:
printf("AF_INET6");
break;
#endif
default:
printf("AF_ERROR\n");
exit(-1);
}
printf(")\n");
if (ai_family == AF_INET && ai_addr)
{
const struct sockaddr_in *ip4 = (void *)ai_addr;
#ifdef HAVE_NTOP
inet_ntop(ai_family, &ip4->sin_addr, str, INET_ADDRSTRLEN);
#else
strncpy(str, inet_ntoa(ip4->sin_addr), INET_ADDRSTRLEN);
#endif
printf("port: %d\n", ntohs(ip4->sin_port));
}
printf("addr: %s\n", str);
}
void printaddrinfo(const struct my_addrinfo *data)
{
if(data == NULL)
{
printf("no data\n");
return;
}
else
printf("starting addrinfo dump\n");
while (data != NULL)
{
printflags(data->ai_flags);
printsocktype(data->ai_socktype);
printaddr(data->ai_family, data->ai_addr);
printprotocol(data->ai_protocol);
//addrlen
data = data->ai_next;
}
}
int main(int argc, char **argv)
{
struct my_addrinfo *res = NULL, hints;
int gaie;
(void)argc;
(void)argv;
memset(&hints, 0x00, sizeof(struct my_addrinfo));
hints.ai_family = AF_INET;
#ifdef _WIN32
{
#ifdef USE_WINSOCK2
const WORD VerNeed = MAKEWORD(2,2);
#else
const WORD VerNeed = MAKEWORD(1,1);
#endif
WSADATA WSAData;
WSAStartup(VerNeed, &WSAData);
}
#endif
printf("-----------------------------------------------------------\n");
#ifndef _WIN32 //NULL as res crashes Win32
gaie = I_getaddrinfo(NULL, NULL, &hints, NULL);
if (gaie != EAI_NONAME)
printf("NULLs test returned: %s(%d)\n", gai_strerror(gaie), gaie);
I_freeaddrinfo(res);
#endif
#if 0 //NULL as res crashes
gaie = I_getaddrinfo("localhost", "5029", NULL, NULL);
if (gaie == 0)
printf("NULL crashes: %s(%d)\n", gai_strerror(gaie), gaie);
I_freeaddrinfo(res);
#endif
gaie = I_getaddrinfo("localhost", NULL, &hints, &res);
//if (gaie != 0)
printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
gaie = I_getaddrinfo(NULL, "5029", &hints, &res);
//if (gaie != 0)
printf("NULLs test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
gaie = I_getaddrinfo("localhost", "5029", &hints, &res);
//if (gaie != 0)
printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
printf("-----------------------------------------------------------\n");
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
gaie = I_getaddrinfo("localhost", NULL, &hints, &res);
//if (gaie != 0)
printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
gaie = I_getaddrinfo(NULL, "5029", &hints, &res);
//if (gaie != 0)
printf("NULLs test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
gaie = I_getaddrinfo("localhost", "5029", &hints, &res);
//if (gaie != 0)
printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
printf("-----------------------------------------------------------\n");
hints.ai_socktype = SOCK_DGRAM;
hints.ai_protocol = IPPROTO_UDP;
gaie = I_getaddrinfo("localhost", NULL, &hints, &res);
//if (gaie != 0)
printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
gaie = I_getaddrinfo(NULL, "5029", &hints, &res);
//if (gaie != 0)
printf("NULLs test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
gaie = I_getaddrinfo("localhost", "5029", &hints, &res);
//if (gaie != 0)
printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
printf("-----------------------------------------------------------\n");
hints.ai_flags = AI_NUMERICHOST;
gaie = I_getaddrinfo("localhost", NULL, &hints, &res);
//if (gaie != 0)
printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
gaie = I_getaddrinfo(NULL, "5029", &hints, &res);
//if (gaie != 0)
printf("NULLs test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
gaie = I_getaddrinfo("localhost", "5029", &hints, &res);
//if (gaie != 0)
printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
printf("-----------------------------------------------------------\n");
gaie = I_getaddrinfo("127.0.0.1", NULL, &hints, &res);
//if (gaie != 0)
printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
gaie = I_getaddrinfo("127.0.0.1", "5029", &hints, &res);
//if (gaie != 0)
printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
printf("-----------------------------------------------------------\n");
gaie = I_getaddrinfo("255.255.255.255", NULL, &hints, &res);
//if (gaie != 0)
printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
gaie = I_getaddrinfo("255.255.255.255", "5029", &hints, &res);
//if (gaie != 0)
printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
printf("-----------------------------------------------------------\n");
hints.ai_flags = AI_PASSIVE;
gaie = I_getaddrinfo("0.0.0.0", NULL, &hints, &res);
//if (gaie != 0)
printf("NULL service test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
gaie = I_getaddrinfo("0.0.0.0", "5029", &hints, &res);
//if (gaie != 0)
printf("no hints test returned: %s(%d)\n", gai_strerror(gaie), gaie);
printaddrinfo(res);
I_freeaddrinfo(res); res = NULL;
return 0;
}
#endif
+71
View File
@@ -0,0 +1,71 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 2011-2018 by Sonic Team Junior.
//
// 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 i_addrinfo.h
/// \brief getaddrinfo stub
#ifndef __I_ADDRINFO__
#define __I_ADDRINFO__
#ifdef __GNUG__
#pragma interface
#endif
#ifndef AI_PASSIVE
#define AI_PASSIVE 0x01
#endif
#ifndef AI_NUMERICHOST
#define AI_NUMERICHOST 0x04
#endif
#ifndef AI_V4MAPPED
#define AI_V4MAPPED 0x08
#endif
#ifndef AI_ADDRCONFIG
#define AI_ADDRCONFIG 0x20
#endif
#ifdef _WIN32
#ifndef EAI_NONAME
#define EAI_NONAME WSAHOST_NOT_FOUND
#endif
#endif
#ifndef EAI_NONAME
#define EAI_NONAME -2
#endif
#ifdef _WIN32 // already use the stub for Win32
// w32api, ws2tcpip.h, r1.12
struct my_addrinfo {
int ai_flags;
int ai_family;
int ai_socktype;
int ai_protocol;
size_t ai_addrlen;
char *ai_canonname;
struct sockaddr *ai_addr;
struct my_addrinfo *ai_next;
};
#else
#define my_addrinfo addrinfo
#endif
void WS_addrinfocleanup(void);
#ifndef my_addrinfo
void I_freeaddrinfo(struct my_addrinfo *res);
int I_getaddrinfo(const char *node, const char *service,
const struct my_addrinfo *hints,
struct my_addrinfo **res);
#elif !defined (test_stub)
#define I_getaddrinfo getaddrinfo
#define I_freeaddrinfo freeaddrinfo
#endif
#endif
+87 -44
View File
@@ -29,36 +29,42 @@
#ifdef _WIN32 #ifdef _WIN32
#define USE_WINSOCK #define USE_WINSOCK
#if defined (_WIN64) || defined (HAVE_IPV6)
#define USE_WINSOCK2
#else //_WIN64/HAVE_IPV6
#define USE_WINSOCK1
#endif
#endif //WIN32 OS #endif //WIN32 OS
#ifdef USE_WINSOCK #ifdef USE_WINSOCK2
#include <ws2tcpip.h> #include <ws2tcpip.h>
#define addrinfo_t ADDRINFOA
#else
#define addrinfo_t struct addrinfo
#endif #endif
#include "doomdef.h" #include "doomdef.h"
#ifndef USE_WINSOCK
#include <arpa/inet.h>
#ifdef __APPLE_CC__
#ifndef _BSD_SOCKLEN_T_
#define _BSD_SOCKLEN_T_
#endif //_BSD_SOCKLEN_T_
#endif //__APPLE_CC__
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
#include <sys/ioctl.h>
#endif //normal BSD API
#include <errno.h>
#include <time.h> #include <time.h>
#ifdef USE_WINSOCK1
#include <winsock.h>
#else
#ifndef USE_WINSOCK
#include <arpa/inet.h>
#ifdef __APPLE_CC__
#ifndef _BSD_SOCKLEN_T_
#define _BSD_SOCKLEN_T_
#endif //_BSD_SOCKLEN_T_
#endif //__APPLE_CC__
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
#include <sys/ioctl.h>
#endif //normal BSD API
#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON) #include <errno.h>
#include <sys/time.h>
#endif // UNIXCOMMON #if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
#include <sys/time.h>
#endif // UNIXCOMMON
#endif
#ifdef USE_WINSOCK #ifdef USE_WINSOCK
// some undefined under win32 // some undefined under win32
@@ -146,6 +152,7 @@ static UINT8 UPNP_support = TRUE;
#define close closesocket #define close closesocket
#endif #endif
#include "i_addrinfo.h"
#define DEFAULTPORT "5029" #define DEFAULTPORT "5029"
#if defined (USE_WINSOCK) #if defined (USE_WINSOCK)
@@ -162,6 +169,10 @@ typedef unsigned long SOCKET_TYPE;
#define IPV6_MULTICAST_ADDRESS "ff15::57e1:1a12" #define IPV6_MULTICAST_ADDRESS "ff15::57e1:1a12"
#ifdef USE_WINSOCK1
typedef int socklen_t;
#endif
typedef struct typedef struct
{ {
mysockaddr_t address; mysockaddr_t address;
@@ -221,8 +232,9 @@ static char *get_WSAErrorStr(int e)
#define strerror get_WSAErrorStr #define strerror get_WSAErrorStr
#endif #endif
#ifdef USE_WINSOCK #ifdef USE_WINSOCK2
#define inet_ntop inet_ntopA #define inet_ntop inet_ntopA
#define HAVE_NTOP
static const char* inet_ntopA(short af, const void *cp, char *buf, socklen_t len) static const char* inet_ntopA(short af, const void *cp, char *buf, socklen_t len)
{ {
DWORD Dlen = len, AFlen = 0; DWORD Dlen = len, AFlen = 0;
@@ -266,6 +278,8 @@ static const char* inet_ntopA(short af, const void *cp, char *buf, socklen_t len
return NULL; return NULL;
return buf; return buf;
} }
#elif !defined (USE_WINSOCK1)
#define HAVE_NTOP
#endif #endif
#ifdef HAVE_MINIUPNPC // based on old XChat patch #ifdef HAVE_MINIUPNPC // based on old XChat patch
@@ -346,6 +360,7 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk)
static char s[64]; // 255.255.255.255:65535 or static char s[64]; // 255.255.255.255:65535 or
// [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]:65535 // [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]:65535
#ifdef HAVE_NTOP
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
int v6 = (sk->any.sa_family == AF_INET6); int v6 = (sk->any.sa_family == AF_INET6);
#else #else
@@ -383,7 +398,15 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk)
#endif #endif
else if(sk->any.sa_family == AF_INET && sk->ip4.sin_port != 0) else if(sk->any.sa_family == AF_INET && sk->ip4.sin_port != 0)
strcat(s, va(":%d", ntohs(sk->ip4.sin_port))); strcat(s, va(":%d", ntohs(sk->ip4.sin_port)));
#else
if (sk->any.sa_family == AF_INET)
{
strcpy(s, inet_ntoa(sk->ip4.sin_addr));
if (sk->ip4.sin_port != 0) strcat(s, va(":%d", ntohs(sk->ip4.sin_port)));
}
else
sprintf(s, "Unknown type");
#endif
return s; return s;
} }
@@ -845,11 +868,15 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
#ifdef USE_WINSOCK #ifdef USE_WINSOCK
{ // Alam_GBC: disable the new UDP connection reset behavior for Win2k and up { // Alam_GBC: disable the new UDP connection reset behavior for Win2k and up
#ifdef USE_WINSOCK2
DWORD dwBytesReturned = 0; DWORD dwBytesReturned = 0;
BOOL bfalse = FALSE; BOOL bfalse = FALSE;
rc = WSAIoctl(s, SIO_UDP_CONNRESET, &bfalse, sizeof(bfalse), rc = WSAIoctl(s, SIO_UDP_CONNRESET, &bfalse, sizeof(bfalse),
NULL, 0, &dwBytesReturned, NULL, NULL); NULL, 0, &dwBytesReturned, NULL, NULL);
#else
unsigned long falseval = false;
rc = ioctl(s, SIO_UDP_CONNRESET, &falseval);
#endif
if (rc == -1) if (rc == -1)
{ {
e = errno; e = errno;
@@ -1019,7 +1046,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
static boolean UDP_Socket(void) static boolean UDP_Socket(void)
{ {
size_t s; size_t s;
addrinfo_t *ai, *runp, hints; struct my_addrinfo *ai, *runp, hints;
int gaie; int gaie;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
const INT32 b_ipv6 = M_CheckParm("-ipv6"); const INT32 b_ipv6 = M_CheckParm("-ipv6");
@@ -1048,7 +1075,7 @@ static boolean UDP_Socket(void)
{ {
while (M_IsNextParm()) while (M_IsNextParm())
{ {
gaie = getaddrinfo(M_GetNextParm(), serv, &hints, &ai); gaie = I_getaddrinfo(M_GetNextParm(), serv, &hints, &ai);
if (gaie == 0) if (gaie == 0)
{ {
runp = ai; runp = ai;
@@ -1062,13 +1089,13 @@ static boolean UDP_Socket(void)
} }
runp = runp->ai_next; runp = runp->ai_next;
} }
freeaddrinfo(ai); I_freeaddrinfo(ai);
} }
} }
} }
else else
{ {
gaie = getaddrinfo("0.0.0.0", serv, &hints, &ai); gaie = I_getaddrinfo("0.0.0.0", serv, &hints, &ai);
if (gaie == 0) if (gaie == 0)
{ {
runp = ai; runp = ai;
@@ -1089,7 +1116,7 @@ static boolean UDP_Socket(void)
} }
runp = runp->ai_next; runp = runp->ai_next;
} }
freeaddrinfo(ai); I_freeaddrinfo(ai);
} }
} }
@@ -1101,7 +1128,7 @@ static boolean UDP_Socket(void)
{ {
while (M_IsNextParm()) while (M_IsNextParm())
{ {
gaie = getaddrinfo(M_GetNextParm(), serv, &hints, &ai); gaie = I_getaddrinfo(M_GetNextParm(), serv, &hints, &ai);
if (gaie == 0) if (gaie == 0)
{ {
runp = ai; runp = ai;
@@ -1115,13 +1142,13 @@ static boolean UDP_Socket(void)
} }
runp = runp->ai_next; runp = runp->ai_next;
} }
freeaddrinfo(ai); I_freeaddrinfo(ai);
} }
} }
} }
else else
{ {
gaie = getaddrinfo("::", serv, &hints, &ai); gaie = I_getaddrinfo("::", serv, &hints, &ai);
if (gaie == 0) if (gaie == 0)
{ {
runp = ai; runp = ai;
@@ -1135,7 +1162,7 @@ static boolean UDP_Socket(void)
} }
runp = runp->ai_next; runp = runp->ai_next;
} }
freeaddrinfo(ai); I_freeaddrinfo(ai);
} }
} }
} }
@@ -1189,7 +1216,11 @@ boolean I_InitTcpDriver(void)
if (!init_tcp_driver) if (!init_tcp_driver)
{ {
#ifdef USE_WINSOCK #ifdef USE_WINSOCK
#ifdef USE_WINSOCK2
const WORD VerNeed = MAKEWORD(2,2); const WORD VerNeed = MAKEWORD(2,2);
#else
const WORD VerNeed = MAKEWORD(1,1);
#endif
WSADATA WSAData; WSADATA WSAData;
const int WSAresult = WSAStartup(VerNeed, &WSAData); const int WSAresult = WSAStartup(VerNeed, &WSAData);
if (WSAresult != 0) if (WSAresult != 0)
@@ -1216,14 +1247,21 @@ boolean I_InitTcpDriver(void)
if (WSAresult != WSAVERNOTSUPPORTED) if (WSAresult != WSAVERNOTSUPPORTED)
CONS_Debug(DBG_NETPLAY, "WinSock(TCP/IP) error: %s\n",WSError); CONS_Debug(DBG_NETPLAY, "WinSock(TCP/IP) error: %s\n",WSError);
} }
#ifdef USE_WINSOCK2
if (LOBYTE(WSAData.wVersion) != 2 || if(LOBYTE(WSAData.wVersion) != 2 ||
HIBYTE(WSAData.wVersion) != 2) HIBYTE(WSAData.wVersion) != 2)
{ {
WSACleanup(); WSACleanup();
CONS_Debug(DBG_NETPLAY, "No WinSock(TCP/IP) 2.2 driver detected\n"); CONS_Debug(DBG_NETPLAY, "No WinSock(TCP/IP) 2.2 driver detected\n");
} }
#else
if (LOBYTE(WSAData.wVersion) != 1 ||
HIBYTE(WSAData.wVersion) != 1)
{
WSACleanup();
CONS_Debug(DBG_NETPLAY, "No WinSock(TCP/IP) 1.1 driver detected\n");
}
#endif
CONS_Debug(DBG_NETPLAY, "WinSock description: %s\n",WSAData.szDescription); CONS_Debug(DBG_NETPLAY, "WinSock description: %s\n",WSAData.szDescription);
CONS_Debug(DBG_NETPLAY, "WinSock System Status: %s\n",WSAData.szSystemStatus); CONS_Debug(DBG_NETPLAY, "WinSock System Status: %s\n",WSAData.szSystemStatus);
#endif #endif
@@ -1263,6 +1301,7 @@ void I_ShutdownTcpDriver(void)
CONS_Printf("I_ShutdownTcpDriver: "); CONS_Printf("I_ShutdownTcpDriver: ");
#ifdef USE_WINSOCK #ifdef USE_WINSOCK
WS_addrinfocleanup();
WSACleanup(); WSACleanup();
#endif #endif
CONS_Printf("shut down\n"); CONS_Printf("shut down\n");
@@ -1271,24 +1310,24 @@ void I_ShutdownTcpDriver(void)
static boolean SOCK_GetAddr(struct sockaddr_in *sin, const char *address, const char *port, boolean test) static boolean SOCK_GetAddr(struct sockaddr_in *sin, const char *address, const char *port, boolean test)
{ {
addrinfo_t *ai = NULL, *runp, hints; struct my_addrinfo *ai = NULL, *runp, hints;
int gaie; int gaie;
size_t i; size_t i;
if (!port || !port[0]) if (!port || !port[0])
port = DEFAULTPORT; port = DEFAULTPORT;
memset(&hints, 0x00, sizeof (hints)); memset (&hints, 0x00, sizeof (hints));
hints.ai_flags = AI_ADDRCONFIG; hints.ai_flags = AI_ADDRCONFIG;
hints.ai_family = AF_UNSPEC; hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_DGRAM; hints.ai_socktype = SOCK_DGRAM;
hints.ai_protocol = IPPROTO_UDP; hints.ai_protocol = IPPROTO_UDP;
gaie = getaddrinfo(address, port, &hints, &ai); gaie = I_getaddrinfo(address, port, &hints, &ai);
if (gaie != 0) if (gaie != 0)
{ {
freeaddrinfo(ai); I_freeaddrinfo(ai);
return false; return false;
} }
@@ -1317,7 +1356,7 @@ static boolean SOCK_GetAddr(struct sockaddr_in *sin, const char *address, const
if (runp != NULL) if (runp != NULL)
memcpy(sin, runp->ai_addr, runp->ai_addrlen); memcpy(sin, runp->ai_addr, runp->ai_addrlen);
freeaddrinfo(ai); I_freeaddrinfo(ai);
return (runp != NULL); return (runp != NULL);
} }
@@ -1515,7 +1554,7 @@ static boolean SOCK_SetUnbanTime(time_t timestamp)
static boolean SOCK_SetBanAddress(const char *address, const char *mask) static boolean SOCK_SetBanAddress(const char *address, const char *mask)
{ {
addrinfo_t *ai, *runp, hints; struct my_addrinfo *ai, *runp, hints;
int gaie; int gaie;
if (!address) if (!address)
@@ -1527,7 +1566,7 @@ static boolean SOCK_SetBanAddress(const char *address, const char *mask)
hints.ai_socktype = SOCK_DGRAM; hints.ai_socktype = SOCK_DGRAM;
hints.ai_protocol = IPPROTO_UDP; hints.ai_protocol = IPPROTO_UDP;
gaie = getaddrinfo(address, "0", &hints, &ai); gaie = I_getaddrinfo(address, "0", &hints, &ai);
if (gaie != 0) if (gaie != 0)
return false; return false;
@@ -1572,7 +1611,7 @@ static boolean SOCK_SetBanAddress(const char *address, const char *mask)
runp = runp->ai_next; runp = runp->ai_next;
} }
freeaddrinfo(ai); I_freeaddrinfo(ai);
return true; return true;
} }
@@ -1621,6 +1660,8 @@ boolean I_InitTcpNetwork(void)
// FIXME: for dedicated server, numnodes needs to be set to 0 upon start // FIXME: for dedicated server, numnodes needs to be set to 0 upon start
if (dedicated) if (dedicated)
doomcom->numnodes = 0; doomcom->numnodes = 0;
/* else if (M_IsNextParm())
doomcom->numnodes = (INT16)atoi(M_GetNextParm());*/
else else
doomcom->numnodes = 1; doomcom->numnodes = 1;
@@ -1705,3 +1746,5 @@ boolean I_InitTcpNetwork(void)
return ret; return ret;
} }
#include "i_addrinfo.c"
+1 -1
View File
@@ -94,8 +94,8 @@ INT32 VID_SetMode(INT32 modenum);
\return name of video mode \return name of video mode
*/ */
const char *VID_GetModeName(INT32 modenum); const char *VID_GetModeName(INT32 modenum);
void VID_PrepareModeList(void); /// note hack for SDL
void VID_PrepareModeList(void);
/** \brief can video system do fullscreen /** \brief can video system do fullscreen
*/ */
-5
View File
@@ -10,14 +10,9 @@
/// \file k_director.h /// \file k_director.h
/// \brief SRB2kart automatic spectator camera. /// \brief SRB2kart automatic spectator camera.
#ifndef __K_DIRECTOR__
#define __K_DIRECTOR__
boolean K_DirectorIsAvailable(void); boolean K_DirectorIsAvailable(void);
void K_InitDirector(void); void K_InitDirector(void);
void K_UpdateDirector(void); void K_UpdateDirector(void);
void K_DrawDirectorDebugger(void); void K_DrawDirectorDebugger(void);
void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source); void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source);
void K_ToggleDirector(void); void K_ToggleDirector(void);
#endif
+1 -1
View File
@@ -4333,7 +4333,7 @@ static void K_drawInput(void)
target = 0; target = 0;
else // turning of multiple strengths! else // turning of multiple strengths!
{ {
target = ((abs(cmd->driftturn) - 1)/200)+1; // was 125, do we need another toggle for this? Zzz... target = ((abs(cmd->driftturn) - 1)/125)+1;
if (target > 4) if (target > 4)
target = 4; target = 4;
if (cmd->driftturn < 0) if (cmd->driftturn < 0)
-11
View File
@@ -1,14 +1,3 @@
// SONIC ROBO BLAST 2 KART SATURN
//-----------------------------------------------------------------------------
// Copyright (C) 2025 by Indev.
//
// 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 k_stats.c
/// \brief Game statistics handling
#include "k_stats.h" #include "k_stats.h"
#include "doomstat.h" #include "doomstat.h"
#include "g_game.h" #include "g_game.h"
-11
View File
@@ -1,14 +1,3 @@
// SONIC ROBO BLAST 2 KART SATURN
//-----------------------------------------------------------------------------
// Copyright (C) 2025 by Indev.
//
// 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 k_stats.h
/// \brief Game statistics handling
#ifndef __K_STATS__ #ifndef __K_STATS__
#define __K_STATS__ #define __K_STATS__
+7 -21
View File
@@ -377,9 +377,7 @@ static int lib_pSpawnMobj(lua_State *L)
NOHUD NOHUD
if (type >= NUMMOBJTYPES) if (type >= NUMMOBJTYPES)
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1); return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
mobj_t *th = P_SpawnMobj(x, y, z, type); LUA_PushUserdata(L, P_SpawnMobj(x, y, z, type), META_MOBJ);
th->islocal = !hook_important;
LUA_PushUserdata(L, th, META_MOBJ);
return 1; return 1;
} }
@@ -405,9 +403,7 @@ static int lib_pSpawnMissile(lua_State *L)
return LUA_ErrInvalid(L, "mobj_t"); return LUA_ErrInvalid(L, "mobj_t");
if (type >= NUMMOBJTYPES) if (type >= NUMMOBJTYPES)
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1); return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
mobj_t *th = P_SpawnMissile(source, dest, type); LUA_PushUserdata(L, P_SpawnMissile(source, dest, type), META_MOBJ);
th->islocal = !hook_important;
LUA_PushUserdata(L, th, META_MOBJ);
return 1; return 1;
} }
@@ -424,9 +420,7 @@ static int lib_pSpawnXYZMissile(lua_State *L)
return LUA_ErrInvalid(L, "mobj_t"); return LUA_ErrInvalid(L, "mobj_t");
if (type >= NUMMOBJTYPES) if (type >= NUMMOBJTYPES)
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1); return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
mobj_t *th = P_SpawnXYZMissile(source, dest, type, x, y, z); LUA_PushUserdata(L, P_SpawnXYZMissile(source, dest, type, x, y, z), META_MOBJ);
th->islocal = !hook_important;
LUA_PushUserdata(L, th, META_MOBJ);
return 1; return 1;
} }
@@ -445,9 +439,7 @@ static int lib_pSpawnPointMissile(lua_State *L)
return LUA_ErrInvalid(L, "mobj_t"); return LUA_ErrInvalid(L, "mobj_t");
if (type >= NUMMOBJTYPES) if (type >= NUMMOBJTYPES)
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1); return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
mobj_t *th = P_SpawnPointMissile(source, xa, ya, za, type, x, y, z); LUA_PushUserdata(L, P_SpawnPointMissile(source, xa, ya, za, type, x, y, z), META_MOBJ);
th->islocal = !hook_important;
LUA_PushUserdata(L, th, META_MOBJ);
return 1; return 1;
} }
@@ -464,9 +456,7 @@ static int lib_pSpawnAlteredDirectionMissile(lua_State *L)
return LUA_ErrInvalid(L, "mobj_t"); return LUA_ErrInvalid(L, "mobj_t");
if (type >= NUMMOBJTYPES) if (type >= NUMMOBJTYPES)
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1); return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
mobj_t *th = P_SpawnAlteredDirectionMissile(source, type, x, y, z, shiftingAngle); LUA_PushUserdata(L, P_SpawnAlteredDirectionMissile(source, type, x, y, z, shiftingAngle), META_MOBJ);
th->islocal = !hook_important;
LUA_PushUserdata(L, th, META_MOBJ);
return 1; return 1;
} }
@@ -495,9 +485,7 @@ static int lib_pSPMAngle(lua_State *L)
return LUA_ErrInvalid(L, "mobj_t"); return LUA_ErrInvalid(L, "mobj_t");
if (type >= NUMMOBJTYPES) if (type >= NUMMOBJTYPES)
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1); return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
mobj_t *th = P_SPMAngle(source, type, angle, allowaim, flags2); LUA_PushUserdata(L, P_SPMAngle(source, type, angle, allowaim, flags2), META_MOBJ);
th->islocal = !hook_important;
LUA_PushUserdata(L, th, META_MOBJ);
return 1; return 1;
} }
@@ -511,9 +499,7 @@ static int lib_pSpawnPlayerMissile(lua_State *L)
return LUA_ErrInvalid(L, "mobj_t"); return LUA_ErrInvalid(L, "mobj_t");
if (type >= NUMMOBJTYPES) if (type >= NUMMOBJTYPES)
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1); return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
mobj_t *th = P_SpawnPlayerMissile(source, type, flags2); LUA_PushUserdata(L, P_SpawnPlayerMissile(source, type, flags2), META_MOBJ);
th->islocal = !hook_important;
LUA_PushUserdata(L, th, META_MOBJ);
return 1; return 1;
} }
-6
View File
@@ -10,9 +10,6 @@
/// \file lua_hook.h /// \file lua_hook.h
/// \brief hooks for Lua scripting /// \brief hooks for Lua scripting
#ifndef __LUA_HOOK__
#define __LUA_HOOK__
#include "r_defs.h" #include "r_defs.h"
#include "d_player.h" #include "d_player.h"
#include "s_sound.h" #include "s_sound.h"
@@ -109,7 +106,6 @@ ENUM (STRING_HOOK);
extern boolean hook_cmd_running; // This is used by PlayerCmd and lua_playerlib to prevent anything from being wirtten to player while we run PlayerCmd. extern boolean hook_cmd_running; // This is used by PlayerCmd and lua_playerlib to prevent anything from being wirtten to player while we run PlayerCmd.
extern int hook_defrosting; extern int hook_defrosting;
extern bool hook_important;
void LUA_HookVoid(int hook); void LUA_HookVoid(int hook);
void LUA_HookHUD(int hook, huddrawlist_h drawlist); void LUA_HookHUD(int hook, huddrawlist_h drawlist);
@@ -150,5 +146,3 @@ boolean LUA_HookPlayerSquish(player_t *player, mobj_t *inflictor, mobj_t *source
// (note: function format in lua doesn't include maxresults, so its function(result, gametype, secondgametype, prevmap) // (note: function format in lua doesn't include maxresults, so its function(result, gametype, secondgametype, prevmap)
// to get maxresults use #result) // to get maxresults use #result)
void LUA_HookSetupVote(INT16 result[], INT16 maxresults, UINT8 gt, UINT8 secondgt); void LUA_HookSetupVote(INT16 result[], INT16 maxresults, UINT8 gt, UINT8 secondgt);
#endif //__LUA_HOOK__
+4 -26
View File
@@ -19,7 +19,6 @@
#include "b_bot.h" #include "b_bot.h"
#include "z_zone.h" #include "z_zone.h"
#include "m_perfstats.h" #include "m_perfstats.h"
#include "w_wad.h"
#include "lua_script.h" #include "lua_script.h"
#include "lua_libs.h" #include "lua_libs.h"
@@ -40,20 +39,14 @@ LIST (stringHookNames, STRING_HOOK_LIST);
#undef LIST #undef LIST
typedef struct {
int id;
bool important;
} hookinfo_t;
typedef struct { typedef struct {
int numHooks; int numHooks;
hookinfo_t *ids; int *ids;
} hook_t; } hook_t;
typedef struct { typedef struct {
int numGeneric; int numGeneric;
int ref; int ref;
bool important;
} stringhook_t; } stringhook_t;
static hook_t hookIds[HOOK(MAX)]; static hook_t hookIds[HOOK(MAX)];
@@ -63,8 +56,6 @@ static hook_t mobjHookIds[NUMMOBJTYPES][MOBJ_HOOK(MAX)];
// Lua tables are used to lookup string hook ids. // Lua tables are used to lookup string hook ids.
static stringhook_t stringHooks[STRING_HOOK(MAX)]; static stringhook_t stringHooks[STRING_HOOK(MAX)];
bool hook_important = true;
// This will be indexed by hook id, the value of which fetches the registry. // This will be indexed by hook id, the value of which fetches the registry.
static int * hookRefs; static int * hookRefs;
static int nextid; static int nextid;
@@ -118,11 +109,7 @@ static void get_table(lua_State *L)
FUNCINLINE static ATTRINLINE void add_hook_to_table(lua_State *L, int n) FUNCINLINE static ATTRINLINE void add_hook_to_table(lua_State *L, int n)
{ {
lua_newtable(L);
lua_pushnumber(L, nextid); lua_pushnumber(L, nextid);
lua_rawseti(L, -2, 1);
lua_pushboolean(L, wadfiles[numwadfiles-1]->important);
lua_rawseti(L, -2, 2);
lua_rawseti(L, -2, n); lua_rawseti(L, -2, n);
} }
@@ -193,8 +180,7 @@ FUNCINLINE static ATTRINLINE void add_hook(hook_t *map)
{ {
Z_Realloc(map->ids, (map->numHooks + 1) * sizeof *map->ids, Z_Realloc(map->ids, (map->numHooks + 1) * sizeof *map->ids,
PU_STATIC, &map->ids); PU_STATIC, &map->ids);
map->ids[map->numHooks].important = wadfiles[numwadfiles-1]->important; map->ids[map->numHooks++] = nextid;
map->ids[map->numHooks++].id = nextid;
} }
FUNCINLINE static ATTRINLINE void add_mobj_hook(lua_State *L, int hook_type) FUNCINLINE static ATTRINLINE void add_mobj_hook(lua_State *L, int hook_type)
@@ -301,7 +287,6 @@ struct Hook_State {
const char * string;/* used to fetch table, ran first if set */ const char * string;/* used to fetch table, ran first if set */
int top;/* index of last argument passed to hook */ int top;/* index of last argument passed to hook */
int id;/* id to fetch ref */ int id;/* id to fetch ref */
boolean important;/* is this hook from local addon */
int values;/* num arguments passed to hook */ int values;/* num arguments passed to hook */
int results;/* num values returned by hook */ int results;/* num values returned by hook */
Hook_Callback results_handler;/* callback when hook successfully returns */ Hook_Callback results_handler;/* callback when hook successfully returns */
@@ -431,29 +416,22 @@ FUNCINLINE static ATTRINLINE void init_hook_call
hook->results_handler = results_handler; hook->results_handler = results_handler;
} }
FUNCINLINE static ATTRINLINE void get_hook(Hook_State *hook, const hookinfo_t *ids, int n) FUNCINLINE static ATTRINLINE void get_hook(Hook_State *hook, const int *ids, int n)
{ {
hook->id = ids[n].id; hook->id = ids[n];
hook->important = ids[n].important;
lua_getref(gL, hookRefs[hook->id]); lua_getref(gL, hookRefs[hook->id]);
} }
FUNCINLINE static ATTRINLINE void get_hook_from_table(Hook_State *hook, int n) FUNCINLINE static ATTRINLINE void get_hook_from_table(Hook_State *hook, int n)
{ {
lua_rawgeti(gL, -1, n); lua_rawgeti(gL, -1, n);
lua_rawgeti(gL, -1, 1);
hook->id = lua_tonumber(gL, -1); hook->id = lua_tonumber(gL, -1);
lua_pop(gL, 1); lua_pop(gL, 1);
lua_rawgeti(gL, -2, 2);
hook->important = lua_toboolean(gL, -1);
lua_pop(gL, 2);
lua_getref(gL, hookRefs[hook->id]); lua_getref(gL, hookRefs[hook->id]);
} }
static int call_single_hook_no_copy(Hook_State *hook) static int call_single_hook_no_copy(Hook_State *hook)
{ {
hook_important = hook->important;
if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0) if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0)
{ {
if (hook->results > 0) if (hook->results > 0)
-5
View File
@@ -10,9 +10,6 @@
/// \file lua_libs.h /// \file lua_libs.h
/// \brief libraries for Lua scripting /// \brief libraries for Lua scripting
#ifndef __LUA_LIBS__
#define __LUA_LIBS__
#include "doomtype.h" #include "doomtype.h"
#include "blua/lua.h" #include "blua/lua.h"
@@ -76,5 +73,3 @@ int LUA_ThinkerLib(lua_State *L);
int LUA_MapLib(lua_State *L); int LUA_MapLib(lua_State *L);
int LUA_BlockmapLib(lua_State *L); int LUA_BlockmapLib(lua_State *L);
int LUA_HudLib(lua_State *L); int LUA_HudLib(lua_State *L);
#endif //__LUA_LIBS__
+15 -59
View File
@@ -797,12 +797,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
{ {
mobj_t *mobj = *((mobj_t **)lua_touserdata(gL, myindex)); mobj_t *mobj = *((mobj_t **)lua_touserdata(gL, myindex));
if (!mobj) if (!mobj)
{
WRITEUINT8(*p, ARCH_NULL); WRITEUINT8(*p, ARCH_NULL);
return 3; else {
}
else
{
WRITEUINT8(*p, ARCH_MOBJ); WRITEUINT8(*p, ARCH_MOBJ);
WRITEUINT32(*p, mobj->mobjnum); WRITEUINT32(*p, mobj->mobjnum);
} }
@@ -812,12 +808,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
{ {
player_t *player = *((player_t **)lua_touserdata(gL, myindex)); player_t *player = *((player_t **)lua_touserdata(gL, myindex));
if (!player) if (!player)
{
WRITEUINT8(*p, ARCH_NULL); WRITEUINT8(*p, ARCH_NULL);
return 3; else {
}
else
{
WRITEUINT8(*p, ARCH_PLAYER); WRITEUINT8(*p, ARCH_PLAYER);
WRITEUINT8(*p, player - players); WRITEUINT8(*p, player - players);
} }
@@ -827,12 +819,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
{ {
mapthing_t *mapthing = *((mapthing_t **)lua_touserdata(gL, myindex)); mapthing_t *mapthing = *((mapthing_t **)lua_touserdata(gL, myindex));
if (!mapthing) if (!mapthing)
{
WRITEUINT8(*p, ARCH_NULL); WRITEUINT8(*p, ARCH_NULL);
return 3; else {
}
else
{
WRITEUINT8(*p, ARCH_MAPTHING); WRITEUINT8(*p, ARCH_MAPTHING);
WRITEUINT16(*p, mapthing - mapthings); WRITEUINT16(*p, mapthing - mapthings);
} }
@@ -842,12 +830,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
{ {
vertex_t *vertex = *((vertex_t **)lua_touserdata(gL, myindex)); vertex_t *vertex = *((vertex_t **)lua_touserdata(gL, myindex));
if (!vertex) if (!vertex)
{
WRITEUINT8(*p, ARCH_NULL); WRITEUINT8(*p, ARCH_NULL);
return 3; else {
}
else
{
WRITEUINT8(*p, ARCH_VERTEX); WRITEUINT8(*p, ARCH_VERTEX);
WRITEUINT16(*p, vertex - vertexes); WRITEUINT16(*p, vertex - vertexes);
} }
@@ -857,12 +841,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
{ {
line_t *line = *((line_t **)lua_touserdata(gL, myindex)); line_t *line = *((line_t **)lua_touserdata(gL, myindex));
if (!line) if (!line)
{
WRITEUINT8(*p, ARCH_NULL); WRITEUINT8(*p, ARCH_NULL);
return 3; else {
}
else
{
WRITEUINT8(*p, ARCH_LINE); WRITEUINT8(*p, ARCH_LINE);
WRITEUINT16(*p, line - lines); WRITEUINT16(*p, line - lines);
} }
@@ -872,12 +852,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
{ {
side_t *side = *((side_t **)lua_touserdata(gL, myindex)); side_t *side = *((side_t **)lua_touserdata(gL, myindex));
if (!side) if (!side)
{
WRITEUINT8(*p, ARCH_NULL); WRITEUINT8(*p, ARCH_NULL);
return 3; else {
}
else
{
WRITEUINT8(*p, ARCH_SIDE); WRITEUINT8(*p, ARCH_SIDE);
WRITEUINT16(*p, side - sides); WRITEUINT16(*p, side - sides);
} }
@@ -887,12 +863,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
{ {
subsector_t *subsector = *((subsector_t **)lua_touserdata(gL, myindex)); subsector_t *subsector = *((subsector_t **)lua_touserdata(gL, myindex));
if (!subsector) if (!subsector)
{
WRITEUINT8(*p, ARCH_NULL); WRITEUINT8(*p, ARCH_NULL);
return 3; else {
}
else
{
WRITEUINT8(*p, ARCH_SUBSECTOR); WRITEUINT8(*p, ARCH_SUBSECTOR);
WRITEUINT16(*p, subsector - subsectors); WRITEUINT16(*p, subsector - subsectors);
} }
@@ -902,12 +874,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
{ {
sector_t *sector = *((sector_t **)lua_touserdata(gL, myindex)); sector_t *sector = *((sector_t **)lua_touserdata(gL, myindex));
if (!sector) if (!sector)
{
WRITEUINT8(*p, ARCH_NULL); WRITEUINT8(*p, ARCH_NULL);
return 3; else {
}
else
{
WRITEUINT8(*p, ARCH_SECTOR); WRITEUINT8(*p, ARCH_SECTOR);
WRITEUINT16(*p, sector - sectors); WRITEUINT16(*p, sector - sectors);
} }
@@ -917,12 +885,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
{ {
pslope_t *slope = *((pslope_t **)lua_touserdata(gL, myindex)); pslope_t *slope = *((pslope_t **)lua_touserdata(gL, myindex));
if (!slope) if (!slope)
{
WRITEUINT8(*p, ARCH_NULL); WRITEUINT8(*p, ARCH_NULL);
return 3; else {
}
else
{
WRITEUINT8(*p, ARCH_SLOPE); WRITEUINT8(*p, ARCH_SLOPE);
WRITEUINT16(*p, slope->id); WRITEUINT16(*p, slope->id);
} }
@@ -932,12 +896,8 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
{ {
mapheader_t *header = *((mapheader_t **)lua_touserdata(gL, myindex)); mapheader_t *header = *((mapheader_t **)lua_touserdata(gL, myindex));
if (!header) if (!header)
{
WRITEUINT8(*p, ARCH_NULL); WRITEUINT8(*p, ARCH_NULL);
return 3; else {
}
else
{
WRITEUINT8(*p, ARCH_MAPHEADER); WRITEUINT8(*p, ARCH_MAPHEADER);
WRITEUINT16(*p, header - *mapheaderinfo); WRITEUINT16(*p, header - *mapheaderinfo);
} }
@@ -1043,23 +1003,19 @@ static void ArchiveTables(UINT8 **p)
e = ArchiveValue(p, TABLESINDEX, -2); // key should be either a number or a string, ArchiveValue can handle this. e = ArchiveValue(p, TABLESINDEX, -2); // key should be either a number or a string, ArchiveValue can handle this.
if (e == 2) // invalid key type (function, thread, lightuserdata, or anything we don't recognise) if (e == 2) // invalid key type (function, thread, lightuserdata, or anything we don't recognise)
{ {
CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -2), luaL_typename(gL, -2), i); lua_pushvalue(gL, -2);
} CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -1), luaL_typename(gL, -1), i);
else if (e == 3) // nil key due to invalid userdata. NOT an error.
{
lua_pop(gL, 1); lua_pop(gL, 1);
continue;
} }
// Write value // Write value
e = ArchiveValue(p, TABLESINDEX, -1); e = ArchiveValue(p, TABLESINDEX, -1);
if (e == 1) if (e == 1)
{
n++; // the table contained a new table we'll have to archive. :( n++; // the table contained a new table we'll have to archive. :(
}
else if (e == 2) // invalid value type else if (e == 2) // invalid value type
{ {
CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -2), luaL_typename(gL, -1)); lua_pushvalue(gL, -2);
CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -1), luaL_typename(gL, -1));
lua_pop(gL, 1);
} }
lua_pop(gL, 1); lua_pop(gL, 1);
-11
View File
@@ -1,14 +1,3 @@
// SONIC ROBO BLAST 2 KART SATURN
//-----------------------------------------------------------------------------
// Copyright (C) 2025 by Indev.
//
// 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 lua_udatalib.c
/// \brief Implementation of lua userdata object metatables based on getter/setter functions
#include "doomtype.h" #include "doomtype.h"
#include "m_fixed.h" #include "m_fixed.h"
#include "lua_udatalib.h" #include "lua_udatalib.h"
+1 -12
View File
@@ -1,14 +1,3 @@
// SONIC ROBO BLAST 2 KART SATURN
//-----------------------------------------------------------------------------
// Copyright (C) 2025 by Indev.
//
// 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 lua_udatalib.h
/// \brief Implementation of lua userdata object metatables based on getter/setter functions
#ifndef __LUA_UDATALIB_H__ #ifndef __LUA_UDATALIB_H__
#define __LUA_UDATALIB_H__ #define __LUA_UDATALIB_H__
@@ -111,4 +100,4 @@ void udatalib_addfields(lua_State *L, int mt, const udata_field_t fields[]);
return 0; \ return 0; \
} }
#endif #endif
-5
View File
@@ -10,9 +10,6 @@
/// \file m_cond.h /// \file m_cond.h
/// \brief Unlockable condition system for SRB2 version 2.1 /// \brief Unlockable condition system for SRB2 version 2.1
#ifndef __M_COND__
#define __M_COND__
#include "doomdef.h" #include "doomdef.h"
// -------- // --------
@@ -185,5 +182,3 @@ UINT8 M_GotLowEnoughTime(INT32 tictime);
//UINT8 M_GotHighEnoughRings(INT32 trings); //UINT8 M_GotHighEnoughRings(INT32 trings);
#define M_Achieved(a) ((a) >= MAXCONDITIONSETS || conditionSets[a].achieved) #define M_Achieved(a) ((a) >= MAXCONDITIONSETS || conditionSets[a].achieved)
#endif //__M_COND__
-11
View File
@@ -1,14 +1,3 @@
// SONIC ROBO BLAST 2 KART SATURN
//-----------------------------------------------------------------------------
// Copyright (C) 2025 by Indev.
//
// 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 m_curl.c
/// \brief Common curl-related functions shared across http-mserv and file download
#include "m_curl.h" #include "m_curl.h"
#include "doomtype.h" #include "doomtype.h"
#include "i_system.h" // I_OutputMsg #include "i_system.h" // I_OutputMsg
-11
View File
@@ -1,14 +1,3 @@
// SONIC ROBO BLAST 2 KART SATURN
//-----------------------------------------------------------------------------
// Copyright (C) 2025 by Indev.
//
// 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 m_curl.h
/// \brief Common curl-related functions shared across http-mserv and file download
#ifndef __M_CURL__ #ifndef __M_CURL__
#define __M_CURL__ #define __M_CURL__
+2 -13
View File
@@ -1,14 +1,3 @@
// SONIC ROBO BLAST 2 KART SATURN
//-----------------------------------------------------------------------------
// Copyright (C) 2025 by Indev.
//
// 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 m_emotes.cpp
/// \brief Chat emotes handling
#include <map> #include <map>
#include <string> #include <string>
#include <sstream> #include <sstream>
@@ -92,7 +81,7 @@ void M_LoadEmotes(UINT16 wadnum)
if (emote_name.size() > MAXEMOTENAME) if (emote_name.size() > MAXEMOTENAME)
{ {
CONS_Alert(CONS_WARNING, "EMOTES: Emote name is too long, truncating. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum); CONS_Alert(CONS_WARNING, "EMOTES: Emote name is too long, truncating. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
emote_name.resize(MAXEMOTENAME); emote_name = emote_name.substr(0, MAXEMOTENAME);
} }
emote = &emotes[emote_name]; emote = &emotes[emote_name];
@@ -139,7 +128,7 @@ void M_LoadEmotes(UINT16 wadnum)
if (framelumpname.size() > 8) if (framelumpname.size() > 8)
{ {
CONS_Alert(CONS_WARNING, "EMOTES: Frame %d name is too long. (file %s, line %d)", numframes, wadfiles[wadnum]->filename, linenum); CONS_Alert(CONS_WARNING, "EMOTES: Frame %d name is too long. (file %s, line %d)", numframes, wadfiles[wadnum]->filename, linenum);
framelumpname.resize(8); framelumpname = framelumpname.substr(0, 8);
} }
std::strncpy(emote->frames[numframes], framelumpname.c_str(), framelumpname.size()+1); std::strncpy(emote->frames[numframes], framelumpname.c_str(), framelumpname.size()+1);
-11
View File
@@ -1,14 +1,3 @@
// SONIC ROBO BLAST 2 KART SATURN
//-----------------------------------------------------------------------------
// Copyright (C) 2025 by Indev.
//
// 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 m_emotes.h
/// \brief Chat emotes handling
#ifndef __M_EMOTES__ #ifndef __M_EMOTES__
#define __M_EMOTES__ #define __M_EMOTES__
+20 -28
View File
@@ -702,13 +702,7 @@ static void M_CheckStringItem(void)
// Just in case // Just in case
memset(menu_text_input_buf, 0, sizeof menu_text_input_buf); memset(menu_text_input_buf, 0, sizeof menu_text_input_buf);
M_TextInputInit(&menuinput, menu_text_input_buf, sizeof menu_text_input_buf);
// special case: name input, cap it to prevent writing outside the textbox
// kinda ugly but itll work
if (cv == &cv_playername)
M_TextInputInit(&menuinput, menu_text_input_buf, MAXPLAYERNAME +1);
else
M_TextInputInit(&menuinput, menu_text_input_buf, sizeof menu_text_input_buf);
M_TextInputSetString(&menuinput, cv->string); M_TextInputSetString(&menuinput, cv->string);
} }
@@ -1438,11 +1432,10 @@ void M_Drawer(void)
V_DrawThinString(vid.dup, vid.height - 20*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, compbranch); V_DrawThinString(vid.dup, vid.height - 20*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, compbranch);
V_DrawThinString(vid.dup, vid.height - 10*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision); V_DrawThinString(vid.dup, vid.height - 10*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision);
#else // Regular build #else // Regular build
#ifdef SATURN_TESTING // ok not regular build lmao, we dont need to show this stuff in Saturn release builds V_DrawThinString(vid.dup, vid.height - 20*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision); // Removeur this for release! im just lazy to make a new flag or smth
V_DrawThinString(vid.dup, vid.height - 20*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision);
#endif
V_DrawThinString(vid.dup, vid.height - 10*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s", VERSIONSTRING)); V_DrawThinString(vid.dup, vid.height - 10*vid.dup, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s", VERSIONSTRING));
#endif #endif
#ifdef HWRENDER #ifdef HWRENDER
if (rendermode == render_opengl) if (rendermode == render_opengl)
V_DrawThinString(0, 0, V_GREENMAP|V_SNAPTOTOP|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, ("Opengl")); V_DrawThinString(0, 0, V_GREENMAP|V_SNAPTOTOP|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, ("Opengl"));
@@ -2719,10 +2712,6 @@ static void M_PrepareLevelSelect(void)
// //
boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt) boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt)
{ {
// invalid mapnum
if (mapnum < -1)
return false;
// Random map! // Random map!
if (mapnum == -1) if (mapnum == -1)
return (gamestate != GS_TIMEATTACK && !modeattacking); return (gamestate != GS_TIMEATTACK && !modeattacking);
@@ -3113,7 +3102,7 @@ static void M_AddonsInternal(void)
break; break;
} }
strlcpy(menupath, pathname, MAXFILEPATH); strlcpy(menupath, pathname, 1024);
menupathindex[(menudepthleft = menudepth-1)] = strlen(menupath) + 1; menupathindex[(menudepthleft = menudepth-1)] = strlen(menupath) + 1;
if (menupath[menupathindex[menudepthleft]-2] != PATHSEP[0]) if (menupath[menupathindex[menudepthleft]-2] != PATHSEP[0])
@@ -3226,9 +3215,9 @@ static void M_DrawTemperature(INT32 x, fixed_t t)
static char *M_AddonsHeaderPath(void) static char *M_AddonsHeaderPath(void)
{ {
UINT32 len; UINT32 len;
static char header[MAXFILEPATH]; static char header[1024];
strlcpy(header, va("%s folder%s", cv_addons_option.string, menupath+menupathindex[menudepth-1]-1), MAXFILEPATH); strlcpy(header, va("%s folder%s", cv_addons_option.string, menupath+menupathindex[menudepth-1]-1), 1024);
len = strlen(header); len = strlen(header);
if (len > 34) if (len > 34)
{ {
@@ -3964,7 +3953,9 @@ static void PrepReplayList(boolean reset)
Lock_search_state(); Lock_search_state();
Z_Free(demolist_all); if (demolist_all)
Z_Free(demolist_all);
demolist_all = Z_Calloc(sizeof(menudemo_t) * sizedirmenu, PU_STATIC, NULL); demolist_all = Z_Calloc(sizeof(menudemo_t) * sizedirmenu, PU_STATIC, NULL);
for (i = 0; i < sizedirmenu; i++) for (i = 0; i < sizedirmenu; i++)
@@ -3982,9 +3973,9 @@ static void PrepReplayList(boolean reset)
else else
{ {
demolist_all[i].type = MD_NOTLOADED; demolist_all[i].type = MD_NOTLOADED;
snprintf(demolist_all[i].filepath, sizeof(demolist_all[i].filepath), // FIXME - do something with buffer sizes. menupath is 1024 chars but filepath is only
// 255 = UINT8 limit. dirmenu entries are restricted to this length (see DIR_LEN). // 256. I'm not really sure what to do here but don't want to leave warnings...
"%s%.255s", menupath, dirmenu[i] + DIR_STRING); snprintf(demolist_all[i].filepath, 255, "%.254s%s", menupath, dirmenu[i] + DIR_STRING);
sprintf(demolist_all[i].title, "....."); sprintf(demolist_all[i].title, ".....");
} }
} }
@@ -4339,7 +4330,7 @@ static void DrawReplayHutReplayInfo(void)
static void M_DrawReplayHut(void) static void M_DrawReplayHut(void)
{ {
INT32 x, y, cursory = 0; INT32 x, y, cursory = 0;
INT32 i; INT16 i;
INT16 replaylistitem = currentMenu->numitems-2; INT16 replaylistitem = currentMenu->numitems-2;
boolean processed_one_this_frame = false; boolean processed_one_this_frame = false;
const INT32 scaledviewheight = (vid.height/vid.dup); const INT32 scaledviewheight = (vid.height/vid.dup);
@@ -4412,7 +4403,7 @@ static void M_DrawReplayHut(void)
V_DrawCenteredString(160, 100, V_ALLOWLOWERCASE, msg); V_DrawCenteredString(160, 100, V_ALLOWLOWERCASE, msg);
} }
for (i = 0; i < (INT32)replayqueryfound; i++) for (i = 0; i < (INT16)replayqueryfound; i++)
{ {
INT32 localy = y+i*10; INT32 localy = y+i*10;
INT32 localx = x; INT32 localx = x;
@@ -7228,7 +7219,7 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade)
if (i == oldval) if (i == oldval)
return; return;
if (i >= 0 && !mapheaderinfo[i]) if(!mapheaderinfo[i])
continue; // Don't allocate the header. That just makes memory usage skyrocket. continue; // Don't allocate the header. That just makes memory usage skyrocket.
} while (!M_CanShowLevelInList(i, cv_newgametype.value)); } while (!M_CanShowLevelInList(i, cv_newgametype.value));
@@ -7266,7 +7257,7 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade)
if (i == oldval) if (i == oldval)
return; return;
if (i >= 0 && !mapheaderinfo[i]) if(!mapheaderinfo[i])
continue; // Don't allocate the header. That just makes memory usage skyrocket. continue; // Don't allocate the header. That just makes memory usage skyrocket.
} while (!M_CanShowLevelInList(i, cv_newgametype.value)); } while (!M_CanShowLevelInList(i, cv_newgametype.value));
@@ -9446,8 +9437,9 @@ static void M_VideoModeMenu(INT32 choice)
memset(modedescs, 0, sizeof(modedescs)); memset(modedescs, 0, sizeof(modedescs));
#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
VID_PrepareModeList(); // FIXME: hack VID_PrepareModeList(); // FIXME: hack
#endif
vidm_nummodes = 0; vidm_nummodes = 0;
vidm_selected = 0; vidm_selected = 0;
nummodes = VID_NumModes(); nummodes = VID_NumModes();
@@ -10338,9 +10330,9 @@ static const char *M_GetDiscordName(discordRequest_t *r)
return ""; return "";
if (cv_discordstreamer.value) if (cv_discordstreamer.value)
return DRPC_HideUsername(r->username); return r->username;
return r->username; return va("%s#%s", r->username, r->discriminator);
} }
// (this goes in k_hud.c when merged into v2) // (this goes in k_hud.c when merged into v2)
+5 -23
View File
@@ -645,20 +645,10 @@ static menuitem_t OP_ControlsMenu[] =
{IT_CALL | IT_STRING, NULL, "Player 3 Controls...", &M_Setup3PControlsMenu, 30}, {IT_CALL | IT_STRING, NULL, "Player 3 Controls...", &M_Setup3PControlsMenu, 30},
{IT_CALL | IT_STRING, NULL, "Player 4 Controls...", &M_Setup4PControlsMenu, 40}, {IT_CALL | IT_STRING, NULL, "Player 4 Controls...", &M_Setup4PControlsMenu, 40},
{IT_SUBMENU | IT_STRING, NULL, "Mouse Options...", &OP_MouseOptionsDef, 55}, {IT_SUBMENU | IT_STRING, NULL, "Mouse Options...", &OP_MouseOptionsDef, 60},
{IT_STRING | IT_CVAR, NULL, "Controls per key", &cv_controlperkey, 75}, {IT_STRING | IT_CVAR, NULL, "Controls per key", &cv_controlperkey, 80},
{IT_STRING | IT_CVAR, NULL, "Digital turn easing", &cv_turnsmooth, 90},
{IT_STRING | IT_CVAR, NULL, "Digital turn easing (P1)", &cv_turnsmooth[0], 85},
{IT_STRING | IT_CVAR, NULL, "Digital turn easing (P2)", &cv_turnsmooth[1], 95},
{IT_STRING | IT_CVAR, NULL, "Digital turn easing (P3)", &cv_turnsmooth[2], 105},
{IT_STRING | IT_CVAR, NULL, "Digital turn easing (P4)", &cv_turnsmooth[3], 115},
// i hate our menus sincerly
{IT_STRING | IT_CVAR, NULL, "Lite Steer (P1)", &cv_litesteer[0], 135},
{IT_STRING | IT_CVAR, NULL, "Lite Steer (P2)", &cv_litesteer[1], 145},
{IT_STRING | IT_CVAR, NULL, "Lite Steer (P3)", &cv_litesteer[2], 155},
{IT_STRING | IT_CVAR, NULL, "Lite Steer (P4)", &cv_litesteer[3], 165},
}; };
static const char* OP_ControlsTooltips[] = static const char* OP_ControlsTooltips[] =
@@ -669,15 +659,7 @@ static const char* OP_ControlsTooltips[] =
"Setup player 4 controls.", "Setup player 4 controls.",
"Options for mouse control.", "Options for mouse control.",
"Allowed amount of controls per key.", "Allowed amount of controls per key.",
"Turn smoothing for non-analog turning (Player 1).", "Turn smoothing for non-analog turning.",
"Turn smoothing for non-analog turning (Player 2).",
"Turn smoothing for non-analog turning (Player 3).",
"Turn smoothing for non-analog turning (Player 4).",
"Hold DOWN on d-pad/keyboard for shallow turns (Player 1).",
"Hold DOWN on d-pad/keyboard for shallow turns (Player 2).",
"Hold DOWN on d-pad/keyboard for shallow turns (Player 3).",
"Hold DOWN on d-pad/keyboard for shallow turns (Player 4).",
}; };
static menuitem_t OP_AllControlsMenu[] = static menuitem_t OP_AllControlsMenu[] =
@@ -2442,7 +2424,7 @@ menu_t OP_MainDef =
NULL NULL
}; };
menu_t OP_ControlsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_ControlsMenu, &OP_MainDef, 40, 15, OP_ControlsTooltips); menu_t OP_ControlsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_ControlsMenu, &OP_MainDef, 60, 30, OP_ControlsTooltips);
//WTF //WTF
menu_t OP_MouseOptionsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_MouseOptionsMenu, &OP_ControlsDef, 60, 30, OP_MouseTooltips); menu_t OP_MouseOptionsDef = DEFAULTMENUSTYLE("M_CONTRO", OP_MouseOptionsMenu, &OP_ControlsDef, 60, 30, OP_MouseTooltips);
menu_t OP_AllControlsDef = CONTROLMENUSTYLE(OP_AllControlsMenu, &OP_ControlsDef); menu_t OP_AllControlsDef = CONTROLMENUSTYLE(OP_AllControlsMenu, &OP_ControlsDef);
+2 -13
View File
@@ -1,14 +1,3 @@
// SONIC ROBO BLAST 2 KART SATURN
//-----------------------------------------------------------------------------
// Copyright (C) 2025 by Indev.
//
// 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 m_textinput.c
/// \brief User text input implementation
#include "m_textinput.h" #include "m_textinput.h"
#include "m_menu.h" // MAXSTRINGLENGTH #include "m_menu.h" // MAXSTRINGLENGTH
#include "v_video.h" #include "v_video.h"
@@ -239,8 +228,8 @@ void M_TextInputClear(textinput_t *input)
void M_TextInputSetString(textinput_t *input, const char *c) void M_TextInputSetString(textinput_t *input, const char *c)
{ {
memset(input->buffer, 0, input->buffer_size); memset(input->buffer, 0, input->buffer_size);
strncpy(input->buffer, c, input->buffer_size); strcpy(input->buffer, c);
input->cursor = input->select = input->length = strlen(input->buffer); input->cursor = input->select = input->length = strlen(c);
} }
static boolean M_TextInputHandleBase(textinput_t *input, INT32 key, boolean emotes) static boolean M_TextInputHandleBase(textinput_t *input, INT32 key, boolean emotes)
-11
View File
@@ -1,14 +1,3 @@
// SONIC ROBO BLAST 2 KART SATURN
//-----------------------------------------------------------------------------
// Copyright (C) 2025 by Indev.
//
// 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 m_textinput.h
/// \brief User text input implementation
#ifndef __M_TEXTINPUT__ #ifndef __M_TEXTINPUT__
#define __M_TEXTINPUT__ #define __M_TEXTINPUT__
+46 -93
View File
@@ -345,7 +345,6 @@ static boolean PIT_CheckThing(mobj_t *thing)
blockdist = thing->radius + tmthing->radius; blockdist = thing->radius + tmthing->radius;
if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist) if (abs(thing->x - tmx) >= blockdist || abs(thing->y - tmy) >= blockdist)
return true; // didn't hit it return true; // didn't hit it
// see if it went over / under // see if it went over / under
if (tmthing->z > thing->z + thing->height) if (tmthing->z > thing->z + thing->height)
return true; // overhead return true; // overhead
@@ -1713,14 +1712,10 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
tmbbox[BOXRIGHT] = x + tmthing->radius; tmbbox[BOXRIGHT] = x + tmthing->radius;
tmbbox[BOXLEFT] = x - tmthing->radius; tmbbox[BOXLEFT] = x - tmthing->radius;
if (thing->x != x || thing->y != y || !thing->subsector) if (thing->x != x || thing->y != y || thing->subsector == NULL)
{
newsec = R_PointInSubsector(x, y)->sector; newsec = R_PointInSubsector(x, y)->sector;
}
else else
{
newsec = thing->subsector->sector; newsec = thing->subsector->sector;
}
ceilingline = blockingline = NULL; ceilingline = blockingline = NULL;
@@ -1813,17 +1808,17 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
midheight = (bottomheight + ((topheight - bottomheight)/2)); midheight = (bottomheight + ((topheight - bottomheight)/2));
delta1 = abs(thing->z - midheight); delta1 = thing->z - midheight;
delta2 = abs(thingtop - midheight); delta2 = thingtop - midheight;
if (topheight > tmfloorz && delta1 < delta2 if (topheight > tmfloorz && abs(delta1) < abs(delta2)
&& !(rover->flags & FF_REVERSEPLATFORM)) && !(rover->flags & FF_REVERSEPLATFORM))
{ {
tmfloorz = tmdropoffz = topheight; tmfloorz = tmdropoffz = topheight;
tmfloorslope = *rover->t_slope; tmfloorslope = *rover->t_slope;
} }
if (bottomheight < tmceilingz && delta1 >= delta2 if (bottomheight < tmceilingz && abs(delta1) >= abs(delta2)
&& !(rover->flags & FF_PLATFORM) && !(rover->flags & FF_PLATFORM)
&& !(thing->type == MT_SKIM && (rover->flags & FF_SWIMMABLE))) && !(thing->type == MT_SKIM && (rover->flags & FF_SWIMMABLE)))
{ {
@@ -1874,7 +1869,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
{ {
sector_t *polysec; sector_t *polysec;
fixed_t delta1, delta2, thingtop; fixed_t delta1, delta2, thingtop;
fixed_t polytop, polybottom, polymid; fixed_t polytop, polybottom;
po->validcount = validcount; po->validcount = validcount;
@@ -1900,24 +1895,21 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
} }
thingtop = thing->z + thing->height; thingtop = thing->z + thing->height;
polymid = (polybottom + ((polytop - polybottom)/2)); delta1 = thing->z - (polybottom + ((polytop - polybottom)/2));
delta2 = thingtop - (polybottom + ((polytop - polybottom)/2));
delta1 = abs(thing->z - polymid); if (polytop > tmfloorz && abs(delta1) < abs(delta2))
delta2 = abs(thingtop - polymid);
if (polytop > tmfloorz && delta1 < delta2)
{ {
tmfloorz = tmdropoffz = polytop; tmfloorz = tmdropoffz = polytop;
tmfloorslope = NULL; tmfloorslope = NULL;
} }
if (polybottom < tmceilingz && delta1 >= delta2) if (polybottom < tmceilingz && abs(delta1) >= abs(delta2))
{ {
tmceilingz = tmdrpoffceilz = polybottom; tmceilingz = tmdrpoffceilz = polybottom;
tmceilingslope = NULL; tmceilingslope = NULL;
} }
} }
plink = (polymaplink_t *)(plink->link.next); plink = (polymaplink_t *)(plink->link.next);
} }
} }
@@ -2002,14 +1994,10 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
tmbbox[BOXRIGHT] = x + thiscam->radius; tmbbox[BOXRIGHT] = x + thiscam->radius;
tmbbox[BOXLEFT] = x - thiscam->radius; tmbbox[BOXLEFT] = x - thiscam->radius;
if (thiscam->x != x || thiscam->y != y || !thiscam->subsector) if (thiscam->x != x || thiscam->y != y || thiscam->subsector == NULL)
{ newsec = R_PointInSubsectorFast(x, y)->sector;
newsec = R_PointInSubsector(x, y)->sector;
}
else else
{
newsec = thiscam->subsector->sector; newsec = thiscam->subsector->sector;
}
ceilingline = blockingline = NULL; ceilingline = blockingline = NULL;
@@ -2054,25 +2042,24 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
for (rover = newsec->ffloors; rover; rover = rover->next) for (rover = newsec->ffloors; rover; rover = rover->next)
{ {
fixed_t topheight, bottomheight, midheight; fixed_t topheight, bottomheight;
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
|| UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
continue; continue;
topheight = P_CameraGetFOFTopZ(thiscam, newsec, rover, x, y, NULL); topheight = P_CameraGetFOFTopZ(thiscam, newsec, rover, x, y, NULL);
bottomheight = P_CameraGetFOFBottomZ(thiscam, newsec, rover, x, y, NULL); bottomheight = P_CameraGetFOFBottomZ(thiscam, newsec, rover, x, y, NULL);
midheight = (bottomheight + ((topheight - bottomheight)/2));
delta1 = abs(thiscam->z - midheight); delta1 = thiscam->z - (bottomheight
delta2 = abs(thingtop - midheight); + ((topheight - bottomheight)/2));
delta2 = thingtop - (bottomheight
+ ((topheight - bottomheight)/2));
if (topheight > tmfloorz && delta1 < delta2) if (topheight > tmfloorz && abs(delta1) < abs(delta2))
{ {
tmfloorz = tmdropoffz = topheight; tmfloorz = tmdropoffz = topheight;
} }
if (bottomheight < tmceilingz && abs(delta1) >= abs(delta2))
if (bottomheight < tmceilingz && delta1 >= delta2)
{ {
tmceilingz = tmdrpoffceilz = bottomheight; tmceilingz = tmdrpoffceilz = bottomheight;
} }
@@ -2098,7 +2085,6 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
validcount++; validcount++;
for (by = yl; by <= yh; by++) for (by = yl; by <= yh; by++)
{
for (bx = xl; bx <= xh; bx++) for (bx = xl; bx <= xh; bx++)
{ {
INT32 offset; INT32 offset;
@@ -2120,7 +2106,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
{ {
sector_t *polysec; sector_t *polysec;
fixed_t delta1, delta2, thingtop; fixed_t delta1, delta2, thingtop;
fixed_t polytop, polybottom, polymid; fixed_t polytop, polybottom;
po->validcount = validcount; po->validcount = validcount;
@@ -2151,21 +2137,18 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
} }
thingtop = thiscam->z + thiscam->height; thingtop = thiscam->z + thiscam->height;
polymid = (polybottom + ((polytop - polybottom)/2)); delta1 = thiscam->z - (polybottom + ((polytop - polybottom)/2));
delta2 = thingtop - (polybottom + ((polytop - polybottom)/2));
delta1 = abs(thiscam->z - polymid); if (polytop > tmfloorz && abs(delta1) < abs(delta2))
delta2 = abs(thingtop - polymid);
if (polytop > tmfloorz && delta1 < delta2)
tmfloorz = tmdropoffz = polytop; tmfloorz = tmdropoffz = polytop;
if (polybottom < tmceilingz && delta1 >= delta2) if (polybottom < tmceilingz && abs(delta1) >= abs(delta2))
tmceilingz = tmdrpoffceilz = polybottom; tmceilingz = tmdrpoffceilz = polybottom;
} }
plink = (polymaplink_t *)(plink->link.next); plink = (polymaplink_t *)(plink->link.next);
} }
} }
}
} }
// check lines // check lines
@@ -3219,46 +3202,32 @@ stairstep:
} }
do { do {
if (tmxmove > mo->radius) if (tmxmove > mo->radius) {
{
newx = mo->x + mo->radius; newx = mo->x + mo->radius;
tmxmove -= mo->radius; tmxmove -= mo->radius;
} } else if (tmxmove < -mo->radius) {
else if (tmxmove < -mo->radius)
{
newx = mo->x - mo->radius; newx = mo->x - mo->radius;
tmxmove += mo->radius; tmxmove += mo->radius;
} } else {
else
{
newx = mo->x + tmxmove; newx = mo->x + tmxmove;
tmxmove = 0; tmxmove = 0;
} }
if (tmymove > mo->radius) {
if (tmymove > mo->radius)
{
newy = mo->y + mo->radius; newy = mo->y + mo->radius;
tmymove -= mo->radius; tmymove -= mo->radius;
} } else if (tmymove < -mo->radius) {
else if (tmymove < -mo->radius)
{
newy = mo->y - mo->radius; newy = mo->y - mo->radius;
tmymove += mo->radius; tmymove += mo->radius;
} } else {
else
{
newy = mo->y + tmymove; newy = mo->y + tmymove;
tmymove = 0; tmymove = 0;
} }
if (!P_TryMove(mo, newx, newy, true)) {
if (!P_TryMove(mo, newx, newy, true))
{
if (success) if (success)
return; // Good enough!! return; // Good enough!!
else else
goto retry; goto retry;
} }
success = true; success = true;
} while(tmxmove || tmymove); } while(tmxmove || tmymove);
} }
@@ -3634,7 +3603,7 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)
if (thing->subsector->sector->ffloors && (realcrush || thing->flags & MF_PUSHABLE)) if (thing->subsector->sector->ffloors && (realcrush || thing->flags & MF_PUSHABLE))
{ {
ffloor_t *rover; ffloor_t *rover;
fixed_t topheight, bottomheight, midheight; fixed_t topheight, bottomheight;
fixed_t delta1, delta2; fixed_t delta1, delta2;
INT32 thingtop = thing->z + thing->height; INT32 thingtop = thing->z + thing->height;
@@ -3646,12 +3615,10 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)
topheight = *rover->topheight; topheight = *rover->topheight;
bottomheight = *rover->bottomheight; bottomheight = *rover->bottomheight;
midheight = ((bottomheight + topheight)/2);
delta1 = abs(thing->z - midheight); delta1 = thing->z - (bottomheight + topheight)/2;
delta2 = abs(thingtop - midheight); delta2 = thingtop - (bottomheight + topheight)/2;
if (bottomheight <= thing->ceilingz && abs(delta1) >= abs(delta2))
if (bottomheight <= thing->ceilingz && delta1 >= delta2)
{ {
if (thing->flags & MF_PUSHABLE) if (thing->flags & MF_PUSHABLE)
{ {
@@ -3700,7 +3667,6 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)
killer = P_SpawnMobj(thing->x, thing->y, thing->z, MT_NULL); killer = P_SpawnMobj(thing->x, thing->y, thing->z, MT_NULL);
killer->threshold = 44; // Special flag for crushing killer->threshold = 44; // Special flag for crushing
} }
if (!thing->player) if (!thing->player)
P_DamageMobj(thing, killer, killer, DMG_INSTAKILL); P_DamageMobj(thing, killer, killer, DMG_INSTAKILL);
else else
@@ -3780,11 +3746,9 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
do do
{ {
for (n = sector->touching_thinglist; n; n = n->m_thinglist_next) // go through list for (n = sector->touching_thinglist; n; n = n->m_thinglist_next) // go through list
{
if (!n->visited) // unprocessed thing found if (!n->visited) // unprocessed thing found
{ {
n->visited = true; // mark thing as processed n->visited = true; // mark thing as processed
if (!(n->m_thing->flags & MF_NOBLOCKMAP)) //jff 4/7/98 don't do these if (!(n->m_thing->flags & MF_NOBLOCKMAP)) //jff 4/7/98 don't do these
{ {
if (!PIT_ChangeSector(n->m_thing, false)) // process it if (!PIT_ChangeSector(n->m_thing, false)) // process it
@@ -3793,10 +3757,8 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
return nofit; return nofit;
} }
} }
break; // exit and start over break; // exit and start over
} }
}
} while (n); // repeat from scratch until all things left are marked valid } while (n); // repeat from scratch until all things left are marked valid
// Nothing blocked us, so lets crush for real! // Nothing blocked us, so lets crush for real!
@@ -3818,18 +3780,15 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
do do
{ {
for (n = sec->touching_thinglist; n; n = n->m_thinglist_next) for (n = sec->touching_thinglist; n; n = n->m_thinglist_next)
if (!n->visited)
{ {
if (!n->visited) n->visited = true;
if (!(n->m_thing->flags & MF_NOBLOCKMAP))
{ {
n->visited = true; PIT_ChangeSector(n->m_thing, true);
return nofit;
if (!(n->m_thing->flags & MF_NOBLOCKMAP))
{
PIT_ChangeSector(n->m_thing, true);
return nofit;
}
break;
} }
break;
} }
} while (n); } while (n);
} }
@@ -3844,11 +3803,9 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
do do
{ {
for (n = sector->touching_thinglist; n; n = n->m_thinglist_next) // go through list for (n = sector->touching_thinglist; n; n = n->m_thinglist_next) // go through list
{
if (!n->visited) // unprocessed thing found if (!n->visited) // unprocessed thing found
{ {
n->visited = true; // mark thing as processed n->visited = true; // mark thing as processed
if (!(n->m_thing->flags & MF_NOBLOCKMAP)) //jff 4/7/98 don't do these if (!(n->m_thing->flags & MF_NOBLOCKMAP)) //jff 4/7/98 don't do these
{ {
PIT_ChangeSector(n->m_thing, true); // process it PIT_ChangeSector(n->m_thing, true); // process it
@@ -3856,7 +3813,6 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
} }
break; // exit and start over break; // exit and start over
} }
}
} while (n); // repeat from scratch until all things left are marked valid } while (n); // repeat from scratch until all things left are marked valid
return nofit; return nofit;
@@ -4131,7 +4087,7 @@ fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
for (rover = sec->ffloors; rover; rover = rover->next) for (rover = sec->ffloors; rover; rover = rover->next)
{ {
fixed_t topheight, bottomheight, midheight; fixed_t topheight, bottomheight;
if (!(rover->flags & FF_EXISTS)) if (!(rover->flags & FF_EXISTS))
continue; continue;
@@ -4149,16 +4105,13 @@ fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
if (floorz < z) if (floorz < z)
floorz = z; floorz = z;
} }
continue; continue;
} }
midheight = (bottomheight + ((topheight - bottomheight)/2)); delta1 = z - (bottomheight + ((topheight - bottomheight)/2));
delta2 = thingtop - (bottomheight + ((topheight - bottomheight)/2));
delta1 = abs(z - midheight); if (topheight > floorz && abs(delta1) < abs(delta2))
delta2 = abs(thingtop - midheight);
if (topheight > floorz && delta1 < delta2)
floorz = topheight; floorz = topheight;
} }
} }
+1 -1
View File
@@ -11889,7 +11889,7 @@ void P_SpawnHoops(mapthing_t *mthing)
z += P_GetSectorFloorZAt(sec, x, y); z += P_GetSectorFloorZAt(sec, x, y);
hoopcenter->z = z - hoopcenter->height/2; hoopcenter->z -= hoopcenter->height/2;
P_UnsetThingPosition(hoopcenter); P_UnsetThingPosition(hoopcenter);
hoopcenter->x = x; hoopcenter->x = x;
+36 -36
View File
@@ -61,7 +61,7 @@ typedef enum
// //
// P_ArchivePlayer // P_ArchivePlayer
// //
FUNCINLINE static ATTRINLINE void P_ArchivePlayer(savebuffer_t *save) static inline void P_ArchivePlayer(savebuffer_t *save)
{ {
const player_t *player = &players[consoleplayer]; const player_t *player = &players[consoleplayer];
INT32 pllives = player->lives; INT32 pllives = player->lives;
@@ -85,7 +85,7 @@ FUNCINLINE static ATTRINLINE void P_ArchivePlayer(savebuffer_t *save)
// //
// P_UnArchivePlayer // P_UnArchivePlayer
// //
FUNCINLINE static ATTRINLINE void P_UnArchivePlayer(savebuffer_t *save) static inline void P_UnArchivePlayer(savebuffer_t *save)
{ {
savedata.skincolor = READUINT8(save->p); savedata.skincolor = READUINT8(save->p);
savedata.skin = READUINT8(save->p); savedata.skin = READUINT8(save->p);
@@ -1043,25 +1043,25 @@ typedef enum
tc_end tc_end
} specials_e; } specials_e;
FUNCINLINE static ATTRINLINE UINT32 SaveMobjnum(const mobj_t *mobj) static inline UINT32 SaveMobjnum(const mobj_t *mobj)
{ {
if (mobj) return mobj->mobjnum; if (mobj) return mobj->mobjnum;
return 0; return 0;
} }
FUNCINLINE static ATTRINLINE UINT32 SaveSector(const sector_t *sector) static inline UINT32 SaveSector(const sector_t *sector)
{ {
if (sector) return (UINT32)(sector - sectors); if (sector) return (UINT32)(sector - sectors);
return 0xFFFFFFFF; return 0xFFFFFFFF;
} }
FUNCINLINE static ATTRINLINE UINT32 SaveLine(const line_t *line) static inline UINT32 SaveLine(const line_t *line)
{ {
if (line) return (UINT32)(line - lines); if (line) return (UINT32)(line - lines);
return 0xFFFFFFFF; return 0xFFFFFFFF;
} }
FUNCINLINE static ATTRINLINE UINT32 SavePlayer(const player_t *player) static inline UINT32 SavePlayer(const player_t *player)
{ {
if (player) return (UINT32)(player - players); if (player) return (UINT32)(player - players);
return 0xFFFFFFFF; return 0xFFFFFFFF;
@@ -1476,7 +1476,7 @@ static void SaveElevatorThinker(savebuffer_t *save, const thinker_t *th, const U
// //
// Saves a scroll_t thinker // Saves a scroll_t thinker
// //
FUNCINLINE static ATTRINLINE void SaveScrollThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type) static inline void SaveScrollThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
{ {
const scroll_t *ht = (const void *)th; const scroll_t *ht = (const void *)th;
WRITEUINT8(save->p, type); WRITEUINT8(save->p, type);
@@ -1497,7 +1497,7 @@ FUNCINLINE static ATTRINLINE void SaveScrollThinker(savebuffer_t *save, const th
// //
// Saves a friction_t thinker // Saves a friction_t thinker
// //
FUNCINLINE static ATTRINLINE void SaveFrictionThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type) static inline void SaveFrictionThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
{ {
const friction_t *ht = (const void *)th; const friction_t *ht = (const void *)th;
WRITEUINT8(save->p, type); WRITEUINT8(save->p, type);
@@ -1513,7 +1513,7 @@ FUNCINLINE static ATTRINLINE void SaveFrictionThinker(savebuffer_t *save, const
// //
// Saves a pusher_t thinker // Saves a pusher_t thinker
// //
FUNCINLINE static ATTRINLINE void SavePusherThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type) static inline void SavePusherThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
{ {
const pusher_t *ht = (const void *)th; const pusher_t *ht = (const void *)th;
WRITEUINT8(save->p, type); WRITEUINT8(save->p, type);
@@ -1598,7 +1598,7 @@ static void SaveDisappearThinker(savebuffer_t *save, const thinker_t *th, const
// //
// Saves a polyrotate_t thinker // Saves a polyrotate_t thinker
// //
FUNCINLINE static ATTRINLINE void SavePolyrotatetThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type) static inline void SavePolyrotatetThinker(savebuffer_t *save, const thinker_t *th, const UINT8 type)
{ {
const polyrotate_t *ht = (const void *)th; const polyrotate_t *ht = (const void *)th;
WRITEUINT8(save->p, type); WRITEUINT8(save->p, type);
@@ -1935,25 +1935,25 @@ mobj_t *P_FindNewPosition(UINT32 oldposition)
return NULL; return NULL;
} }
FUNCINLINE static ATTRINLINE mobj_t *LoadMobj(UINT32 mobjnum) static inline mobj_t *LoadMobj(UINT32 mobjnum)
{ {
if (mobjnum == 0) return NULL; if (mobjnum == 0) return NULL;
return (mobj_t *)(size_t)mobjnum; return (mobj_t *)(size_t)mobjnum;
} }
FUNCINLINE static ATTRINLINE sector_t *LoadSector(UINT32 sector) static inline sector_t *LoadSector(UINT32 sector)
{ {
if (sector >= numsectors) return NULL; if (sector >= numsectors) return NULL;
return &sectors[sector]; return &sectors[sector];
} }
FUNCINLINE static ATTRINLINE line_t *LoadLine(UINT32 line) static inline line_t *LoadLine(UINT32 line)
{ {
if (line >= numlines) return NULL; if (line >= numlines) return NULL;
return &lines[line]; return &lines[line];
} }
FUNCINLINE static ATTRINLINE player_t *LoadPlayer(UINT32 player) static inline player_t *LoadPlayer(UINT32 player)
{ {
if (player >= MAXPLAYERS) return NULL; if (player >= MAXPLAYERS) return NULL;
return &players[player]; return &players[player];
@@ -2529,7 +2529,7 @@ static void LoadScrollThinker(savebuffer_t *save, actionf_p1 thinker)
// //
// Loads a friction_t from a save game // Loads a friction_t from a save game
// //
FUNCINLINE static ATTRINLINE void LoadFrictionThinker(savebuffer_t *save, actionf_p1 thinker) static inline void LoadFrictionThinker(savebuffer_t *save, actionf_p1 thinker)
{ {
friction_t *ht = (friction_t*)Z_LevelPoolMalloc(sizeof (*ht)); friction_t *ht = (friction_t*)Z_LevelPoolMalloc(sizeof (*ht));
ht->thinker.alloctype = TAT_LEVELPOOL; ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2576,7 +2576,7 @@ static void LoadPusherThinker(savebuffer_t *save, actionf_p1 thinker)
// //
// Loads a laserthink_t from a save game // Loads a laserthink_t from a save game
// //
FUNCINLINE static ATTRINLINE void LoadLaserThinker(savebuffer_t *save, actionf_p1 thinker) static inline void LoadLaserThinker(savebuffer_t *save, actionf_p1 thinker)
{ {
laserthink_t *ht = (laserthink_t*)Z_LevelPoolMalloc(sizeof (*ht)); laserthink_t *ht = (laserthink_t*)Z_LevelPoolMalloc(sizeof (*ht));
ht->thinker.alloctype = TAT_LEVELPOOL; ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2621,7 +2621,7 @@ FUNCINLINE static ATTRINLINE void LoadLightlevelThinker(savebuffer_t *save, acti
// //
// Loads a executor_t from a save game // Loads a executor_t from a save game
// //
FUNCINLINE static ATTRINLINE void LoadExecutorThinker(savebuffer_t *save, actionf_p1 thinker) static inline void LoadExecutorThinker(savebuffer_t *save, actionf_p1 thinker)
{ {
executor_t *ht = (executor_t*)Z_LevelPoolMalloc(sizeof (*ht)); executor_t *ht = (executor_t*)Z_LevelPoolMalloc(sizeof (*ht));
ht->thinker.alloctype = TAT_LEVELPOOL; ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2639,7 +2639,7 @@ FUNCINLINE static ATTRINLINE void LoadExecutorThinker(savebuffer_t *save, action
// //
// Loads a disappear_t thinker // Loads a disappear_t thinker
// //
FUNCINLINE static ATTRINLINE void LoadDisappearThinker(savebuffer_t *save, actionf_p1 thinker) static inline void LoadDisappearThinker(savebuffer_t *save, actionf_p1 thinker)
{ {
disappear_t *ht = (disappear_t*)Z_LevelPoolMalloc(sizeof (*ht)); disappear_t *ht = (disappear_t*)Z_LevelPoolMalloc(sizeof (*ht));
ht->thinker.alloctype = TAT_LEVELPOOL; ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2660,7 +2660,7 @@ FUNCINLINE static ATTRINLINE void LoadDisappearThinker(savebuffer_t *save, actio
// //
// Loads a polyrotate_t thinker // Loads a polyrotate_t thinker
// //
FUNCINLINE static ATTRINLINE void LoadPolyrotatetThinker(savebuffer_t *save, actionf_p1 thinker) static inline void LoadPolyrotatetThinker(savebuffer_t *save, actionf_p1 thinker)
{ {
polyrotate_t *ht = (polyrotate_t*)Z_LevelPoolMalloc(sizeof (*ht)); polyrotate_t *ht = (polyrotate_t*)Z_LevelPoolMalloc(sizeof (*ht));
ht->thinker.alloctype = TAT_LEVELPOOL; ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2720,7 +2720,7 @@ static void LoadPolymoveThinker(savebuffer_t *save, actionf_p1 thinker)
// //
// Loads a polywaypoint_t thinker // Loads a polywaypoint_t thinker
// //
FUNCINLINE static ATTRINLINE void LoadPolywaypointThinker(savebuffer_t *save, actionf_p1 thinker) static inline void LoadPolywaypointThinker(savebuffer_t *save, actionf_p1 thinker)
{ {
polywaypoint_t *ht = (polywaypoint_t*)Z_LevelPoolMalloc(sizeof (*ht)); polywaypoint_t *ht = (polywaypoint_t*)Z_LevelPoolMalloc(sizeof (*ht));
ht->thinker.alloctype = TAT_LEVELPOOL; ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2776,7 +2776,7 @@ FUNCINLINE static ATTRINLINE void LoadPolywaypointThinker(savebuffer_t *save, ac
// //
// loads a polyslidedoor_t thinker // loads a polyslidedoor_t thinker
// //
FUNCINLINE static ATTRINLINE void LoadPolyslidedoorThinker(savebuffer_t *save, actionf_p1 thinker) static inline void LoadPolyslidedoorThinker(savebuffer_t *save, actionf_p1 thinker)
{ {
polyslidedoor_t *ht = (polyslidedoor_t*)Z_LevelPoolMalloc(sizeof (*ht)); polyslidedoor_t *ht = (polyslidedoor_t*)Z_LevelPoolMalloc(sizeof (*ht));
ht->thinker.alloctype = TAT_LEVELPOOL; ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2814,7 +2814,7 @@ FUNCINLINE static ATTRINLINE void LoadPolyslidedoorThinker(savebuffer_t *save, a
// //
// Loads a polyswingdoor_t thinker // Loads a polyswingdoor_t thinker
// //
FUNCINLINE static ATTRINLINE void LoadPolyswingdoorThinker(savebuffer_t *save, actionf_p1 thinker) static inline void LoadPolyswingdoorThinker(savebuffer_t *save, actionf_p1 thinker)
{ {
polyswingdoor_t *ht = (polyswingdoor_t*)Z_LevelPoolMalloc(sizeof (*ht)); polyswingdoor_t *ht = (polyswingdoor_t*)Z_LevelPoolMalloc(sizeof (*ht));
ht->thinker.alloctype = TAT_LEVELPOOL; ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -2847,7 +2847,7 @@ FUNCINLINE static ATTRINLINE void LoadPolyswingdoorThinker(savebuffer_t *save, a
// //
// Loads a polydisplace_t thinker // Loads a polydisplace_t thinker
// //
FUNCINLINE static ATTRINLINE void LoadPolydisplaceThinker(savebuffer_t *save, actionf_p1 thinker) static inline void LoadPolydisplaceThinker(savebuffer_t *save, actionf_p1 thinker)
{ {
polydisplace_t *ht = (polydisplace_t*)Z_LevelPoolMalloc(sizeof (*ht)); polydisplace_t *ht = (polydisplace_t*)Z_LevelPoolMalloc(sizeof (*ht));
ht->thinker.alloctype = TAT_LEVELPOOL; ht->thinker.alloctype = TAT_LEVELPOOL;
@@ -3115,7 +3115,7 @@ static void P_NetUnArchiveThinkers(savebuffer_t *save)
#define PD_FLAGS 0x01 #define PD_FLAGS 0x01
#define PD_TRANS 0x02 #define PD_TRANS 0x02
FUNCINLINE static ATTRINLINE void P_ArchivePolyObj(savebuffer_t *save, polyobj_t *po) static inline void P_ArchivePolyObj(savebuffer_t *save, polyobj_t *po)
{ {
UINT8 diff = 0; UINT8 diff = 0;
WRITEINT32(save->p, po->id); WRITEINT32(save->p, po->id);
@@ -3137,7 +3137,7 @@ FUNCINLINE static ATTRINLINE void P_ArchivePolyObj(savebuffer_t *save, polyobj_t
WRITEINT32(save->p, po->translucency); WRITEINT32(save->p, po->translucency);
} }
FUNCINLINE static ATTRINLINE void P_UnArchivePolyObj(savebuffer_t *save, polyobj_t *po) static inline void P_UnArchivePolyObj(savebuffer_t *save, polyobj_t *po)
{ {
INT32 id; INT32 id;
UINT32 angle; UINT32 angle;
@@ -3172,7 +3172,7 @@ FUNCINLINE static ATTRINLINE void P_UnArchivePolyObj(savebuffer_t *save, polyobj
Polyobj_MoveOnLoad(po, angle, x, y); Polyobj_MoveOnLoad(po, angle, x, y);
} }
FUNCINLINE static ATTRINLINE void P_ArchivePolyObjects(savebuffer_t *save) static inline void P_ArchivePolyObjects(savebuffer_t *save)
{ {
INT32 i; INT32 i;
@@ -3185,7 +3185,7 @@ FUNCINLINE static ATTRINLINE void P_ArchivePolyObjects(savebuffer_t *save)
P_ArchivePolyObj(save, &PolyObjects[i]); P_ArchivePolyObj(save, &PolyObjects[i]);
} }
FUNCINLINE static ATTRINLINE void P_UnArchivePolyObjects(savebuffer_t *save) static inline void P_UnArchivePolyObjects(savebuffer_t *save)
{ {
INT32 i, numSavedPolys; INT32 i, numSavedPolys;
@@ -3203,7 +3203,7 @@ FUNCINLINE static ATTRINLINE void P_UnArchivePolyObjects(savebuffer_t *save)
// //
// P_FinishMobjs // P_FinishMobjs
// //
FUNCINLINE static ATTRINLINE void P_FinishMobjs(void) static inline void P_FinishMobjs(void)
{ {
thinker_t *currentthinker; thinker_t *currentthinker;
mobj_t *mobj; mobj_t *mobj;
@@ -3220,7 +3220,7 @@ FUNCINLINE static ATTRINLINE void P_FinishMobjs(void)
} }
} }
FUNCINLINE static ATTRINLINE mobj_t *RelinkMobj(mobj_t **ptr) static inline mobj_t *RelinkMobj(mobj_t **ptr)
{ {
UINT32 temp = (UINT32)(size_t)*ptr; UINT32 temp = (UINT32)(size_t)*ptr;
*ptr = NULL; *ptr = NULL;
@@ -3269,7 +3269,7 @@ static void P_RelinkPointers(void)
// //
// P_NetArchiveSpecials // P_NetArchiveSpecials
// //
FUNCINLINE static ATTRINLINE void P_NetArchiveSpecials(savebuffer_t *save) static inline void P_NetArchiveSpecials(savebuffer_t *save)
{ {
size_t i, z; size_t i, z;
@@ -3347,7 +3347,7 @@ static void P_NetUnArchiveSpecials(savebuffer_t *save)
// ======================================================================= // =======================================================================
// Misc // Misc
// ======================================================================= // =======================================================================
FUNCINLINE static ATTRINLINE void P_ArchiveMisc(savebuffer_t *save) static inline void P_ArchiveMisc(savebuffer_t *save)
{ {
if (gamecomplete) if (gamecomplete)
WRITEINT16(save->p, gamemap | 8192); WRITEINT16(save->p, gamemap | 8192);
@@ -3360,7 +3360,7 @@ FUNCINLINE static ATTRINLINE void P_ArchiveMisc(savebuffer_t *save)
WRITESTRINGN(save->p, timeattackfolder, sizeof(timeattackfolder)); WRITESTRINGN(save->p, timeattackfolder, sizeof(timeattackfolder));
} }
FUNCINLINE static ATTRINLINE void P_UnArchiveSPGame(savebuffer_t *save, INT16 mapoverride) static inline void P_UnArchiveSPGame(savebuffer_t *save, INT16 mapoverride)
{ {
char testname[sizeof(timeattackfolder)]; char testname[sizeof(timeattackfolder)];
@@ -3531,8 +3531,7 @@ static void P_ReloadSaveLevelData(void)
ss->floorpic_angle = spawnss->floorpic_angle; ss->floorpic_angle = spawnss->floorpic_angle;
ss->ceilingpic_angle = spawnss->ceilingpic_angle; ss->ceilingpic_angle = spawnss->ceilingpic_angle;
ss->tag = spawnss->tag; ss->tag = spawnss->tag;
ss->firsttag = spawnss->firsttag; ss->firsttag = ss->nexttag = -1;
ss->nexttag = spawnss->nexttag;
if (ss->ffloors) if (ss->ffloors)
{ {
@@ -3557,8 +3556,7 @@ static void P_ReloadSaveLevelData(void)
li->callcount = 0; li->callcount = 0;
li->tag = spawnli->tag; li->tag = spawnli->tag;
li->firsttag = spawnli->firsttag; li->firsttag = li->nexttag = -1;
li->nexttag = spawnli->nexttag;
if (li->sidenum[0] != 0xffff) if (li->sidenum[0] != 0xffff)
{ {
@@ -3582,6 +3580,8 @@ static void P_ReloadSaveLevelData(void)
si->midtexture = spawnsi->midtexture; si->midtexture = spawnsi->midtexture;
} }
} }
P_InitTagLists();
} }
FUNCINLINE static ATTRINLINE boolean P_NetUnArchiveMisc(savebuffer_t *save, boolean reloading) FUNCINLINE static ATTRINLINE boolean P_NetUnArchiveMisc(savebuffer_t *save, boolean reloading)
+14 -4
View File
@@ -544,7 +544,18 @@ static void P_LoadSegs(UINT8 *data)
{ {
li->v1 = &vertexes[SHORT(ml->v1)]; li->v1 = &vertexes[SHORT(ml->v1)];
li->v2 = &vertexes[SHORT(ml->v2)]; li->v2 = &vertexes[SHORT(ml->v2)];
#ifdef HWRENDER
if (rendermode == render_opengl)
{
li->fv1.x = FixedToFloat(li->v1->x);
li->fv1.y = FixedToFloat(li->v1->y);
//li->fv1.z = FixedToFloat(li->v1->z); // z is unused in gl
li->fv2.x = FixedToFloat(li->v2->x);
li->fv2.y = FixedToFloat(li->v2->y);
//li->fv2.z = FixedToFloat(li->v2->z);
}
#endif
li->length = P_SegLength(li); li->length = P_SegLength(li);
li->angle = (SHORT(ml->angle))<<FRACBITS; li->angle = (SHORT(ml->angle))<<FRACBITS;
li->offset = (SHORT(ml->offset))<<FRACBITS; li->offset = (SHORT(ml->offset))<<FRACBITS;
@@ -1983,12 +1994,11 @@ static void P_LoadMapData(const virtres_t* virt)
P_LoadLinedefs(virtlinedefs->data); P_LoadLinedefs(virtlinedefs->data);
P_LoadSidedefs(virtsidedefs->data); P_LoadSidedefs(virtsidedefs->data);
P_LoadThings(virtthings->data); P_LoadThings(virtthings->data);
P_InitTagLists(); // Create xref tables for tags
// Copy relevant map data for NetArchive purposes. // Copy relevant map data for NetArchive purposes.
spawnsectors = Z_Malloc(numsectors * sizeof(*sectors), PU_LEVEL, NULL); spawnsectors = Z_Calloc(numsectors * sizeof(*sectors), PU_LEVEL, NULL);
spawnlines = Z_Malloc(numlines * sizeof(*lines), PU_LEVEL, NULL); spawnlines = Z_Calloc(numlines * sizeof(*lines), PU_LEVEL, NULL);
spawnsides = Z_Malloc(numsides * sizeof(*sides), PU_LEVEL, NULL); spawnsides = Z_Calloc(numsides * sizeof(*sides), PU_LEVEL, NULL);
memcpy(spawnsectors, sectors, numsectors * sizeof(*sectors)); memcpy(spawnsectors, sectors, numsectors * sizeof(*sectors));
memcpy(spawnlines, lines, numlines * sizeof(*lines)); memcpy(spawnlines, lines, numlines * sizeof(*lines));
+1
View File
@@ -5387,6 +5387,7 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
// set current weather // set current weather
curWeather = mapheaderinfo[gamemap-1]->weather; curWeather = mapheaderinfo[gamemap-1]->weather;
P_InitTagLists(); // Create xref tables for tags
P_SearchForDisableLinedefs(); // Disable linedefs are now allowed to disable *any* line P_SearchForDisableLinedefs(); // Disable linedefs are now allowed to disable *any* line
P_SpawnScrollers(); // Add generalized scrollers P_SpawnScrollers(); // Add generalized scrollers
+2 -1
View File
@@ -18,6 +18,7 @@
#include <stdint.h> #include <stdint.h>
#include "qs22j.h" #include "qs22j.h"
#include "doomdef.h"
#define INSORTTHRESH 5 // if n < this use insertion sort #define INSORTTHRESH 5 // if n < this use insertion sort
// MUST be >= 2 // MUST be >= 2
@@ -88,7 +89,7 @@ static inline char *med3(char *a, char *b, char *c, int (*compar)(const void *,
void qs22j(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *)) void qs22j(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *))
{ {
// we have nothing to sort // we have nothing to sort
if (__builtin_expect(!!(nmemb <= 1), 0) ) //UNLIKELY - thx windoze if (UNLIKELY(nmemb <= 1))
{ {
return; return;
} }
+1 -1
View File
@@ -77,7 +77,7 @@ void R_ClearDrawSegs(void)
// CPhipps - // CPhipps -
// Instead of clipsegs, let's try using an array with one entry for each column, // Instead of clipsegs, let's try using an array with one entry for each column,
// indicating whether it's blocked by a solid wall yet or not. // indicating whether it's blocked by a solid wall yet or not.
UINT8 *solidcol = NULL; UINT8 *solidcol;
void R_AllocClipSegMemory(void) void R_AllocClipSegMemory(void)
{ {
+83 -120
View File
@@ -90,21 +90,21 @@ INT32 numtextures = 0; // total number of textures found,
// size of following tables // size of following tables
texture_t **textures = NULL; texture_t **textures = NULL;
static UINT32 **texturecolumnofs = NULL; // column offset lookup table for each texture static UINT32 **texturecolumnofs; // column offset lookup table for each texture
UINT8 **texturecache = NULL; // graphics data for each generated full-size texture UINT8 **texturecache; // graphics data for each generated full-size texture
// texture width is a power of 2, so it can easily repeat along sidedefs using a simple mask // texture width is a power of 2, so it can easily repeat along sidedefs using a simple mask
static INT32 *texturewidth = NULL; static INT32 *texturewidthmask;
fixed_t *textureheight = NULL; // needed for texture pegging fixed_t *textureheight; // needed for texture pegging
INT32 *texturetranslation = NULL; INT32 *texturetranslation;
// needed for pre rendering // needed for pre rendering
sprcache_t *spritecachedinfo = NULL; sprcache_t *spritecachedinfo;
lighttable_t *colormaps = NULL; lighttable_t *colormaps;
UINT8 *encoremap = NULL; UINT8 *encoremap;
#ifdef HASINVERT #ifdef HASINVERT
UINT8 invertmap[256]; UINT8 invertmap[256];
#endif #endif
@@ -241,12 +241,11 @@ static INT32 tidcachelen = 0;
// R_DrawColumnInCache // R_DrawColumnInCache
// Clip and draw a column from a patch into a cached post. // Clip and draw a column from a patch into a cached post.
// //
static inline void R_DrawColumnInCache(column_t *patch, UINT8 *cache, texpatch_t *originPatch, INT32 cacheheight) static inline void R_DrawColumnInCache(column_t *patch, UINT8 *cache, INT32 originy, INT32 cacheheight)
{ {
INT32 count, position; INT32 count, position;
UINT8 *source; UINT8 *source;
INT32 topdelta, prevdelta = -1; INT32 topdelta, prevdelta = -1;
INT32 originy = originPatch->originy;
while (patch->topdelta != 0xff) while (patch->topdelta != 0xff)
{ {
@@ -261,7 +260,6 @@ static inline void R_DrawColumnInCache(column_t *patch, UINT8 *cache, texpatch_t
if (position < 0) if (position < 0)
{ {
count += position; count += position;
source -= position; // start further down the column
position = 0; position = 0;
} }
@@ -275,50 +273,6 @@ static inline void R_DrawColumnInCache(column_t *patch, UINT8 *cache, texpatch_t
} }
} }
static UINT8 *R_AllocateTextureBlock(size_t blocksize, UINT8 **user)
{
texturememory += blocksize;
return Z_Malloc(blocksize, PU_LEVEL, user);
}
static UINT8 *R_AllocateDummyTextureBlock(size_t width, UINT8 **user)
{
// Allocate dummy data. Keep 4-bytes aligned.
// Column offsets will be initialized to 0, which points to the 0xff byte (empty column flag).
size_t blocksize = 4 + (width * 4);
UINT8 *block = R_AllocateTextureBlock(blocksize, user);
memset(block, 0, blocksize);
block[0] = 0xff;
return block;
}
static boolean R_CheckTextureLumpLength(texture_t *texture, size_t patch)
{
UINT16 wadnum = texture->patches[patch].wad;
UINT16 lumpnum = texture->patches[patch].lump;
size_t lumplength = W_LumpLengthPwad(wadnum, lumpnum);
// The header does not exist
if (lumplength < offsetof(softwarepatch_t, columnofs))
{
CONS_Alert(
CONS_ERROR,
"%.8s: texture lump data is too small. Expected %s bytes, got %s. (%s)\n",
texture->name,
sizeu1(offsetof(softwarepatch_t, columnofs)),
sizeu2(lumplength),
wadfiles[wadnum]->lumpinfo[lumpnum].fullname
);
return false;
}
return true;
}
// //
// R_GenerateTexture // R_GenerateTexture
// //
@@ -343,10 +297,6 @@ UINT8 *R_GenerateTexture(size_t texnum)
column_t *patchcol; column_t *patchcol;
UINT8 *colofs; UINT8 *colofs;
UINT16 wadnum;
lumpnum_t lumpnum;
size_t lumplength;
I_Assert(texnum <= (size_t)numtextures); I_Assert(texnum <= (size_t)numtextures);
texture = textures[texnum]; texture = textures[texnum];
I_Assert(texture != NULL); I_Assert(texture != NULL);
@@ -361,57 +311,45 @@ UINT8 *R_GenerateTexture(size_t texnum)
{ {
boolean holey = false; boolean holey = false;
patch = texture->patches; patch = texture->patches;
pdata = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL);
wadnum = patch->wad;
lumpnum = patch->lump;
lumplength = W_LumpLengthPwad(wadnum, lumpnum);
// The header does not exist
if (R_CheckTextureLumpLength(texture, 0) == false)
{
block = R_AllocateDummyTextureBlock(texture->width, &texturecache[texnum]);
texturecolumnofs[texnum] = (UINT32*)&block[4];
textures[texnum]->holes = true;
return block;
}
pdata = (UINT8*)W_CacheLumpNumPwad(wadnum, lumpnum, PU_LEVEL);
realpatch = (softwarepatch_t *)pdata; realpatch = (softwarepatch_t *)pdata;
// Check the patch for holes. // Check the patch for holes.
if (texture->width > SHORT(realpatch->width) || texture->height > SHORT(realpatch->height)) if (texture->width > SHORT(realpatch->width) || texture->height > SHORT(realpatch->height))
holey = true; holey = true;
else
colofs = (UINT8 *)realpatch->columnofs;
for (x = 0; x < texture->width && !holey; x++)
{ {
column_t *col = (column_t *)((UINT8 *)realpatch + LONG(*(UINT32 *)&colofs[x<<2])); colofs = (UINT8 *)realpatch->columnofs;
INT32 topdelta, prevdelta = -1, y = 0; for (x = 0; x < texture->width; x++)
while (col->topdelta != 0xff)
{ {
topdelta = col->topdelta; column_t *col = (column_t *)((UINT8 *)realpatch + LONG(*(UINT32 *)&colofs[x<<2]));
if (topdelta <= prevdelta)
topdelta += prevdelta;
prevdelta = topdelta;
if (topdelta > y)
break;
y = topdelta + col->length + 1;
col = (column_t *)((UINT8 *)col + col->length + 4);
}
if (y < texture->height) INT32 topdelta, prevdelta = -1, y = 0;
holey = true; // this texture is HOLEy! D:
while (col->topdelta != 0xff)
{
topdelta = col->topdelta;
if (topdelta <= prevdelta)
topdelta += prevdelta;
prevdelta = topdelta;
if (topdelta > y)
break;
y = topdelta + col->length + 1;
col = (column_t *)((UINT8 *)col + col->length + 4);
}
if (y < texture->height)
holey = true; // this texture is HOLEy! D:
}
} }
// If the patch uses transparency, we have to save it this way. // If the patch uses transparency, we have to save it this way.
if (holey) if (holey)
{ {
texture->holes = true; texture->holes = true;
blocksize = lumplength; blocksize = W_LumpLengthPwad(patch->wad, patch->lump);
block = Z_Calloc(blocksize, PU_LEVEL, &texturecache[texnum]); // will change tag at end of this function block = Z_Calloc(blocksize, PU_LEVEL, &texturecache[texnum]);
M_Memcpy(block, realpatch, blocksize); M_Memcpy(block, realpatch, blocksize);
texturememory += blocksize; texturememory += blocksize;
@@ -427,6 +365,7 @@ UINT8 *R_GenerateTexture(size_t texnum)
goto done; goto done;
} }
// Otherwise, do multipatch format. // Otherwise, do multipatch format.
} }
@@ -445,18 +384,10 @@ UINT8 *R_GenerateTexture(size_t texnum)
// texture data after the lookup table // texture data after the lookup table
blocktex = block + (texture->width*4); blocktex = block + (texture->width*4);
for (x = 0; x < texture->width; ++x)
{
// generate column ofset lookup
*(UINT32 *)&colofs[x<<2] = LONG((x * texture->height) + (texture->width*4));
}
// Composite the columns together. // Composite the columns together.
for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++) for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
{ {
wadnum = patch->wad; pdata = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL);
lumpnum = patch->lump;
pdata = (UINT8*)W_CacheLumpNumPwad(wadnum, lumpnum, PU_LEVEL);
realpatch = (softwarepatch_t *)pdata; realpatch = (softwarepatch_t *)pdata;
x1 = patch->originx; x1 = patch->originx;
@@ -487,7 +418,9 @@ UINT8 *R_GenerateTexture(size_t texnum)
{ {
patchcol = (column_t *)((UINT8 *)realpatch + LONG(realpatch->columnofs[x-x1])); patchcol = (column_t *)((UINT8 *)realpatch + LONG(realpatch->columnofs[x-x1]));
R_DrawColumnInCache(patchcol, block + LONG(*(UINT32 *)&colofs[x<<2]), patch, texture->height); // generate column ofset lookup
*(UINT32 *)&colofs[x<<2] = LONG((x * texture->height) + (texture->width*4));
R_DrawColumnInCache(patchcol, block + LONG(*(UINT32 *)&colofs[x<<2]), patch->originy, texture->height);
} }
} }
@@ -506,7 +439,6 @@ INT32 R_GetTextureNum(INT32 texnum)
{ {
if (texnum < 0 || texnum >= numtextures) if (texnum < 0 || texnum >= numtextures)
return 0; return 0;
return texturetranslation[texnum]; return texturetranslation[texnum];
} }
@@ -524,12 +456,17 @@ void R_CheckTextureCache(INT32 tex)
static inline INT32 wrap_column(fixed_t tex, INT32 col) static inline INT32 wrap_column(fixed_t tex, INT32 col)
{ {
INT32 width = texturewidth[tex]; if (texturewidthmask[tex])
col &= texturewidthmask[tex]; // set by load textures
if (width & (width - 1))
col = (UINT32)col % width;
else else
col &= (width - 1); {
const INT16 texwidth = textures[tex]->width;
// Odd width texture, cannot just mask.
// Sometime gets colnum = -1 or = width, even without tiling.
// Test LostCiv, Map 20, crates.
col = ((col % texwidth) + texwidth) % texwidth;
}
return col; return col;
} }
@@ -539,6 +476,13 @@ static inline INT32 wrap_column(fixed_t tex, INT32 col)
// //
UINT8 *R_GetColumn(fixed_t tex, INT32 col) UINT8 *R_GetColumn(fixed_t tex, INT32 col)
{ {
if (!texturecache[tex])
{
// This must be here because cache can be freed by other operations.
// To prevent must lock individual texture cache on every draw.
R_GenerateTexture(tex);
}
return texturecache[tex] + LONG(texturecolumnofs[tex][wrap_column(tex, col)]); return texturecache[tex] + LONG(texturecolumnofs[tex][wrap_column(tex, col)]);
} }
@@ -572,10 +516,11 @@ static INT32
Rloadtextures (INT32 i, INT32 w) Rloadtextures (INT32 i, INT32 w)
{ {
UINT16 j, numlumps = 0; UINT16 j, numlumps = 0;
INT32 k;
UINT16 texstart, texend, texturesLumpPos; UINT16 texstart, texend, texturesLumpPos;
softwarepatch_t *patchlump;
texpatch_t *patch; texpatch_t *patch;
texture_t *texture; texture_t *texture;
softwarepatch_t patchlump;
// Get the lump numbers for the markers in the WAD, if they exist. // Get the lump numbers for the markers in the WAD, if they exist.
if (W_FileHasFolders(wadfiles[w])) if (W_FileHasFolders(wadfiles[w]))
@@ -615,7 +560,7 @@ Rloadtextures (INT32 i, INT32 w)
continue; // If it is then SKIP IT continue; // If it is then SKIP IT
} }
W_ReadLumpHeaderPwad(wadnum, lumpnum, &patchlump, PNG_HEADER_SIZE, 0); patchlump = (softwarepatch_t *)W_CacheLumpNumPwad(wadnum, lumpnum, PU_STATIC);
//CONS_Printf("\n\"%s\" is a single patch, dimensions %d x %d",W_CheckNameForNumPwad((wadnum, lumpnum), patchlump->width, patchlump->height); //CONS_Printf("\n\"%s\" is a single patch, dimensions %d x %d",W_CheckNameForNumPwad((wadnum, lumpnum), patchlump->width, patchlump->height);
texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL); texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
@@ -623,10 +568,8 @@ Rloadtextures (INT32 i, INT32 w)
// Set texture properties. // Set texture properties.
M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name)); M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
texture->hash = quickncasehash(texture->name, 8); texture->hash = quickncasehash(texture->name, 8);
texture->width = SHORT(patchlump->width);
texture->width = SHORT(patchlump.width); texture->height = SHORT(patchlump->height);
texture->height = SHORT(patchlump.height);
texture->type = TEXTURETYPE_SINGLEPATCH; texture->type = TEXTURETYPE_SINGLEPATCH;
texture->patchcount = 1; texture->patchcount = 1;
texture->holes = false; texture->holes = false;
@@ -638,7 +581,27 @@ Rloadtextures (INT32 i, INT32 w)
patch->wad = wadnum; patch->wad = wadnum;
patch->lump = texstart + j; patch->lump = texstart + j;
texturewidth[i] = texture->width; Z_Free(patchlump);
// determine width power of 2
#if 1
// [WDJ] only need to determine if exact power of 2.
k = 1;
while (k < texture->width)
k<<=1;
#else
// Largest power of 2 that fits within width.
k = 1;
while (k << 1 <= texture->width)
k <<= 1;
#endif
if (k != texture->width)
{
// Odd width
k = 1; // make texturewidthmask = 0
}
texturewidthmask[i] = k - 1;
textureheight[i] = texture->height << FRACBITS; textureheight[i] = texture->height << FRACBITS;
i++; i++;
} }
@@ -746,7 +709,7 @@ static void R_AllocateTextures(INT32 add)
// Allocate texture referencing cache. // Allocate texture referencing cache.
recallocuser(&texturecache, oldsize, newsize); recallocuser(&texturecache, oldsize, newsize);
// Allocate texture width table. // Allocate texture width table.
recallocuser(&texturewidth, oldsize, newsize); recallocuser(&texturewidthmask, oldsize, newsize);
// Allocate texture height table. // Allocate texture height table.
recallocuser(&textureheight, oldsize, newsize); recallocuser(&textureheight, oldsize, newsize);
// Create translation table for global animation. // Create translation table for global animation.
@@ -1218,7 +1181,7 @@ void R_ParseTEXTURESLump(UINT16 wadNum, UINT16 lumpNum, INT32 *texindex)
newTexture = R_ParseTexture(true); newTexture = R_ParseTexture(true);
// Store the new texture // Store the new texture
textures[*texindex] = newTexture; textures[*texindex] = newTexture;
texturewidth[*texindex] = newTexture->width; texturewidthmask[*texindex] = newTexture->width - 1;
textureheight[*texindex] = newTexture->height << FRACBITS; textureheight[*texindex] = newTexture->height << FRACBITS;
// Increment i back in R_LoadTextures() // Increment i back in R_LoadTextures()
(*texindex)++; (*texindex)++;
+10 -6
View File
@@ -114,6 +114,11 @@ typedef struct
fixed_t x, y, z; fixed_t x, y, z;
} vertex_t; } vertex_t;
typedef struct
{
float x, y/*, z*/;
} floatvertex_t;
// Forward of linedefs, for sectors. // Forward of linedefs, for sectors.
struct line_s; struct line_s;
@@ -543,12 +548,11 @@ typedef struct seg_s
sector_t *frontsector; sector_t *frontsector;
sector_t *backsector; sector_t *backsector;
fixed_t length; // precalculated seg length fixed_t length; // precalculated seg length
#ifdef HWRENDER #ifdef HWRENDER
// new pointers so that AdjustSegs doesn't mess with v1/v2 floatvertex_t fv1;
polyvertex_t *pv1; floatvertex_t fv2;
polyvertex_t *pv2;
#endif #endif
polyobj_t *polyseg; polyobj_t *polyseg;
@@ -615,12 +619,12 @@ typedef struct drawseg_s
// Pointers to lists for sprite clipping, all three adjusted so [x1] is first value. // Pointers to lists for sprite clipping, all three adjusted so [x1] is first value.
INT16 *sprtopclip; INT16 *sprtopclip;
INT16 *sprbottomclip; INT16 *sprbottomclip;
fixed_t *maskedtexturecol; INT16 *maskedtexturecol;
struct visplane_s *ffloorplanes[MAXFFLOORS]; struct visplane_s *ffloorplanes[MAXFFLOORS];
INT32 numffloorplanes; INT32 numffloorplanes;
struct ffloor_s *thicksides[MAXFFLOORS]; struct ffloor_s *thicksides[MAXFFLOORS];
fixed_t *thicksidecol; INT16 *thicksidecol;
INT32 numthicksides; INT32 numthicksides;
fixed_t *frontscale; fixed_t *frontscale;
+150 -107
View File
@@ -41,7 +41,8 @@
/** \brief view info /** \brief view info
*/ */
INT32 viewwidth, viewheight, viewwindowx, viewwindowy; INT32 linesize, viewwidth, viewheight, viewwindowx, viewwindowy;
UINT8 *renderscreen; // haleyjd
// ========================================================================= // =========================================================================
// COLUMN DRAWING CODE STUFF // COLUMN DRAWING CODE STUFF
@@ -488,92 +489,6 @@ void R_FlushTranslationColormapCache(void)
// in reality, the few routines that can work for either mode, are // in reality, the few routines that can work for either mode, are
// put here // put here
enum columncontext_e columncontext = COLUMNCONTEXT_DIRECT;
enum ColumnFlushType
{
FLUSH_NONE = 0x0000,
FLUSH_OPAQUE = 0x0001,
FLUSH_TRANS = 0x0002,
FLUSH_COLORMAP = 0x0004,
FLUSH_COLORMAP_TRANS = 0x0008,
};
typedef struct drawcolumndata_temp_s
{
INT32 x;
INT32 yl[8], yh[8];
// e6y: resolution limitation is removed
UINT8 *buf;
INT32 startx;
ColumnFlushType type;
INT32 commontop, commonbot;
UINT8 *transmap;
// SoM 7-28-04: Fix the fuzz problem.
UINT8 *translation;
} drawcolumndata_temp_t;
drawcolumndata_temp_t temp_dc = {};
//
// Error functions that will abort if R_FlushColumns tries to flush
// columns without a column type.
//
FUNCNORETURN static ATTRNORETURN void R_FlushWholeError(void)
{
I_Error("R_FlushWholeColumns called without being initialized.\n");
}
FUNCNORETURN static ATTRNORETURN void R_FlushHTError(void)
{
I_Error("R_FlushHTColumns called without being initialized.\n");
}
FUNCNORETURN static ATTRNORETURN void R_QuadFlushError(void)
{
I_Error("R_FlushQuadColumn called without being initialized.\n");
}
static void (*R_FlushWholeColumns)(void) = R_FlushWholeError;
static void (*R_FlushHTColumns)(void) = R_FlushHTError;
static void (*R_FlushQuadColumn)(void) = R_QuadFlushError;
static void R_FlushColumns(void)
{
if (temp_dc.x != 8 || temp_dc.commontop >= temp_dc.commonbot)
R_FlushWholeColumns();
else
{
R_FlushHTColumns();
R_FlushQuadColumn();
}
temp_dc.x = 0;
}
//
// R_ResetColumnBuffer
//
// haleyjd 09/13/04: new function to call from main rendering loop
// which gets rid of the unnecessary reset of various variables during
// column drawing.
//
void R_ResetColumnBuffer(void)
{
// haleyjd 10/06/05: this must not be done if x == 0!
if (temp_dc.x)
{
R_FlushColumns();
}
temp_dc.type = FLUSH_NONE;
R_FlushWholeColumns = R_FlushWholeError;
R_FlushHTColumns = R_FlushHTError;
R_FlushQuadColumn = R_QuadFlushError;
}
/** \brief The R_InitViewBuffer function /** \brief The R_InitViewBuffer function
Creates lookup tables for getting the framebuffer address Creates lookup tables for getting the framebuffer address
@@ -606,35 +521,40 @@ static void R_AllocViewMemory(void)
R_AllocVisSpriteMemory(); R_AllocVisSpriteMemory();
} }
void R_InitViewBuffer(void)
void R_InitViewBuffer(INT32 width, INT32 height)
{ {
if (width > MAXVIDWIDTH)
width = MAXVIDWIDTH;
if (height > MAXVIDHEIGHT)
height = MAXVIDHEIGHT;
R_AllocViewMemory(); R_AllocViewMemory();
viewwindowx = 0; viewwindowx = 0;
viewwindowy = 0; viewwindowy = 0;
INT32 bufsize = (vid.width * 8) * sizeof(*temp_dc.buf); linesize = vid.width; // killough 11/98
renderscreen = vid.screens[0]; // haleyjd 07/02/14
}
if (temp_dc.buf) /** \brief viewborder patches lump numbers
{ */
#if defined(__SSE__) lumpnum_t viewborderlump[8];
aligned_free(temp_dc.buf);
#else
Z_Free(temp_dc.buf);
#endif
}
memset(&temp_dc, 0, sizeof(temp_dc)); /** \brief Store the lumpnumber of the viewborder patches
*/
#if defined(__SSE__) void R_InitViewBorder(void)
while (bufsize & 15) {
bufsize++; viewborderlump[BRDR_T] = W_GetNumForName("brdr_t");
temp_dc.buf = static_cast<UINT8*>(aligned_alloc(16, bufsize)); viewborderlump[BRDR_B] = W_GetNumForName("brdr_b");
#else viewborderlump[BRDR_L] = W_GetNumForName("brdr_l");
temp_dc.buf = static_cast<UINT8*>(Z_Malloc(bufsize, PU_STATIC, NULL)); viewborderlump[BRDR_R] = W_GetNumForName("brdr_r");
#endif viewborderlump[BRDR_TL] = W_GetNumForName("brdr_tl");
viewborderlump[BRDR_BL] = W_GetNumForName("brdr_bl");
memset(temp_dc.buf, 0, bufsize); viewborderlump[BRDR_TR] = W_GetNumForName("brdr_tr");
viewborderlump[BRDR_BR] = W_GetNumForName("brdr_br");
} }
/** \brief The R_VideoErase function /** \brief The R_VideoErase function
@@ -658,6 +578,129 @@ void R_VideoErase(size_t ofs, INT32 count)
M_Memcpy(vid.screens[0] + ofs, vid.screens[1] + ofs, count); M_Memcpy(vid.screens[0] + ofs, vid.screens[1] + ofs, count);
} }
#if 0
/** \brief R_FillBackScreen
Fills the back screen with a pattern for variable screen sizes
Also draws a beveled edge.
*/
void R_FillBackScreen(void)
{
UINT8 *src, *dest;
patch_t *patch;
INT32 x, y, step, boff;
// quickfix, don't cache lumps in both modes
if (rendermode != render_soft)
return;
// draw pattern around the status bar too (when hires),
// so return only when in full-screen without status bar.
if (scaledviewwidth == vid.width && viewheight == vid.height)
return;
src = scr_borderpatch;
dest = vid.screens[1];
for (y = 0; y < vid.height; y++)
{
for (x = 0; x < vid.width/128; x++)
{
M_Memcpy (dest, src+((y&127)<<7), 128);
dest += 128;
}
if (vid.width&127)
{
M_Memcpy(dest, src+((y&127)<<7), vid.width&127);
dest += (vid.width&127);
}
}
// don't draw the borders when viewwidth is full vid.width.
if (scaledviewwidth == vid.width)
return;
step = 8;
boff = 8;
patch = W_CacheLumpNum(viewborderlump[BRDR_T], PU_CACHE);
for (x = 0; x < scaledviewwidth; x += step)
V_DrawPatch(viewwindowx + x, viewwindowy - boff, 1, patch);
patch = W_CacheLumpNum(viewborderlump[BRDR_B], PU_CACHE);
for (x = 0; x < scaledviewwidth; x += step)
V_DrawPatch(viewwindowx + x, viewwindowy + viewheight, 1, patch);
patch = W_CacheLumpNum(viewborderlump[BRDR_L], PU_CACHE);
for (y = 0; y < viewheight; y += step)
V_DrawPatch(viewwindowx - boff, viewwindowy + y, 1, patch);
patch = W_CacheLumpNum(viewborderlump[BRDR_R],PU_CACHE);
for (y = 0; y < viewheight; y += step)
V_DrawPatch(viewwindowx + scaledviewwidth, viewwindowy + y, 1,
patch);
// Draw beveled corners.
V_DrawPatch(viewwindowx - boff, viewwindowy - boff, 1,
W_CacheLumpNum(viewborderlump[BRDR_TL], PU_CACHE));
V_DrawPatch(viewwindowx + scaledviewwidth, viewwindowy - boff, 1,
W_CacheLumpNum(viewborderlump[BRDR_TR], PU_CACHE));
V_DrawPatch(viewwindowx - boff, viewwindowy + viewheight, 1,
W_CacheLumpNum(viewborderlump[BRDR_BL], PU_CACHE));
V_DrawPatch(viewwindowx + scaledviewwidth, viewwindowy + viewheight, 1,
W_CacheLumpNum(viewborderlump[BRDR_BR], PU_CACHE));
}
/** \brief The R_DrawViewBorder
Draws the border around the view
for different size windows?
*/
void R_DrawViewBorder(void)
{
INT32 top, side, ofs;
if (rendermode == render_none)
return;
#ifdef HWRENDER
if (rendermode != render_soft)
{
HWR_DrawViewBorder(0);
return;
}
else
#endif
#ifdef DEBUG
fprintf(stderr,"RDVB: vidwidth %d vidheight %d scaledviewwidth %d viewheight %d\n",
vid.width, vid.height, scaledviewwidth, viewheight);
#endif
if (scaledviewwidth == vid.width)
return;
top = (vid.height - viewheight)>>1;
side = (vid.width - scaledviewwidth)>>1;
// copy top and one line of left side
R_VideoErase(0, top*vid.width+side);
// copy one line of right side and bottom
ofs = (viewheight+top)*vid.width - side;
R_VideoErase(ofs, top*vid.width + side);
// copy sides using wraparound
ofs = top*vid.width + vid.width-side;
side <<= 1;
// simpler using our VID_Blit routine
VID_BlitLinearScreen(vid.screens[1] + ofs, vid.screens[0] + ofs, side, viewheight - 1,
vid.width, vid.width);
}
#endif
// ========================================================================== // ==========================================================================
// INCLUDE DRAWING CODE HERE // INCLUDE DRAWING CODE HERE
// ========================================================================== // ==========================================================================
+36 -25
View File
@@ -25,12 +25,15 @@ extern "C" {
// ------------------------------- // -------------------------------
// COMMON STUFF FOR 8bpp AND 16bpp // COMMON STUFF FOR 8bpp AND 16bpp
// ------------------------------- // -------------------------------
extern UINT8 *renderscreen;
extern INT32 linesize;
FUNCINLINE static ATTRINLINE UINT8 *R_Address(INT32 px, INT32 py) FUNCINLINE static ATTRINLINE UINT8 *R_Address(INT32 px, INT32 py)
{ {
return vid.screens[0] + (py + viewwindowy) * vid.width + (viewwindowx + px); return renderscreen + (py + viewwindowy) * linesize + (viewwindowx + px);
} }
typedef struct { typedef struct {
float x, y, z; float x, y, z;
} floatv3_t; } floatv3_t;
@@ -99,16 +102,6 @@ extern floatv3_t *ds_su, *ds_sv, *ds_sz;
extern float focallengthf; extern float focallengthf;
enum columncontext_e
{
COLUMNCONTEXT_DIRECT = 0,
COLUMNCONTEXT_FLUSH,
};
extern enum columncontext_e columncontext;
void R_SetColumnContext(enum columncontext_e _columncontext);
void R_ResetColumnBuffer(void);
typedef void (coldrawfunc_t)(drawcolumndata_t*); typedef void (coldrawfunc_t)(drawcolumndata_t*);
typedef void (spandrawfunc_t)(drawspandata_t*); typedef void (spandrawfunc_t)(drawspandata_t*);
@@ -159,11 +152,28 @@ extern spandrawfunc_t *spanfuncs[SPANDRAWFUNC_MAX];
void R_DrawMaskedColumn(drawcolumndata_t* dc, column_t *column); void R_DrawMaskedColumn(drawcolumndata_t* dc, column_t *column);
// ------------------------------------------------ /// \brief Top border
// r_draw.c #define BRDR_T 0
// ------------------------------------------------ /// \brief Bottom border
#define BRDR_B 1
/// \brief Left border
#define BRDR_L 2
/// \brief Right border
#define BRDR_R 3
/// \brief Topleft border
#define BRDR_TL 4
/// \brief Topright border
#define BRDR_TR 5
/// \brief Bottomleft border
#define BRDR_BL 6
/// \brief Bottomright border
#define BRDR_BR 7
// Custom player skin translation extern lumpnum_t viewborderlump[8];
// ------------------------------------------------
// r_draw.c COMMON ROUTINES FOR BOTH 8bpp and 16bpp
// ------------------------------------------------
#define GTC_CACHE 1 #define GTC_CACHE 1
#define GTC_MENUCACHE GTC_CACHE #define GTC_MENUCACHE GTC_CACHE
@@ -209,9 +219,19 @@ UINT8 *R_GetBlendTable(int style, INT32 alphalevel);
boolean R_BlendLevelVisible(INT32 blendmode, INT32 alphalevel); boolean R_BlendLevelVisible(INT32 blendmode, INT32 alphalevel);
void R_InitViewBuffer(void); // Custom player skin translation
void R_InitViewBuffer(INT32 width, INT32 height);
void R_InitViewBorder(void);
void R_VideoErase(size_t ofs, INT32 count); void R_VideoErase(size_t ofs, INT32 count);
// Rendering function.
#if 0
void R_FillBackScreen(void);
// If the view size is not full screen, draws a border around it.
void R_DrawViewBorder(void);
#endif
#define TRANSPARENTPIXEL 247 #define TRANSPARENTPIXEL 247
// ----------------- // -----------------
@@ -230,15 +250,6 @@ void R_DrawTranslatedTranslucentColumn(drawcolumndata_t* dc);
void R_Draw2sMultiPatchColumn(drawcolumndata_t* dc); void R_Draw2sMultiPatchColumn(drawcolumndata_t* dc);
void R_Draw2sMultiPatchTranslucentColumn(drawcolumndata_t* dc); void R_Draw2sMultiPatchTranslucentColumn(drawcolumndata_t* dc);
// column drawers which use buffered drawing with flush
void R_DrawColumn_Flush(drawcolumndata_t* dc);
void R_DrawTranslucentColumn_Flush(drawcolumndata_t* dc);
void R_DrawTranslatedColumn_Flush(drawcolumndata_t* dc);
void R_DrawColumnShadowed_Flush(drawcolumndata_t* dc);
void R_DrawTranslatedTranslucentColumn_Flush(drawcolumndata_t* dc);
void R_Draw2sMultiPatchColumn_Flush(drawcolumndata_t* dc);
void R_Draw2sMultiPatchTranslucentColumn_Flush(drawcolumndata_t* dc);
void R_DrawFogColumn(drawcolumndata_t* dc); void R_DrawFogColumn(drawcolumndata_t* dc);
// span drawers // span drawers
+17 -63
View File
@@ -21,8 +21,6 @@
// a has a constant z depth from top to bottom. // a has a constant z depth from top to bottom.
// //
#include "r_draw_flush.cpp"
enum DrawColumnType enum DrawColumnType
{ {
DC_BASIC = 0x0000, DC_BASIC = 0x0000,
@@ -30,12 +28,10 @@ enum DrawColumnType
DC_TRANSMAP = 0x0002, DC_TRANSMAP = 0x0002,
DC_HOLES = 0x0004, DC_HOLES = 0x0004,
DC_LIGHTLIST = 0x0008, DC_LIGHTLIST = 0x0008,
DC_DIRECT = 0x0010, // draw our columns directly to screen!
}; };
template<DrawColumnType Type> template<DrawColumnType Type>
FUNCINLINE static ATTRINLINE constexpr UINT8 static constexpr UINT8 R_GetColumnTranslated(drawcolumndata_t* dc, UINT8 col, const UINT8 * restrict colormap)
R_GetColumnTranslated(const drawcolumndata_t* dc, UINT8 col, const UINT8 * restrict colormap)
{ {
if constexpr (Type & DrawColumnType::DC_COLORMAP) if constexpr (Type & DrawColumnType::DC_COLORMAP)
{ {
@@ -45,10 +41,8 @@ R_GetColumnTranslated(const drawcolumndata_t* dc, UINT8 col, const UINT8 * restr
return colormap[col]; return colormap[col];
} }
// translucency is handled on flush side now!
template<DrawColumnType Type> template<DrawColumnType Type>
FUNCINLINE static ATTRINLINE constexpr UINT8 static constexpr UINT8 R_GetColumnTranslucent(drawcolumndata_t* dc, UINT8 * restrict dest, UINT8 col, const UINT8 * restrict colormap)
R_GetColumnTranslucent(const drawcolumndata_t* dc, UINT8 * restrict dest, UINT8 col, const UINT8 * restrict colormap)
{ {
col = R_GetColumnTranslated<Type>(dc, col, colormap); col = R_GetColumnTranslated<Type>(dc, col, colormap);
@@ -63,8 +57,7 @@ R_GetColumnTranslucent(const drawcolumndata_t* dc, UINT8 * restrict dest, UINT8
} }
template<DrawColumnType Type> template<DrawColumnType Type>
FUNCINLINE static ATTRINLINE constexpr UINT8 static constexpr UINT8 R_DrawColumnPixel(drawcolumndata_t* dc, UINT8 * restrict dest, UINT32 bit, const UINT8 * restrict source, const UINT8 * restrict colormap)
R_DrawColumnPixel(const drawcolumndata_t* dc, UINT8 * restrict dest, UINT32 bit, const UINT8 * restrict source, const UINT8 * restrict colormap)
{ {
UINT8 col = source[bit]; UINT8 col = source[bit];
@@ -76,7 +69,6 @@ R_DrawColumnPixel(const drawcolumndata_t* dc, UINT8 * restrict dest, UINT32 bit,
} }
} }
// if we dont buffer our columns, we need to handle translucency again
return R_GetColumnTranslucent<Type>(dc, dest, col, colormap); return R_GetColumnTranslucent<Type>(dc, dest, col, colormap);
} }
@@ -88,18 +80,8 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
{ {
INT32 count; INT32 count;
// leban 1/17/99:
// removed the + 1 here, adjusted the if test, and added an increment
// later. this helps a compiler pipeline a bit better. the x86
// assembler also does this.
count = dc->yh - dc->yl; count = dc->yh - dc->yl;
// leban 1/17/99:
// this case isn't executed too often. depending on how many instructions
// there are between here and the second if test below, this case could
// be moved down and might save instructions overall. since there are
// probably different wads that favor one way or the other, i'll leave
// this alone for now.
if (count < 0) // Zero length, column does not exceed a pixel. if (count < 0) // Zero length, column does not exceed a pixel.
{ {
return; return;
@@ -168,7 +150,6 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
} }
R_DrawColumnTemplate<NewType>(&dc_copy); R_DrawColumnTemplate<NewType>(&dc_copy);
if (solid) if (solid)
{ {
dc_copy.yl = bheight; dc_copy.yl = bheight;
@@ -202,37 +183,19 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
// killough 2/1/98: more performance tuning // killough 2/1/98: more performance tuning
intptr_t frac; intptr_t frac;
// Looks familiar.
const intptr_t fracstep = dc->iscale; const intptr_t fracstep = dc->iscale;
const intptr_t heightmask = dc->sourcelength-1; // CPhipps - specify type const intptr_t heightmask = dc->sourcelength-1;
constexpr INT32 npow2min = -1; constexpr INT32 npow2min = -1;
const INT32 npow2max = dc->sourcelength; const INT32 npow2max = dc->sourcelength;
const INT32 stride = vid.width;
const UINT8 * restrict source = dc->source; const UINT8 * restrict source = dc->source;
const lighttable_t * restrict colormap = dc->colormap; const lighttable_t * restrict colormap = dc->colormap;
// Framebuffer destination address. // Framebuffer destination address.
// SoM: MAGIC UINT8 * restrict dest = R_Address(dc->x, dc->yl);
UINT8 * restrict dest;
if constexpr (Type & DrawColumnType::DC_DIRECT) count++;
dest = R_Address(dc->x, dc->yl);
else if constexpr ((Type & (DrawColumnType::DC_COLORMAP | DrawColumnType::DC_TRANSMAP))
== (DrawColumnType::DC_COLORMAP | DrawColumnType::DC_TRANSMAP))
dest = R_GetBufferColormapTrans(dc);
else if constexpr (Type & DrawColumnType::DC_TRANSMAP)
dest = R_GetBufferTrans(dc);
else if constexpr (Type & DrawColumnType::DC_COLORMAP)
dest = R_GetBufferColormap(dc);
else
dest = R_GetBufferOpaque(dc);
INT32 stride = 8; //SoM: Oh, Oh it's MAGIC! You know...
if constexpr (Type & DrawColumnType::DC_DIRECT)
stride = vid.width;
count++; // killough 1/99: minor tuning
// Determine scaling, which is the only mapping to be done. // Determine scaling, which is the only mapping to be done.
frac = (dc->texturemid + FixedMul((dc->yl << FRACBITS) - centeryfrac, fracstep)); frac = (dc->texturemid + FixedMul((dc->yl << FRACBITS) - centeryfrac, fracstep));
@@ -242,16 +205,15 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
case 255: case 255:
case 127: case 127:
{ {
while (count--) while(count--)
{ {
*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap); *dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap);
dest += stride; dest += stride;
frac += fracstep; frac += fracstep;
} }
} }
break; break;
case npow2min: case -1:
{ {
if (frac < 0) if (frac < 0)
// adjust in case we underread // adjust in case we underread
@@ -261,7 +223,6 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
while (--count >= 0) while (--count >= 0)
{ {
*dest = R_DrawColumnPixel<Type>(dc, dest, frac>>FRACBITS, source, colormap); *dest = R_DrawColumnPixel<Type>(dc, dest, frac>>FRACBITS, source, colormap);
dest += stride; dest += stride;
frac += fracstep; frac += fracstep;
} }
@@ -274,12 +235,10 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
while ((count -= 2) >= 0) // texture height is a power of 2 -- killough while ((count -= 2) >= 0) // texture height is a power of 2 -- killough
{ {
*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap); *dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap);
dest += stride; dest += stride;
frac += fracstep; frac += fracstep;
*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap); *dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap);
dest += stride; dest += stride;
frac += fracstep; frac += fracstep;
} }
@@ -312,7 +271,7 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
{ {
// Re-map color indices from wall texture column // Re-map color indices from wall texture column
// using a lighting/special effects LUT. // using a lighting/special effects LUT.
// heightmask is the Tutti-Frutti fix -- killough // heightmask is the Tutti-Frutti fix
// -1 is the lower clamp bound because column posts have a "safe" byte before the real data // -1 is the lower clamp bound because column posts have a "safe" byte before the real data
// and a few bytes after as well // and a few bytes after as well
@@ -352,18 +311,13 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
R_DrawColumnTemplate<opt>(dc); \ R_DrawColumnTemplate<opt>(dc); \
} }
#define DEFINE_COLUMN_COMBO(name, flags) \ DEFINE_COLUMN_FUNC(R_DrawColumn, DC_BASIC)
DEFINE_COLUMN_FUNC(name, flags|DC_DIRECT) \ DEFINE_COLUMN_FUNC(R_DrawTranslucentColumn, DC_TRANSMAP)
DEFINE_COLUMN_FUNC(name ## _Flush, flags) DEFINE_COLUMN_FUNC(R_DrawTranslatedColumn, DC_COLORMAP)
DEFINE_COLUMN_FUNC(R_DrawColumnShadowed, DC_LIGHTLIST)
DEFINE_COLUMN_COMBO(R_DrawColumn, DC_BASIC) DEFINE_COLUMN_FUNC(R_DrawTranslatedTranslucentColumn, DC_COLORMAP|DC_TRANSMAP)
DEFINE_COLUMN_COMBO(R_DrawTranslucentColumn, DC_TRANSMAP) DEFINE_COLUMN_FUNC(R_Draw2sMultiPatchColumn, DC_HOLES)
DEFINE_COLUMN_COMBO(R_DrawTranslatedColumn, DC_COLORMAP) DEFINE_COLUMN_FUNC(R_Draw2sMultiPatchTranslucentColumn, DC_HOLES|DC_TRANSMAP)
DEFINE_COLUMN_COMBO(R_DrawColumnShadowed, DC_LIGHTLIST)
DEFINE_COLUMN_COMBO(R_DrawTranslatedTranslucentColumn, DC_COLORMAP|DC_TRANSMAP)
DEFINE_COLUMN_COMBO(R_Draw2sMultiPatchColumn, DC_HOLES)
DEFINE_COLUMN_COMBO(R_Draw2sMultiPatchTranslucentColumn, DC_HOLES|DC_TRANSMAP)
/** \brief The R_DrawFogColumn function /** \brief The R_DrawFogColumn function
Fog wall. Fog wall.
-269
View File
@@ -1,269 +0,0 @@
// SONIC ROBO BLAST 2 KART
//-----------------------------------------------------------------------------
// Copyright (C) 2025 by Kart Krew.
// Copyright (C) 2020 by Sonic Team Junior.
// Copyright (C) 2000 by DooM Legacy Team.
// Copyright (C) 1996 by id Software, Inc.
// Copyright (C) 1999 by Chi Hoang, Lee Killough, Jim Flynn, Rand Phares, Ty Halderman
// Copyright (C) 1999-2000 by Jess Haas, Nicolas Kalkhof, Colin Phipps, Florian Schulze
// Copyright (C) Copyright 2005, 2006 by Florian Schulze, Colin Phipps, Neil Stevens, Andrey Budko
// Copyright (C) 2013 by James Haley, Stephen McGranahan, et al.
//
// 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 r_draw_flush.cpp
/// \brief Optimized quad column buffer code. By SoM.
/// \note no includes because this is included as part of r_draw.cpp
template<ColumnFlushType Type>
FUNCINLINE static ATTRINLINE constexpr UINT8
R_GetFlushPixelTranslated(const drawcolumndata_temp_t *t_dc, UINT8 col)
{
if constexpr (Type & (ColumnFlushType::FLUSH_COLORMAP | ColumnFlushType::FLUSH_COLORMAP_TRANS))
{
col = t_dc->translation[col];
}
return col;
}
template<ColumnFlushType Type>
FUNCINLINE static ATTRINLINE constexpr UINT8
R_GetFlushPixelTranslucent(const drawcolumndata_temp_t *t_dc, UINT8 * restrict dest, UINT8 col)
{
col = R_GetFlushPixelTranslated<Type>(t_dc, col);
if constexpr (Type & (ColumnFlushType::FLUSH_TRANS | ColumnFlushType::FLUSH_COLORMAP_TRANS))
{
// haleyjd 09/11/04: use temptranmap here
return *(t_dc->transmap + (col << 8) + (*dest));
}
else
{
return col;
}
}
template<ColumnFlushType Type>
FUNCINLINE static ATTRINLINE constexpr UINT8
R_DrawFlushPixel(const drawcolumndata_temp_t *t_dc, UINT8 * restrict dest, const UINT8 * restrict source)
{
UINT8 col = *source;
return R_GetFlushPixelTranslucent<Type>(t_dc, dest, col);
}
//
// R_FlushWhole
//
// Flushes the entire columns in the buffer, one at a time.
// This is used when a quad flush isn't possible.
//
template<ColumnFlushType Type>
static void R_FlushWhole(void)
{
UINT8 * restrict source;
UINT8 * restrict dest;
INT32 count, yl;
const INT32 stride = vid.width;
drawcolumndata_temp_t *t_dc = &temp_dc;
UINT8 *restrict buf = t_dc->buf;
while (--t_dc->x >= 0)
{
yl = t_dc->yl[t_dc->x];
source = &buf[t_dc->x + (yl << 3)];
dest = R_Address(t_dc->startx + t_dc->x, yl);
count = t_dc->yh[t_dc->x] - yl + 1;
while (--count >= 0)
{
*dest = R_DrawFlushPixel<Type>(t_dc, dest, source);
source += 8;
dest += stride;
}
}
}
//
// R_FlushHT
//
// Flushes the head and tail of columns in the buffer in
// preparation for a quad flush.
//
template<ColumnFlushType Type>
static void R_FlushHT(void)
{
UINT8 * restrict source;
UINT8 * restrict dest;
INT32 count, colnum = 0;
INT32 yl, yh;
const INT32 stride = vid.width;
const drawcolumndata_temp_t *t_dc = &temp_dc;
UINT8 *restrict buf = t_dc->buf;
while (colnum < 8)
{
yl = t_dc->yl[colnum];
yh = t_dc->yh[colnum];
// flush column head
if (yl < t_dc->commontop)
{
source = &buf[colnum + (yl << 3)];
dest = R_Address(t_dc->startx + colnum, yl);
count = t_dc->commontop - yl;
while (--count >= 0)
{
*dest = R_DrawFlushPixel<Type>(t_dc, dest, source);
source += 8;
dest += stride;
}
}
// flush column tail
if (yh > t_dc->commonbot)
{
source = &buf[colnum + ((t_dc->commonbot + 1) << 3)];
dest = R_Address(t_dc->startx + colnum, t_dc->commonbot + 1);
count = yh - t_dc->commonbot;
while (--count >= 0)
{
*dest = R_DrawFlushPixel<Type>(t_dc, dest, source);
source += 8;
dest += stride;
}
}
++colnum;
}
}
// Begin: Quad column flushing functions.
template<ColumnFlushType Type>
static void R_FlushQuad(void)
{
const INT32 stride = vid.width;
const drawcolumndata_temp_t *t_dc = &temp_dc;
INT32 count = t_dc->commonbot - t_dc->commontop + 1;
const UINT8 *restrict buf = t_dc->buf;
const UINT8 * restrict source = buf + (t_dc->commontop << 3);
UINT8 * restrict dest = R_Address(t_dc->startx, t_dc->commontop);
if constexpr (Type & ColumnFlushType::FLUSH_OPAQUE)
{
#if __SIZEOF_POINTER__ >= 8 // does not make much sense on 32bit targets
// 8 byte aligned copy -- make sure our dest ptr, source ptr AND stride are a multiple of 8!
if ((((uintptr_t)dest | (uintptr_t)source | stride) & 7) == 0)
{
const INT64 *source64 = reinterpret_cast<const INT64 *>(source);
INT64 *dest64 = reinterpret_cast<INT64 *>(dest);
const INT32 deststep = stride / 8;
while (--count >= 0)
{
*dest64 = *source64++;
dest64 += deststep;
}
}
else
#endif
{
while (--count >= 0)
{
dest[0] = source[0];
dest[1] = source[1];
dest[2] = source[2];
dest[3] = source[3];
dest[4] = source[4];
dest[5] = source[5];
dest[6] = source[6];
dest[7] = source[7];
source += 8;
dest += stride;
}
}
}
else
{
while (--count >= 0)
{
dest[0] = R_DrawFlushPixel<Type>(t_dc, &dest[0], &source[0]);
dest[1] = R_DrawFlushPixel<Type>(t_dc, &dest[1], &source[1]);
dest[2] = R_DrawFlushPixel<Type>(t_dc, &dest[2], &source[2]);
dest[3] = R_DrawFlushPixel<Type>(t_dc, &dest[3], &source[3]);
dest[4] = R_DrawFlushPixel<Type>(t_dc, &dest[4], &source[4]);
dest[5] = R_DrawFlushPixel<Type>(t_dc, &dest[5], &source[5]);
dest[6] = R_DrawFlushPixel<Type>(t_dc, &dest[6], &source[6]);
dest[7] = R_DrawFlushPixel<Type>(t_dc, &dest[7], &source[7]);
source += 8;
dest += stride;
}
}
}
// haleyjd 09/12/04: split up R_GetBuffer into various different
// functions to minimize the number of branches and take advantage
// of as much precalculated information as possible.
template<ColumnFlushType Type>
static UINT8 *R_GetBuffer(drawcolumndata_t *dc)
{
drawcolumndata_temp_t *t_dc = &temp_dc;
// haleyjd: reordered predicates
if (t_dc->x == 8 ||
(t_dc->x && (t_dc->type != Type || t_dc->x + t_dc->startx != dc->x)))
R_FlushColumns();
if (!t_dc->x)
{
++t_dc->x;
t_dc->startx = dc->x;
t_dc->yl[0] = t_dc->commontop = dc->yl;
t_dc->yh[0] = t_dc->commonbot = dc->yh;
t_dc->type = Type;
if constexpr (Type & (ColumnFlushType::FLUSH_TRANS | ColumnFlushType::FLUSH_COLORMAP_TRANS))
{
t_dc->transmap = dc->transmap;
}
if constexpr (Type & (ColumnFlushType::FLUSH_COLORMAP | ColumnFlushType::FLUSH_COLORMAP_TRANS))
{
t_dc->translation = dc->translation;
}
R_FlushWholeColumns = R_FlushWhole<Type>;
R_FlushHTColumns = R_FlushHT<Type>;
R_FlushQuadColumn = R_FlushQuad<Type>;
return &t_dc->buf[dc->yl << 3];
}
t_dc->yl[t_dc->x] = dc->yl;
t_dc->yh[t_dc->x] = dc->yh;
if (dc->yl > t_dc->commontop)
t_dc->commontop = dc->yl;
if (dc->yh < t_dc->commonbot)
t_dc->commonbot = dc->yh;
return &t_dc->buf[(dc->yl << 3) + t_dc->x++];
}
#define DEFINE_GETBUF_FUNC(name, flags) \
FUNCINLINE static ATTRINLINE UINT8 *name(drawcolumndata_t *dc) \
{ \
constexpr ColumnFlushType opt = static_cast<ColumnFlushType>(flags); \
return R_GetBuffer<opt>(dc); \
}
DEFINE_GETBUF_FUNC(R_GetBufferOpaque, FLUSH_OPAQUE)
DEFINE_GETBUF_FUNC(R_GetBufferTrans, FLUSH_TRANS)
DEFINE_GETBUF_FUNC(R_GetBufferColormap, FLUSH_COLORMAP)
DEFINE_GETBUF_FUNC(R_GetBufferColormapTrans, FLUSH_COLORMAP_TRANS)
+72 -69
View File
@@ -25,9 +25,6 @@
#define local_for_thread static #define local_for_thread static
#endif #endif
#include <vector>
#include <algorithm>
// ========================================================================== // ==========================================================================
// SPANS // SPANS
// ========================================================================== // ==========================================================================
@@ -50,8 +47,7 @@ enum DrawSpanType
}; };
template<DrawSpanType Type> template<DrawSpanType Type>
FUNCINLINE static ATTRINLINE constexpr UINT8 static constexpr UINT8 R_GetSpanTranslated(drawspandata_t* ds, UINT8 col)
R_GetSpanTranslated(const drawspandata_t* ds, UINT8 col)
{ {
if constexpr (Type & DrawSpanType::DS_COLORMAP) if constexpr (Type & DrawSpanType::DS_COLORMAP)
{ {
@@ -64,8 +60,7 @@ R_GetSpanTranslated(const drawspandata_t* ds, UINT8 col)
} }
template<DrawSpanType Type> template<DrawSpanType Type>
FUNCINLINE static ATTRINLINE constexpr UINT8 static constexpr UINT8 R_GetSpanTranslucent(drawspandata_t* ds, UINT8 *dsrc, const UINT8 *colormap, UINT8 col)
R_GetSpanTranslucent(const drawspandata_t* ds, UINT8 *dsrc, const UINT8 *colormap, UINT8 col)
{ {
col = colormap[R_GetSpanTranslated<Type>(ds, col)]; col = colormap[R_GetSpanTranslated<Type>(ds, col)];
@@ -80,8 +75,7 @@ R_GetSpanTranslucent(const drawspandata_t* ds, UINT8 *dsrc, const UINT8 *colorma
} }
template<DrawSpanType Type> template<DrawSpanType Type>
FUNCINLINE static ATTRINLINE constexpr UINT8 static constexpr UINT8 R_DrawSpanPixel(drawspandata_t* ds, UINT8 *dsrc, const UINT8 *colormap, UINT32 bit, const UINT8 *source)
R_DrawSpanPixel(const drawspandata_t* ds, UINT8 *dsrc, const UINT8 *colormap, UINT32 bit, const UINT8 *source)
{ {
UINT8 col = source[bit]; UINT8 col = source[bit];
@@ -160,18 +154,14 @@ static void R_DrawSpanTemplate(drawspandata_t* ds)
{ {
bit = ((yposition >> ds->nflatyshift) & ds->nflatmask) | (xposition >> ds->nflatxshift); bit = ((yposition >> ds->nflatyshift) & ds->nflatmask) | (xposition >> ds->nflatxshift);
if constexpr (Type & DS_RIPPLE) dest[i] = R_DrawSpanPixel<Type>(ds, &dsrc[i], colormap, bit, source);
dest[i] = R_DrawSpanPixel<Type>(ds, &dsrc[i], colormap, bit, source);
else
dest[i] = R_DrawSpanPixel<Type>(ds, &dest[i], colormap, bit, source);
xposition += xstep; xposition += xstep;
yposition += ystep; yposition += ystep;
} }
dest += 8; dest += 8;
if constexpr (Type & DS_RIPPLE) dsrc += 8;
dsrc += 8;
count -= 8; count -= 8;
} }
@@ -180,14 +170,10 @@ static void R_DrawSpanTemplate(drawspandata_t* ds)
{ {
bit = ((yposition >> ds->nflatyshift) & ds->nflatmask) | (xposition >> ds->nflatxshift); bit = ((yposition >> ds->nflatyshift) & ds->nflatmask) | (xposition >> ds->nflatxshift);
if constexpr (Type & DS_RIPPLE) *dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
else
*dest = R_DrawSpanPixel<Type>(ds, dest, colormap, bit, source);
dest++; dest++;
if constexpr (Type & DS_RIPPLE) dsrc++;
dsrc++;
xposition += xstep; xposition += xstep;
yposition += ystep; yposition += ystep;
@@ -196,39 +182,31 @@ static void R_DrawSpanTemplate(drawspandata_t* ds)
// R_CalcTiltedLighting // R_CalcTiltedLighting
// Exactly what it says on the tin. I wish I wasn't too lazy to explain things properly. // Exactly what it says on the tin. I wish I wasn't too lazy to explain things properly.
static void R_CalcTiltedLighting(std::vector<INT32>& lightbuffer, INT32 x1, INT32 x2, fixed_t start, fixed_t end) static void R_CalcTiltedLighting(INT32 *lightbuffer, INT32 x1, INT32 x2, fixed_t start, fixed_t end)
{ {
// ZDoom uses a different lighting setup to us, and I couldn't figure out how to adapt their version // ZDoom uses a different lighting setup to us, and I couldn't figure out how to adapt their version
// of this function. Here's my own. // of this function. Here's my own.
INT32 i; INT32 i, left = x1, right = x2;
const fixed_t step = (end-start)/(x2 - x1 + 1); const fixed_t step = (end-start)/(x2 - x1 + 1);
// I wanna do some optimizing by checking for out-of-range segments on either side to fill in all at once, // I wanna do some optimizing by checking for out-of-range segments on either side to fill in all at once,
// but I'm too bad at coding to not crash the game trying to do that. I guess this is fast enough for now... // but I'm too bad at coding to not crash the game trying to do that. I guess this is fast enough for now...
for (i = x1; i <= x2; i++) for (i = left; i <= right; i++)
{ {
fixed_t light = start >> FRACBITS; lightbuffer[i] = (start += step) >> FRACBITS;
lightbuffer[i] = CLAMP(light, 0, MAXLIGHTSCALE - 1);
start += step; if (lightbuffer[i] < 0)
{
lightbuffer[i] = 0;
}
else if (lightbuffer[i] >= MAXLIGHTSCALE)
{
lightbuffer[i] = MAXLIGHTSCALE-1;
}
} }
} }
static void R_GetTiltedLighting(std::vector<INT32>& tiltlighting, const drawspandata_t* ds, const float iz, const int width, const INT32 stride)
{
float planelightfloat = PLANELIGHTFLOAT;
const fixed_t lightstart = FloatToFixed(iz * planelightfloat);
const fixed_t lightend = FloatToFixed((iz + ds->szp.x * width) * planelightfloat);
if (tiltlighting.size() != (size_t)viewwidth)
{
tiltlighting.resize(viewwidth);
}
R_CalcTiltedLighting(tiltlighting, ds->x1, ds->x2, lightstart, lightend);
//CONS_Printf("tilted lighting %f to %f (foc %f)\n", FixedToFloat(lightstart), FixedToFloat(lightend), focallengthf);
}
template<DrawSpanType Type> template<DrawSpanType Type>
static void R_DrawTiltedSpanTemplate(drawspandata_t* ds) static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
{ {
@@ -245,23 +223,41 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
float endz, endu, endv; float endz, endu, endv;
UINT32 stepu, stepv; UINT32 stepu, stepv;
UINT32 bit; UINT32 bit;
local_for_thread INT32 *tiltlighting = NULL;
local_for_thread INT32 oldviewwidth = 0;
// dont realloc every frame pls thx
if (tiltlighting == NULL || oldviewwidth != viewwidth)
{
tiltlighting = static_cast<INT32*>(realloc(tiltlighting, sizeof(*tiltlighting) * viewwidth));
oldviewwidth = viewwidth;
}
INT32 x1 = ds->x1; INT32 x1 = ds->x1;
const INT32 nflatxshift = ds->nflatxshift; const INT32 nflatxshift = ds->nflatxshift;
const INT32 nflatyshift = ds->nflatyshift; const INT32 nflatyshift = ds->nflatyshift;
const INT32 nflatmask = ds->nflatmask; const INT32 nflatmask = ds->nflatmask;
const INT32 stride = vid.width; const INT32 stride = vid.width;
local_for_thread std::vector<INT32> tiltlighting;
iz = ds->szp.z + ds->szp.y*(centery-ds->y) + ds->szp.x*(ds->x1-centerx); iz = ds->szp.z + ds->szp.y*(centery-ds->y) + ds->szp.x*(ds->x1-centerx);
// Lighting is simple. It's just linear interpolation from start to end
{
float planelightfloat = PLANELIGHTFLOAT;
float lightstart, lightend;
lightend = (iz + ds->szp.x*width) * planelightfloat;
lightstart = iz * planelightfloat;
R_CalcTiltedLighting(tiltlighting, ds->x1, ds->x2, FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend));
//CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf);
}
uz = ds->sup.z + ds->sup.y*(centery-ds->y) + ds->sup.x*(ds->x1-centerx); uz = ds->sup.z + ds->sup.y*(centery-ds->y) + ds->sup.x*(ds->x1-centerx);
vz = ds->svp.z + ds->svp.y*(centery-ds->y) + ds->svp.x*(ds->x1-centerx); vz = ds->svp.z + ds->svp.y*(centery-ds->y) + ds->svp.x*(ds->x1-centerx);
// Lighting is simple. It's just linear interpolation from start to end const UINT8 *source = ds->source;
R_GetTiltedLighting(tiltlighting, ds, iz, width, stride); const UINT8 *colormap = ds->colormap;
const UINT8 * restrict source = ds->source;
const UINT8 * restrict colormap = ds->colormap;
if constexpr (Type & DS_RIPPLE) if constexpr (Type & DS_RIPPLE)
{ {
@@ -323,16 +319,12 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
{ {
bit = (((v + stepv * i) >> nflatyshift) & nflatmask) | ((u + stepu * i) >> nflatxshift); bit = (((v + stepv * i) >> nflatyshift) & nflatmask) | ((u + stepu * i) >> nflatxshift);
colormap = ds->planezlight[tiltlighting[x1 + i]] + (ds->colormap - colormaps); colormap = ds->planezlight[tiltlighting[x1 + i]] + (ds->colormap - colormaps);
if constexpr (Type & DS_RIPPLE) dest[i] = R_DrawSpanPixel<Type>(ds, &dsrc[i], colormap, bit, source);
dest[i] = R_DrawSpanPixel<Type>(ds, &dsrc[i], colormap, bit, source);
else
dest[i] = R_DrawSpanPixel<Type>(ds, &dest[i], colormap, bit, source);
} }
ds->x1 += SPANSIZE; ds->x1 += SPANSIZE;
dest += SPANSIZE; dest += SPANSIZE;
if constexpr (Type & DS_RIPPLE) dsrc += SPANSIZE;
dsrc += SPANSIZE;
startu = endu; startu = endu;
startv = endv; startv = endv;
width -= SPANSIZE; width -= SPANSIZE;
@@ -346,10 +338,7 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
v = (INT64)(startv); v = (INT64)(startv);
bit = ((v >> nflatyshift) & nflatmask) | (u >> nflatxshift); bit = ((v >> nflatyshift) & nflatmask) | (u >> nflatxshift);
colormap = ds->planezlight[tiltlighting[ds->x1]] + (ds->colormap - colormaps); colormap = ds->planezlight[tiltlighting[ds->x1]] + (ds->colormap - colormaps);
if constexpr (Type & DS_RIPPLE) *dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
else
*dest = R_DrawSpanPixel<Type>(ds, dest, colormap, bit, source);
ds->x1++; ds->x1++;
} }
else else
@@ -372,14 +361,10 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
{ {
bit = ((v >> ds->nflatyshift) & ds->nflatmask) | (u >> ds->nflatxshift); bit = ((v >> ds->nflatyshift) & ds->nflatmask) | (u >> ds->nflatxshift);
colormap = ds->planezlight[tiltlighting[ds->x1]] + (ds->colormap - colormaps); colormap = ds->planezlight[tiltlighting[ds->x1]] + (ds->colormap - colormaps);
if constexpr (Type & DS_RIPPLE) *dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
*dest = R_DrawSpanPixel<Type>(ds, dsrc, colormap, bit, source);
else
*dest = R_DrawSpanPixel<Type>(ds, dest, colormap, bit, source);
dest++; dest++;
if constexpr (Type & DS_RIPPLE)
dsrc++;
ds->x1++; ds->x1++;
dsrc++;
u += stepu; u += stepu;
v += stepv; v += stepv;
} }
@@ -410,11 +395,11 @@ DEFINE_SPAN_COMBO(R_DrawTranslucentWaterSpan, DS_TRANSMAP|DS_RIPPLE)
*/ */
void R_DrawFogSpan(drawspandata_t* ds) void R_DrawFogSpan(drawspandata_t* ds)
{ {
INT32 count = ds->x2 - ds->x1 + 1;
const UINT8 * restrict colormap = ds->colormap; const UINT8 * restrict colormap = ds->colormap;
UINT8 * restrict dest = R_Address(ds->x1, ds->y); UINT8 * restrict dest = R_Address(ds->x1, ds->y);
intptr_t count = ds->x2 - ds->x1 + 1;
while (count >= 4) while (count >= 4)
{ {
dest[0] = colormap[dest[0]]; dest[0] = colormap[dest[0]];
@@ -422,7 +407,7 @@ void R_DrawFogSpan(drawspandata_t* ds)
dest[2] = colormap[dest[2]]; dest[2] = colormap[dest[2]];
dest[3] = colormap[dest[3]]; dest[3] = colormap[dest[3]];
dest += 4; dest += 4;
count -= 4; count -= 4;
} }
@@ -438,13 +423,31 @@ void R_DrawFogSpan_Tilted(drawspandata_t* ds)
int width = ds->x2 - ds->x1; int width = ds->x2 - ds->x1;
float iz = ds->szp.z + ds->szp.y*(centery-ds->y) + ds->szp.x*(ds->x1-centerx); float iz = ds->szp.z + ds->szp.y*(centery-ds->y) + ds->szp.x*(ds->x1-centerx);
UINT8 * restrict dest; UINT8 * restrict dest;
local_for_thread std::vector<INT32> tiltlighting;
local_for_thread INT32 *tiltlighting = NULL;
local_for_thread INT32 oldviewwidth = 0;
// dont realloc every frame pls thx
if (tiltlighting == NULL || oldviewwidth != viewwidth)
{
tiltlighting = static_cast<INT32*>(realloc(tiltlighting, sizeof(*tiltlighting) * viewwidth));
oldviewwidth = viewwidth;
}
dest = R_Address(ds->x1, ds->y); dest = R_Address(ds->x1, ds->y);
const INT32 stride = vid.width; const INT32 stride = vid.width;
// Lighting is simple. It's just linear interpolation from start to end // Lighting is simple. It's just linear interpolation from start to end
R_GetTiltedLighting(tiltlighting, ds, iz, width, stride); {
float planelightfloat = PLANELIGHTFLOAT;
float lightstart, lightend;
lightend = (iz + ds->szp.x*width) * planelightfloat;
lightstart = iz * planelightfloat;
R_CalcTiltedLighting(tiltlighting, ds->x1, ds->x2, FLOAT_TO_FIXED(lightstart), FLOAT_TO_FIXED(lightend));
//CONS_Printf("tilted lighting %f to %f (foc %f)\n", lightstart, lightend, focallengthf);
}
do do
{ {
+1 -1
View File
@@ -172,7 +172,7 @@ static vector3_t *R_LerpVector3(const vector3_t *from, const vector3_t *to, fixe
// recalc necessary stuff for mouseaiming // recalc necessary stuff for mouseaiming
// slopes are already calculated for the full possible view (which is 4*viewheight). // slopes are already calculated for the full possible view (which is 4*viewheight).
// 18/08/18: (No it's actually 16*viewheight, thanks Lactozilla for finding this out) // 18/08/18: (No it's actually 16*viewheight, thanks Lactozilla for finding this out)
void R_SetupFreelook(void) static void R_SetupFreelook(void)
{ {
// clip it in the case we are looking a hardware 90 degrees full aiming // clip it in the case we are looking a hardware 90 degrees full aiming
// (lmps, network and use F12...) // (lmps, network and use F12...)
-1
View File
@@ -151,7 +151,6 @@ typedef struct levelinterpolator_s {
}; };
} levelinterpolator_t; } levelinterpolator_t;
void R_SetupFreelook(void);
// Interpolates the current view variables (r_state.h) against the selected view context in R_SetViewContext // Interpolates the current view variables (r_state.h) against the selected view context in R_SetViewContext
void R_InterpolateView(fixed_t frac, boolean forceinvalid); void R_InterpolateView(fixed_t frac, boolean forceinvalid);
// Special function just for software // Special function just for software
+6 -14
View File
@@ -63,7 +63,7 @@ size_t loopcount;
fixed_t viewx, viewy, viewz; fixed_t viewx, viewy, viewz;
angle_t viewangle, aimingangle, viewroll; angle_t viewangle, aimingangle, viewroll;
UINT8 viewssnum = 0; UINT8 viewssnum;
fixed_t viewcos, viewsin; fixed_t viewcos, viewsin;
boolean skyVisible; boolean skyVisible;
boolean skyVisiblePerPlayer[MAXSPLITSCREENPLAYERS]; // saved values of skyVisible for each splitscreen player boolean skyVisiblePerPlayer[MAXSPLITSCREENPLAYERS]; // saved values of skyVisible for each splitscreen player
@@ -88,7 +88,7 @@ INT32 viewangletox[FINEANGLES/2];
// The xtoviewangleangle[] table maps a screen pixel // The xtoviewangleangle[] table maps a screen pixel
// to the lowest viewangle that maps back to x ranges // to the lowest viewangle that maps back to x ranges
// from clipangle to -clipangle. // from clipangle to -clipangle.
angle_t *xtoviewangle = NULL; angle_t *xtoviewangle;
lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE]; lighttable_t *scalelight[LIGHTLEVELS][MAXLIGHTSCALE];
lighttable_t *scalelightfixed[MAXLIGHTSCALE]; lighttable_t *scalelightfixed[MAXLIGHTSCALE];
@@ -960,8 +960,6 @@ void R_ExecuteSetViewSize(void)
} }
} }
R_SetupFreelook();
am_recalc = true; am_recalc = true;
} }
@@ -1005,7 +1003,7 @@ static void R_InitViewMapping(void)
static void R_SetupViewBuffers(void) static void R_SetupViewBuffers(void)
{ {
R_CalcFov(cv_fov.value); R_CalcFov(cv_fov.value);
R_InitViewBuffer(); R_InitViewBuffer(viewwidth, viewheight);
R_InitViewMapping(); R_InitViewMapping();
} }
@@ -1025,6 +1023,8 @@ void R_Init(void)
//I_OutputMsg("\nR_InitData"); //I_OutputMsg("\nR_InitData");
R_InitData(); R_InitData();
//I_OutputMsg("\nR_InitViewBorder");
R_InitViewBorder();
R_SetViewSize(); // setsizeneeded is set true R_SetViewSize(); // setsizeneeded is set true
// this is now done by SCR_Recalc() at the first mode set // this is now done by SCR_Recalc() at the first mode set
@@ -1400,16 +1400,12 @@ void R_RenderPlayerView(player_t *player)
R_ClearClipSegs(); R_ClearClipSegs();
R_ClearDrawSegs(); R_ClearDrawSegs();
R_ClearSegTables();
R_ClearPlanes(); R_ClearPlanes();
R_ClearSprites(); R_ClearSprites();
R_SetColumnContext(COLUMNCONTEXT_FLUSH);
R_RenderViewpoint(&masks[nummasks - 1], false); R_RenderViewpoint(&masks[nummasks - 1], false);
R_ClipSprites(drawsegs, NULL); R_ClipSprites(drawsegs, NULL);
R_ResetColumnBuffer();
R_SetColumnContext(COLUMNCONTEXT_DIRECT);
R_DrawSkyPlanes(); // draw the fucker again to prevent some artifacts R_DrawSkyPlanes(); // draw the fucker again to prevent some artifacts
R_DrawPlanes(); R_DrawPlanes();
R_DrawMasked(masks, nummasks); R_DrawMasked(masks, nummasks);
@@ -1438,13 +1434,11 @@ void R_RenderPlayerView(player_t *player)
R_ClearClipSegs(); R_ClearClipSegs();
} }
R_ClearDrawSegs(); R_ClearDrawSegs();
R_ClearSegTables();
R_ClearSprites(); R_ClearSprites();
// check for new console commands. // check for new console commands.
NetUpdate(); NetUpdate();
R_SetColumnContext(COLUMNCONTEXT_FLUSH);
ps_numbspcalls.value.i = ps_numpolyobjects.value.i = ps_numdrawnodes.value.i = 0; ps_numbspcalls.value.i = ps_numpolyobjects.value.i = ps_numdrawnodes.value.i = 0;
PS_START_TIMING(ps_bsptime); PS_START_TIMING(ps_bsptime);
R_RenderViewpoint(&masks[nummasks - 1], true); R_RenderViewpoint(&masks[nummasks - 1], true);
@@ -1452,7 +1446,6 @@ void R_RenderPlayerView(player_t *player)
PS_START_TIMING(ps_sw_spritecliptime); PS_START_TIMING(ps_sw_spritecliptime);
R_ClipSprites(drawsegs, NULL); R_ClipSprites(drawsegs, NULL);
PS_STOP_TIMING(ps_sw_spritecliptime); PS_STOP_TIMING(ps_sw_spritecliptime);
R_ResetColumnBuffer();
ps_numsprites.value.i = numvisiblesprites; ps_numsprites.value.i = numvisiblesprites;
@@ -1489,14 +1482,12 @@ void R_RenderPlayerView(player_t *player)
R_RenderViewpoint(&masks[nummasks - 1], true); R_RenderViewpoint(&masks[nummasks - 1], true);
R_ClipSprites(ds_p - (masks[nummasks - 1].drawsegs[1] - masks[nummasks - 1].drawsegs[0]), portal); R_ClipSprites(ds_p - (masks[nummasks - 1].drawsegs[1] - masks[nummasks - 1].drawsegs[0]), portal);
R_ResetColumnBuffer();
Portal_Remove(portal); Portal_Remove(portal);
} }
} }
PS_STOP_TIMING(ps_sw_portaltime); PS_STOP_TIMING(ps_sw_portaltime);
R_SetColumnContext(COLUMNCONTEXT_DIRECT);
PS_START_TIMING(ps_sw_planetime); PS_START_TIMING(ps_sw_planetime);
if (!skybox) if (!skybox)
R_DrawSkyPlanes(); R_DrawSkyPlanes();
@@ -1507,6 +1498,7 @@ void R_RenderPlayerView(player_t *player)
PS_START_TIMING(ps_sw_maskedtime); PS_START_TIMING(ps_sw_maskedtime);
R_DrawMasked(masks, nummasks); R_DrawMasked(masks, nummasks);
PS_STOP_TIMING(ps_sw_maskedtime); PS_STOP_TIMING(ps_sw_maskedtime);
free(masks); free(masks);
// Check for new console commands. // Check for new console commands.
+1 -1
View File
@@ -97,7 +97,7 @@ FUNCINLINE static ATTRINLINE PUREFUNC INT32 R_PointOnSide(fixed_t x, fixed_t y,
// Try to quickly decide by looking at sign bits. // Try to quickly decide by looking at sign bits.
// also use a mask to avoid branch prediction // also use a mask to avoid branch prediction
INT32 mask = (((node->dy ^ node->dx ^ x ^ y) < 0) ? -1 : 0); INT32 mask = (node->dy ^ node->dx ^ x ^ y) >> 31;
return (mask & ((node->dy ^ x) < 0)) | // (left is negative) return (mask & ((node->dy ^ x) < 0)) | // (left is negative)
(~mask & (FixedMul(y, node->dx>>FRACBITS) >= FixedMul(node->dy>>FRACBITS, x))); (~mask & (FixedMul(y, node->dx>>FRACBITS) >= FixedMul(node->dy>>FRACBITS, x)));
} }
+25 -47
View File
@@ -19,7 +19,6 @@
#include "r_skins.h" #include "r_skins.h"
#include "z_zone.h" #include "z_zone.h"
#include "w_wad.h" #include "w_wad.h"
#include <vector>
#ifdef HWRENDER #ifdef HWRENDER
#include "hardware/hw_glob.h" #include "hardware/hw_glob.h"
@@ -38,7 +37,7 @@ static void R_ParseSpriteInfoFrame(spriteinfo_t *info)
UINT8 frameFrame = 0xFF; UINT8 frameFrame = 0xFF;
INT16 frameXPivot = 0; INT16 frameXPivot = 0;
INT16 frameYPivot = 0; INT16 frameYPivot = 0;
rotaxis_t frameRotAxis = ROTAXIS_X; rotaxis_t frameRotAxis = 0;
// Sprite identifier // Sprite identifier
sprinfoToken = M_GetToken(NULL); sprinfoToken = M_GetToken(NULL);
@@ -159,14 +158,14 @@ static void R_ParseSpriteInfo(boolean spr2)
I_Error("Error parsing SPRTINFO lump: Unknown sprite name \"%s\"", newSpriteName); I_Error("Error parsing SPRTINFO lump: Unknown sprite name \"%s\"", newSpriteName);
if (!memcmp(newSpriteName,sprnames[i],4)) if (!memcmp(newSpriteName,sprnames[i],4))
{ {
sprnum = static_cast<spritenum_t>(i); sprnum = i;
break; break;
} }
} }
} }
// allocate a spriteinfo // allocate a spriteinfo
info = static_cast<spriteinfo_t*>(Z_Calloc(sizeof(spriteinfo_t), PU_STATIC, NULL)); info = Z_Calloc(sizeof(spriteinfo_t), PU_STATIC, NULL);
info->available = true; info->available = true;
// Left Curly Brace // Left Curly Brace
@@ -330,7 +329,7 @@ void R_LoadSpriteInfoLumps(UINT16 wadnum, UINT16 numlumps)
patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest) patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest)
{ {
patch_t *patch = static_cast<patch_t*>((dest == NULL) ? Z_Calloc(sizeof(patch_t), PU_PATCH, NULL) : dest); patch_t *patch = (dest == NULL) ? Z_Calloc(sizeof(patch_t), PU_PATCH, NULL) : (patch_t *)(dest);
if (source) if (source)
{ {
@@ -342,7 +341,7 @@ patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest)
patch->height = SHORT(source->height); patch->height = SHORT(source->height);
patch->leftoffset = SHORT(source->leftoffset); patch->leftoffset = SHORT(source->leftoffset);
patch->topoffset = SHORT(source->topoffset); patch->topoffset = SHORT(source->topoffset);
patch->columnofs = static_cast<INT32*>(Z_Calloc(size, PU_PATCH_DATA, NULL)); patch->columnofs = Z_Calloc(size, PU_PATCH_DATA, NULL);
for (col = 0; col < source->width; col++) for (col = 0; col < source->width; col++)
{ {
@@ -358,7 +357,7 @@ patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest)
if (colsize <= 0) if (colsize <= 0)
I_Error("Patch_Create: no column data!"); I_Error("Patch_Create: no column data!");
patch->columns = static_cast<UINT8*>(Z_Calloc(colsize, PU_PATCH_DATA, NULL)); patch->columns = Z_Calloc(colsize, PU_PATCH_DATA, NULL);
M_Memcpy(patch->columns, ((UINT8 *)source + LONG(source->columnofs[0])), colsize); M_Memcpy(patch->columns, ((UINT8 *)source + LONG(source->columnofs[0])), colsize);
} }
@@ -430,8 +429,8 @@ void *Patch_AllocateHardwarePatch(patch_t *patch)
{ {
if (!patch->hardware) if (!patch->hardware)
{ {
GLPatch_t *glPatch = static_cast<GLPatch_t*>(Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, &patch->hardware)); GLPatch_t *glPatch = Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, &patch->hardware);
glPatch->mipmap = static_cast<GLMipmap_t*>(Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, &glPatch->mipmap)); glPatch->mipmap = Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, &glPatch->mipmap);
} }
return (void *)(patch->hardware); return (void *)(patch->hardware);
} }
@@ -449,8 +448,7 @@ void *Patch_CreateGL(patch_t *patch)
} }
#endif // HWRENDER #endif // HWRENDER
// 1 MB should be enough for most cases static UINT8 *imgbuf = NULL;
static std::vector<UINT8> imgbuf(1024 * 1024);
// //
// R_MaskedFlatToPatch // R_MaskedFlatToPatch
@@ -460,27 +458,17 @@ static std::vector<UINT8> imgbuf(1024 * 1024);
void *R_PixelsToPatch(UINT8 *raw, INT16 width, INT16 height, INT16 leftoffset, INT16 topoffset, size_t *destsize) void *R_PixelsToPatch(UINT8 *raw, INT16 width, INT16 height, INT16 leftoffset, INT16 topoffset, size_t *destsize)
{ {
INT16 x, y; INT16 x, y;
UINT8 *img, *imgptr; UINT8 *img;
UINT8 *colpointers, *startofspan; UINT8 *colpointers, *startofspan;
size_t size = 0; size_t size = 0;
if (!raw) if (!raw)
return NULL; return NULL;
// Allocate a staging buffer with the maximum size needed for a patch of the same size as the input. if (!imgbuf)
imgbuf = Z_Malloc(1<<26, PU_STATIC, NULL);
// round up to nearest multiple of 254-pixel posts, plus 1 more 254-pixel post for paranoia reasons UINT8 *imgptr = imgbuf;
size_t maxcolumnsize = (2 + (height - 1) / 256) * 256;
// the patch header, and width columns of the max column size
size_t maxoutsize = maxcolumnsize * width + (8 + 4 * width);
// so, a 512x512 flat should maximally need 393,760 (384.53 KiB) bytes.
// quite a bit smaller than 64 megabytes, and much less annoying to the windows debug allocator!
while (imgbuf.size() < maxoutsize)
{
imgbuf.resize(imgbuf.size() * 2);
}
imgptr = imgbuf.data();
// Write image size and offset // Write image size and offset
WRITEINT16(imgptr, width); WRITEINT16(imgptr, width);
@@ -500,7 +488,7 @@ void *R_PixelsToPatch(UINT8 *raw, INT16 width, INT16 height, INT16 leftoffset, I
startofspan = NULL; startofspan = NULL;
// Write column pointer // Write column pointer
WRITEINT32(colpointers, imgptr - imgbuf.data()); WRITEINT32(colpointers, imgptr - imgbuf);
// Write pixels // Write pixels
for (y = 0; y < height; y++) for (y = 0; y < height; y++)
@@ -569,9 +557,9 @@ void *R_PixelsToPatch(UINT8 *raw, INT16 width, INT16 height, INT16 leftoffset, I
WRITEUINT8(imgptr, 0xFF); WRITEUINT8(imgptr, 0xFF);
} }
size = imgptr-imgbuf.data(); size = imgptr-imgbuf;
img = static_cast<UINT8*>(Z_Malloc(size, PU_STATIC, NULL)); img = Z_Malloc(size, PU_STATIC, NULL);
memcpy(img, imgbuf.data(), size); memcpy(img, imgbuf, size);
if (destsize != NULL) if (destsize != NULL)
*destsize = size; *destsize = size;
@@ -594,27 +582,17 @@ void *R_PixelsToPatch(UINT8 *raw, INT16 width, INT16 height, INT16 leftoffset, I
void *R_MaskedFlatToPatch(UINT16 *raw, INT16 width, INT16 height, INT16 leftoffset, INT16 topoffset, size_t *destsize) void *R_MaskedFlatToPatch(UINT16 *raw, INT16 width, INT16 height, INT16 leftoffset, INT16 topoffset, size_t *destsize)
{ {
INT16 x, y; INT16 x, y;
UINT8 *img, *imgptr; UINT8 *img;
UINT8 *colpointers, *startofspan; UINT8 *colpointers, *startofspan;
size_t size = 0; size_t size = 0;
if (!raw) if (!raw)
return NULL; return NULL;
// Allocate a staging buffer with the maximum size needed for a patch of the same size as the input. if (!imgbuf)
imgbuf = Z_Malloc(1<<26, PU_STATIC, NULL);
// round up to nearest multiple of 254-pixel posts, plus 1 more 254-pixel post for paranoia reasons UINT8 *imgptr = imgbuf;
size_t maxcolumnsize = (2 + (height - 1) / 256) * 256;
// the patch header, and width columns of the max column size
size_t maxoutsize = maxcolumnsize * width + (8 + 4 * width);
// so, a 512x512 flat should maximally need 393,760 (384.53 KiB) bytes.
// quite a bit smaller than 64 megabytes, and much less annoying to the windows debug allocator!
while (imgbuf.size() < maxoutsize)
{
imgbuf.resize(imgbuf.size() * 2);
}
imgptr = imgbuf.data();
// Write image size and offset // Write image size and offset
WRITEINT16(imgptr, width); WRITEINT16(imgptr, width);
@@ -634,7 +612,7 @@ void *R_MaskedFlatToPatch(UINT16 *raw, INT16 width, INT16 height, INT16 leftoffs
startofspan = NULL; startofspan = NULL;
// Write column pointer // Write column pointer
WRITEINT32(colpointers, imgptr - imgbuf.data()); WRITEINT32(colpointers, imgptr - imgbuf);
// Write pixels // Write pixels
for (y = 0; y < height; y++) for (y = 0; y < height; y++)
@@ -704,9 +682,9 @@ void *R_MaskedFlatToPatch(UINT16 *raw, INT16 width, INT16 height, INT16 leftoffs
WRITEUINT8(imgptr, 0xFF); WRITEUINT8(imgptr, 0xFF);
} }
size = imgptr-imgbuf.data(); size = imgptr-imgbuf;
img = static_cast<UINT8*>(Z_Malloc(size, PU_STATIC, NULL)); img = Z_Malloc(size, PU_STATIC, NULL);
memcpy(img, imgbuf.data(), size); memcpy(img, imgbuf, size);
if (destsize != NULL) if (destsize != NULL)
*destsize = size; *destsize = size;
-10
View File
@@ -14,10 +14,6 @@
#ifndef __R_PATCH__ #ifndef __R_PATCH__
#define __R_PATCH__ #define __R_PATCH__
#ifdef __cplusplus
extern "C" {
#endif
#include "r_defs.h" #include "r_defs.h"
// Structs // Structs
@@ -40,8 +36,6 @@ typedef struct
boolean available; boolean available;
} spriteinfo_t; } spriteinfo_t;
#define PNG_HEADER_SIZE (8)
// Patch functions // Patch functions
patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest); patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest);
void Patch_Free(patch_t *patch); void Patch_Free(patch_t *patch);
@@ -67,8 +61,4 @@ void *R_PixelsToPatch(UINT8 *raw, INT16 width, INT16 height, INT16 leftoffset, I
UINT16 R_GetPatchPixel(patch_t *patch, INT32 x, INT32 y, boolean flip); UINT16 R_GetPatchPixel(patch_t *patch, INT32 x, INT32 y, boolean flip);
void R_PatchToPixels(patch_t *patch, UINT8 *dst); // Important: dst must have enough space for patch->width*patch->height pixels! void R_PatchToPixels(patch_t *patch, UINT8 *dst); // Important: dst must have enough space for patch->width*patch->height pixels!
#ifdef __cplusplus
} // extern "C"
#endif
#endif // __R_PATCH__ #endif // __R_PATCH__
@@ -15,7 +15,6 @@
#include "r_patchrotation.h" #include "r_patchrotation.h"
#include "z_zone.h" #include "z_zone.h"
#include "w_wad.h" #include "w_wad.h"
#include <vector>
#ifdef ROTSPRITE #ifdef ROTSPRITE
// //
@@ -90,14 +89,14 @@ patch_t *Patch_GetRotatedSprite(spriteframe_t *sprite, size_t frame, size_t spri
RotatedPatch_DoRotation(rotsprite, patch, rotationangle, xpivot, ypivot, flip); RotatedPatch_DoRotation(rotsprite, patch, rotationangle, xpivot, ypivot, flip);
} }
return static_cast<patch_t*>(rotsprite->patches[idx]); return rotsprite->patches[idx];
} }
rotsprite_t *RotatedPatch_Create(INT32 numangles) rotsprite_t *RotatedPatch_Create(INT32 numangles)
{ {
rotsprite_t *rotsprite = static_cast<rotsprite_t*>(Z_Calloc(sizeof(rotsprite_t), PU_STATIC, NULL)); rotsprite_t *rotsprite = Z_Calloc(sizeof(rotsprite_t), PU_STATIC, NULL);
rotsprite->angles = numangles; rotsprite->angles = numangles;
rotsprite->patches = static_cast<void**>(Z_Calloc(rotsprite->angles * 2 * sizeof(void *), PU_STATIC, NULL)); rotsprite->patches = Z_Calloc(rotsprite->angles * 2 * sizeof(void *), PU_STATIC, NULL);
return rotsprite; return rotsprite;
} }
@@ -119,8 +118,30 @@ static void RotatedPatch_CalculateDimensions(
h1 = FixedInt(FixedCeil(h1 + (FRACUNIT/2))); h1 = FixedInt(FixedCeil(h1 + (FRACUNIT/2)));
h2 = FixedInt(FixedCeil(h2 + (FRACUNIT/2))); h2 = FixedInt(FixedCeil(h2 + (FRACUNIT/2)));
*newwidth = std::max(width, std::max(w1, w2)); *newwidth = max(width, max(w1, w2));
*newheight = std::max(height, std::max(h1, h2)); *newheight = max(height, max(h1, h2));
}
static void RotatedPatch_AllocImgBuf(UINT16 **buf, size_t size, size_t *capacity)
{
if (!*buf)
{
*buf = Z_Malloc(*capacity, PU_STATIC, NULL);
}
size_t allocsize = size * sizeof(UINT16);
// make sure our buffer always fits with what we need
if (allocsize > *capacity)
{
while (*capacity < allocsize)
*capacity *= 2;
Z_Free(*buf);
*buf = Z_Malloc(*capacity, PU_STATIC, NULL);
}
//CONS_Printf("RotatedPatch_AllocBuf: Allocated %.2f KB\n", *capacity / 1024.0);
} }
void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle, INT32 xpivot, INT32 ypivot, boolean flip) void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle, INT32 xpivot, INT32 ypivot, boolean flip)
@@ -128,10 +149,10 @@ void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle
UINT32 i; UINT32 i;
patch_t *rotated; patch_t *rotated;
static std::vector<UINT16> rawdst(1024 * 1024), rawconv(1024 * 1024); // 1 MB should be enough for most cases static UINT16 *rawdst = NULL, *rawconv = NULL;
UINT16 *rawout; UINT16 *rawout;
size_t size; size_t size;
static size_t dst_capacity = (1024 * 1024), conv_capacity = (1024 * 1024); // 1 MB should be enough for most cases
INT32 bflip = (flip != 0x00); INT32 bflip = (flip != 0x00);
INT32 width = patch->width; INT32 width = patch->width;
@@ -185,10 +206,7 @@ void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle
if (!size) if (!size)
size = (width * height); size = (width * height);
while (rawdst.size() < size) RotatedPatch_AllocImgBuf(&rawdst, size, &dst_capacity);
{
rawdst.resize(rawdst.size() * 2);
}
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
rawdst[i] = 0xFF00; rawdst[i] = 0xFF00;
@@ -232,11 +250,11 @@ void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle
size = (width * height); size = (width * height);
rawconv.resize(size); RotatedPatch_AllocImgBuf(&rawconv, size, &conv_capacity);
memset(rawconv.data(), 0, size * sizeof(UINT16)); memset(rawconv, 0, conv_capacity * sizeof(UINT16));
src = &rawdst[(miny * newwidth) + minx]; src = &rawdst[(miny * newwidth) + minx];
dest = rawconv.data(); dest = rawconv;
dy = height; dy = height;
while (dy--) while (dy--)
@@ -249,14 +267,14 @@ void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle
ox -= minx; ox -= minx;
oy -= miny; oy -= miny;
rawout = rawconv.data(); rawout = rawconv;
} }
else else
{ {
width = newwidth; width = newwidth;
height = newheight; height = newheight;
rawout = rawdst.data(); rawout = rawdst;
} }
// make patch // make patch
+53 -39
View File
@@ -46,27 +46,31 @@
// good night sweet prince // good night sweet prince
//#define SHITPLANESPARENCY //#define SHITPLANESPARENCY
visplane_t *visplanes[MAXVISPLANES] = {}; visplane_t *visplanes[MAXVISPLANES];
static visplane_t *freetail; static visplane_t *freetail;
static visplane_t **freehead = &freetail; static visplane_t **freehead = &freetail;
visplane_t *floorplane = NULL; visplane_t *floorplane;
visplane_t *ceilingplane = NULL; visplane_t *ceilingplane;
visffloor_t visffloor[MAXFFLOORS] = {}; visffloor_t visffloor[MAXFFLOORS];
INT32 numffloors = 0; INT32 numffloors;
//SoM: 3/23/2000: Boom visplane hashing routine. //SoM: 3/23/2000: Boom visplane hashing routine.
#define visplane_hash(picnum,lightlevel,height) \ #define visplane_hash(picnum,lightlevel,height) \
((unsigned)((picnum)*3+(lightlevel)+(height)*7) & VISPLANEHASHMASK) ((unsigned)((picnum)*3+(lightlevel)+(height)*7) & VISPLANEHASHMASK)
//SoM: 3/23/2000: Use boom opening limit removal
size_t maxopenings;
INT16 *openings, *lastopening; /// \todo free leak
// //
// Clip values are the solid pixel bounding the range. // Clip values are the solid pixel bounding the range.
// floorclip starts out SCREENHEIGHT // floorclip starts out SCREENHEIGHT
// ceilingclip starts out -1 // ceilingclip starts out -1
// //
INT16 *floorclip = NULL, *ceilingclip = NULL; INT16 *floorclip, *ceilingclip;
fixed_t *frontscale = NULL; fixed_t *frontscale;
// //
// spanstart holds the start of a plane span // spanstart holds the start of a plane span
@@ -81,13 +85,13 @@ static INT32 *spanstart;
// (this is to calculate yslopes only when really needed) // (this is to calculate yslopes only when really needed)
// (when mouselookin', yslope is moving into yslopetab) // (when mouselookin', yslope is moving into yslopetab)
// Check R_SetupFrame, R_SetViewSize for more... // Check R_SetupFrame, R_SetViewSize for more...
fixed_t *yslopetab = NULL; fixed_t *yslopetab;
fixed_t *yslope = NULL; fixed_t *yslope;
fixed_t basexscale = 0, baseyscale = 0; fixed_t basexscale, baseyscale;
static INT16 *ffloor_f_clip = NULL; static INT16 *ffloor_f_clip;
static INT16 *ffloor_c_clip = NULL; static INT16 *ffloor_c_clip;
static void R_SetTiltedSpan(drawspandata_t* ds, INT32 span); static void R_SetTiltedSpan(drawspandata_t* ds, INT32 span);
static void R_SetSlopePlaneVectors(drawspandata_t* ds, visplane_t *pl, INT32 y, fixed_t xoff, fixed_t yoff); static void R_SetSlopePlaneVectors(drawspandata_t* ds, visplane_t *pl, INT32 y, fixed_t xoff, fixed_t yoff);
@@ -335,13 +339,13 @@ void R_ClearPlanes(void)
R_ClearFFloorClips(); R_ClearFFloorClips();
for (i = 0; i < MAXVISPLANES; i++) for (i = 0; i < MAXVISPLANES; i++)
{
for (*freehead = visplanes[i], visplanes[i] = NULL; for (*freehead = visplanes[i], visplanes[i] = NULL;
freehead && *freehead ;) freehead && *freehead ;)
{ {
freehead = &(*freehead)->next; freehead = &(*freehead)->next;
} }
}
lastopening = openings;
// left to right mapping // left to right mapping
angle = (viewangle-ANGLE_90)>>ANGLETOFINESHIFT; angle = (viewangle-ANGLE_90)>>ANGLETOFINESHIFT;
@@ -616,12 +620,14 @@ void R_ExpandPlane(visplane_t *pl, INT32 start, INT32 stop)
// //
static void R_MakeSpans(void (*mapfunc)(drawspandata_t* ds, void(*spanfunc)(drawspandata_t*), INT32, INT32, INT32, boolean), spandrawfunc_t* localspanfunc, drawspandata_t* ds, INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2, boolean allow_parallel) static void R_MakeSpans(void (*mapfunc)(drawspandata_t* ds, void(*spanfunc)(drawspandata_t*), INT32, INT32, INT32, boolean), spandrawfunc_t* localspanfunc, drawspandata_t* ds, INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2, boolean allow_parallel)
{ {
const INT32 vidheight = vid.height;
// Alam: from r_splats's R_RenderFloorSplat // Alam: from r_splats's R_RenderFloorSplat
if (t1 >= viewheight) t1 = viewheight-1; if (t1 >= vidheight) t1 = vidheight-1;
if (b1 >= viewheight) b1 = viewheight-1; if (b1 >= vidheight) b1 = vidheight-1;
if (t2 >= viewheight) t2 = viewheight-1; if (t2 >= vidheight) t2 = vidheight-1;
if (b2 >= viewheight) b2 = viewheight-1; if (b2 >= vidheight) b2 = vidheight-1;
if (x-1 >= viewwidth) x = viewwidth; if (x-1 >= vid.width) x = vid.width;
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
// We want to draw N spans per subtask to ensure the work is // We want to draw N spans per subtask to ensure the work is
@@ -714,10 +720,13 @@ void R_DrawPlanes(void)
visplane_t *pl; visplane_t *pl;
INT32 i; INT32 i;
drawspandata_t ds = {}; drawspandata_t ds = {};
#ifdef HAVE_THREADS
srb2::ThreadPool::Sema tp_sema;
#endif
R_UpdatePlaneRipple(&ds); R_UpdatePlaneRipple(&ds);
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
srb2::ThreadPool::Sema tp_sema;
srb2::g_main_threadpool->begin_sema(); srb2::g_main_threadpool->begin_sema();
#endif #endif
for (i = 0; i < MAXVISPLANES; i++, pl++) for (i = 0; i < MAXVISPLANES; i++, pl++)
@@ -737,20 +746,13 @@ void R_DrawPlanes(void)
#endif #endif
} }
static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*), boolean allow_parallel); static void R_DrawSkyPlane(visplane_t *pl, void(*colfunc2)(drawcolumndata_t*), boolean allow_parallel);
void R_DrawSkyPlanes(void) void R_DrawSkyPlanes(void)
{ {
visplane_t *pl; visplane_t *pl;
INT32 i; INT32 i;
// If we're not supposed to draw the sky (e.g. for skyboxes), don't do anything!
// This probably utterly ruins sky rendering for FOFs and polyobjects, unfortunately
if (!newview->sky)
{
return;
}
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
srb2::ThreadPool::Sema tp_sema; srb2::ThreadPool::Sema tp_sema;
srb2::g_main_threadpool->begin_sema(); srb2::g_main_threadpool->begin_sema();
@@ -772,17 +774,23 @@ void R_DrawSkyPlanes(void)
#endif #endif
} }
static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*), boolean allow_parallel) static void R_DrawSkyPlane(visplane_t *pl, void(*colfunc2)(drawcolumndata_t*), boolean allow_parallel)
{ {
INT32 x; INT32 x;
if (!(pl->minx <= pl->maxx)) if (!(pl->minx <= pl->maxx))
return; return;
drawcolumndata_t dc = {}; // If we're not supposed to draw the sky (e.g. for skyboxes), don't do anything!
const INT32 texture = texturetranslation[skytexture]; // This probably utterly ruins sky rendering for FOFs and polyobjects, unfortunately
if (!newview->sky)
{
return;
}
// Reset column drawer function (note: couldn't we just call colfuncs[BASEDRAWFUNC] directly?) drawcolumndata_t dc = {};
// Reset column drawer function (note: couldn't we just call walldrawerfunc directly?)
// (that is, unless we'll need to switch drawers in future for some reason) // (that is, unless we'll need to switch drawers in future for some reason)
R_SetColumnFunc(BASEDRAWFUNC); R_SetColumnFunc(BASEDRAWFUNC);
@@ -799,13 +807,16 @@ static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*),
dc.colormap += COLORMAP_REMAPOFFSET; dc.colormap += COLORMAP_REMAPOFFSET;
dc.texturemid = skytexturemid; dc.texturemid = skytexturemid;
dc.texheight = textureheight[texture] >>FRACBITS; dc.texheight = textureheight[skytexture] >>FRACBITS;
dc.sourcelength = dc.texheight; dc.sourcelength = dc.texheight;
x = pl->minx; x = pl->minx;
// Precache the texture so we don't corrupt the zoned heap off-main thread // Precache the texture so we don't corrupt the zoned heap off-main thread
R_CheckTextureCache(texture); if (!texturecache[texturetranslation[skytexture]])
{
R_GenerateTexture(texturetranslation[skytexture]);
}
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
while (x <= pl->maxx) while (x <= pl->maxx)
@@ -830,9 +841,11 @@ static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*),
dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x + i]>>ANGLETOFINESHIFT)); dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x + i]>>ANGLETOFINESHIFT));
dc.x = x + i; dc.x = x + i;
dc.source = R_GetColumn(texture, -angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18 dc.source =
R_GetColumn(texturetranslation[skytexture],
-angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18
skycolfunc(&dc); colfunc2(&dc);
} }
}; };
@@ -866,9 +879,10 @@ static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*),
dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x]>>ANGLETOFINESHIFT)); dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x]>>ANGLETOFINESHIFT));
dc.x = x; dc.x = x;
dc.source = dc.source =
R_GetColumn(texturetranslation[skytexture], -angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18 R_GetColumn(texturetranslation[skytexture],
-angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18
skycolfunc(&dc); colfunc2(&dc);
} }
#endif #endif
} }
@@ -1153,7 +1167,7 @@ void R_DrawSinglePlane(drawspandata_t* ds, visplane_t *pl, boolean allow_paralle
offset = (scry*vid.width) + scrx; offset = (scry*vid.width) + scrx;
// No idea if this works // No idea if this works
VID_BlitLinearScreen(vid.screens[0] + offset, VID_BlitLinearScreen(renderscreen + offset,
vid.screens[1] + (top*vid.width), // intentionally not +offset vid.screens[1] + (top*vid.width), // intentionally not +offset
viewwidth, bottom-top, viewwidth, bottom-top,
vid.width, vid.width); vid.width, vid.width);
+2
View File
@@ -67,6 +67,8 @@ extern visplane_t *floorplane;
extern visplane_t *ceilingplane; extern visplane_t *ceilingplane;
// Visplane related. // Visplane related.
extern INT16 *lastopening, *openings;
extern size_t maxopenings;
extern INT16 *floorclip, *ceilingclip; extern INT16 *floorclip, *ceilingclip;
extern fixed_t *frontscale, *yslopetab; extern fixed_t *frontscale, *yslopetab;
+216 -277
View File
@@ -26,6 +26,7 @@
#include "p_local.h" // Camera... #include "p_local.h" // Camera...
#include "p_setup.h" #include "p_setup.h"
#include "p_slopes.h" #include "p_slopes.h"
#include "console.h" // con_clipviewtop
#include "screen.h" #include "screen.h"
#include "core/memory.h" #include "core/memory.h"
@@ -77,21 +78,9 @@ static fixed_t topfrac, topstep;
static fixed_t bottomfrac, bottomstep; static fixed_t bottomfrac, bottomstep;
static lighttable_t **walllights; static lighttable_t **walllights;
static fixed_t *maskedtexturecol; static INT16 *maskedtexturecol;
static fixed_t *maskedtextureheight = NULL; static fixed_t *maskedtextureheight = NULL;
static size_t numopenings;
static INT16 *openings, *lastopening;
static size_t texturecolumntablesize;
static fixed_t *texturecolumntable, *curtexturecolumntable;
void R_ClearSegTables(void)
{
lastopening = openings;
curtexturecolumntable = texturecolumntable;
}
// ========================================================================== // ==========================================================================
// R_RenderMaskedSegRange // R_RenderMaskedSegRange
// ========================================================================== // ==========================================================================
@@ -151,18 +140,7 @@ static void R_Render2sidedMultiPatchColumn(drawcolumndata_t* dc, column_t *colum
transnum_t R_GetLinedefTransTable(fixed_t alpha) transnum_t R_GetLinedefTransTable(fixed_t alpha)
{ {
if (alpha >= FRACUNIT) return static_cast<transnum_t>((20*(FRACUNIT - alpha - 1) + FRACUNIT) >> (FRACBITS+1));
{
return static_cast<transnum_t>(0);
}
else if (alpha <= 0)
{
return NUMTRANSMAPS;
}
else
{
return static_cast<transnum_t>((20*(FRACUNIT - alpha - 1) + FRACUNIT) >> (FRACBITS+1));
}
} }
static inline boolean R_OverflowTest(drawcolumndata_t* dc) static inline boolean R_OverflowTest(drawcolumndata_t* dc)
@@ -195,7 +173,7 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3
ldef = curline->linedef; ldef = curline->linedef;
range = std::max<INT32>(drawseg->x2-drawseg->x1, 1); range = std::max(drawseg->x2-drawseg->x1, 1);
// Setup lighting based on the presence/lack-of 3D floors. // Setup lighting based on the presence/lack-of 3D floors.
dc->numlights = 0; dc->numlights = 0;
@@ -328,137 +306,141 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3
else else
dc->texturemid -= (textureheight[texnum])*times; dc->texturemid -= (textureheight[texnum])*times;
// Check for overflows first const INT16 colnum = maskedtexturecol[dc->x];
if (R_OverflowTest(dc))
{
// Eh, no, go away, don't waste our time
if (dc->numlights)
{
for (i = 0; i < dc->numlights; i++)
{
rlight = &dc->lightlist[i];
rlight->height += rlight->heightstep;
}
}
spryscale += rw_scalestep;
continue;
}
// calculate lighting // calculate lighting
if (dc->numlights) if (colnum != INT16_MAX)
{ {
lighttable_t **xwalllights; // Check for overflows first
if (R_OverflowTest(dc))
sprbotscreen = INT32_MAX;
sprtopscreen = windowtop = (centeryfrac - FixedMul(dc->texturemid, spryscale));
realbot = windowbottom = FixedMul(textureheight[texnum], spryscale) + sprtopscreen;
dc->iscale = 0xffffffffu / (unsigned)spryscale;
// draw the texture
col = (column_t *)((UINT8 *)R_GetColumn(texnum, (maskedtexturecol[dc->x] >> FRACBITS)) - 3);
auto set_light_vars = [&](INT32 k)
{ {
rlight = &dc->lightlist[k]; // Eh, no, go away, don't waste our time
if (dc->numlights)
lightnum = rlight->lightnum;
if (lightnum < 0)
xwalllights = scalelight[0];
else if (lightnum >= LIGHTLEVELS)
xwalllights = scalelight[LIGHTLEVELS-1];
else
xwalllights = scalelight[lightnum];
pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
if (pindex >= MAXLIGHTSCALE)
pindex = MAXLIGHTSCALE - 1;
if (rlight->extra_colormap)
rlight->rcolormap = rlight->extra_colormap->colormap + (xwalllights[pindex] - colormaps);
else
rlight->rcolormap = xwalllights[pindex];
};
auto set_colormap_below_light = [&]
{
dc->colormap = rlight->rcolormap;
if (encoremap && !(ldef->flags & ML_TFERLINE))
dc->colormap += COLORMAP_REMAPOFFSET;
};
// Use the base sector's light level above the first FOF.
// You can imagine it as the sky casting its light on top of the highest FOF.
set_light_vars(0);
set_colormap_below_light();
for (i = 0; i < dc->numlights; i++)
{
if ((dc->lightlist[i].flags & FF_NOSHADE))
continue;
set_light_vars(i);
height = rlight->height;
rlight->height += rlight->heightstep;
if (height <= windowtop)
{ {
set_colormap_below_light(); for (i = 0; i < dc->numlights; i++)
continue;
}
windowbottom = height;
if (windowbottom >= realbot)
{
windowbottom = realbot;
colfunc_2s(dc, col);
for (i++; i < dc->numlights; i++)
{ {
rlight = &dc->lightlist[i]; rlight = &dc->lightlist[i];
rlight->height += rlight->heightstep; rlight->height += rlight->heightstep;
} }
continue;
} }
colfunc_2s(dc, col); spryscale += rw_scalestep;
continue;
windowtop = windowbottom + 1;
set_colormap_below_light();
} }
windowbottom = realbot;
if (windowtop < windowbottom)
colfunc_2s(dc, col);
spryscale += rw_scalestep; if (dc->numlights)
continue; {
lighttable_t **xwalllights;
sprbotscreen = INT32_MAX;
sprtopscreen = windowtop = (centeryfrac - FixedMul(dc->texturemid, spryscale));
realbot = windowbottom = FixedMul(textureheight[texnum], spryscale) + sprtopscreen;
dc->iscale = 0xffffffffu / (unsigned)spryscale;
// draw the texture
col = (column_t *)((UINT8 *)R_GetColumn(texnum, colnum) - 3);
auto set_light_vars = [&](INT32 k)
{
rlight = &dc->lightlist[k];
lightnum = rlight->lightnum;
if (lightnum < 0)
xwalllights = scalelight[0];
else if (lightnum >= LIGHTLEVELS)
xwalllights = scalelight[LIGHTLEVELS-1];
else
xwalllights = scalelight[lightnum];
pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
if (pindex >= MAXLIGHTSCALE)
pindex = MAXLIGHTSCALE - 1;
if (rlight->extra_colormap)
rlight->rcolormap = rlight->extra_colormap->colormap + (xwalllights[pindex] - colormaps);
else
rlight->rcolormap = xwalllights[pindex];
};
auto set_colormap_below_light = [&]
{
dc->colormap = rlight->rcolormap;
if (encoremap && !(ldef->flags & ML_TFERLINE))
dc->colormap += COLORMAP_REMAPOFFSET;
};
// Use the base sector's light level above the first FOF.
// You can imagine it as the sky casting its light on top of the highest FOF.
set_light_vars(0);
set_colormap_below_light();
for (i = 0; i < dc->numlights; i++)
{
if ((dc->lightlist[i].flags & FF_NOSHADE))
continue;
set_light_vars(i);
height = rlight->height;
rlight->height += rlight->heightstep;
if (height <= windowtop)
{
set_colormap_below_light();
continue;
}
windowbottom = height;
if (windowbottom >= realbot)
{
windowbottom = realbot;
colfunc_2s(dc, col);
for (i++; i < dc->numlights; i++)
{
rlight = &dc->lightlist[i];
rlight->height += rlight->heightstep;
}
continue;
}
colfunc_2s(dc, col);
windowtop = windowbottom + 1;
set_colormap_below_light();
}
windowbottom = realbot;
if (windowtop < windowbottom)
colfunc_2s(dc, col);
spryscale += rw_scalestep;
continue;
}
// calculate lighting
pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
if (pindex >= MAXLIGHTSCALE)
pindex = MAXLIGHTSCALE - 1;
dc->colormap = walllights[pindex];
if (encoremap && !(ldef->flags & ML_TFERLINE))
dc->colormap += COLORMAP_REMAPOFFSET;
if (frontsector->extra_colormap)
dc->colormap = frontsector->extra_colormap->colormap + (dc->colormap - colormaps);
sprtopscreen = centeryfrac - FixedMul(dc->texturemid, spryscale);
dc->iscale = 0xffffffffu / (unsigned)spryscale;
// draw the texture
col = (column_t *)((UINT8 *)R_GetColumn(texnum, colnum) - 3);
colfunc_2s(dc, col);
} }
// calculate lighting
pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
if (pindex >= MAXLIGHTSCALE)
pindex = MAXLIGHTSCALE - 1;
dc->colormap = walllights[pindex];
if (encoremap && !(ldef->flags & ML_TFERLINE))
dc->colormap += COLORMAP_REMAPOFFSET;
if (frontsector->extra_colormap)
dc->colormap = frontsector->extra_colormap->colormap + (dc->colormap - colormaps);
sprtopscreen = centeryfrac - FixedMul(dc->texturemid, spryscale);
dc->iscale = 0xffffffffu / (unsigned)spryscale;
// draw the texture
col = (column_t *)((UINT8 *)R_GetColumn(texnum, (maskedtexturecol[dc->x] >> FRACBITS)) - 3);
colfunc_2s(dc, col);
spryscale += rw_scalestep; spryscale += rw_scalestep;
} }
} }
@@ -627,6 +609,8 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
sector_t tempsec; sector_t tempsec;
INT32 templight; INT32 templight;
INT32 i, p; INT32 i, p;
fixed_t bottombounds = viewheight << FRACBITS;
fixed_t topbounds = (con_clipviewtop - 1) << FRACBITS;
fixed_t offsetvalue = 0; fixed_t offsetvalue = 0;
lightlist_t *light; lightlist_t *light;
r_lightlist_t *rlight; r_lightlist_t *rlight;
@@ -648,7 +632,6 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
void (*colfunc_2s) (drawcolumndata_t* dc, column_t *); void (*colfunc_2s) (drawcolumndata_t* dc, column_t *);
// Calculate light table. // Calculate light table.
// Use different light tables // Use different light tables
// for horizontal / vertical / diagonal. Diagonal? // for horizontal / vertical / diagonal. Diagonal?
@@ -691,7 +674,7 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
fog = true; fog = true;
} }
range = std::max<INT32>(drawseg->x2-drawseg->x1, 1); range = std::max(drawseg->x2-drawseg->x1, 1);
//SoM: Moved these up here so they are available for my lightlist calculations //SoM: Moved these up here so they are available for my lightlist calculations
rw_scalestep = drawseg->scalestep; rw_scalestep = drawseg->scalestep;
spryscale = drawseg->scale1 + (x1 - drawseg->x1)*rw_scalestep; spryscale = drawseg->scale1 + (x1 - drawseg->x1)*rw_scalestep;
@@ -916,11 +899,14 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
// draw the columns // draw the columns
for (dc->x = x1; dc->x <= x2; dc->x++) for (dc->x = x1; dc->x <= x2; dc->x++)
{ {
if (maskedtexturecol[dc->x] == INT16_MAX)
continue;
// skew FOF walls // skew FOF walls
if (ffloortextureslide) if (ffloortextureslide)
{ {
if (oldx != -1) if (oldx != -1)
dc->texturemid += FixedMul(ffloortextureslide, (maskedtexturecol[oldx]-maskedtexturecol[dc->x])); dc->texturemid += FixedMul(ffloortextureslide, (maskedtexturecol[oldx]-maskedtexturecol[dc->x])<<FRACBITS);
oldx = dc->x; oldx = dc->x;
} }
@@ -933,7 +919,7 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
bottom_frac += bottom_step; bottom_frac += bottom_step;
// SoM: If column is out of range, why bother with it?? // SoM: If column is out of range, why bother with it??
if (windowbottom < 0 || windowtop > (viewheight << FRACBITS)) if (windowbottom < topbounds || windowtop > bottombounds)
{ {
if (dc->numlights) if (dc->numlights)
{ {
@@ -950,6 +936,9 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
continue; continue;
} }
// Get data for the column
col = (column_t *)((UINT8 *)R_GetColumn(texnum, maskedtexturecol[dc->x]) - 3);
if (!fog) if (!fog)
{ {
dc->iscale = 0xffffffffu / (unsigned)spryscale; dc->iscale = 0xffffffffu / (unsigned)spryscale;
@@ -960,9 +949,6 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
R_SetColumnFunc(BASEDRAWFUNC); R_SetColumnFunc(BASEDRAWFUNC);
} }
// Get data for the column
col = (column_t *)((UINT8 *)R_GetColumn(texnum, (maskedtexturecol[dc->x] >> FRACBITS)) - 3);
// SoM: New code does not rely on R_DrawColumnShadowed which // SoM: New code does not rely on R_DrawColumnShadowed which
// will (hopefully) put less strain on the stack. // will (hopefully) put less strain on the stack.
if (dc->numlights) if (dc->numlights)
@@ -1173,14 +1159,13 @@ static inline void R_ExpandPlaneY(visplane_t *pl, INT32 x, INT16 top, INT16 bott
static void R_DrawWallColumn(drawcolumndata_t* dc, INT32 yl, INT32 yh, fixed_t mid, fixed_t texturecolumn, INT32 texture, boolean remap) static void R_DrawWallColumn(drawcolumndata_t* dc, INT32 yl, INT32 yh, fixed_t mid, fixed_t texturecolumn, INT32 texture, boolean remap)
{ {
const INT32 itexturecolumn = texturecolumn >> FRACBITS;
dc->yl = yl; dc->yl = yl;
dc->yh = yh; dc->yh = yh;
dc->texturemid = mid; dc->texturemid = mid;
dc->source = R_GetColumn(texture, itexturecolumn); dc->source = R_GetColumn(texture, texturecolumn);
dc->texheight = textureheight[texture] >> FRACBITS; dc->texheight = textureheight[texture] >> FRACBITS;
dc->sourcelength = dc->texheight; dc->sourcelength = dc->texheight;
R_SetColumnFunc(colfunctype); //R_SetColumnFunc(colfunctype);
coldrawfunc_t* colfunccopy = colfunc; coldrawfunc_t* colfunccopy = colfunc;
drawcolumndata_t dc_copy = *dc; drawcolumndata_t dc_copy = *dc;
if (remap) if (remap)
@@ -1206,21 +1191,13 @@ static void R_RenderSegLoop(drawcolumndata_t* dc)
INT32 bottom; INT32 bottom;
INT32 i; INT32 i;
if (midtexture)
R_CheckTextureCache(midtexture);
if (toptexture)
R_CheckTextureCache(toptexture);
if (bottomtexture)
R_CheckTextureCache(bottomtexture);
// Loop over width // Loop over width
for (; rw_x < rw_stopx; rw_x++) for (; rw_x < rw_stopx; rw_x++)
{ {
// mark floor / ceiling areas // mark floor / ceiling areas
yl = (topfrac+HEIGHTUNIT-1)>>HEIGHTBITS; yl = (topfrac+HEIGHTUNIT-1)>>HEIGHTBITS;
yh = bottomfrac>>HEIGHTBITS;
// Mark ceiling // no space above wall?
top = ceilingclip[rw_x]+1; top = ceilingclip[rw_x]+1;
// no space above wall? // no space above wall?
@@ -1237,10 +1214,10 @@ static void R_RenderSegLoop(drawcolumndata_t* dc)
} }
} }
// Mark floor yh = bottomfrac>>HEIGHTBITS;
bottom = floorclip[rw_x]-1; bottom = floorclip[rw_x]-1;
// no space below floor?
if (yh > bottom) if (yh > bottom)
yh = bottom; yh = bottom;
@@ -1369,7 +1346,7 @@ static void R_RenderSegLoop(drawcolumndata_t* dc)
// calculate texture offset // calculate texture offset
angle = (rw_centerangle + xtoviewangle[rw_x])>>ANGLETOFINESHIFT; angle = (rw_centerangle + xtoviewangle[rw_x])>>ANGLETOFINESHIFT;
// Mask 4095 to guarantee this index is within bounds // Mask 4095 to guarantee this index is within bounds
texturecolumn = rw_offset-FixedMul(FINETANGENT(angle & 4095), rw_distance); texturecolumn = rw_offset-FixedMul(FINETANGENT(angle & 4095),rw_distance);
if (oldtexturecolumn != -1) if (oldtexturecolumn != -1)
{ {
@@ -1380,6 +1357,8 @@ static void R_RenderSegLoop(drawcolumndata_t* dc)
} }
oldtexturecolumn = texturecolumn; oldtexturecolumn = texturecolumn;
texturecolumn >>= FRACBITS;
// texturecolumn and lighting are independent of wall tiers // texturecolumn and lighting are independent of wall tiers
if (segtextured) if (segtextured)
{ {
@@ -1536,7 +1515,7 @@ static void R_RenderSegLoop(drawcolumndata_t* dc)
if (maskedtexture || numthicksides) if (maskedtexture || numthicksides)
{ {
// save texturecol for backdrawing of masked mid texture // save texturecol for backdrawing of masked mid texture
maskedtexturecol[rw_x] = texturecolumn; maskedtexturecol[rw_x] = (INT16)texturecolumn;
if (maskedtextureheight != NULL) if (maskedtextureheight != NULL)
{ {
@@ -1582,7 +1561,7 @@ static void R_RenderSegLoop(drawcolumndata_t* dc)
static void R_MarkSegBounds(void) static void R_MarkSegBounds(void)
{ {
INT32 yl, yh; INT32 yl, yh;
INT32 top, bottom; INT32 top, bottom;
INT16 topclip, bottomclip; INT16 topclip, bottomclip;
@@ -1591,9 +1570,8 @@ static void R_MarkSegBounds(void)
{ {
// mark floor / ceiling areas // mark floor / ceiling areas
yl = (topfrac+HEIGHTUNIT-1)>>HEIGHTBITS; yl = (topfrac+HEIGHTUNIT-1)>>HEIGHTBITS;
yh = bottomfrac>>HEIGHTBITS;
// Mark ceiling // no space above wall?
top = ceilingclip[rw_x]+1; top = ceilingclip[rw_x]+1;
// no space above wall? // no space above wall?
@@ -1610,10 +1588,10 @@ static void R_MarkSegBounds(void)
} }
} }
// Mark floor yh = bottomfrac>>HEIGHTBITS;
bottom = floorclip[rw_x]-1; bottom = floorclip[rw_x]-1;
// no space below floor?
if (yh > bottom) if (yh > bottom)
yh = bottom; yh = bottom;
@@ -1638,6 +1616,12 @@ static void R_MarkSegBounds(void)
if (markfloor) // no bottom wall if (markfloor) // no bottom wall
floorclip[rw_x] = bottomclip; floorclip[rw_x] = bottomclip;
if (floorclip[rw_x] <= ceilingclip[rw_x] + 1)
{
solidcol[rw_x] = 1;
didsolidcol = true;
}
rw_scale += rw_scalestep; rw_scale += rw_scalestep;
topfrac += topstep; topfrac += topstep;
bottomfrac += bottomstep; bottomfrac += bottomstep;
@@ -1679,87 +1663,15 @@ void R_AllocSegMemory(void)
fixed_t *frontscale_p = frontscaletable; fixed_t *frontscale_p = frontscaletable;
fixed_t *maskedheight_p = maskedheighttable; fixed_t *maskedheight_p = maskedheighttable;
for (drawseg_t *drawseg = drawsegs; drawseg < lastseg; drawseg++) for (drawseg_t *ds = drawsegs; ds < lastseg; ds++)
{ {
drawseg->frontscale = frontscale_p; ds->frontscale = frontscale_p;
drawseg->maskedtextureheight = maskedheight_p; ds->maskedtextureheight = maskedheight_p;
frontscale_p += viewwidth; frontscale_p += viewwidth;
maskedheight_p += viewwidth; maskedheight_p += viewwidth;
} }
} }
//SoM: Code to remove limits on openings.
static void R_AllocClippingTables(size_t range)
{
size_t pos = lastopening - openings;
size_t need = range * 2; // for both sprtopclip and sprbottomclip
if (pos + need < numopenings)
return;
INT16 *oldopenings = openings;
INT16 *oldlast = lastopening;
if (numopenings == 0)
numopenings = 16384;
numopenings += need;
openings = static_cast<INT16*>(Z_Realloc(openings, numopenings * sizeof (*openings), PU_STATIC, NULL));
lastopening = openings + pos;
if (oldopenings == NULL)
return;
// borrowed fix from *cough* zdoom *cough*
// [RH] We also need to adjust the openings pointers that
// were already stored in drawsegs.
for (drawseg_t *drawseg = drawsegs; drawseg < ds_p; drawseg++)
{
// Check if it's in range of the openings
#define CHECK(which) \
if (which + drawseg->x1 >= oldopenings && which + drawseg->x1 <= oldlast) \
which = (which - oldopenings) + openings
CHECK(drawseg->sprtopclip);
CHECK(drawseg->sprbottomclip);
#undef CHECK
}
}
static void R_AllocTextureColumnTables(size_t range)
{
size_t pos = curtexturecolumntable - texturecolumntable;
// For both tables, we reserve exactly an amount of memory that's equivalent to
// how many columns the seg will take on the entire screen (think about it)
if (pos + range < texturecolumntablesize)
return;
fixed_t *oldtable = texturecolumntable;
fixed_t *oldlast = curtexturecolumntable;
if (texturecolumntablesize == 0)
texturecolumntablesize = 16384;
texturecolumntablesize += range;
texturecolumntable = static_cast<fixed_t*>(Z_Realloc(texturecolumntable, texturecolumntablesize * sizeof (*texturecolumntable), PU_STATIC, NULL));
curtexturecolumntable = texturecolumntable + pos;
if (oldtable == NULL)
return;
for (drawseg_t *drawseg = drawsegs; drawseg < ds_p; drawseg++)
{
// Check if it's in range of the tables
#define CHECK(which) \
if (which + drawseg->x1 >= oldtable && which + drawseg->x1 <= oldlast) \
which = (which - oldtable) + texturecolumntable
CHECK(drawseg->maskedtexturecol);
CHECK(drawseg->thicksidecol);
#undef CHECK
}
}
// //
// R_StoreWallRange // R_StoreWallRange
// A wall segment will be drawn // A wall segment will be drawn
@@ -1772,13 +1684,12 @@ void R_StoreWallRange(INT32 start, INT32 stop)
angle_t distangle, offsetangle; angle_t distangle, offsetangle;
boolean longboi; boolean longboi;
INT32 lightnum; INT32 lightnum;
INT32 i = 0, p; INT32 i, p;
lightlist_t *light; lightlist_t *light;
r_lightlist_t *rlight; r_lightlist_t *rlight;
INT32 range; INT32 range;
vertex_t segleft, segright; vertex_t segleft, segright;
fixed_t ceilingfrontslide, floorfrontslide, ceilingbackslide, floorbackslide; fixed_t ceilingfrontslide, floorfrontslide, ceilingbackslide, floorbackslide;
const INT32 twosidedmidtexture = R_GetTextureNum(curline->sidedef->midtexture);
drawcolumndata_t dc = {}; drawcolumndata_t dc = {};
maskedtextureheight = NULL; maskedtextureheight = NULL;
@@ -1834,6 +1745,41 @@ void R_StoreWallRange(INT32 start, INT32 stop)
ds_p->curline = curline; ds_p->curline = curline;
rw_stopx = stop+1; rw_stopx = stop+1;
//SoM: Code to remove limits on openings.
{
size_t pos = lastopening - openings;
size_t need = (rw_stopx - start)*4 + pos;
if (need > maxopenings)
{
drawseg_t *ds; //needed for fix from *cough* zdoom *cough*
INT16 *oldopenings = openings;
INT16 *oldlast = lastopening;
do
maxopenings = maxopenings ? maxopenings*2 : 16384;
while (need > maxopenings);
openings = static_cast<INT16*>(Z_Realloc(openings, maxopenings * sizeof (*openings), PU_STATIC, NULL));
lastopening = openings + pos;
if (oldopenings == NULL)
return;
// borrowed fix from *cough* zdoom *cough*
// [RH] We also need to adjust the openings pointers that
// were already stored in drawsegs.
for (ds = drawsegs; ds < ds_p; ds++)
{
#define ADJUST(p) if (ds->p + ds->x1 >= oldopenings && ds->p + ds->x1 <= oldlast) ds->p = (ds->p - oldopenings) + openings;
ADJUST(maskedtexturecol);
ADJUST(sprtopclip);
ADJUST(sprbottomclip);
ADJUST(thicksidecol);
#undef ADJUST
}
}
} // end of code to remove limits on openings
// calculate scale at both ends and step // calculate scale at both ends and step
ds_p->scale1 = rw_scale = R_ScaleFromGlobalAngle(viewangle + xtoviewangle[start]); ds_p->scale1 = rw_scale = R_ScaleFromGlobalAngle(viewangle + xtoviewangle[start]);
@@ -1928,7 +1874,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
numbackffloors = 0; numbackffloors = 0;
memset(ds_p->thicksides, 0, MAXFFLOORS * sizeof(*ds_p->thicksides)); for (i = 0; i < MAXFFLOORS; i++)
ds_p->thicksides[i] = NULL;
if (numffloors) if (numffloors)
{ {
@@ -2213,8 +2160,6 @@ void R_StoreWallRange(INT32 start, INT32 stop)
rw_toptexturemid += sidedef->rowoffset; rw_toptexturemid += sidedef->rowoffset;
rw_bottomtexturemid += sidedef->rowoffset; rw_bottomtexturemid += sidedef->rowoffset;
R_AllocTextureColumnTables(rw_stopx - start);
// allocate space for masked texture tables // allocate space for masked texture tables
if (frontsector && backsector && (frontsector->tag != backsector->tag) && (backsector->ffloors || frontsector->ffloors)) if (frontsector && backsector && (frontsector->tag != backsector->tag) && (backsector->ffloors || frontsector->ffloors))
{ {
@@ -2228,15 +2173,15 @@ void R_StoreWallRange(INT32 start, INT32 stop)
maskedtexture = true; maskedtexture = true;
ds_p->thicksidecol = maskedtexturecol = curtexturecolumntable - rw_x; ds_p->thicksidecol = maskedtexturecol = lastopening - rw_x;
curtexturecolumntable += rw_stopx - rw_x; lastopening += rw_stopx - rw_x;
lowcut = std::max(worldbottom, worldlow) + viewz; lowcut = std::max(worldbottom, worldlow) + viewz;
highcut = std::min(worldtop, worldhigh) + viewz; highcut = std::min(worldtop, worldhigh) + viewz;
lowcutslope = std::max(worldbottomslope, worldlowslope) + viewz; lowcutslope = std::max(worldbottomslope, worldlowslope) + viewz;
highcutslope = std::min(worldtopslope, worldhighslope) + viewz; highcutslope = std::min(worldtopslope, worldhighslope) + viewz;
auto check_fof_offscreen = [&](ffloor_t* rover, INT32 bottom, INT32 bottomslope, INT32 top, INT32 topslope) auto check_fof_offscreen = [&](INT32 bottom, INT32 bottomslope, INT32 top, INT32 topslope)
{ {
return ((P_GetFFloorTopZAt (rover, segleft .x, segleft .y) <= bottom + viewz return ((P_GetFFloorTopZAt (rover, segleft .x, segleft .y) <= bottom + viewz
&& P_GetFFloorTopZAt (rover, segright.x, segright.y) <= bottomslope + viewz) && P_GetFFloorTopZAt (rover, segright.x, segright.y) <= bottomslope + viewz)
@@ -2376,7 +2321,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
continue; continue;
// Oy vey. // Oy vey.
if (check_fof_offscreen(rover, worldbottom, worldbottomslope, worldtop, worldtopslope)) if (check_fof_offscreen(worldbottom, worldbottomslope, worldtop, worldtopslope))
continue; continue;
ds_p->thicksides[i] = rover; ds_p->thicksides[i] = rover;
@@ -2394,10 +2339,10 @@ void R_StoreWallRange(INT32 start, INT32 stop)
continue; continue;
// Oy vey. // Oy vey.
if (check_fof_offscreen(rover, worldbottom, worldbottomslope, worldtop, worldtopslope)) if (check_fof_offscreen(worldbottom, worldbottomslope, worldtop, worldtopslope))
continue; continue;
if (check_fof_offscreen(rover, worldlow, worldlowslope, worldhigh, worldhighslope)) if (check_fof_offscreen(worldlow, worldlowslope, worldhigh, worldhighslope))
continue; continue;
ds_p->thicksides[i] = rover; ds_p->thicksides[i] = rover;
@@ -2408,14 +2353,13 @@ void R_StoreWallRange(INT32 start, INT32 stop)
ds_p->numthicksides = numthicksides = i; ds_p->numthicksides = numthicksides = i;
} }
if (twosidedmidtexture) if (sidedef->midtexture > 0 && sidedef->midtexture < numtextures)
{ {
// masked midtexture // masked midtexture
if (!ds_p->thicksidecol) if (!ds_p->thicksidecol)
{ {
ds_p->maskedtexturecol = maskedtexturecol = curtexturecolumntable - rw_x; ds_p->maskedtexturecol = maskedtexturecol = lastopening - rw_x;
curtexturecolumntable += rw_stopx - rw_x; lastopening += rw_stopx - rw_x;
} }
else else
ds_p->maskedtexturecol = ds_p->thicksidecol; ds_p->maskedtexturecol = ds_p->thicksidecol;
@@ -2995,23 +2939,18 @@ void R_StoreWallRange(INT32 start, INT32 stop)
} }
// save sprite clipping info // save sprite clipping info
if (maskedtexture || (ds_p->silhouette & (SIL_TOP | SIL_BOTTOM))) if (((ds_p->silhouette & SIL_TOP) || maskedtexture) && !ds_p->sprtopclip)
{ {
R_AllocClippingTables(rw_stopx - start); M_Memcpy(lastopening, ceilingclip+start, 2*(rw_stopx - start));
ds_p->sprtopclip = lastopening - start;
lastopening += rw_stopx - start;
}
if (((ds_p->silhouette & SIL_TOP) || maskedtexture) && !ds_p->sprtopclip) if (((ds_p->silhouette & SIL_BOTTOM) || maskedtexture) && !ds_p->sprbottomclip)
{ {
M_Memcpy(lastopening, ceilingclip + start, 2*(rw_stopx - start)); M_Memcpy(lastopening, floorclip + start, 2*(rw_stopx-start));
ds_p->sprtopclip = lastopening - start; ds_p->sprbottomclip = lastopening - start;
lastopening += rw_stopx - start; lastopening += rw_stopx - start;
}
if (((ds_p->silhouette & SIL_BOTTOM) || maskedtexture) && !ds_p->sprbottomclip)
{
M_Memcpy(lastopening, floorclip + start, 2*(rw_stopx - start));
ds_p->sprbottomclip = lastopening - start;
lastopening += rw_stopx - start;
}
} }
if (maskedtexture) if (maskedtexture)
@@ -3019,13 +2958,13 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (!(ds_p->silhouette & SIL_TOP)) if (!(ds_p->silhouette & SIL_TOP))
{ {
ds_p->silhouette |= SIL_TOP; ds_p->silhouette |= SIL_TOP;
ds_p->tsilheight = (twosidedmidtexture) ? INT32_MIN : INT32_MAX; ds_p->tsilheight = (sidedef->midtexture > 0 && sidedef->midtexture < numtextures) ? INT32_MIN: INT32_MAX;
} }
if (!(ds_p->silhouette & SIL_BOTTOM)) if (!(ds_p->silhouette & SIL_BOTTOM))
{ {
ds_p->silhouette |= SIL_BOTTOM; ds_p->silhouette |= SIL_BOTTOM;
ds_p->bsilheight = (twosidedmidtexture) ? INT32_MAX : INT32_MIN; ds_p->bsilheight = (sidedef->midtexture > 0 && sidedef->midtexture < numtextures) ? INT32_MAX: INT32_MIN;
} }
} }
-1
View File
@@ -25,7 +25,6 @@ extern "C" {
void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2); void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2);
void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pffloor); void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pffloor);
void R_StoreWallRange(INT32 start, INT32 stop); void R_StoreWallRange(INT32 start, INT32 stop);
void R_ClearSegTables(void);
void R_AllocSegMemory(void); void R_AllocSegMemory(void);
-8
View File
@@ -35,8 +35,6 @@
CV_PossibleValue_t Forceskin_cons_t[MAXSKINS+2]; CV_PossibleValue_t Forceskin_cons_t[MAXSKINS+2];
#include "discord.h"
INT32 numskins = 0; INT32 numskins = 0;
INT32 numallskins = 0; INT32 numallskins = 0;
INT32 numlocalskins = 0; INT32 numlocalskins = 0;
@@ -330,14 +328,8 @@ void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
if (player->mo) if (player->mo)
P_SetScale(player->mo, player->mo->scale); P_SetScale(player->mo, player->mo->scale);
// for replays: We have changed our skin mid-game; let the game know so it can do the same in the replay!
demo_extradata[playernum] |= DXD_SKIN; demo_extradata[playernum] |= DXD_SKIN;
#ifdef HAVE_DISCORDRPC
if (player - players == consoleplayer)
DRPC_UpdatePresence();
#endif
return; return;
} }
-1
View File
@@ -15,7 +15,6 @@
#ifndef __R_SKINS__ #ifndef __R_SKINS__
#define __R_SKINS__ #define __R_SKINS__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
+33 -25
View File
@@ -43,6 +43,13 @@
#define MINZ (FRACUNIT*16) #define MINZ (FRACUNIT*16)
#define BASEYCENTER (BASEVIDHEIGHT/2) #define BASEYCENTER (BASEVIDHEIGHT/2)
typedef struct
{
INT32 x1, x2;
INT32 column;
INT32 topclip, bottomclip;
} maskdraw_t;
// //
// Sprite rotation 0 is facing the viewer, // Sprite rotation 0 is facing the viewer,
// rotation 1 is one angle turn CLOCKWISE around the axis. // rotation 1 is one angle turn CLOCKWISE around the axis.
@@ -53,8 +60,8 @@
static lighttable_t **spritelights; static lighttable_t **spritelights;
// constant arrays used for psprite clipping and initializing clipping // constant arrays used for psprite clipping and initializing clipping
INT16 *negonearray = NULL; INT16 *negonearray;
INT16 *screenheightarray = NULL; INT16 *screenheightarray;
// //
// INITIALIZATION FUNCTIONS // INITIALIZATION FUNCTIONS
@@ -87,6 +94,13 @@ static drawseg_xrange_item_t *drawsegs_xrange;
static size_t drawsegs_xrange_size = 0; static size_t drawsegs_xrange_size = 0;
static INT32 drawsegs_xrange_count = 0; static INT32 drawsegs_xrange_count = 0;
INT32 R_ThingLightLevel(mobj_t* thing)
{
INT32 lightlevel = thing->lightlevel;
return lightlevel;
}
// //
// Sprite rotation 0 is facing the viewer, // Sprite rotation 0 is facing the viewer,
// rotation 1 is one angle turn CLOCKWISE around the axis. // rotation 1 is one angle turn CLOCKWISE around the axis.
@@ -298,7 +312,7 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
// store sprite info in lookup tables // store sprite info in lookup tables
//FIXME : numspritelumps do not duplicate sprite replacements //FIXME : numspritelumps do not duplicate sprite replacements
W_ReadLumpHeaderPwad(wadnum, l, &patch, PNG_HEADER_SIZE, 0); W_ReadLumpHeaderPwad(wadnum, l, &patch, (sizeof(INT16) *4), 0);
spritecachedinfo[numspritelumps].width = (INT32)(SHORT(patch.width))<<FRACBITS; spritecachedinfo[numspritelumps].width = (INT32)(SHORT(patch.width))<<FRACBITS;
spritecachedinfo[numspritelumps].offset = (INT32)(SHORT(patch.leftoffset))<<FRACBITS; spritecachedinfo[numspritelumps].offset = (INT32)(SHORT(patch.leftoffset))<<FRACBITS;
spritecachedinfo[numspritelumps].topoffset = (INT32)(SHORT(patch.topoffset))<<FRACBITS; spritecachedinfo[numspritelumps].topoffset = (INT32)(SHORT(patch.topoffset))<<FRACBITS;
@@ -532,8 +546,8 @@ void R_ClearSprites(void)
visspritecount = numvisiblesprites = clippedvissprites = 0; visspritecount = numvisiblesprites = clippedvissprites = 0;
} }
static INT16 *vissprite_clipbot[MAXVISSPRITES >> VISSPRITECHUNKBITS] = {0}; static INT16 *vissprite_clipbot[MAXVISSPRITES >> VISSPRITECHUNKBITS];
static INT16 *vissprite_cliptop[MAXVISSPRITES >> VISSPRITECHUNKBITS] = {0}; static INT16 *vissprite_cliptop[MAXVISSPRITES >> VISSPRITECHUNKBITS];
static void R_AllocVisSpriteChunkMemory(UINT32 chunk) static void R_AllocVisSpriteChunkMemory(UINT32 chunk)
{ {
@@ -567,16 +581,16 @@ static vissprite_t overflowsprite;
static vissprite_t *R_GetVisSprite(UINT32 num) static vissprite_t *R_GetVisSprite(UINT32 num)
{ {
UINT32 chunk = num >> VISSPRITECHUNKBITS; UINT32 chunk = num >> VISSPRITECHUNKBITS;
// Allocate chunk if necessary // Allocate chunk if necessary
if (!visspritechunks[chunk]) if (!visspritechunks[chunk])
{ {
Z_Malloc(sizeof(vissprite_t) * VISSPRITESPERCHUNK, PU_LEVEL, &visspritechunks[chunk]); Z_Malloc(sizeof(vissprite_t) * VISSPRITESPERCHUNK, PU_LEVEL, &visspritechunks[chunk]);
R_AllocVisSpriteChunkMemory(chunk); R_AllocVisSpriteChunkMemory(chunk);
} }
return visspritechunks[chunk] + (num & VISSPRITEINDEXMASK); return visspritechunks[chunk] + (num & VISSPRITEINDEXMASK);
} }
static vissprite_t *R_NewVisSprite(void) static vissprite_t *R_NewVisSprite(void)
@@ -593,8 +607,8 @@ static vissprite_t *R_NewVisSprite(void)
// Masked means: partly transparent, i.e. stored // Masked means: partly transparent, i.e. stored
// in posts/runs of opaque pixels. // in posts/runs of opaque pixels.
// //
INT16 *mfloorclip = NULL; INT16 *mfloorclip;
INT16 *mceilingclip = NULL; INT16 *mceilingclip;
fixed_t spryscale = 0, sprtopscreen = 0, sprbotscreen = 0; fixed_t spryscale = 0, sprtopscreen = 0, sprbotscreen = 0;
fixed_t windowtop = 0, windowbottom = 0; fixed_t windowtop = 0, windowbottom = 0;
@@ -723,6 +737,7 @@ static void R_DrawFlippedMaskedColumn(drawcolumndata_t* dc, column_t *column)
dc->texturemid = basetexturemid; dc->texturemid = basetexturemid;
} }
// Based off of R_GetLinedefTransTable // Based off of R_GetLinedefTransTable
transnum_t R_GetThingTransTable(fixed_t alpha, transnum_t transmap) transnum_t R_GetThingTransTable(fixed_t alpha, transnum_t transmap)
{ {
@@ -2234,13 +2249,11 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
} }
ds->curline->polyseg->visplane = NULL; ds->curline->polyseg->visplane = NULL;
} }
if (ds->maskedtexturecol) if (ds->maskedtexturecol)
{ {
entry = R_CreateDrawNode(head); entry = R_CreateDrawNode(head);
entry->seg = ds; entry->seg = ds;
} }
if (ds->numffloorplanes) if (ds->numffloorplanes)
{ {
for (i = 0; i < ds->numffloorplanes; i++) for (i = 0; i < ds->numffloorplanes; i++)
@@ -2510,6 +2523,8 @@ void R_InitDrawNodes(void)
// R_DrawSprite // R_DrawSprite
// //
//Fab : 26-04-98: //Fab : 26-04-98:
// NOTE : uses con_clipviewtop, so that when console is on,
// don't draw the part of sprites hidden under the console
static void R_DrawSprite(vissprite_t *spr) static void R_DrawSprite(vissprite_t *spr)
{ {
mfloorclip = spr->clipbot; mfloorclip = spr->clipbot;
@@ -2809,7 +2824,6 @@ void R_ClipSprites(drawseg_t* dsstart, portal_t* portal)
if (drawsegs_xrange_size < maxdrawsegs) if (drawsegs_xrange_size < maxdrawsegs)
{ {
// haleyjd: fix reallocation to track 2x size
drawsegs_xrange_size = 2 * maxdrawsegs; drawsegs_xrange_size = 2 * maxdrawsegs;
for (i = 0; i < DS_RANGES_COUNT; i++) for (i = 0; i < DS_RANGES_COUNT; i++)
@@ -2849,9 +2863,6 @@ void R_ClipSprites(drawseg_t* dsstart, portal_t* portal)
} }
} }
// haleyjd: terminate with a nullptr user for faster loop - adds ~3 FPS
drawsegs_xranges[0].items[drawsegs_xranges[0].count].user = nullptr;
for (; clippedvissprites < visspritecount; clippedvissprites++) for (; clippedvissprites < visspritecount; clippedvissprites++)
{ {
vissprite_t *spr = R_GetVisSprite(clippedvissprites); vissprite_t *spr = R_GetVisSprite(clippedvissprites);
@@ -3017,7 +3028,7 @@ static void R_DrawMaskedList(drawnode_t* head)
else if (r2->seg && r2->seg->maskedtexturecol != NULL) else if (r2->seg && r2->seg->maskedtexturecol != NULL)
{ {
next = r2->prev; next = r2->prev;
R_RenderMaskedSegRange(r2->seg, r2->seg->x1, r2->seg->x2); R_RenderMaskedSegRange( r2->seg, r2->seg->x1, r2->seg->x2);
r2->seg->maskedtexturecol = NULL; r2->seg->maskedtexturecol = NULL;
R_DoneWithNode(r2); R_DoneWithNode(r2);
r2 = next; r2 = next;
@@ -3056,9 +3067,6 @@ void R_DrawMasked(maskcount_t* masks, INT32 nummasks)
heads = static_cast<drawnode_t*>(calloc(nummasks, sizeof(drawnode_t))); heads = static_cast<drawnode_t*>(calloc(nummasks, sizeof(drawnode_t)));
if (!heads)
I_Error("R_DrawMasked: No more free memory\n");
for (i = 0; i < nummasks; i++) for (i = 0; i < nummasks; i++)
{ {
heads[i].next = heads[i].prev = &heads[i]; heads[i].next = heads[i].prev = &heads[i];
+5 -8
View File
@@ -23,10 +23,10 @@ extern "C" {
// number of sprite lumps for spritewidth,offset,topoffset lookup tables // number of sprite lumps for spritewidth,offset,topoffset lookup tables
// Fab: this is a hack : should allocate the lookup tables per sprite // Fab: this is a hack : should allocate the lookup tables per sprite
#if __SIZEOF_POINTER__ < 8 #if defined(__x86_64__) || defined(__amd64__) || defined(__aarch64__) || defined(__arm64__) // only for 64bit (idk how else to proper check lmao)
#define MAXVISSPRITES 2048 // added 2-2-98 was 128 #define MAXVISSPRITES 4096
#else #else
#define MAXVISSPRITES 4096 // only for 64bit #define MAXVISSPRITES 2048 // added 2-2-98 was 128
#endif #endif
#define VISSPRITECHUNKBITS 6 // 2^6 = 64 sprites per chunk #define VISSPRITECHUNKBITS 6 // 2^6 = 64 sprites per chunk
@@ -63,10 +63,7 @@ extern fixed_t windowtop;
extern fixed_t windowbottom; extern fixed_t windowbottom;
extern INT32 lengthcol; extern INT32 lengthcol;
FUNCINLINE static ATTRINLINE INT32 R_ThingLightLevel(mobj_t* thing) INT32 R_ThingLightLevel(mobj_t *thing);
{
return (INT32)thing->lightlevel;
}
fixed_t R_GetSpriteDirectionalLighting(angle_t angle); fixed_t R_GetSpriteDirectionalLighting(angle_t angle);
fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope); fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope);
@@ -86,7 +83,7 @@ typedef struct
{ {
size_t drawsegs[2]; size_t drawsegs[2];
size_t vissprites[2]; size_t vissprites[2];
fixed_t viewx, viewy, viewz; /**< View z stored at the time of the BSP traversal for the view/portal. Masked sorting/drawing needs it. */ fixed_t viewx, viewy, viewz; /**< View z stored at the time of the BSP traversal for the view/portal. Masked sorting/drawing needs it. */
sector_t* viewsector; sector_t* viewsector;
} maskcount_t; } maskcount_t;
+77 -119
View File
@@ -80,7 +80,11 @@ consvar_t cv_accuratefps = {"fpssampling", "1", CV_SAVE, accuratefps_cons_t, NUL
// SCREEN VARIABLES // SCREEN VARIABLES
// ========================================================================= // =========================================================================
static void SCR_SetDrawFuncs(enum columncontext_e _columncontext) UINT8 *scr_borderpatch; // flat used to fill the reduced view borders set at ST_Init()
// =========================================================================
static void SCR_SetDrawFuncs(void)
{ {
// //
// setup the right draw routines // setup the right draw routines
@@ -99,27 +103,13 @@ static void SCR_SetDrawFuncs(enum columncontext_e _columncontext)
spanfuncs[SPANDRAWFUNC_FOG] = R_DrawFogSpan; spanfuncs[SPANDRAWFUNC_FOG] = R_DrawFogSpan;
spanfuncs[SPANDRAWFUNC_TILTEDFOG] = R_DrawFogSpan_Tilted; spanfuncs[SPANDRAWFUNC_TILTEDFOG] = R_DrawFogSpan_Tilted;
if (_columncontext == COLUMNCONTEXT_FLUSH) colfuncs[BASEDRAWFUNC] = R_DrawColumn;
{ colfuncs[COLDRAWFUNC_FUZZY] = R_DrawTranslucentColumn;
colfuncs[BASEDRAWFUNC] = R_DrawColumn_Flush; colfuncs[COLDRAWFUNC_TRANS] = R_DrawTranslatedColumn;
colfuncs[COLDRAWFUNC_FUZZY] = R_DrawTranslucentColumn_Flush; colfuncs[COLDRAWFUNC_SHADOWED] = R_DrawColumnShadowed;
colfuncs[COLDRAWFUNC_TRANS] = R_DrawTranslatedColumn_Flush; colfuncs[COLDRAWFUNC_TRANSTRANS] = R_DrawTranslatedTranslucentColumn;
colfuncs[COLDRAWFUNC_SHADOWED] = R_DrawColumnShadowed_Flush; colfuncs[COLDRAWFUNC_TWOSMULTIPATCH] = R_Draw2sMultiPatchColumn;
colfuncs[COLDRAWFUNC_TRANSTRANS] = R_DrawTranslatedTranslucentColumn_Flush; colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumn;
colfuncs[COLDRAWFUNC_TWOSMULTIPATCH] = R_Draw2sMultiPatchColumn_Flush;
colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumn_Flush;
}
else
{
colfuncs[BASEDRAWFUNC] = R_DrawColumn;
colfuncs[COLDRAWFUNC_FUZZY] = R_DrawTranslucentColumn;
colfuncs[COLDRAWFUNC_TRANS] = R_DrawTranslatedColumn;
colfuncs[COLDRAWFUNC_SHADOWED] = R_DrawColumnShadowed;
colfuncs[COLDRAWFUNC_TRANSTRANS] = R_DrawTranslatedTranslucentColumn;
colfuncs[COLDRAWFUNC_TWOSMULTIPATCH] = R_Draw2sMultiPatchColumn;
colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumn;
}
colfuncs[COLDRAWFUNC_FOG] = R_DrawFogColumn; colfuncs[COLDRAWFUNC_FOG] = R_DrawFogColumn;
R_SetColumnFunc(BASEDRAWFUNC); R_SetColumnFunc(BASEDRAWFUNC);
@@ -141,23 +131,12 @@ void SCR_SetMode(void)
V_SetPalette(0); V_SetPalette(0);
SCR_SetDrawFuncs(COLUMNCONTEXT_DIRECT); SCR_SetDrawFuncs();
// set the apprpriate drawer for the sky (tall or INT16) // set the apprpriate drawer for the sky (tall or INT16)
setmodeneeded = 0; setmodeneeded = 0;
} }
// used to switch between column buffering and drawing them directly to screen
// our sky "plane" drawer cannot handle the buffer system due to multithreading
// (that would require alot of extra complexity for smth with massive diminishing results)
// Our masked drawing step draws things in a very particular order, which results in alot of flushing to screen
// effectively adding massive overhead due to excessive flushing, so we draw our masked thing directly to screen instead
void R_SetColumnContext(enum columncontext_e _columncontext)
{
columncontext = _columncontext;
SCR_SetDrawFuncs(_columncontext); // set our column drawers
}
void R_SetColumnFunc(size_t id) void R_SetColumnFunc(size_t id)
{ {
I_Assert(id < COLDRAWFUNC_MAX); I_Assert(id < COLDRAWFUNC_MAX);
@@ -319,6 +298,7 @@ void SCR_SetDefaultMode(void)
// Change fullscreen on/off according to cv_fullscreen // Change fullscreen on/off according to cv_fullscreen
void SCR_ChangeFullscreen(void) void SCR_ChangeFullscreen(void)
{ {
#ifdef DIRECTFULLSCREEN
I_SetBorderlessWindow(); // Running this here so we can have borderless window at startup I_SetBorderlessWindow(); // Running this here so we can have borderless window at startup
// allow_fullscreen is set by VID_PrepareModeList // allow_fullscreen is set by VID_PrepareModeList
@@ -331,8 +311,8 @@ void SCR_ChangeFullscreen(void)
VID_PrepareModeList(); VID_PrepareModeList();
setmodeneeded = VID_GetModeForSize(vid.width, vid.height) + 1; setmodeneeded = VID_GetModeForSize(vid.width, vid.height) + 1;
} }
return; return;
#endif
} }
boolean SCR_IsAspectCorrect(INT32 width, INT32 height) boolean SCR_IsAspectCorrect(INT32 width, INT32 height)
@@ -420,97 +400,74 @@ void SCR_CalculateFPS(void)
#endif #endif
} }
static void SCR_DrawOldTicRate(UINT32 cap, UINT32 benchmark, double fps, INT32 fpsflags)
{
const char *fps_string;
INT32 ticcntcolor = 0;
if (fps > (benchmark - 5))
ticcntcolor = V_GREENMAP;
else if (fps < 20)
ticcntcolor = V_REDMAP;
if (cap != 0)
fps_string = va("%d/%d\x82", (INT32)fps, cap);
else
fps_string = va("%d\x82", (INT32)fps);
// draw "FPS"
if (cv_ticrate.value == 3)
V_DrawRightAlignedString(319, 181, V_YELLOWMAP|fpsflags, "FPS");
V_DrawRightAlignedString(319, 190, ticcntcolor|fpsflags, fps_string);
}
static void SCR_DrawKartTicRate(UINT32 cap, UINT32 benchmark, double fps, INT32 fpsflags)
{
UINT8 *ticcntcolor = NULL;
INT32 x = 318;
// draw "FPS"
if (cv_ticrate.value == 1)
{
ticcntcolor = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_YELLOW, GTC_CACHE);
V_DrawFixedPatch(306<<FRACBITS, 183<<FRACBITS, FRACUNIT, fpsflags, framecounter, ticcntcolor);
}
if (fps > (benchmark - 5))
ticcntcolor = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_MINT, GTC_CACHE);
else if (fps < 20)
ticcntcolor = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_RASPBERRY, GTC_CACHE);
else
ticcntcolor = NULL;
if (cap != 0)
{
UINT32 digits = 1;
UINT32 c2 = cap;
while (c2 > 0)
{
c2 = c2 / 10;
digits++;
}
// draw total frame:
V_DrawPingNum(x, 190, fpsflags, cap, ticcntcolor);
x -= digits * 4;
// draw "/"
V_DrawFixedPatch(x<<FRACBITS, 190<<FRACBITS, FRACUNIT, fpsflags, frameslash, ticcntcolor);
}
// draw our actual framerate
V_DrawPingNum(x, 190, fpsflags, fps, ticcntcolor);
}
void SCR_DisplayTicRate(void) void SCR_DisplayTicRate(void)
{ {
UINT32 cap, benchmark; UINT32 cap = R_GetFramerateCap();
double fps; UINT32 benchmark = (cap == 0) ? I_GetRefreshRate() : cap;
INT32 fpsflags; double fps = round(averageFPS);
INT32 fpsflags = V_LocalTransFlag()|V_SNAPTOBOTTOM|V_SNAPTORIGHT;
if (gamestate == GS_NULL) if (gamestate == GS_NULL)
return; return;
cap = R_GetFramerateCap(); // new kart counter
benchmark = (cap == 0) ? I_GetRefreshRate() : cap; if (cv_ticrate.value == 1 || cv_ticrate.value == 2)
fps = round(averageFPS);
fpsflags = V_LocalTransFlag()|V_SNAPTOBOTTOM|V_SNAPTORIGHT;
switch (cv_ticrate.value)
{ {
case 1: // new kart counter const UINT8 *ticcntcolor = NULL;
case 2: INT32 x = 318;
SCR_DrawKartTicRate(cap, benchmark, fps, fpsflags);
break; // draw "FPS"
case 3: // kart v1.0/srb2 counter if (cv_ticrate.value == 1)
case 4: V_DrawFixedPatch(306<<FRACBITS, 183<<FRACBITS, FRACUNIT, fpsflags, framecounter, R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_YELLOW, GTC_CACHE));
SCR_DrawOldTicRate(cap, benchmark, fps, fpsflags);
break; if (fps > (benchmark - 5))
default: ticcntcolor = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_MINT, GTC_CACHE);
break; else if (fps < 20)
ticcntcolor = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_RASPBERRY, GTC_CACHE);
if (cap != 0)
{
UINT32 digits = 1;
UINT32 c2 = cap;
while (c2 > 0)
{
c2 = c2 / 10;
digits++;
}
// draw total frame:
V_DrawPingNum(x, 190, fpsflags, cap, ticcntcolor);
x -= digits * 4;
// draw "/"
V_DrawFixedPatch(x<<FRACBITS, 190<<FRACBITS, FRACUNIT, fpsflags, frameslash, ticcntcolor);
}
// draw our actual framerate
V_DrawPingNum(x, 190, fpsflags, fps, ticcntcolor);
}
else if (cv_ticrate.value == 3 || cv_ticrate.value == 4) // kart v1.0/srb2 counter
{
const char *fps_string;
INT32 ticcntcolor2 = 0;
if (fps > (benchmark - 5))
ticcntcolor2 = V_GREENMAP;
else if (fps < 20)
ticcntcolor2 = V_REDMAP;
if (cap != 0)
fps_string = va("%d/%d\x82", (INT32)fps, cap);
else
fps_string = va("%d\x82", (INT32)fps);
// draw "FPS"
if (cv_ticrate.value == 3)
V_DrawRightAlignedString(319, 181, V_YELLOWMAP|fpsflags, "FPS");
V_DrawRightAlignedString(319, 190, ticcntcolor2|fpsflags, fps_string);
} }
} }
@@ -525,6 +482,7 @@ void SCR_DisplayLocalPing(void)
if (cv_showping.value == 1 || (cv_showping.value == 2 && ping > servermaxping)) // only show 2 (warning) if our ping is at a bad level if (cv_showping.value == 1 || (cv_showping.value == 2 && ping > servermaxping)) // only show 2 (warning) if our ping is at a bad level
{ {
INT32 dispy = (cv_ticrate.value == 1) ? 165 : ((cv_ticrate.value == 2 || cv_ticrate.value == 4) ? 172 : ((cv_ticrate.value == 3) ? 163 : 181)); // absolute buttpain INT32 dispy = (cv_ticrate.value == 1) ? 165 : ((cv_ticrate.value == 2 || cv_ticrate.value == 4) ? 172 : ((cv_ticrate.value == 3) ? 163 : 181)); // absolute buttpain
HU_drawPlayerPing(308, dispy, consoleplayer, pingflags); // consoleplayer's ping is everyone's ping in a splitnetgame :P HU_drawPlayerPing(308, dispy, consoleplayer, pingflags); // consoleplayer's ping is everyone's ping in a splitnetgame :P
} }
} }
+2 -1
View File
@@ -84,6 +84,8 @@ enum
extern viddef_t vid; extern viddef_t vid;
extern INT32 setmodeneeded; // mode number to set if needed, or 0 extern INT32 setmodeneeded; // mode number to set if needed, or 0
extern UINT8 *scr_borderpatch; // patch used to fill the view borders
extern consvar_t cv_scr_width, cv_scr_height, cv_renderview, cv_frameskip, cv_fullscreen, cv_vhseffect, cv_shittyscreen; extern consvar_t cv_scr_width, cv_scr_height, cv_renderview, cv_frameskip, cv_fullscreen, cv_vhseffect, cv_shittyscreen;
extern consvar_t cv_parallelsoftware; extern consvar_t cv_parallelsoftware;
extern consvar_t cv_paralleldrawmasked; extern consvar_t cv_paralleldrawmasked;
@@ -94,7 +96,6 @@ extern consvar_t cv_vidwait;
extern consvar_t cv_votebgscaling; extern consvar_t cv_votebgscaling;
//void R_SetColumnContext(enum columncontext_e _columncontext); // declared in r_draw!
void R_SetColumnFunc(size_t id); void R_SetColumnFunc(size_t id);
void R_SetSpanFunc(size_t id); void R_SetSpanFunc(size_t id);
boolean R_CheckColumnFunc(size_t id); boolean R_CheckColumnFunc(size_t id);
+2 -2
View File
@@ -45,7 +45,7 @@ MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /G5 /W3 /GX /Zi /Ot /Og /Oi /Op /Oy /Ob1 /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "NDEBUG" /D "SDLMAIN" /D "NO_STDIO_REDIRECT" /D "USE_WGL_SWAP" /D "HAVE_SDL" /D "HWRENDER" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GF /c # ADD CPP /nologo /G5 /W3 /GX /Zi /Ot /Og /Oi /Op /Oy /Ob1 /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "NDEBUG" /D "SDLMAIN" /D "NO_STDIO_REDIRECT" /D "USE_WGL_SWAP" /D "DIRECTFULLSCREEN" /D "HAVE_SDL" /D "HWRENDER" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GF /c
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG"
# SUBTRACT RSC /x # SUBTRACT RSC /x
@@ -72,7 +72,7 @@ LINK32=link.exe
# PROP Target_Dir "" # PROP Target_Dir ""
MTL=midl.exe MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /G6 /W4 /WX /Gm /GX /ZI /Od /Op /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "_DEBUG" /D "USE_WGL_SWAP" /D "HAVE_SDL" /D "HWRENDER" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GZ /c # ADD CPP /nologo /G6 /W4 /WX /Gm /GX /ZI /Od /Op /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "_DEBUG" /D "USE_WGL_SWAP" /D "DIRECTFULLSCREEN" /D "HAVE_SDL" /D "HWRENDER" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GZ /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG"
Loaded 100 of 108 files, more files were not shown because too many files have changed in this diff. Show more