eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Last fix for skyrooms. Should now show entities in the skyroom.

Browse source 
Fix a couple of valgrind issues.
Added reason info for when a download fails.
Downloading models now forgets failed-to-load state, fixing a downloaded-but-still-missing bug.
Use anisotropic filtering in more fps_presets.
Fix significant fps loss when using the modelviewer.
First attempt at automatic LOD (supported for md3s and extended-iqms for now).



git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5494 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2019-07-29 05:28:20 +00:00
parent 326f9dddc8
commit 1b8e779b9b
31 changed files with 498 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
CMakeLists.txt
View file

@ -381,6 +381,22 @@ ELSE()
# engine/gl/gl_vidwayland.c # engine/gl/gl_vidwayland.c
ENDIF() ENDIF()
SET(FTE_GL_FILES
#These are GL-specific, but can be left even if no gl is supported.
engine/gl/gl_backend.c
engine/gl/gl_bloom.c
engine/gl/gl_draw.c
engine/gl/gl_rmain.c
engine/gl/gl_rmisc.c
engine/gl/gl_rsurf.c
engine/gl/gl_screen.c
engine/gl/gl_vidcommon.c
engine/gl/glmod_doom.c
)
SET(FTE_VK_FILES
engine/vk/vk_backend.c
engine/vk/vk_init.c
)
SET(FTE_COMMON_FILES SET(FTE_COMMON_FILES
#these files are common to both server-only and client+server builds. #these files are common to both server-only and client+server builds.
engine/common/cmd.c engine/common/cmd.c
@ -617,13 +633,12 @@ SET(FTE_CLIENT_FILES
engine/client/snd_ov.c engine/client/snd_ov.c
engine/client/textedit.c engine/client/textedit.c
engine/client/valid.c engine/client/valid.c
engine/client/vid_headless.c
engine/client/view.c engine/client/view.c
engine/client/wad.c engine/client/wad.c
engine/client/zqtp.c engine/client/zqtp.c
#These are generic renderer files #These are generic renderer files and no longer gl-specific (for the most part)
engine/gl/gl_alias.c engine/gl/gl_alias.c
engine/gl/gl_font.c engine/gl/gl_font.c
engine/gl/gl_ngraph.c engine/gl/gl_ngraph.c
@ -633,19 +648,10 @@ SET(FTE_CLIENT_FILES
engine/gl/gl_warp.c engine/gl/gl_warp.c
engine/gl/ltface.c engine/gl/ltface.c
#These are GL-specific, but can be left even if no gl is supported. #these are renderer-specific
engine/gl/gl_backend.c engine/client/vid_headless.c
engine/gl/gl_bloom.c ${FTE_GL_FILES}
engine/gl/gl_draw.c ${FTE_VK_FILES}
engine/gl/gl_rmain.c
engine/gl/gl_rmisc.c
engine/gl/gl_rsurf.c
engine/gl/gl_screen.c
engine/gl/gl_vidcommon.c
engine/gl/glmod_doom.c
engine/vk/vk_backend.c
engine/vk/vk_init.c
) )
ADD_LIBRARY(fteq3bot MODULE ADD_LIBRARY(fteq3bot MODULE
@ -705,6 +711,7 @@ ELSE()
SET_TARGET_PROPERTIES(bullet PROPERTIES PREFIX "fteplug_") SET_TARGET_PROPERTIES(bullet PROPERTIES PREFIX "fteplug_")
SET_TARGET_PROPERTIES(bullet PROPERTIES LINK_FLAGS "-Wl,--no-undefined") SET_TARGET_PROPERTIES(bullet PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
TARGET_LINK_LIBRARIES(bullet m ${BULLET_LIBRARIES}) TARGET_LINK_LIBRARIES(bullet m ${BULLET_LIBRARIES})
SET(INSTALLTARGS ${INSTALLTARGS} bullet)
ENDIF() ENDIF()
ENDIF() ENDIF()
@ -717,6 +724,7 @@ IF(ANDROID)
) )
SET_TARGET_PROPERTIES(ftedroid PROPERTIES COMPILE_DEFINITIONS "${FTE_LIB_DEFINES};${FTE_DEFINES};${FTE_REVISON}") SET_TARGET_PROPERTIES(ftedroid PROPERTIES COMPILE_DEFINITIONS "${FTE_LIB_DEFINES};${FTE_DEFINES};${FTE_REVISON}")
TARGET_LINK_LIBRARIES(ftedroid ${FTE_LIBS} ) TARGET_LINK_LIBRARIES(ftedroid ${FTE_LIBS} )
SET(INSTALLTARGS ${INSTALLTARGS} ftedroid)
ELSE() ELSE()
#systems that actually have executables... #systems that actually have executables...
ADD_EXECUTABLE(fteqw WIN32 ADD_EXECUTABLE(fteqw WIN32
@ -726,6 +734,7 @@ ELSE()
) )
SET_TARGET_PROPERTIES(fteqw PROPERTIES COMPILE_DEFINITIONS "${FTE_LIB_DEFINES};${FTE_DEFINES};${FTE_REVISON}") SET_TARGET_PROPERTIES(fteqw PROPERTIES COMPILE_DEFINITIONS "${FTE_LIB_DEFINES};${FTE_DEFINES};${FTE_REVISON}")
TARGET_LINK_LIBRARIES(fteqw ${FTE_LIBS} ) TARGET_LINK_LIBRARIES(fteqw ${FTE_LIBS} )
SET(INSTALLTARGS ${INSTALLTARGS} fteqw)
ADD_EXECUTABLE(fteqw-sv ADD_EXECUTABLE(fteqw-sv
${FTESV_ARCH_FILES} ${FTESV_ARCH_FILES}
@ -733,12 +742,14 @@ ELSE()
) )
SET_TARGET_PROPERTIES(fteqw-sv PROPERTIES COMPILE_DEFINITIONS "SERVERONLY;${FTE_LIB_DEFINES};${FTESV_DEFINES};${FTE_REVISON}") SET_TARGET_PROPERTIES(fteqw-sv PROPERTIES COMPILE_DEFINITIONS "SERVERONLY;${FTE_LIB_DEFINES};${FTESV_DEFINES};${FTE_REVISON}")
TARGET_LINK_LIBRARIES(fteqw-sv ${FTESV_LIBS}) TARGET_LINK_LIBRARIES(fteqw-sv ${FTESV_LIBS})
SET(INSTALLTARGS ${INSTALLTARGS} fteqw-sv)
ADD_EXECUTABLE(iqmtool ADD_EXECUTABLE(iqmtool
iqm/iqm.cpp iqm/iqm.cpp
iqm/iqm.h iqm/iqm.h
) )
SET_TARGET_PROPERTIES(iqmtool PROPERTIES COMPILE_DEFINITIONS "${FTE_REVISON}") SET_TARGET_PROPERTIES(iqmtool PROPERTIES COMPILE_DEFINITIONS "${FTE_REVISON}")
SET(INSTALLTARGS ${INSTALLTARGS} iqmtool)
ADD_EXECUTABLE(qtv ADD_EXECUTABLE(qtv
fteqtv/netchan.c fteqtv/netchan.c
@ -764,6 +775,7 @@ ELSE()
ELSE() ELSE()
TARGET_LINK_LIBRARIES(qtv m) TARGET_LINK_LIBRARIES(qtv m)
ENDIF() ENDIF()
SET(INSTALLTARGS ${INSTALLTARGS} qtv)
IF(NOT WIN32) IF(NOT WIN32)
ADD_EXECUTABLE(ftemaster ADD_EXECUTABLE(ftemaster
@ -784,6 +796,7 @@ ELSE()
) )
SET_TARGET_PROPERTIES(ftemaster PROPERTIES COMPILE_DEFINITIONS "MASTERONLY;${FTE_LIB_DEFINES};${FTESV_DEFINES};${FTE_REVISON}") SET_TARGET_PROPERTIES(ftemaster PROPERTIES COMPILE_DEFINITIONS "MASTERONLY;${FTE_LIB_DEFINES};${FTESV_DEFINES};${FTE_REVISON}")
TARGET_LINK_LIBRARIES(ftemaster ${FTESV_LIBS}) TARGET_LINK_LIBRARIES(ftemaster ${FTESV_LIBS})
SET(INSTALLTARGS ${INSTALLTARGS} ftemaster)
ENDIF() ENDIF()
ADD_EXECUTABLE(httpserver ADD_EXECUTABLE(httpserver
@ -796,6 +809,7 @@ ELSE()
IF(WIN32) IF(WIN32)
TARGET_LINK_LIBRARIES(httpserver ${ZLIB_LIBRARIES} ws2_32) TARGET_LINK_LIBRARIES(httpserver ${ZLIB_LIBRARIES} ws2_32)
ENDIF() ENDIF()
#SET(INSTALLTARGS ${INSTALLTARGS} httpserver)
ADD_EXECUTABLE(fteqcc ADD_EXECUTABLE(fteqcc
engine/qclib/qcctui.c engine/qclib/qcctui.c
@ -809,6 +823,7 @@ ELSE()
) )
SET_TARGET_PROPERTIES(fteqcc PROPERTIES COMPILE_DEFINITIONS "${FTE_LIB_DEFINES};${FTE_REVISON}") SET_TARGET_PROPERTIES(fteqcc PROPERTIES COMPILE_DEFINITIONS "${FTE_LIB_DEFINES};${FTE_REVISON}")
TARGET_LINK_LIBRARIES(fteqcc ${ZLIB_LIBRARIES} m) TARGET_LINK_LIBRARIES(fteqcc ${ZLIB_LIBRARIES} m)
SET(INSTALLTARGS ${INSTALLTARGS} fteqcc)
IF(${WIN32}) IF(${WIN32})
ADD_EXECUTABLE(fteqccgui WIN32 ADD_EXECUTABLE(fteqccgui WIN32
@ -826,6 +841,7 @@ ELSE()
) )
SET_TARGET_PROPERTIES(fteqccgui PROPERTIES COMPILE_DEFINITIONS "${FTE_LIB_DEFINES};${FTE_REVISON}") SET_TARGET_PROPERTIES(fteqccgui PROPERTIES COMPILE_DEFINITIONS "${FTE_LIB_DEFINES};${FTE_REVISON}")
TARGET_LINK_LIBRARIES(fteqccgui ${ZLIB_LIBRARIES} shlwapi ole32 comctl32 comdlg32) TARGET_LINK_LIBRARIES(fteqccgui ${ZLIB_LIBRARIES} shlwapi ole32 comctl32 comdlg32)
SET(INSTALLTARGS ${INSTALLTARGS} fteqccgui)
ELSE() ELSE()
FIND_PACKAGE(Qt5Widgets) FIND_PACKAGE(Qt5Widgets)
IF (Qt5Widgets_FOUND) IF (Qt5Widgets_FOUND)
@ -846,16 +862,16 @@ ELSE()
SET_TARGET_PROPERTIES(fteqccgui PROPERTIES COMPILE_DEFINITIONS "${FTE_LIB_DEFINES};${FTE_REVISON};${Qt5Widgets_COMPILE_DEFINITIONS}") SET_TARGET_PROPERTIES(fteqccgui PROPERTIES COMPILE_DEFINITIONS "${FTE_LIB_DEFINES};${FTE_REVISON};${Qt5Widgets_COMPILE_DEFINITIONS}")
SET_PROPERTY(TARGET fteqccgui PROPERTY POSITION_INDEPENDENT_CODE TRUE) SET_PROPERTY(TARGET fteqccgui PROPERTY POSITION_INDEPENDENT_CODE TRUE)
TARGET_LINK_LIBRARIES(fteqccgui ${ZLIB_LIBRARIES} ${Qt5Widgets_LIBRARIES} qscintilla2_qt5) TARGET_LINK_LIBRARIES(fteqccgui ${ZLIB_LIBRARIES} ${Qt5Widgets_LIBRARIES} qscintilla2_qt5)
SET(INSTALLTARGS ${INSTALLTARGS} fteqccgui)
ENDIF() ENDIF()
ENDIF() ENDIF()
ENDIF() ENDIF()
#Quake Injector Alike plugin #Quake Injector Alike plugin
ADD_LIBRARY(qi MODULE ADD_LIBRARY(qi MODULE
plugins/qvm_api.c plugins/qvm_api.c
plugins/plugin.c plugins/plugin.c
plugins/qi/qi.c plugins/qi/qi.c
plugins/emailnot/md5.c plugins/emailnot/md5.c
plugins/jabber/xml.c plugins/jabber/xml.c
) )
@ -863,6 +879,7 @@ SET_TARGET_PROPERTIES(qi PROPERTIES COMPILE_DEFINITIONS "FTEPLUGIN;${FTE_LIB_DEF
SET_TARGET_PROPERTIES(qi PROPERTIES PREFIX "fteplug_") SET_TARGET_PROPERTIES(qi PROPERTIES PREFIX "fteplug_")
SET_TARGET_PROPERTIES(qi PROPERTIES LINK_FLAGS "-Wl,--no-undefined") SET_TARGET_PROPERTIES(qi PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
TARGET_LINK_LIBRARIES(qi m) TARGET_LINK_LIBRARIES(qi m)
SET(INSTALLTARGS ${INSTALLTARGS} qi)
#ODE Physics library plugin #ODE Physics library plugin
FIND_PATH(LIBODE_INCLUDE_DIR ode/ode.h) FIND_PATH(LIBODE_INCLUDE_DIR ode/ode.h)
@ -879,6 +896,7 @@ IF (LIBODE_INCLUDE_DIR)
SET_TARGET_PROPERTIES(ode PROPERTIES PREFIX "fteplug_") SET_TARGET_PROPERTIES(ode PROPERTIES PREFIX "fteplug_")
SET_TARGET_PROPERTIES(ode PROPERTIES LINK_FLAGS "-Wl,--no-undefined") SET_TARGET_PROPERTIES(ode PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
TARGET_LINK_LIBRARIES(ode m ${LIBODE_LIBRARY}) TARGET_LINK_LIBRARIES(ode m ${LIBODE_LIBRARY})
SET(INSTALLTARGS ${INSTALLTARGS} ode)
ENDIF() ENDIF()
#EzQuake Hud port plugin #EzQuake Hud port plugin
@ -894,6 +912,7 @@ SET_TARGET_PROPERTIES(ezhud PROPERTIES COMPILE_DEFINITIONS "FTEPLUGIN;${FTE_LIB_
SET_TARGET_PROPERTIES(ezhud PROPERTIES PREFIX "fteplug_") SET_TARGET_PROPERTIES(ezhud PROPERTIES PREFIX "fteplug_")
SET_TARGET_PROPERTIES(ezhud PROPERTIES LINK_FLAGS "-Wl,--no-undefined") SET_TARGET_PROPERTIES(ezhud PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
TARGET_LINK_LIBRARIES(ezhud m) TARGET_LINK_LIBRARIES(ezhud m)
SET(INSTALLTARGS ${INSTALLTARGS} ezhud)
#IRC client plugin #IRC client plugin
ADD_LIBRARY(irc MODULE ADD_LIBRARY(irc MODULE
@ -905,6 +924,7 @@ SET_TARGET_PROPERTIES(irc PROPERTIES COMPILE_DEFINITIONS "FTEPLUGIN;${FTE_LIB_DE
SET_TARGET_PROPERTIES(irc PROPERTIES PREFIX "fteplug_") SET_TARGET_PROPERTIES(irc PROPERTIES PREFIX "fteplug_")
SET_TARGET_PROPERTIES(irc PROPERTIES LINK_FLAGS "-Wl,--no-undefined") SET_TARGET_PROPERTIES(irc PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
TARGET_LINK_LIBRARIES(irc m) TARGET_LINK_LIBRARIES(irc m)
SET(INSTALLTARGS ${INSTALLTARGS} irc)
#model formats plugin #model formats plugin
ADD_LIBRARY(models MODULE ADD_LIBRARY(models MODULE
@ -917,6 +937,7 @@ SET_TARGET_PROPERTIES(models PROPERTIES COMPILE_DEFINITIONS "FTEPLUGIN;${FTE_LIB
SET_TARGET_PROPERTIES(models PROPERTIES PREFIX "fteplug_") SET_TARGET_PROPERTIES(models PROPERTIES PREFIX "fteplug_")
SET_TARGET_PROPERTIES(models PROPERTIES LINK_FLAGS "-Wl,--no-undefined") SET_TARGET_PROPERTIES(models PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
TARGET_LINK_LIBRARIES(models m) TARGET_LINK_LIBRARIES(models m)
SET(INSTALLTARGS ${INSTALLTARGS} models)
#x11 server plugin (note: for displaying other programs) #x11 server plugin (note: for displaying other programs)
ADD_LIBRARY(x11 MODULE ADD_LIBRARY(x11 MODULE
@ -931,6 +952,7 @@ SET_TARGET_PROPERTIES(x11 PROPERTIES COMPILE_DEFINITIONS "FTEPLUGIN;${FTE_LIB_DE
SET_TARGET_PROPERTIES(x11 PROPERTIES PREFIX "fteplug_") SET_TARGET_PROPERTIES(x11 PROPERTIES PREFIX "fteplug_")
SET_TARGET_PROPERTIES(x11 PROPERTIES LINK_FLAGS "-Wl,--no-undefined") SET_TARGET_PROPERTIES(x11 PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
TARGET_LINK_LIBRARIES(x11 m) TARGET_LINK_LIBRARIES(x11 m)
SET(INSTALLTARGS ${INSTALLTARGS} x11)
#ffmpeg client plugin. no proper way to detect dependancies right now, so I've gotta try the manual way. #ffmpeg client plugin. no proper way to detect dependancies right now, so I've gotta try the manual way.
FIND_PATH(AVCODEC_INCLUDE_DIR libavcodec/avcodec.h) FIND_PATH(AVCODEC_INCLUDE_DIR libavcodec/avcodec.h)
@ -955,6 +977,7 @@ IF((AVFORMAT_INCLUDE_DIR) AND (AVSWSCALE_INCLUDE_DIR))
TARGET_LINK_LIBRARIES(ffmpeg m ${AVFORMAT_LIBRARY} ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${AVSWSCALE_LIBRARY}) TARGET_LINK_LIBRARIES(ffmpeg m ${AVFORMAT_LIBRARY} ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${AVSWSCALE_LIBRARY})
SET_TARGET_PROPERTIES(ffmpeg PROPERTIES COMPILE_DEFINITIONS "FTEPLUGIN;${FTE_LIB_DEFINES}") SET_TARGET_PROPERTIES(ffmpeg PROPERTIES COMPILE_DEFINITIONS "FTEPLUGIN;${FTE_LIB_DEFINES}")
SET_TARGET_PROPERTIES(ffmpeg PROPERTIES PREFIX "fteplug_") SET_TARGET_PROPERTIES(ffmpeg PROPERTIES PREFIX "fteplug_")
SET(INSTALLTARGS ${INSTALLTARGS} ffmpeg)
ELSE() ELSE()
MESSAGE(WARNING "ffmpeg library NOT available. Quake shouldn't be playing fmv anyway.") MESSAGE(WARNING "ffmpeg library NOT available. Quake shouldn't be playing fmv anyway.")
ENDIF() ENDIF()
@ -978,6 +1001,14 @@ IF(NOT ANDROID)
ELSE() ELSE()
TARGET_LINK_LIBRARIES(xmpp m resolv) TARGET_LINK_LIBRARIES(xmpp m resolv)
ENDIF() ENDIF()
SET(INSTALLTARGS ${INSTALLTARGS} xmpp)
ENDIF() ENDIF()
INCLUDE(GNUInstallDirs)
SET(FTE_INSTALL_BINDIR games CACHE STRING "Binary dir to install to.")
INSTALL(TARGETS ${INSTALLTARGS}
RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}${FTE_INSTALL_BINDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}"
)
#cef plugin #cef plugin

3
engine/client/cl_ents.c
View file

@ -5641,6 +5641,9 @@ void CL_SetSolidEntities (void)
physent_t *pent; physent_t *pent;
model_t *mod; model_t *mod;
VALGRIND_MAKE_MEM_UNDEFINED(&pmove, sizeof(pmove));
pmove.world = &csqc_world;
memset(&pmove.physents[0], 0, sizeof(physent_t)); memset(&pmove.physents[0], 0, sizeof(physent_t));
pmove.physents[0].model = cl.worldmodel; pmove.physents[0].model = cl.worldmodel;
VectorClear (pmove.physents[0].origin); VectorClear (pmove.physents[0].origin);

9
engine/client/cl_main.c
View file

@ -3047,6 +3047,7 @@ void CL_ConnectionlessPacket (void)
int candtls = 0; //0=no,1=optional,2=mandatory int candtls = 0; //0=no,1=optional,2=mandatory
#endif #endif
char guidhash[256]; char guidhash[256];
*guidhash = 0;
s = MSG_ReadString (); s = MSG_ReadString ();
COM_Parse(s); COM_Parse(s);
@ -4090,6 +4091,8 @@ void CL_Download_f (void)
if (!strnicmp(url, "qw://", 5) || !strnicmp(url, "q2://", 5)) if (!strnicmp(url, "qw://", 5) || !strnicmp(url, "q2://", 5))
{ {
url += 5; url += 5;
if (*url == '/') //a conforming url should always have a host section, an empty one is simply three slashes.
url++;
} }
if (!*localname) if (!*localname)
@ -4146,14 +4149,14 @@ void CL_DownloadSize_f(void)
if (!strcmp(size, "e")) if (!strcmp(size, "e"))
{ {
Con_Printf("Download of \"%s\" failed. Not found.\n", rname); Con_Printf("Download of \"%s\" failed. Not found.\n", rname);
CL_DownloadFailed(rname, NULL); CL_DownloadFailed(rname, NULL, DLFAIL_SERVERFILE);
} }
else if (!strcmp(size, "p")) else if (!strcmp(size, "p"))
{ {
if (cls.download && stricmp(cls.download->remotename, rname)) if (cls.download && stricmp(cls.download->remotename, rname))
{ {
Con_Printf("Download of \"%s\" failed. Not allowed.\n", rname); Con_Printf("Download of \"%s\" failed. Not allowed.\n", rname);
CL_DownloadFailed(rname, NULL); CL_DownloadFailed(rname, NULL, DLFAIL_SERVERCVAR);
} }
} }
else if (!strcmp(size, "r")) else if (!strcmp(size, "r"))
@ -4163,7 +4166,7 @@ void CL_DownloadSize_f(void)
if (!CL_AllowArbitaryDownload(rname, redirection)) if (!CL_AllowArbitaryDownload(rname, redirection))
return; return;
dl = CL_DownloadFailed(rname, NULL); dl = CL_DownloadFailed(rname, NULL, DLFAIL_REDIRECTED);
Con_DPrintf("Download of \"%s\" redirected to \"%s\".\n", rname, redirection); Con_DPrintf("Download of \"%s\" redirected to \"%s\".\n", rname, redirection);
CL_CheckOrEnqueDownloadFile(redirection, NULL, dl->flags); CL_CheckOrEnqueDownloadFile(redirection, NULL, dl->flags);
} }

92
engine/client/cl_parse.c
View file

@ -564,12 +564,14 @@ qboolean CL_EnqueDownload(const char *filename, const char *localname, unsigned
COM_FileExtension(localname, ext, sizeof(ext)); COM_FileExtension(localname, ext, sizeof(ext));
if (!stricmp(ext, "dll") || !stricmp(ext, "so") || strchr(localname, '\\') || strchr(localname, ':') || strstr(localname, "..")) if (!stricmp(ext, "dll") || !stricmp(ext, "so") || strchr(localname, '\\') || strchr(localname, ':') || strstr(localname, ".."))
{ {
CL_DownloadFailed(filename, NULL, DLFAIL_UNTRIED);
Con_Printf("Denying download of \"%s\"\n", filename); Con_Printf("Denying download of \"%s\"\n", filename);
return false; return false;
} }
if (!(flags & DLLF_USEREXPLICIT) && !cl_downloads.ival) if (!(flags & DLLF_USEREXPLICIT) && !cl_downloads.ival)
{ {
CL_DownloadFailed(filename, NULL, DLFAIL_CLIENTCVAR);
if (flags & DLLF_VERBOSE) if (flags & DLLF_VERBOSE)
Con_Printf("cl_downloads setting prevents download of \"%s\"\n", filename); Con_Printf("cl_downloads setting prevents download of \"%s\"\n", filename);
return false; return false;
@ -581,7 +583,10 @@ qboolean CL_EnqueDownload(const char *filename, const char *localname, unsigned
#ifdef NQPROT #ifdef NQPROT
if (!webdl && cls.protocol == CP_NETQUAKE) if (!webdl && cls.protocol == CP_NETQUAKE)
if (!cl_dp_serverextension_download) if (!cl_dp_serverextension_download)
{
CL_DownloadFailed(filename, NULL, DLFAIL_UNSUPPORTED);
return false; return false;
}
#endif #endif
for (dl = cl.faileddownloads; dl; dl = dl->next) //yeah, so it failed... Ignore it. for (dl = cl.faileddownloads; dl; dl = dl->next) //yeah, so it failed... Ignore it.
@ -701,7 +706,10 @@ static void CL_WebDownloadFinished(struct dl_download *dl)
{ {
if (dl->status == DL_FAILED) if (dl->status == DL_FAILED)
{ {
CL_DownloadFailed(dl->url, &dl->qdownload); if (dl->replycode == 404) //regular file-not-found
CL_DownloadFailed(dl->url, &dl->qdownload, DLFAIL_SERVERFILE);
else //other stuff is PROBABLY 403forbidden, but lets blame the server's config if its a tls issue etc.
CL_DownloadFailed(dl->url, &dl->qdownload, DLFAIL_SERVERCVAR);
if (dl->qdownload.flags & DLLF_ALLOWWEB) //re-enqueue it if allowed, but this time not from the web server. if (dl->qdownload.flags & DLLF_ALLOWWEB) //re-enqueue it if allowed, but this time not from the web server.
CL_EnqueDownload(dl->qdownload.localname, dl->qdownload.localname, dl->qdownload.flags & ~DLLF_ALLOWWEB); CL_EnqueDownload(dl->qdownload.localname, dl->qdownload.localname, dl->qdownload.flags & ~DLLF_ALLOWWEB);
} }
@ -745,7 +753,7 @@ static void CL_SendDownloadStartRequest(char *filename, char *localname, unsigne
cls.download = &wdl->qdownload; cls.download = &wdl->qdownload;
} }
else else
CL_DownloadFailed(filename, NULL); CL_DownloadFailed(filename, NULL, DLFAIL_CLIENTCVAR);
return; return;
} }
#endif #endif
@ -813,6 +821,8 @@ void CL_DownloadFinished(qdownload_t *dl)
else else
{ {
CL_CheckModelResources(filename); CL_CheckModelResources(filename);
Mod_FileWritten(filename);
if (!cl.sendprespawn) if (!cl.sendprespawn)
{ {
/* /*
@ -827,6 +837,7 @@ void CL_DownloadFinished(qdownload_t *dl)
} }
} }
*/ */
for (i = 0; i < MAX_PRECACHE_MODELS; i++) //go and load this model now. for (i = 0; i < MAX_PRECACHE_MODELS; i++) //go and load this model now.
{ {
if (!strcmp(cl.model_name[i], filename)) if (!strcmp(cl.model_name[i], filename))
@ -1707,7 +1718,43 @@ void CL_RequestNextDownload (void)
if (!cl.worldmodel || cl.worldmodel->loadstate != MLS_LOADED) if (!cl.worldmodel || cl.worldmodel->loadstate != MLS_LOADED)
{ {
Con_Printf("\n\n-------------\n" CON_ERROR "Couldn't download \"%s\" - cannot fully connect\n", cl.worldmodel?cl.worldmodel->name:"unknown"); downloadlist_t *dl = NULL;
const char *worldname = cl.worldmodel?cl.worldmodel->name:"unknown";
if (cl.worldmodel)
for (dl = cl.faileddownloads; dl; dl = dl->next) //yeah, so it failed... Ignore it.
if (!strcmp(dl->rname, cl.worldmodel->name))
break;
Con_Printf("\n\n-------------\n");
switch (dl?dl->failreason:DLFAIL_UNTRIED)
{
case DLFAIL_UNSUPPORTED:
Con_Printf(CON_ERROR "Download of \"%s\" not supported on this server - cannot fully connect\n", worldname);
break;
case DLFAIL_CORRUPTED:
Con_Printf(CON_ERROR "Download of \"%s\" corrupt/failed - cannot fully connect\n", worldname);
break;
case DLFAIL_CLIENTCVAR:
Con_Printf(CON_ERROR "Downloading of \"%s\" blocked by clientside cvars - tweak cl_download* before retrying\n", worldname);
break;
case DLFAIL_CLIENTFILE:
Con_Printf(CON_ERROR "Disk error downloading \"%s\" - cannot fully connect\n", worldname);
break;
case DLFAIL_SERVERCVAR:
Con_Printf(CON_ERROR "Download of \"%s\" denied by server - cannot fully connect\n", worldname);
break;
case DLFAIL_SERVERFILE:
Con_Printf(CON_ERROR "Download of \"%s\" unavailable - cannot fully connect\n", worldname);
break;
case DLFAIL_REDIRECTED:
Con_Printf(CON_ERROR "Redirection failure downloading \"%s\" - cannot fully connect\n", worldname);
break;
case DLFAIL_UNTRIED:
if (COM_FCheckExists(worldname))
Con_Printf(CON_ERROR "Couldn't load \"%s\" - corrupt? - cannot fully connect\n", worldname);
else
Con_Printf(CON_ERROR "Couldn't find \"%s\" - cannot fully connect\n", worldname);
break;
}
#ifdef HAVE_MEDIA_ENCODER #ifdef HAVE_MEDIA_ENCODER
if (cls.demoplayback && Media_Capturing()) if (cls.demoplayback && Media_Capturing())
{ {
@ -1838,7 +1885,7 @@ static char *ZLibDownloadDecode(int *messagesize, char *input, int finalsize)
} }
#endif #endif
downloadlist_t *CL_DownloadFailed(const char *name, qdownload_t *qdl) downloadlist_t *CL_DownloadFailed(const char *name, qdownload_t *qdl, enum dlfailreason_e failreason)
{ {
//add this to our failed list. (so we don't try downloading it again...) //add this to our failed list. (so we don't try downloading it again...)
downloadlist_t *failed, **link, *dl; downloadlist_t *failed, **link, *dl;
@ -1846,6 +1893,7 @@ downloadlist_t *CL_DownloadFailed(const char *name, qdownload_t *qdl)
failed->next = cl.faileddownloads; failed->next = cl.faileddownloads;
cl.faileddownloads = failed; cl.faileddownloads = failed;
Q_strncpyz(failed->rname, name, sizeof(failed->rname)); Q_strncpyz(failed->rname, name, sizeof(failed->rname));
failed->failreason = failreason;
//if this is what we're currently downloading, close it up now. //if this is what we're currently downloading, close it up now.
//don't do this if we're just marking the file as unavailable for download. //don't do this if we're just marking the file as unavailable for download.
@ -2148,10 +2196,12 @@ static void CL_ParseChunkedDownload(qdownload_t *dl)
if (flag < 0) if (flag < 0)
{ {
enum dlfailreason_e failreason;
if (flag == DLERR_REDIRECTFILE) if (flag == DLERR_REDIRECTFILE)
{ {
if (CL_AllowArbitaryDownload(dl->remotename, svname)) if (CL_AllowArbitaryDownload(dl->remotename, svname))
{ {
failreason = DLFAIL_REDIRECTED;
Con_Printf("Download of \"%s\" redirected to \"%s\"\n", dl->remotename, svname); Con_Printf("Download of \"%s\" redirected to \"%s\"\n", dl->remotename, svname);
if (!strncmp(svname, "package/", 8)) if (!strncmp(svname, "package/", 8))
{ {
@ -2182,20 +2232,32 @@ static void CL_ParseChunkedDownload(qdownload_t *dl)
} }
} }
else if (CL_CheckOrEnqueDownloadFile(svname, NULL, 0)) else if (CL_CheckOrEnqueDownloadFile(svname, NULL, 0))
{
Con_Printf("However, \"%s\" already exists. You may need to delete it.\n", svname); Con_Printf("However, \"%s\" already exists. You may need to delete it.\n", svname);
failreason = DLFAIL_CLIENTFILE;
}
} }
svname = dl->remotename; svname = dl->remotename;
} }
else if (flag == DLERR_UNKNOWN) else if (flag == DLERR_UNKNOWN)
{
Con_Printf("Server reported an error when downloading file \"%s\"\n", svname); Con_Printf("Server reported an error when downloading file \"%s\"\n", svname);
failreason = DLFAIL_CORRUPTED;
}
else if (flag == DLERR_PERMISSIONS) else if (flag == DLERR_PERMISSIONS)
{
Con_Printf("Server permissions deny downloading file \"%s\"\n", svname); Con_Printf("Server permissions deny downloading file \"%s\"\n", svname);
failreason = DLFAIL_SERVERCVAR;
}
else //if (flag == DLERR_FILENOTFOUND) else //if (flag == DLERR_FILENOTFOUND)
{
Con_Printf("Couldn't find file \"%s\" on the server\n", svname); Con_Printf("Couldn't find file \"%s\" on the server\n", svname);
failreason = DLFAIL_SERVERFILE;
}
if (dl) if (dl)
{ {
CL_DownloadFailed(svname, dl); CL_DownloadFailed(svname, dl, failreason);
CL_RequestNextDownload(); CL_RequestNextDownload();
} }
@ -2233,7 +2295,7 @@ static void CL_ParseChunkedDownload(qdownload_t *dl)
if (!DL_Begun(dl)) if (!DL_Begun(dl))
{ {
CL_DownloadFailed(svname, dl); CL_DownloadFailed(svname, dl, DLFAIL_CLIENTFILE);
return; return;
} }
@ -2578,7 +2640,7 @@ static void CL_ParseDownload (qboolean zlib)
Con_DPrintf("Download for %s redirected to %s\n", requestedname, name); Con_DPrintf("Download for %s redirected to %s\n", requestedname, name);
/*quakeforge http download redirection*/ /*quakeforge http download redirection*/
if (dl) if (dl)
CL_DownloadFailed(dl->remotename, dl); CL_DownloadFailed(dl->remotename, dl, DLFAIL_REDIRECTED);
//FIXME: find some safe way to do this and actually test it. we should already know the local name, but we might have gained a .gz or something (this is quakeforge after all). //FIXME: find some safe way to do this and actually test it. we should already know the local name, but we might have gained a .gz or something (this is quakeforge after all).
// CL_CheckOrEnqueDownloadFile(name, localname, DLLF_IGNOREFAILED); // CL_CheckOrEnqueDownloadFile(name, localname, DLLF_IGNOREFAILED);
return; return;
@ -2603,7 +2665,7 @@ static void CL_ParseDownload (qboolean zlib)
Con_TPrintf ("File not found.\n"); Con_TPrintf ("File not found.\n");
if (dl) if (dl)
CL_DownloadFailed(dl->remotename, dl); CL_DownloadFailed(dl->remotename, dl, DLFAIL_SERVERFILE);
return; return;
} }
@ -2615,7 +2677,7 @@ static void CL_ParseDownload (qboolean zlib)
{ {
msg_readcount += size; msg_readcount += size;
Con_TPrintf ("Failed to open %s\n", dl->tempname); Con_TPrintf ("Failed to open %s\n", dl->tempname);
CL_DownloadFailed(dl->remotename, dl); CL_DownloadFailed(dl->remotename, dl, DLFAIL_CLIENTFILE);
CL_RequestNextDownload (); CL_RequestNextDownload ();
return; return;
} }
@ -2835,7 +2897,7 @@ static void CLDP_ParseDownloadBegin(char *s)
dl->size = size; dl->size = size;
if (!DL_Begun(dl)) if (!DL_Begun(dl))
{ {
CL_DownloadFailed(dl->remotename, dl); CL_DownloadFailed(dl->remotename, dl, DLFAIL_CLIENTFILE);
return; return;
} }
@ -2884,7 +2946,7 @@ static void CLDP_ParseDownloadFinished(char *s)
else else
{ {
Con_Printf("Download failed: unable to check CRC of download\n"); Con_Printf("Download failed: unable to check CRC of download\n");
CL_DownloadFailed(dl->remotename, dl); CL_DownloadFailed(dl->remotename, dl, DLFAIL_CLIENTFILE);
return; return;
} }
@ -2892,13 +2954,13 @@ static void CLDP_ParseDownloadFinished(char *s)
if (size != atoi(Cmd_Argv(1))) if (size != atoi(Cmd_Argv(1)))
{ {
Con_Printf("Download failed: wrong file size\n"); Con_Printf("Download failed: wrong file size\n");
CL_DownloadFailed(dl->remotename, dl); CL_DownloadFailed(dl->remotename, dl, DLFAIL_CORRUPTED);
return; return;
} }
if (runningcrc != atoi(Cmd_Argv(2))) if (runningcrc != atoi(Cmd_Argv(2)))
{ {
Con_Printf("Download failed: wrong crc\n"); Con_Printf("Download failed: wrong crc\n");
CL_DownloadFailed(dl->remotename, dl); CL_DownloadFailed(dl->remotename, dl, DLFAIL_CORRUPTED);
return; return;
} }
@ -3085,7 +3147,7 @@ static void CLQW_ParseServerData (void)
{ {
//if we didn't actually start downloading it yet, cancel the current download. //if we didn't actually start downloading it yet, cancel the current download.
//this is to avoid qizmo not responding to the download command, resulting in hanging downloads that cause the client to then be unable to connect anywhere simply because someone's skin was set. //this is to avoid qizmo not responding to the download command, resulting in hanging downloads that cause the client to then be unable to connect anywhere simply because someone's skin was set.
CL_DownloadFailed(cls.download->remotename, cls.download); CL_DownloadFailed(cls.download->remotename, cls.download, DLFAIL_CORRUPTED);
} }
Con_DPrintf ("Serverdata packet %s.\n", cls.demoplayback?"read":"received"); Con_DPrintf ("Serverdata packet %s.\n", cls.demoplayback?"read":"received");
@ -6368,7 +6430,7 @@ static void CL_ParseStuffCmd(char *msg, int destsplit) //this protects stuffcmds
else if (cls.protocol == CP_NETQUAKE && !strcmp(stufftext, "stopdownload")) //download command reported failure. safe to request the next. else if (cls.protocol == CP_NETQUAKE && !strcmp(stufftext, "stopdownload")) //download command reported failure. safe to request the next.
{ {
if (cls.download) if (cls.download)
CL_DownloadFailed(cls.download->remotename, cls.download); CL_DownloadFailed(cls.download->remotename, cls.download, DLFAIL_CORRUPTED);
} }
//DP servers use these to report the correct csprogs.dat file+version to use. //DP servers use these to report the correct csprogs.dat file+version to use.

17
engine/client/cl_pred.c
View file

@ -1219,13 +1219,14 @@ void CL_PredictMovePNum (int seat)
//just in case we don't run any prediction //just in case we don't run any prediction
VectorCopy(tostate->gravitydir, pmove.gravitydir); VectorCopy(tostate->gravitydir, pmove.gravitydir);
if (nopred) //if all else fails...
{ //still need the player's size for onground detection and bobbing. pmove.pm_type = tostate->pm_type;
VectorCopy(tostate->szmins, pmove.player_mins); pmove.onground = tostate->onground;
VectorCopy(tostate->szmaxs, pmove.player_maxs); VectorCopy(tostate->szmins, pmove.player_mins);
} VectorCopy(tostate->szmaxs, pmove.player_maxs);
else
{ if (!nopred)
{
for (i=1 ; i<UPDATE_BACKUP-1 && cl.ackedmovesequence+i < cl.movesequence; i++) for (i=1 ; i<UPDATE_BACKUP-1 && cl.ackedmovesequence+i < cl.movesequence; i++)
{ {
outframe_t *of = &cl.outframes[(cl.ackedmovesequence+i) & UPDATE_MASK]; outframe_t *of = &cl.outframes[(cl.ackedmovesequence+i) & UPDATE_MASK];
@ -1423,6 +1424,8 @@ void CL_PredictMove (void)
// Set up prediction for other players // Set up prediction for other players
CL_SetUpPlayerPrediction(true); CL_SetUpPlayerPrediction(true);
VALGRIND_MAKE_MEM_UNDEFINED(&pmove.onground, sizeof(pmove.onground));
} }

15
engine/client/client.h
View file

@ -549,6 +549,17 @@ typedef struct
extern client_static_t cls; extern client_static_t cls;
enum dlfailreason_e
{
DLFAIL_UNTRIED, //...
DLFAIL_UNSUPPORTED, //eg vanilla nq
DLFAIL_CORRUPTED, //something weird happened (hash fail)
DLFAIL_CLIENTCVAR, //clientside cvar blocked the download
DLFAIL_CLIENTFILE, //some sort of error writing the file
DLFAIL_SERVERCVAR, //serverside setting blocked the download
DLFAIL_REDIRECTED, //server told us to download a different file
DLFAIL_SERVERFILE, //server couldn't find the file
};
typedef struct downloadlist_s { typedef struct downloadlist_s {
char rname[128]; char rname[128];
char localname[128]; char localname[128];
@ -565,6 +576,8 @@ typedef struct downloadlist_s {
#define DLLF_BEGUN (1u<<8) //server has confirmed that the file exists, is readable, and we've opened a file. should not be set on new requests. #define DLLF_BEGUN (1u<<8) //server has confirmed that the file exists, is readable, and we've opened a file. should not be set on new requests.
#define DLLF_ALLOWWEB (1u<<9) //failed http downloads should retry but from the game server itself #define DLLF_ALLOWWEB (1u<<9) //failed http downloads should retry but from the game server itself
enum dlfailreason_e failreason;
struct downloadlist_s *next; struct downloadlist_s *next;
} downloadlist_t; } downloadlist_t;
@ -1303,7 +1316,7 @@ int CL_IsDownloading(const char *localname);
qboolean CL_CheckDLFile(const char *filename); qboolean CL_CheckDLFile(const char *filename);
qboolean CL_CheckOrEnqueDownloadFile (const char *filename, const char *localname, unsigned int flags); qboolean CL_CheckOrEnqueDownloadFile (const char *filename, const char *localname, unsigned int flags);
qboolean CL_EnqueDownload(const char *filename, const char *localname, unsigned int flags); qboolean CL_EnqueDownload(const char *filename, const char *localname, unsigned int flags);
downloadlist_t *CL_DownloadFailed(const char *name, qdownload_t *qdl); downloadlist_t *CL_DownloadFailed(const char *name, qdownload_t *qdl, enum dlfailreason_e failreason);
int CL_DownloadRate(void); int CL_DownloadRate(void);
void CL_GetDownloadSizes(unsigned int *filecount, qofs_t *totalsize, qboolean *somesizesunknown); void CL_GetDownloadSizes(unsigned int *filecount, qofs_t *totalsize, qboolean *somesizesunknown);
qboolean CL_ParseOOBDownload(void); qboolean CL_ParseOOBDownload(void);

7
engine/client/clq3_parse.c
View file

@ -366,9 +366,10 @@ void CLQ3_ParseDownload(void)
} }
if (dl->size == (unsigned int)-1) if (dl->size == (unsigned int)-1)
{ { //the only downloads we should be getting is pk3s.
//if they're advertised-but-failing then its probably due to permissions rather than file-not-found
s = MSG_ReadString(); s = MSG_ReadString();
CL_DownloadFailed(dl->remotename, dl); CL_DownloadFailed(dl->remotename, dl, DLFAIL_SERVERCVAR);
Host_EndGame("%s", s); Host_EndGame("%s", s);
return; return;
} }
@ -398,7 +399,7 @@ void CLQ3_ParseDownload(void)
{ {
if (!DL_Begun(dl)) if (!DL_Begun(dl))
{ {
CL_DownloadFailed(dl->remotename, dl); CL_DownloadFailed(dl->remotename, dl, DLFAIL_CLIENTFILE);
return; return;
} }
} }

19
engine/client/m_options.c
View file

@ -921,6 +921,7 @@ const char *presetexec[] =
//"d_mipcap \"0 3\";" //logically correct, but will fuck up on ATI drivers if increased mid-map, because ATI will just ignore any levels that are not currently enabled. //"d_mipcap \"0 3\";" //logically correct, but will fuck up on ATI drivers if increased mid-map, because ATI will just ignore any levels that are not currently enabled.
"cl_gibfilter 0;" "cl_gibfilter 0;"
"seta cl_deadbodyfilter 0;" "seta cl_deadbodyfilter 0;"
"gl_texture_anisotropic_filtering 4;"
"cl_fullpitch 1;maxpitch 90;seta minpitch -90;" //QS has cheaty viewpitch range. some maps require it. "cl_fullpitch 1;maxpitch 90;seta minpitch -90;" //QS has cheaty viewpitch range. some maps require it.
, //vanilla-esque options (for purists). , //vanilla-esque options (for purists).
@ -982,7 +983,6 @@ const char *presetexec[] =
// "gl_detail 1;" // "gl_detail 1;"
"r_lightstylesmooth 1;" "r_lightstylesmooth 1;"
"r_deluxemapping 2;" "r_deluxemapping 2;"
"gl_texture_anisotropic_filtering 4;"
, // realtime options , // realtime options
"r_bloom 1;" "r_bloom 1;"
@ -3495,15 +3495,15 @@ static void M_ModelViewerDraw(int x, int y, struct menucustom_s *c, struct menu_
vec3_t dir; vec3_t dir;
float f; float f;
VectorAdd(v1, ent.origin, v1); VectorMA(ent.origin, ent.scale, v1, v1);
VectorAdd(v2, ent.origin, v2); VectorMA(ent.origin, ent.scale, v2, v2);
VectorAdd(tr.endpos, ent.origin, tr.endpos); VectorMA(ent.origin, ent.scale, tr.endpos, tr.endpos);
VectorSubtract(tr.endpos, v1, dir); VectorSubtract(tr.endpos, v1, dir);
f = DotProduct(dir, tr.plane.normal) * -2; f = DotProduct(dir, tr.plane.normal) * -2;
VectorMA(dir, f, tr.plane.normal, v2); VectorMA(dir, f, tr.plane.normal, v2);
VectorAdd(v2, tr.endpos, v2); VectorAdd(v2, tr.endpos, v2);
CLQ1_DrawLine(s, v1, tr.endpos, 0, 1, 0, 1); CLQ1_DrawLine(s, v1, tr.endpos, 0, 1, 0, 1);
CLQ1_DrawLine(s, tr.endpos, v2, 1, 0, 0, 1); CLQ1_DrawLine(s, tr.endpos, v2, 1, 0, 0, 1);
} }
@ -3545,14 +3545,14 @@ static void M_ModelViewerDraw(int x, int y, struct menucustom_s *c, struct menu_
Mod_GetTag(ent.model, b, &ent.framestate, boneinfo); Mod_GetTag(ent.model, b, &ent.framestate, boneinfo);
//fixme: no axis transform //fixme: no axis transform
VectorSet(start, boneinfo[3], boneinfo[7], boneinfo[11]); VectorSet(start, boneinfo[3], boneinfo[7], boneinfo[11]);
VectorAdd(start, ent.origin, start); VectorMA(ent.origin, ent.scale, start, start);
if (p) if (p)
{ {
Mod_GetTag(ent.model, p, &ent.framestate, boneinfo); Mod_GetTag(ent.model, p, &ent.framestate, boneinfo);
//fixme: no axis transform //fixme: no axis transform
VectorSet(end, boneinfo[3], boneinfo[7], boneinfo[11]); VectorSet(end, boneinfo[3], boneinfo[7], boneinfo[11]);
VectorAdd(end, ent.origin, end); VectorMA(ent.origin, ent.scale, end, end);
CLQ1_DrawLine(lineshader, start, end, 1, (b-1 == mods->boneidx)?0:1, 1, 1); CLQ1_DrawLine(lineshader, start, end, 1, (b-1 == mods->boneidx)?0:1, 1, 1);
} }
if (b-1 == mods->boneidx) if (b-1 == mods->boneidx)
@ -3567,7 +3567,7 @@ static void M_ModelViewerDraw(int x, int y, struct menucustom_s *c, struct menu_
} }
} }
V_AddEntity(&ent); V_AddAxisEntity(&ent);
R_RenderView(); R_RenderView();
@ -3670,6 +3670,8 @@ static void M_ModelViewerDraw(int x, int y, struct menucustom_s *c, struct menu_
#ifdef SKELETALMODELS #ifdef SKELETALMODELS
"numbones: %i\n" "numbones: %i\n"
#endif #endif
"minlod: %g\n"
"maxlod: %g%s\n"
, ent.model->mins[0], ent.model->mins[1], ent.model->mins[2], ent.model->maxs[0], ent.model->maxs[1], ent.model->maxs[2], , ent.model->mins[0], ent.model->mins[1], ent.model->mins[2], ent.model->maxs[0], ent.model->maxs[1], ent.model->maxs[2],
contents, contents,
inf->csurface.flags, inf->csurface.flags,
@ -3679,6 +3681,7 @@ static void M_ModelViewerDraw(int x, int y, struct menucustom_s *c, struct menu_
#ifdef SKELETALMODELS #ifdef SKELETALMODELS
,inf->numbones ,inf->numbones
#endif #endif
,inf->mindist,inf->maxdist,inf->maxdist?"":" (infinite)"
) )
, CON_WHITEMASK, CPRINT_TALIGN|CPRINT_LALIGN, font_default, fs); , CON_WHITEMASK, CPRINT_TALIGN|CPRINT_LALIGN, font_default, fs);
} }

1
engine/client/merged.h
View file

@ -181,6 +181,7 @@ extern qboolean Mod_PurgeModel (struct model_s *mod, enum mod_purge_e ptype)
extern struct model_s *Mod_FindName (const char *name); //find without loading. needload should be set. extern struct model_s *Mod_FindName (const char *name); //find without loading. needload should be set.
extern struct model_s *Mod_ForName (const char *name, enum mlverbosity_e verbosity); //finds+loads extern struct model_s *Mod_ForName (const char *name, enum mlverbosity_e verbosity); //finds+loads
extern struct model_s *Mod_LoadModel (struct model_s *mod, enum mlverbosity_e verbose); //makes sure a model is loaded extern struct model_s *Mod_LoadModel (struct model_s *mod, enum mlverbosity_e verbose); //makes sure a model is loaded
extern void Mod_FileWritten (const char *filename);
extern void *Mod_Extradata (struct model_s *mod); // handles caching extern void *Mod_Extradata (struct model_s *mod); // handles caching
extern void Mod_TouchModel (const char *name); extern void Mod_TouchModel (const char *name);
extern const char *Mod_FixName (const char *modname, const char *worldname); //remaps the name appropriately extern const char *Mod_FixName (const char *modname, const char *worldname); //remaps the name appropriately

2
engine/client/pr_csqc.c
View file

@ -3570,6 +3570,8 @@ static void QCBUILTIN PF_cs_runplayerphysics (pubprogfuncs_t *prinst, struct glo
if (!cl.worldmodel) if (!cl.worldmodel)
return; //urm.. return; //urm..
VALGRIND_MAKE_MEM_UNDEFINED(&pmove, sizeof(pmove));
//debugging field //debugging field
pmove.sequence = *csqcg.clientcommandframe; pmove.sequence = *csqcg.clientcommandframe;

17
engine/client/renderer.c
View file

@ -255,11 +255,11 @@ cvar_t scr_sshot_prefix = CVAR ("scr_sshot_prefix", "screenshots/fte-");
cvar_t scr_viewsize = CVARFC("viewsize", "100", CVAR_ARCHIVE, SCR_Viewsize_Callback); cvar_t scr_viewsize = CVARFC("viewsize", "100", CVAR_ARCHIVE, SCR_Viewsize_Callback);
#ifdef ANDROID #ifdef ANDROID
cvar_t vid_conautoscale = CVARF ("vid_conautoscale", "2", cvar_t vid_conautoscale = CVARAF ("vid_conautoscale", "2",
CVAR_ARCHIVE | CVAR_RENDERERCALLBACK); "scr_conscale"/*qs*/ /*"vid_conscale"ez*/, CVAR_ARCHIVE | CVAR_RENDERERCALLBACK);
#else #else
cvar_t vid_conautoscale = CVARFD ("vid_conautoscale", "0", cvar_t vid_conautoscale = CVARAFD ("vid_conautoscale", "0",
CVAR_ARCHIVE | CVAR_RENDERERCALLBACK, "Changes the 2d scale, including hud, console, and fonts. To specify an explicit font size, divide the desired 'point' size by 8 to get the scale. High values will be clamped to maintain at least a 320*200 virtual size."); "scr_conscale"/*qs*/ /*"vid_conscale"ez*/, CVAR_ARCHIVE | CVAR_RENDERERCALLBACK, "Changes the 2d scale, including hud, console, and fonts. To specify an explicit font size, divide the desired 'point' size by 8 to get the scale. High values will be clamped to maintain at least a 320*200 virtual size.");
#endif #endif
cvar_t vid_conheight = CVARF ("vid_conheight", "0", cvar_t vid_conheight = CVARF ("vid_conheight", "0",
CVAR_ARCHIVE); CVAR_ARCHIVE);
@ -407,8 +407,8 @@ cvar_t gl_specular_fallbackexp = CVARF ("gl_specular_fallbackexp", "1", CVAR
#endif #endif
// The callbacks are not in D3D yet (also ugly way of seperating this) // The callbacks are not in D3D yet (also ugly way of seperating this)
cvar_t gl_texture_anisotropic_filtering = CVARFCD("gl_texture_anisotropic_filtering", "0", cvar_t gl_texture_anisotropic_filtering = CVARAFCD("gl_texture_anisotropy", "4",
CVAR_ARCHIVE | CVAR_RENDERERCALLBACK, "gl_texture_anisotropic_filtering"/*old*/, CVAR_ARCHIVE | CVAR_RENDERERCALLBACK,
Image_TextureMode_Callback, "Allows for higher quality textures on surfaces that slope away from the camera (like the floor). Set to 16 or something. Only supported with trilinear filtering."); Image_TextureMode_Callback, "Allows for higher quality textures on surfaces that slope away from the camera (like the floor). Set to 16 or something. Only supported with trilinear filtering.");
cvar_t gl_texturemode = CVARFCD("gl_texturemode", "GL_LINEAR_MIPMAP_LINEAR", cvar_t gl_texturemode = CVARFCD("gl_texturemode", "GL_LINEAR_MIPMAP_LINEAR",
CVAR_ARCHIVE | CVAR_RENDERERCALLBACK | CVAR_SAVE, Image_TextureMode_Callback, CVAR_ARCHIVE | CVAR_RENDERERCALLBACK | CVAR_SAVE, Image_TextureMode_Callback,
@ -430,6 +430,8 @@ cvar_t r_portalrecursion = CVARD ("r_portalrecursion", "1", "The number of
cvar_t r_portaldrawplanes = CVARD ("r_portaldrawplanes", "0", "Draw front and back planes in portals. Debug feature."); cvar_t r_portaldrawplanes = CVARD ("r_portaldrawplanes", "0", "Draw front and back planes in portals. Debug feature.");
cvar_t r_portalonly = CVARD ("r_portalonly", "0", "Don't draw things which are not portals. Debug feature."); cvar_t r_portalonly = CVARD ("r_portalonly", "0", "Don't draw things which are not portals. Debug feature.");
cvar_t r_noaliasshadows = CVARF ("r_noaliasshadows", "0", CVAR_ARCHIVE); cvar_t r_noaliasshadows = CVARF ("r_noaliasshadows", "0", CVAR_ARCHIVE);
cvar_t r_lodscale = CVARFD ("r_lodscale", "5", CVAR_ARCHIVE, "Scales the level-of-detail reduction on models (for those that have lod).");
cvar_t r_lodbias = CVARFD ("r_lodbias", "0", CVAR_ARCHIVE, "Biases the level-of-detail on models (for those that have lod).");
cvar_t r_shadows = CVARFD ("r_shadows", "0", CVAR_ARCHIVE, "Draw basic blob shadows underneath entities without using realtime lighting."); cvar_t r_shadows = CVARFD ("r_shadows", "0", CVAR_ARCHIVE, "Draw basic blob shadows underneath entities without using realtime lighting.");
cvar_t r_showbboxes = CVARD("r_showbboxes", "0", "Debugging. Shows bounding boxes. 1=ssqc, 2=csqc. Red=solid, Green=stepping/toss/bounce, Blue=onground."); cvar_t r_showbboxes = CVARD("r_showbboxes", "0", "Debugging. Shows bounding boxes. 1=ssqc, 2=csqc. Red=solid, Green=stepping/toss/bounce, Blue=onground.");
cvar_t r_showfields = CVARD("r_showfields", "0", "Debugging. Shows entity fields boxes (entity closest to crosshair). 1=ssqc, 2=csqc."); cvar_t r_showfields = CVARD("r_showfields", "0", "Debugging. Shows entity fields boxes (entity closest to crosshair). 1=ssqc, 2=csqc.");
@ -537,6 +539,9 @@ void GLRenderer_Init(void)
Cvar_Register (&r_portalonly, GLRENDEREROPTIONS); Cvar_Register (&r_portalonly, GLRENDEREROPTIONS);
Cvar_Register (&r_noaliasshadows, GLRENDEREROPTIONS); Cvar_Register (&r_noaliasshadows, GLRENDEREROPTIONS);
Cvar_Register (&r_lodscale, GRAPHICALNICETIES);
Cvar_Register (&r_lodbias, GRAPHICALNICETIES);
Cvar_Register (&gl_motionblur, GLRENDEREROPTIONS); Cvar_Register (&gl_motionblur, GLRENDEREROPTIONS);
Cvar_Register (&gl_motionblurscale, GLRENDEREROPTIONS); Cvar_Register (&gl_motionblurscale, GLRENDEREROPTIONS);

136
engine/common/com_mesh.c
View file

@ -2047,7 +2047,7 @@ void Mod_AddSingleSurface(entity_t *ent, int surfaceidx, shader_t *shader, qbool
galiasinfo_t *mod; galiasinfo_t *mod;
scenetris_t *t; scenetris_t *t;
vecV_t *posedata = NULL; vecV_t *posedata = NULL;
vec3_t *normdata = NULL; vec3_t *normdata = NULL, tmp;
int surfnum = 0, i; int surfnum = 0, i;
#ifdef SKELETALMODELS #ifdef SKELETALMODELS
int cursurfnum = -1; int cursurfnum = -1;
@ -2113,7 +2113,6 @@ void Mod_AddSingleSurface(entity_t *ent, int surfaceidx, shader_t *shader, qbool
if (normals && normdata) if (normals && normdata)
{ //pegs, one on each vertex. { //pegs, one on each vertex.
vec3_t push;
if (cl_numstris == cl_maxstris) if (cl_numstris == cl_maxstris)
{ {
cl_maxstris+=8; cl_maxstris+=8;
@ -2135,14 +2134,15 @@ void Mod_AddSingleSurface(entity_t *ent, int surfaceidx, shader_t *shader, qbool
cl_stris_ExpandVerts(cl_numstrisvert+t->numvert); cl_stris_ExpandVerts(cl_numstrisvert+t->numvert);
for (i = 0; i < mod->numverts; i++) for (i = 0; i < mod->numverts; i++)
{ {
VectorMA(ent->origin, posedata[i][0], ent->axis[0], cl_strisvertv[t->firstvert+i*2+0]); VectorMA(ent->origin, posedata[i][0], ent->axis[0], tmp);
VectorMA(cl_strisvertv[t->firstvert+i*2+0], posedata[i][1], ent->axis[1], cl_strisvertv[t->firstvert+i*2+0]); VectorMA(tmp, posedata[i][1], ent->axis[1], tmp);
VectorMA(cl_strisvertv[t->firstvert+i*2+0], posedata[i][2], ent->axis[2], cl_strisvertv[t->firstvert+i*2+0]); VectorMA(tmp, posedata[i][2], ent->axis[2], tmp);
VectorMA(ent->origin, ent->scale, tmp, cl_strisvertv[t->firstvert+i*2+0]);
VectorMA(posedata[i], 0.1, normdata[i], push); VectorMA(tmp, 0.1*normdata[i][0], ent->axis[0], tmp);
VectorMA(ent->origin, push[0], ent->axis[0], cl_strisvertv[t->firstvert+i*2+1]); VectorMA(tmp, 0.1*normdata[i][1], ent->axis[1], tmp);
VectorMA(cl_strisvertv[t->firstvert+i*2+1], push[1], ent->axis[1], cl_strisvertv[t->firstvert+i*2+1]); VectorMA(tmp, 0.1*normdata[i][2], ent->axis[2], tmp);
VectorMA(cl_strisvertv[t->firstvert+i*2+1], push[2], ent->axis[2], cl_strisvertv[t->firstvert+i*2+1]); VectorMA(ent->origin, ent->scale, tmp, cl_strisvertv[t->firstvert+i*2+1]);
Vector2Set(cl_strisvertt[t->firstvert+i*2+0], 0.0, 0.0); Vector2Set(cl_strisvertt[t->firstvert+i*2+0], 0.0, 0.0);
Vector2Set(cl_strisvertt[t->firstvert+i*2+1], 1.0, 1.0); Vector2Set(cl_strisvertt[t->firstvert+i*2+1], 1.0, 1.0);
@ -2182,10 +2182,10 @@ void Mod_AddSingleSurface(entity_t *ent, int surfaceidx, shader_t *shader, qbool
cl_stris_ExpandVerts(cl_numstrisvert+mod->numverts); cl_stris_ExpandVerts(cl_numstrisvert+mod->numverts);
for (i = 0; i < mod->numverts; i++) for (i = 0; i < mod->numverts; i++)
{ {
VectorMA(ent->origin, posedata[i][0], ent->axis[0], cl_strisvertv[t->firstvert+i]); VectorMA(vec3_origin, posedata[i][0], ent->axis[0], tmp);
VectorMA(cl_strisvertv[t->firstvert+i], posedata[i][1], ent->axis[1], cl_strisvertv[t->firstvert+i]); VectorMA(tmp, posedata[i][1], ent->axis[1], tmp);
VectorMA(cl_strisvertv[t->firstvert+i], posedata[i][2], ent->axis[2], cl_strisvertv[t->firstvert+i]); VectorMA(tmp, posedata[i][2], ent->axis[2], tmp);
// VectorAdd(ent->origin, posedata[i], cl_strisvertv[t->firstvert+i]); VectorMA(ent->origin, ent->scale, tmp, cl_strisvertv[t->firstvert+i]);
Vector2Set(cl_strisvertt[t->firstvert+i], 0.5, 0.5); Vector2Set(cl_strisvertt[t->firstvert+i], 0.5, 0.5);
Vector4Set(cl_strisvertc[t->firstvert+i], (mod->contents?1:0), 1, 1, 0.1); Vector4Set(cl_strisvertc[t->firstvert+i], (mod->contents?1:0), 1, 1, 0.1);
@ -5171,7 +5171,8 @@ typedef struct {
} md3Shader_t; } md3Shader_t;
//End of Tenebrae 'assistance' //End of Tenebrae 'assistance'
static qboolean QDECL Mod_LoadQ3Model(model_t *mod, void *buffer, size_t fsize) //q3 loads foo.md3, foo_1.md3, foo_2.md3 etc
static galiasinfo_t *Mod_LoadQ3ModelLod(model_t *mod, int *surfcount, void *buffer, size_t fsize)
{ {
#ifndef SERVERONLY #ifndef SERVERONLY
galiasskin_t *skin; galiasskin_t *skin;
@ -5194,13 +5195,14 @@ static qboolean QDECL Mod_LoadQ3Model(model_t *mod, void *buffer, size_t fsize)
vec3_t max; vec3_t max;
galiaspose_t *pose; galiaspose_t *pose;
galiasinfo_t *parent, *root;
galiasanimation_t *group; galiasanimation_t *group;
vecV_t *verts; vecV_t *verts;
md3Triangle_t *intris; md3Triangle_t *intris;
md3XyzNormal_t *invert; md3XyzNormal_t *invert;
galiasinfo_t *first = NULL;
galiasinfo_t **surflink = &first;
int size; int size;
@ -5218,20 +5220,16 @@ static qboolean QDECL Mod_LoadQ3Model(model_t *mod, void *buffer, size_t fsize)
// if (header->version != sdfs) // if (header->version != sdfs)
// Sys_Error("GL_LoadQ3Model: Bad version\n"); // Sys_Error("GL_LoadQ3Model: Bad version\n");
parent = NULL;
root = NULL;
#ifndef SERVERONLY #ifndef SERVERONLY
externalskins = Mod_CountSkinFiles(mod); externalskins = Mod_CountSkinFiles(mod);
#endif #endif
min[0] = min[1] = min[2] = 0;
max[0] = max[1] = max[2] = 0;
framegroups = ParseFrameInfo(mod->name, &numgroups); framegroups = ParseFrameInfo(mod->name, &numgroups);
ClearBounds(min, max);
surf = (md3Surface_t *)((qbyte *)header + LittleLong(header->ofsSurfaces)); surf = (md3Surface_t *)((qbyte *)header + LittleLong(header->ofsSurfaces));
for (s = 0; s < LittleLong(header->numSurfaces); s++) for (s = 0; s < LittleLong(header->numSurfaces); s++, *surfcount+=1)
{ {
if (LittleLong(surf->ident) != MD3_IDENT) if (LittleLong(surf->ident) != MD3_IDENT)
Con_Printf(CON_WARNING "Warning: md3 sub-surface doesn't match ident\n"); Con_Printf(CON_WARNING "Warning: md3 sub-surface doesn't match ident\n");
@ -5248,12 +5246,13 @@ static qboolean QDECL Mod_LoadQ3Model(model_t *mod, void *buffer, size_t fsize)
galias->numanimations = numgroups; galias->numanimations = numgroups;
galias->numverts = numverts; galias->numverts = numverts;
galias->numindexes = LittleLong(surf->numTriangles)*3; galias->numindexes = LittleLong(surf->numTriangles)*3;
galias->shares_verts = s; //with itself, so no sharing. galias->shares_verts = *surfcount; //with itself, so no sharing.
if (parent)
parent->nextsurf = galias; if (!first)
else first = galias;
root = galias; *surflink = galias;
parent = galias; surflink = &galias->nextsurf;
galias->nextsurf = NULL;
//load the texcoords //load the texcoords
#ifndef SERVERONLY #ifndef SERVERONLY
@ -5403,16 +5402,83 @@ static qboolean QDECL Mod_LoadQ3Model(model_t *mod, void *buffer, size_t fsize)
} }
#endif #endif
VectorCopy(min, mod->mins);
VectorCopy(max, mod->maxs);
Mod_CompileTriangleNeighbours (mod, galias); Mod_CompileTriangleNeighbours (mod, galias);
Mod_BuildTextureVectors(galias); Mod_BuildTextureVectors(galias);
//if the surfacename is eg _1 then strip that off.
//this works around q3data requiring different surface names in higher lod levels (and matches q3).
size = strlen(galias->surfacename);
if (size>2 && galias->surfacename[size-2] == '_')
galias->surfacename[size-2] = 0;
surf = (md3Surface_t *)((qbyte *)surf + LittleLong(surf->ofsEnd)); surf = (md3Surface_t *)((qbyte *)surf + LittleLong(surf->ofsEnd));
} }
AddPointToBounds(min, mod->mins, mod->maxs);
AddPointToBounds(max, mod->mins, mod->maxs);
return first;
}
static qboolean QDECL Mod_LoadQ3Model(model_t *mod, void *buffer, size_t fsize)
{
// int version;
galiasinfo_t *root;
md3Header_t *header;
int lod;
int surfcount = 0;
header = buffer;
// if (header->version != sdfs)
// Sys_Error("GL_LoadQ3Model: Bad version\n");
root = NULL;
ClearBounds(mod->mins, mod->maxs);
mod->meshinfo = Mod_LoadQ3ModelLod(mod, &surfcount, buffer, fsize);
if (mod->meshinfo)
{
const char *ext = COM_GetFileExtension(mod->name, NULL);
if (*ext == '.' && ext-mod->name < MAX_QPATH)
{
galiasinfo_t *sublod;
sublod = mod->meshinfo;
for(lod = 1; lod > 0; lod++)
{
size_t s;
char *f;
char basename[MAX_QPATH];
memcpy(basename, mod->name, ext-mod->name);
basename[ext-mod->name] = 0;
f = FS_LoadMallocFile(va("%s_%i.%s", basename, lod, ext), &s);
if (!f)
break;
root = sublod;
sublod = Mod_LoadQ3ModelLod(mod, &surfcount, f, s);
if (sublod)
{
for(;;)
{
root->maxdist = lod;
if (!root->nextsurf)
break;
root = root->nextsurf;
}
root->nextsurf = sublod;
for (root = sublod; root; root = root->nextsurf)
root->mindist = lod;
mod->maxlod = lod+1;
}
else
lod = -1;
FS_FreeFile(f);
}
}
}
root = mod->meshinfo;
if (!root) if (!root)
{ {
root = ZG_Malloc(&mod->memgroup, sizeof(galiasinfo_t)); root = ZG_Malloc(&mod->memgroup, sizeof(galiasinfo_t));
@ -5426,6 +5492,7 @@ static qboolean QDECL Mod_LoadQ3Model(model_t *mod, void *buffer, size_t fsize)
{ {
md3tag_t *src; md3tag_t *src;
md3tag_t *dst; md3tag_t *dst;
int s, i, j;
src = (md3tag_t *)((char*)header+LittleLong(header->ofsTags)); src = (md3tag_t *)((char*)header+LittleLong(header->ofsTags));
dst = root->ofstags; dst = root->ofstags;
@ -5450,6 +5517,8 @@ static qboolean QDECL Mod_LoadQ3Model(model_t *mod, void *buffer, size_t fsize)
} }
} }
mod->radius = RadiusFromBounds(mod->mins, mod->maxs);
#ifndef SERVERONLY #ifndef SERVERONLY
if (mod_md3flags.value) if (mod_md3flags.value)
mod->flags = LittleLong(header->flags); mod->flags = LittleLong(header->flags);
@ -7810,6 +7879,9 @@ static galiasinfo_t *Mod_ParseIQMMeshModel(model_t *mod, const char *buffer, siz
gai[i].surfaceid = ftemesh[i].surfaceid; gai[i].surfaceid = ftemesh[i].surfaceid;
gai[i].mindist = ftemesh[i].mindist; gai[i].mindist = ftemesh[i].mindist;
gai[i].maxdist = ftemesh[i].maxdist; gai[i].maxdist = ftemesh[i].maxdist;
mod->maxlod = max(mod->maxlod, gai[i].mindist);
mod->maxlod = max(mod->maxlod, gai[i].maxdist);
} }
} }
gai[i-1].nextsurf = NULL; gai[i-1].nextsurf = NULL;

4
engine/common/net_wins.c
View file

@ -134,9 +134,9 @@ cvar_t net_enable_tls = CVARD("net_enable_tls", "1", "If enabled, binary dat
#endif #endif
#ifdef HAVE_HTTPSV #ifdef HAVE_HTTPSV
#ifdef SV_MASTER #ifdef SV_MASTER
cvar_t net_enable_http = CVARD("net_enable_http", "1", "If enabled, tcp ports will accept http clients, potentially serving large files which could distrupt gameplay."); cvar_t net_enable_http = CVARD("net_enable_http", "1", "If enabled, tcp ports will accept inbound http clients, potentially serving large files which could distrupt gameplay (This does not affect outgoing http(s) requests).");
#else #else
cvar_t net_enable_http = CVARD("net_enable_http", "0", "If enabled, tcp ports will accept http clients, potentially serving large files which could distrupt gameplay."); cvar_t net_enable_http = CVARD("net_enable_http", "0", "If enabled, tcp ports will accept inbound http clients, potentially serving large files which could distrupt gameplay (This does not affect outgoing http(s) requests).");
#endif #endif
cvar_t net_enable_websockets = CVARD("net_enable_websockets", "1", "If enabled, tcp ports will accept websocket game clients."); cvar_t net_enable_websockets = CVARD("net_enable_websockets", "1", "If enabled, tcp ports will accept websocket game clients.");
cvar_t net_enable_webrtcbroker = CVARD("net_enable_webrtcbroker", "0", "If 1, tcp ports will accept websocket connections from clients trying to broker direct webrtc connections. This should be low traffic, but might involve a lot of mostly-idle connections."); cvar_t net_enable_webrtcbroker = CVARD("net_enable_webrtcbroker", "0", "If 1, tcp ports will accept websocket connections from clients trying to broker direct webrtc connections. This should be low traffic, but might involve a lot of mostly-idle connections.");

7
engine/common/plugin.c
View file

@ -288,13 +288,6 @@ static plugin_t *Plug_Load(const char *file, int type)
COM_StripExtension(file, temp, sizeof(temp)); COM_StripExtension(file, temp, sizeof(temp));
newplug->vm = VM_Create(temp, Plug_SystemCallsNative, NULL, NULL); newplug->vm = VM_Create(temp, Plug_SystemCallsNative, NULL, NULL);
} }
#ifndef ANDROID
if (!newplug->vm && (type & PLUG_NATIVE))
{
Q_snprintfz(temp, sizeof(temp), PLUGINPREFIX"%s_", file);
newplug->vm = VM_Create(temp, Plug_SystemCallsNative, NULL, NULL);
}
#endif
if (!newplug->vm && (type & PLUG_NATIVE)) if (!newplug->vm && (type & PLUG_NATIVE))
{ {
Q_snprintfz(temp, sizeof(temp), PLUGINPREFIX"%s", file); Q_snprintfz(temp, sizeof(temp), PLUGINPREFIX"%s", file);

8
engine/common/protocol.h
View file

@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// protocol.h -- communications protocols // protocol.h -- communications protocols
#include "bothdefs.h"
#define PEXT_SETVIEW 0x00000001 #define PEXT_SETVIEW 0x00000001
#define PEXT_SCALE 0x00000002 #define PEXT_SCALE 0x00000002
@ -79,7 +82,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define PEXT2_PREDINFO 0x00000020 //movevar stats, NQ input sequences+acks. #define PEXT2_PREDINFO 0x00000020 //movevar stats, NQ input sequences+acks.
#define PEXT2_NEWSIZEENCODING 0x00000040 //richer size encoding. #define PEXT2_NEWSIZEENCODING 0x00000040 //richer size encoding.
#define PEXT2_INFOBLOBS 0x00000080 //serverinfo+userinfo lengths can be MUCH higher (protocol is unbounded, but expect low sanity limits on userinfo), and contain nulls etc. #define PEXT2_INFOBLOBS 0x00000080 //serverinfo+userinfo lengths can be MUCH higher (protocol is unbounded, but expect low sanity limits on userinfo), and contain nulls etc.
//#define PEXT2_NEWINTENTS 0x00000100 //clc_move changes //#define PEXT2_NEWINTENTS 0x00000100 //clc_move changes, more buttons etc
#define PEXT2_CLIENTSUPPORT (PEXT2_PRYDONCURSOR|PEXT2_VOICECHAT|PEXT2_SETANGLEDELTA|PEXT2_REPLACEMENTDELTAS|PEXT2_MAXPLAYERS|PEXT2_PREDINFO|PEXT2_NEWSIZEENCODING|PEXT2_INFOBLOBS) #define PEXT2_CLIENTSUPPORT (PEXT2_PRYDONCURSOR|PEXT2_VOICECHAT|PEXT2_SETANGLEDELTA|PEXT2_REPLACEMENTDELTAS|PEXT2_MAXPLAYERS|PEXT2_PREDINFO|PEXT2_NEWSIZEENCODING|PEXT2_INFOBLOBS)
//EzQuake/Mvdsv extensions. (use ezquake name, to avoid confusion about .mvd format and its protocol differences) //EzQuake/Mvdsv extensions. (use ezquake name, to avoid confusion about .mvd format and its protocol differences)
@ -141,6 +144,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define PORT_QWCLIENT 27001 #define PORT_QWCLIENT 27001
#define PORT_QWMASTER 27000 #define PORT_QWMASTER 27000
#define PORT_QWSERVER 27500 #define PORT_QWSERVER 27500
#define PORT_H2SERVER 26900
#define PORT_Q2CLIENT 27901 #define PORT_Q2CLIENT 27901
#define PORT_Q2SERVER 27910 #define PORT_Q2SERVER 27910
#define PORT_Q3MASTER 27950 #define PORT_Q3MASTER 27950
@ -152,8 +156,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define PORT_DEFAULTSERVER PORT_QWSERVER #define PORT_DEFAULTSERVER PORT_QWSERVER
#endif #endif
//hexen2: 26900
//========================================= //=========================================
// out of band message id bytes // out of band message id bytes

42
engine/common/qvm.c
View file

@ -76,11 +76,6 @@ struct vm_s {
qboolean QVM_LoadDLL(vm_t *vm, const char *name, qboolean binroot, void **vmMain, sys_calldll_t syscall) qboolean QVM_LoadDLL(vm_t *vm, const char *name, qboolean binroot, void **vmMain, sys_calldll_t syscall)
{ {
void (EXPORT_FN *dllEntry)(sys_calldll_t syscall); void (EXPORT_FN *dllEntry)(sys_calldll_t syscall);
char dllname_archpri[MAX_OSPATH]; //id compatible
#ifdef ARCH_ALTCPU_POSTFIX
char dllname_archsec[MAX_OSPATH]; //id compatible
#endif
char dllname_anycpu[MAX_OSPATH];//simple
dllhandle_t *hVM; dllhandle_t *hVM;
char fname[MAX_OSPATH*2]; char fname[MAX_OSPATH*2];
@ -94,12 +89,6 @@ qboolean QVM_LoadDLL(vm_t *vm, const char *name, qboolean binroot, void **vmMain
{NULL, NULL}, {NULL, NULL},
}; };
snprintf(dllname_archpri, sizeof(dllname_archpri), "%s"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name);
#ifdef ARCH_ALTCPU_POSTFIX
snprintf(dllname_archsec, sizeof(dllname_archsec), "%s"ARCH_ALTCPU_POSTFIX ARCH_DL_POSTFIX, name);
#endif
snprintf(dllname_anycpu, sizeof(dllname_anycpu), "%s" ARCH_DL_POSTFIX, name);
hVM=NULL; hVM=NULL;
*fname = 0; *fname = 0;
@ -143,14 +132,19 @@ qboolean QVM_LoadDLL(vm_t *vm, const char *name, qboolean binroot, void **vmMain
if (!hVM && FS_NativePath(dllname_anycpu, FS_BINARYPATH, fname, sizeof(fname))) if (!hVM && FS_NativePath(dllname_anycpu, FS_BINARYPATH, fname, sizeof(fname)))
hVM = Sys_LoadLibrary(fname, funcs); hVM = Sys_LoadLibrary(fname, funcs);
#else #else
if (!hVM && FS_NativePath(dllname_archpri, FS_BINARYPATH, fname, sizeof(fname)))
if (!hVM && FS_NativePath(va("%s_"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name), FS_BINARYPATH, fname, sizeof(fname)))
hVM = Sys_LoadLibrary(fname, funcs); hVM = Sys_LoadLibrary(fname, funcs);
if (!hVM && FS_NativePath(dllname_anycpu, FS_BINARYPATH, fname, sizeof(fname))) if (!hVM && FS_NativePath(va("%s"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name), FS_BINARYPATH, fname, sizeof(fname)))
hVM = Sys_LoadLibrary(fname, funcs);
if (!hVM && FS_NativePath(va("%s" ARCH_DL_POSTFIX, name), FS_BINARYPATH, fname, sizeof(fname)))
hVM = Sys_LoadLibrary(fname, funcs); hVM = Sys_LoadLibrary(fname, funcs);
if (!hVM && FS_NativePath(dllname_archpri, FS_ROOT, fname, sizeof(fname))) if (!hVM && FS_NativePath(va("%s_"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name), FS_ROOT, fname, sizeof(fname)))
hVM = Sys_LoadLibrary(fname, funcs); hVM = Sys_LoadLibrary(fname, funcs);
if (!hVM && FS_NativePath(dllname_anycpu, FS_ROOT, fname, sizeof(fname))) if (!hVM && FS_NativePath(va("%s"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name), FS_ROOT, fname, sizeof(fname)))
hVM = Sys_LoadLibrary(fname, funcs);
if (!hVM && FS_NativePath(va("%s" ARCH_DL_POSTFIX, name), FS_ROOT, fname, sizeof(fname)))
hVM = Sys_LoadLibrary(fname, funcs); hVM = Sys_LoadLibrary(fname, funcs);
#endif #endif
} }
@ -165,7 +159,13 @@ qboolean QVM_LoadDLL(vm_t *vm, const char *name, qboolean binroot, void **vmMain
{ {
if (!hVM) if (!hVM)
{ {
snprintf (fname, sizeof(fname), "%s%s", gpath, dllname_archpri); snprintf (fname, sizeof(fname), "%s%s_"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, gpath, name);
Con_DLPrintf(2, "Loading native: %s\n", fname);
hVM = Sys_LoadLibrary(fname, funcs);
}
if (!hVM)
{
snprintf (fname, sizeof(fname), "%s%s"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, gpath, name);
Con_DLPrintf(2, "Loading native: %s\n", fname); Con_DLPrintf(2, "Loading native: %s\n", fname);
hVM = Sys_LoadLibrary(fname, funcs); hVM = Sys_LoadLibrary(fname, funcs);
} }
@ -173,7 +173,13 @@ qboolean QVM_LoadDLL(vm_t *vm, const char *name, qboolean binroot, void **vmMain
#ifdef ARCH_ALTCPU_POSTFIX #ifdef ARCH_ALTCPU_POSTFIX
if (!hVM) if (!hVM)
{ {
snprintf (fname, sizeof(fname), "%s%s", gpath, dllname_archsec); snprintf (fname, sizeof(fname), "%s%s_"ARCH_ALTCPU_POSTFIX ARCH_DL_POSTFIX, gpath, name);
Con_DLPrintf(2, "Loading native: %s\n", fname);
hVM = Sys_LoadLibrary(fname, funcs);
}
if (!hVM)
{
snprintf (fname, sizeof(fname), "%s%s"ARCH_ALTCPU_POSTFIX ARCH_DL_POSTFIX, gpath, name);
Con_DLPrintf(2, "Loading native: %s\n", fname); Con_DLPrintf(2, "Loading native: %s\n", fname);
hVM = Sys_LoadLibrary(fname, funcs); hVM = Sys_LoadLibrary(fname, funcs);
} }
@ -181,7 +187,7 @@ qboolean QVM_LoadDLL(vm_t *vm, const char *name, qboolean binroot, void **vmMain
if (!hVM) if (!hVM)
{ {
snprintf (fname, sizeof(fname), "%s%s", gpath, dllname_anycpu); snprintf (fname, sizeof(fname), "%s%s"ARCH_DL_POSTFIX, gpath, name);
Con_DLPrintf(2, "Loading native: %s\n", fname); Con_DLPrintf(2, "Loading native: %s\n", fname);
hVM = Sys_LoadLibrary(fname, funcs); hVM = Sys_LoadLibrary(fname, funcs);
} }

7
engine/common/zone.h
View file

@ -83,6 +83,13 @@ Zone block
*/ */
#if 0//defined(_DEBUG) && defined(__linux__) && !defined(ANDROID)
#include <valgrind/memcheck.h>
#else
#define VALGRIND_MAKE_MEM_UNDEFINED(ptr,sz) //as an alternative to memzero..
#define VALGRIND_MAKE_MEM_NOACCESS(ptr,sz)
#endif
void Memory_Init (void); void Memory_Init (void);
void Memory_DeInit(void); void Memory_DeInit(void);

73
engine/gl/gl_alias.c
View file

@ -39,7 +39,7 @@ typedef struct
extern cvar_t gl_part_flame, r_fullbrightSkins, r_fb_models, ruleset_allow_fbmodels; extern cvar_t gl_part_flame, r_fullbrightSkins, r_fb_models, ruleset_allow_fbmodels;
extern cvar_t r_noaliasshadows; extern cvar_t r_noaliasshadows;
extern cvar_t r_lodscale, r_lodbias;
extern cvar_t gl_ati_truform; extern cvar_t gl_ati_truform;
extern cvar_t r_vertexdlights; extern cvar_t r_vertexdlights;
@ -715,24 +715,12 @@ static shader_t *GL_ChooseSkin(galiasinfo_t *inf, model_t *model, int surfnum, e
galiascolourmapped_t *cm; galiascolourmapped_t *cm;
char hashname[512]; char hashname[512];
if (plskin)
{
snprintf(hashname, sizeof(hashname), "%s$%s$%i", model->name, plskin->name, surfnum);
skinname = hashname;
}
else if (surfnum)
{
snprintf(hashname, sizeof(hashname), "%s$%i", model->name, surfnum);
skinname = hashname;
}
else
skinname = model->name;
if (!skincolourmapped.numbuckets) if (!skincolourmapped.numbuckets)
{ {
void *buckets = BZ_Malloc(Hash_BytesForBuckets(256)); int bucketcount = 256;
memset(buckets, 0, Hash_BytesForBuckets(256)); void *buckets = BZ_Malloc(Hash_BytesForBuckets(bucketcount));
Hash_InitTable(&skincolourmapped, 256, buckets); memset(buckets, 0, Hash_BytesForBuckets(bucketcount));
Hash_InitTable(&skincolourmapped, bucketcount, buckets);
} }
if (!inf->numskins) if (!inf->numskins)
@ -779,8 +767,27 @@ static shader_t *GL_ChooseSkin(galiasinfo_t *inf, model_t *model, int surfnum, e
bc = 0xfe000000; bc = 0xfe000000;
generateupperlower = true; generateupperlower = true;
} }
if (!skins || !skins->numframes || !skins->frame[subframe].texels)
{ //no top/bottom colourmapping possible here. don't cache a million different values.
tc = 0xfe000000;
bc = 0xfe000000;
generateupperlower = true;
}
} }
if (plskin)
{
snprintf(hashname, sizeof(hashname), "%s$%s$%i", model->name, plskin->name, surfnum);
skinname = hashname;
}
else if (surfnum)
{
snprintf(hashname, sizeof(hashname), "%s$%i", model->name, surfnum);
skinname = hashname;
}
else
skinname = model->name;
for (cm = Hash_Get(&skincolourmapped, skinname); cm; cm = Hash_GetNext(&skincolourmapped, skinname, cm)) for (cm = Hash_Get(&skincolourmapped, skinname); cm; cm = Hash_GetNext(&skincolourmapped, skinname, cm))
{ {
if (cm->tcolour == tc && cm->bcolour == bc && cm->skinnum == e->skinnum && cm->subframe == subframe && cm->pclass == pc) if (cm->tcolour == tc && cm->bcolour == bc && cm->skinnum == e->skinnum && cm->subframe == subframe && cm->pclass == pc)
@ -1685,6 +1692,7 @@ void R_GAlias_GenerateBatches(entity_t *e, batch_t **batches)
batch_t *b; batch_t *b;
int surfnum, j; int surfnum, j;
shadersort_t sort; shadersort_t sort;
float lod;
texnums_t *skin; texnums_t *skin;
@ -1732,8 +1740,39 @@ void R_GAlias_GenerateBatches(entity_t *e, batch_t **batches)
inf = Mod_Extradata (clmodel); inf = Mod_Extradata (clmodel);
if (clmodel->maxlod)
{
vec3_t v;
float z;
VectorSubtract(e->origin, r_refdef.vieworg, v);
z = DotProduct(v, vpn);
if (z < -clmodel->radius)
return; //furthest extent of bounding sphere is nearer than the near clip plane, and thus completely invisible
else if (z < 0)
lod = 0; //nearer than the camera, use the highest lod
else
{
//if the ent is in the middle of the screen, then the right edge of its sphere is at what percentage of the width of the screen...?
//simplified Matrix4x4_CM_Transform4
float coverage = (r_refdef.m_projection_std[5]*clmodel->radius + r_refdef.m_projection_std[ 9]*-z + r_refdef.m_projection_std[13]) /
(r_refdef.m_projection_std[7]*clmodel->radius + r_refdef.m_projection_std[11]*-z + r_refdef.m_projection_std[15]);
lod = 1-(coverage*r_lodscale.value);
lod = bound(0, lod, 1); //so lodbias is a little more reliable.
lod *= clmodel->maxlod;
lod += r_lodbias.value;
lod = max(0, lod); //never nearer than 0, the min value check wouldn't cope.
}
}
else
lod = 0;
for(surfnum=0; inf; inf=inf->nextsurf, surfnum++) for(surfnum=0; inf; inf=inf->nextsurf, surfnum++)
{ {
if (lod < inf->mindist || (inf->maxdist && lod >= inf->maxdist))
continue;
regshader = GL_ChooseSkin(inf, clmodel, surfnum, e, &skin); regshader = GL_ChooseSkin(inf, clmodel, surfnum, e, &skin);
if (!regshader) if (!regshader)
continue; continue;

19
engine/gl/gl_model.c
View file

@ -976,6 +976,21 @@ const char *Mod_FixName(const char *modname, const char *worldname)
} }
return modname; return modname;
} }
//Called when the given file was (re)written.
//
void Mod_FileWritten (const char *filename)
{
int i;
model_t *mod;
for (i=0 , mod=mod_known ; i<mod_numknown ; i++, mod++)
if (!strcmp (mod->publicname, filename) )
{
if (mod->loadstate != MLS_NOTLOADED)
Mod_PurgeModel(mod, MP_RESET);
}
}
/* /*
================== ==================
Mod_FindName Mod_FindName
@ -1262,6 +1277,7 @@ static void Mod_LoadModelWorker (void *ctx, void *data, size_t a, size_t b)
// //
// load the file // load the file
// //
mod->maxlod = 0;
// set necessary engine flags for loading purposes // set necessary engine flags for loading purposes
if (!strcmp(mod->publicname, "progs/player.mdl")) if (!strcmp(mod->publicname, "progs/player.mdl"))
mod->engineflags |= MDLF_PLAYER | MDLF_DOCRC; mod->engineflags |= MDLF_PLAYER | MDLF_DOCRC;
@ -2293,6 +2309,7 @@ static void Mod_ShowEnt_f(void)
static void Mod_SaveEntFile_f(void) static void Mod_SaveEntFile_f(void)
{ {
char fname[MAX_QPATH]; char fname[MAX_QPATH];
char nname[MAX_OSPATH];
model_t *mod = NULL; model_t *mod = NULL;
char *n = Cmd_Argv(1); char *n = Cmd_Argv(1);
const char *ents; const char *ents;
@ -2333,6 +2350,8 @@ static void Mod_SaveEntFile_f(void)
} }
COM_WriteFile(fname, FS_GAMEONLY, ents, strlen(ents)); COM_WriteFile(fname, FS_GAMEONLY, ents, strlen(ents));
if (FS_NativePath(fname, FS_GAMEONLY, nname, sizeof(nname)))
Con_Printf("Wrote %s\n", nname);
} }
/* /*

1
engine/gl/gl_model.h
View file

@ -934,6 +934,7 @@ typedef struct model_s
vec3_t mins, maxs; vec3_t mins, maxs;
float radius; float radius;
float clampscale; float clampscale;
float maxlod;
// //
// solid volume for clipping // solid volume for clipping

11
engine/gl/gl_vidcommon.c
View file

@ -692,11 +692,10 @@ void GL_CheckExtensions (void *(*getglfunction) (char *name))
gl_config.ext_packed_depth_stencil = GL_CheckExtension("GL_EXT_packed_depth_stencil"); gl_config.ext_packed_depth_stencil = GL_CheckExtension("GL_EXT_packed_depth_stencil");
if (GL_CheckExtension("GL_EXT_texture_filter_anisotropic")) if ((!gl_config.gles && gl_config.glversion >= 4.6) || GL_CheckExtension("GL_EXT_texture_filter_anisotropic") || GL_CheckExtension("GL_ARB_texture_filter_anisotropic"))
{ {
qglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &gl_config.ext_texture_filter_anisotropic); qglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &gl_config.ext_texture_filter_anisotropic);
Con_DPrintf("Anisotropic filtering supported (%dx max).\n",gl_config.ext_texture_filter_anisotropic);
Con_DPrintf("Anisotropic filter extension found (%dx max).\n",gl_config.ext_texture_filter_anisotropic);
} }
if ((!gl_config.gles && gl_config.glversion >= 2) || GL_CheckExtension("GL_ARB_texture_non_power_of_two")) if ((!gl_config.gles && gl_config.glversion >= 2) || GL_CheckExtension("GL_ARB_texture_non_power_of_two"))
@ -707,6 +706,12 @@ void GL_CheckExtensions (void *(*getglfunction) (char *name))
if (!gl_config.gles && gl_config.glversion >= 3) if (!gl_config.gles && gl_config.glversion >= 3)
{ //GL_ARB_texture_non_power_of_two is supposed to be mandatory in gl2+ and thus checking for it is redundant and not forwards-compatible { //GL_ARB_texture_non_power_of_two is supposed to be mandatory in gl2+ and thus checking for it is redundant and not forwards-compatible
//geforcefx apparently software emulates it, so only activate it unconditionally on gl3+ hardware. //geforcefx apparently software emulates it, so only activate it unconditionally on gl3+ hardware.
//gl2 drivers will likely still be explicitly advertising GL_ARB_texture_non_power_of_two so there's probably no great loss from requiring a higher version.
sh_config.texture_non_power_of_two = true;
sh_config.texture_non_power_of_two_pic = true;
}
else if (gl_config.gles && gl_config.glversion >= 3)
{ //gles3 is meant to have full npot support (like gl2+ was meant to).
sh_config.texture_non_power_of_two = true; sh_config.texture_non_power_of_two = true;
sh_config.texture_non_power_of_two_pic = true; sh_config.texture_non_power_of_two_pic = true;
} }

4
engine/gl/gl_vidlinuxglx.c
View file

@ -3220,15 +3220,13 @@ static Cursor CreateNullCursor(Display *display, Window root)
Pixmap cursormask; Pixmap cursormask;
XGCValues xgc; XGCValues xgc;
GC gc; GC gc;
XColor dummycolour; XColor dummycolour = {0};
Cursor cursor; Cursor cursor;
cursormask = x11.pXCreatePixmap(display, root, 1, 1, 1/*depth*/); cursormask = x11.pXCreatePixmap(display, root, 1, 1, 1/*depth*/);
xgc.function = GXclear; xgc.function = GXclear;
gc = x11.pXCreateGC(display, cursormask, GCFunction, &xgc); gc = x11.pXCreateGC(display, cursormask, GCFunction, &xgc);
x11.pXFillRectangle(display, cursormask, gc, 0, 0, 1, 1); x11.pXFillRectangle(display, cursormask, gc, 0, 0, 1, 1);
dummycolour.pixel = 0;
dummycolour.red = 0;
dummycolour.flags = 04; dummycolour.flags = 04;
cursor = x11.pXCreatePixmapCursor(display, cursormask, cursormask, cursor = x11.pXCreatePixmapCursor(display, cursormask, cursormask,
&dummycolour,&dummycolour, 0,0); &dummycolour,&dummycolour, 0,0);

31
engine/gl/gl_warp.c
View file

@ -77,7 +77,7 @@ void R_SetSky(const char *sky)
tex.reflectcube = R_LoadHiResTexture(sky, "env:gfx/env", IF_LOADNOW|IF_CUBEMAP|IF_CLAMP); tex.reflectcube = R_LoadHiResTexture(sky, "env:gfx/env", IF_LOADNOW|IF_CUBEMAP|IF_CLAMP);
if (tex.reflectcube->width) if (tex.reflectcube->width)
{ {
forcedsky = R_RegisterShader(va("skybox_%s", sky), 0, "{\nsort sky\nprogram defaultskybox\n{\nmap \"$cube:$reflectcube\"\ntcgen skybox\n}\nsurfaceparm nodlight\nsurfaceparm sky\n}"); forcedsky = R_RegisterShader(va("skybox_%s", sky), 0, "{\nsort sky\nprogram defaultskybox\n{\ndepthwrite\nmap \"$cube:$reflectcube\"\ntcgen skybox\n}\nsurfaceparm nodlight\nsurfaceparm sky\n}");
R_BuildDefaultTexnums(&tex, forcedsky, IF_WORLDTEX); R_BuildDefaultTexnums(&tex, forcedsky, IF_WORLDTEX);
return; return;
} }
@ -116,12 +116,20 @@ void R_DrawFastSky(batch_t *batch)
BE_SubmitBatch(&b); BE_SubmitBatch(&b);
} }
//annoyingly sky does not always write depth values.
//this can allow entities to appear beyond it.
//this can include (massive) entities outside of the skyroom.
//so, we can only draw entities in skyrooms if:
//1) either the ents have robust pvs info and we can draw ONLY the ones actually inside the skyroom
//2) or if r_ignoreentpvs==1 we must mask depth and waste a whole load of batches drawing invisible ents in the sky
extern cvar_t r_ignoreentpvs;
void R_RenderScene (void); void R_RenderScene (void);
qboolean R_DrawSkyroom(shader_t *skyshader) qboolean R_DrawSkyroom(shader_t *skyshader)
{ {
float vmat[16]; float vmat[16];
refdef_t oldrefdef; refdef_t oldrefdef;
extern cvar_t r_ignoreentpvs; //legacy value is 1... // extern cvar_t r_ignoreentpvs; //legacy value is 1...
extern cvar_t v_skyroom_orientation; extern cvar_t v_skyroom_orientation;
if (r_viewcluster == -1) if (r_viewcluster == -1)
@ -135,8 +143,8 @@ qboolean R_DrawSkyroom(shader_t *skyshader)
oldrefdef = r_refdef; oldrefdef = r_refdef;
r_refdef.recurse+=1; r_refdef.recurse+=1;
if (r_ignoreentpvs.ival) //if we're ignoring ent pvs then we're probably drawing lots of ents in the skybox that shouldn't be there // if (r_ignoreentpvs.ival) //if we're ignoring ent pvs then we're probably drawing lots of ents in the skybox that shouldn't be there
r_refdef.firstvisedict = cl_numvisedicts; // r_refdef.firstvisedict = cl_numvisedicts;
r_refdef.externalview = true; //an out-of-body experience... r_refdef.externalview = true; //an out-of-body experience...
r_refdef.skyroom_enabled = false; r_refdef.skyroom_enabled = false;
r_refdef.forcevis = false; r_refdef.forcevis = false;
@ -187,6 +195,10 @@ qboolean R_DrawSkyroom(shader_t *skyshader)
return true; return true;
} }
//q3 mustn't mask sky (breaks q3map2's invisible skyportals), whereas q1 must (or its a cheat). halflife doesn't normally expect masking.
//we also MUST mask any sky inside skyrooms, or you'll see all the entities outside of the skyroom through the room's own sky (q3map2 skyportals are hopefully irrelevant in this case).
#define SKYMUSTBEMASKED (r_worldentity.model->fromgame != fg_quake3 || ((r_refdef.flags & RDF_DISABLEPARTICLES) && !r_ignoreentpvs.ival))
/* /*
================= =================
GL_DrawSkyChain GL_DrawSkyChain
@ -207,6 +219,13 @@ qboolean R_DrawSkyChain (batch_t *batch)
{ {
skyshader = forcedsky; skyshader = forcedsky;
if (r_refdef.flags & RDF_SKIPSKY)
{
if (r_worldentity.model->fromgame != fg_quake3)
GL_SkyForceDepth(batch);
return true;
}
if (forcedsky->numpasses && !forcedsky->skydome) if (forcedsky->numpasses && !forcedsky->skydome)
{ //cubemap skies! { //cubemap skies!
//this is just a simple pass. we use glsl/texgen for any actual work //this is just a simple pass. we use glsl/texgen for any actual work
@ -225,7 +244,7 @@ qboolean R_DrawSkyChain (batch_t *batch)
{ {
if (r_refdef.flags & RDF_SKIPSKY) if (r_refdef.flags & RDF_SKIPSKY)
{ {
if (r_worldentity.model->fromgame != fg_quake3) if (SKYMUSTBEMASKED)
GL_SkyForceDepth(batch); GL_SkyForceDepth(batch);
return true; return true;
} }
@ -290,7 +309,7 @@ qboolean R_DrawSkyChain (batch_t *batch)
//See: The Edge Of Forever (motef, by sock) for an example of where this needs to be skipped. //See: The Edge Of Forever (motef, by sock) for an example of where this needs to be skipped.
//See dm3 for an example of where the depth needs to be correct (OMG THERE'S PLAYERS IN MY SKYBOX! WALLHAXX!). //See dm3 for an example of where the depth needs to be correct (OMG THERE'S PLAYERS IN MY SKYBOX! WALLHAXX!).
//you can't please them all. //you can't please them all.
if (r_worldentity.model->fromgame != fg_quake3) if (SKYMUSTBEMASKED)
GL_SkyForceDepth(batch); GL_SkyForceDepth(batch);
return true; return true;

4
engine/qclib/pr_edict.c
View file

@ -1410,7 +1410,11 @@ static const char *ED_ParseEdict (progfuncs_t *progfuncs, const char *data, edic
// keynames with a leading underscore are used for utility comments, // keynames with a leading underscore are used for utility comments,
// and are immediately discarded by quake // and are immediately discarded by quake
if (keyname[0] == '_') if (keyname[0] == '_')
{
if (externs->badfield)
externs->badfield(&progfuncs->funcs, (struct edict_s*)ent, keyname, qcc_token);
continue; continue;
}
if (!strcmp(keyname, "angle")) //Quake anglehack - we've got to leave it in cos it doesn't work for quake otherwise, and this is a QuakeC lib! if (!strcmp(keyname, "angle")) //Quake anglehack - we've got to leave it in cos it doesn't work for quake otherwise, and this is a QuakeC lib!
{ {

36
engine/server/pr_cmds.c
View file

@ -503,6 +503,20 @@ static void ASMCALL ThinkTimeOp (pubprogfuncs_t *prinst, edict_t *ed, float var)
static int SV_ParticlePrecache_Add(const char *pname); static int SV_ParticlePrecache_Add(const char *pname);
static pbool PDECL SV_BadField(pubprogfuncs_t *inst, edict_t *foo, const char *keyname, const char *value) static pbool PDECL SV_BadField(pubprogfuncs_t *inst, edict_t *foo, const char *keyname, const char *value)
{ {
if (!strcmp(keyname, "traileffect"))
{
foo->xv->traileffectnum = SV_ParticlePrecache_Add(value);
return true;
}
if (!strcmp(keyname, "emiteffect"))
{
foo->xv->emiteffectnum = SV_ParticlePrecache_Add(value);
return true;
}
if (*keyname == '_')
keyname++;
#ifdef HEXEN2 #ifdef HEXEN2
/*Worldspawn only fields...*/ /*Worldspawn only fields...*/
if (NUM_FOR_EDICT(inst, foo) == 0) if (NUM_FOR_EDICT(inst, foo) == 0)
@ -522,20 +536,18 @@ static pbool PDECL SV_BadField(pubprogfuncs_t *inst, edict_t *foo, const char *k
} }
#endif #endif
if (!strcmp(keyname, "traileffect"))
{
foo->xv->traileffectnum = SV_ParticlePrecache_Add(value);
return true;
}
if (!strcmp(keyname, "emiteffect"))
{
foo->xv->emiteffectnum = SV_ParticlePrecache_Add(value);
return true;
}
if (!strcmp(keyname, "sky") || !strcmp(keyname, "fog")) if (!strcmp(keyname, "sky") || !strcmp(keyname, "fog"))
return true; //these things are handled in the client, so don't warn if they're used. return true; //these things are handled in the client, so don't warn if they're used.
if (!strcmp(keyname, "skyroom"))
{
value = COM_Parse(value);sv.skyroom_pos[0] = atof(com_token);
value = COM_Parse(value);sv.skyroom_pos[1] = atof(com_token);
value = COM_Parse(value);sv.skyroom_pos[2] = atof(com_token);
sv.skyroom_pos_known = true;
return true;
}
//don't spam warnings about missing fields if we failed to load the progs. //don't spam warnings about missing fields if we failed to load the progs.
if (!svs.numprogs) if (!svs.numprogs)
return true; return true;
@ -9817,6 +9829,8 @@ static void QCBUILTIN PF_runclientphys(pubprogfuncs_t *prinst, struct globalvars
return; return;
} }
VALGRIND_MAKE_MEM_UNDEFINED(&pmove, sizeof(pmove));
if (pr_global_ptrs->clientcommandframe) if (pr_global_ptrs->clientcommandframe)
pmove.sequence = *pr_global_ptrs->clientcommandframe; pmove.sequence = *pr_global_ptrs->clientcommandframe;
else else

3
engine/server/server.h
View file

@ -170,6 +170,9 @@ typedef struct
qbyte h2cdtrack; qbyte h2cdtrack;
#endif #endif
vec3_t skyroom_pos; //parsed from world._skyroom
qboolean skyroom_pos_known;
int allocated_client_slots; //number of slots available. (used mostly to stop single player saved games cacking up) int allocated_client_slots; //number of slots available. (used mostly to stop single player saved games cacking up)
int spawned_client_slots; //number of PLAYER slots which are active (ie: putclientinserver was called) int spawned_client_slots; //number of PLAYER slots which are active (ie: putclientinserver was called)
int spawned_observer_slots; int spawned_observer_slots;

15
engine/server/sv_ents.c
View file

@ -3868,10 +3868,15 @@ void SV_AddCameraEntity(pvscamera_t *cameras, edict_t *ent, vec3_t viewofs)
return; //don't add the same ent multiple times (.view2 or portals that can see themselves through other portals). return; //don't add the same ent multiple times (.view2 or portals that can see themselves through other portals).
} }
if (viewofs) if (ent)
VectorAdd (ent->v->origin, viewofs, org); {
if (viewofs)
VectorAdd (ent->v->origin, viewofs, org);
else
VectorCopy (ent->v->origin, org);
}
else else
VectorCopy (ent->v->origin, org); VectorCopy (viewofs, org);
sv.world.worldmodel->funcs.ClusterForPoint(sv.world.worldmodel, org, &area); sv.world.worldmodel->funcs.ClusterForPoint(sv.world.worldmodel, org, &area);
for (i = 1; ; i++) for (i = 1; ; i++)
@ -3912,6 +3917,10 @@ void SV_Snapshot_SetupPVS(client_t *client, pvscamera_t *camera)
if (client->edict->xv->view2) if (client->edict->xv->view2)
SV_AddCameraEntity(camera, PROG_TO_EDICT(svprogfuncs, client->edict->xv->view2), NULL); SV_AddCameraEntity(camera, PROG_TO_EDICT(svprogfuncs, client->edict->xv->view2), NULL);
} }
//hack for skyrooms, open up the pvs.
if (sv.skyroom_pos_known)
SV_AddCameraEntity(camera, NULL, sv.skyroom_pos);
} }
void SV_Snapshot_Clear(packet_entities_t *pack) void SV_Snapshot_Clear(packet_entities_t *pack)

8
engine/server/sv_main.c
View file

@ -2796,13 +2796,13 @@ void SV_DoDirectConnect(svconnectinfo_t *fte_restrict info)
if (newcl->zquake_extensions & (Z_EXT_PF_SOLID|Z_EXT_PF_ONGROUND)) if (newcl->zquake_extensions & (Z_EXT_PF_SOLID|Z_EXT_PF_ONGROUND))
{ {
if (newcl->fteprotocolextensions & PEXT_HULLSIZE) if (newcl->fteprotocolextensions & PEXT_HULLSIZE)
Con_TPrintf("%s: ignoring ezquake hullsize extension (conflicts with z_ext_pf_onground).\n", NET_AdrToString (adrbuf, sizeof(adrbuf), &info->adr)); Con_TPrintf("%s: ezquake - ignoring hullsize extension (conflicts with z_ext_pf_onground).\n", NET_AdrToString (adrbuf, sizeof(adrbuf), &info->adr));
if (newcl->fteprotocolextensions & PEXT_SCALE) if (newcl->fteprotocolextensions & PEXT_SCALE)
Con_TPrintf("%s: ignoring ezquake scale extension (conflicts with z_ext_pf_solid).\n", NET_AdrToString (adrbuf, sizeof(adrbuf), &info->adr)); Con_TPrintf("%s: ezquake - ignoring scale extension (conflicts with z_ext_pf_solid).\n", NET_AdrToString (adrbuf, sizeof(adrbuf), &info->adr));
if (newcl->fteprotocolextensions & PEXT_FATNESS) if (newcl->fteprotocolextensions & PEXT_FATNESS)
Con_TPrintf("%s: ignoring ezquake fatness extension (conflicts with z_ext_pf_solid).\n", NET_AdrToString (adrbuf, sizeof(adrbuf), &info->adr)); Con_TPrintf("%s: ezquake - ignoring fatness extension (conflicts with z_ext_pf_solid).\n", NET_AdrToString (adrbuf, sizeof(adrbuf), &info->adr));
if (newcl->fteprotocolextensions & PEXT_TRANS) if (newcl->fteprotocolextensions & PEXT_TRANS)
Con_TPrintf("%s: ignoring ezquake transparency extension (buggy on players, conflicts with z_ext_pf_solid).\n", NET_AdrToString (adrbuf, sizeof(adrbuf), &info->adr)); Con_TPrintf("%s: ezquake - ignoring transparency extension (buggy on players, conflicts with z_ext_pf_solid).\n", NET_AdrToString (adrbuf, sizeof(adrbuf), &info->adr));
newcl->fteprotocolextensions &= ~(PEXT_HULLSIZE|PEXT_TRANS|PEXT_SCALE|PEXT_FATNESS); newcl->fteprotocolextensions &= ~(PEXT_HULLSIZE|PEXT_TRANS|PEXT_SCALE|PEXT_FATNESS);
} }
} }

2
engine/server/sv_user.c
View file

@ -7052,6 +7052,8 @@ void SV_RunCmd (usercmd_t *ucmd, qboolean recurse)
return; return;
} }
VALGRIND_MAKE_MEM_UNDEFINED(&pmove, sizeof(pmove));
host_frametime = ucmd->msec * 0.001; host_frametime = ucmd->msec * 0.001;
host_frametime *= sv.gamespeed; host_frametime *= sv.gamespeed;
if (host_frametime > 0.1) if (host_frametime > 0.1)

9
engine/vk/vk_init.c
View file

@ -2059,12 +2059,15 @@ void VK_Set2D(void)
static void VK_Shutdown_PostProc(void) static void VK_Shutdown_PostProc(void)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < countof(postproc); i++) if (vk.device)
VKBE_RT_Gen(&postproc[i], 0, 0, true, RT_IMAGEFLAGS); {
for (i = 0; i < countof(postproc); i++)
VKBE_RT_Gen(&postproc[i], 0, 0, true, RT_IMAGEFLAGS);
VK_R_BloomShutdown();
}
vk.scenepp_waterwarp = NULL; vk.scenepp_waterwarp = NULL;
vk.scenepp_antialias = NULL; vk.scenepp_antialias = NULL;
VK_R_BloomShutdown();
} }
static void VK_Init_PostProc(void) static void VK_Init_PostProc(void)
{ {

5
plugins/models/gltf.c
View file

@ -1985,9 +1985,10 @@ static qboolean GLTF_LoadModel(struct model_s *mod, char *json, size_t jsonsize,
break; break;
} }
if (j==countof(extensions) || !extensions[j].supported) if (j==countof(extensions) || !extensions[j].supported)
{
Con_Printf(CON_ERROR "%s: Required gltf2 extension \"%s\" not supported\n", mod->name, extname); Con_Printf(CON_ERROR "%s: Required gltf2 extension \"%s\" not supported\n", mod->name, extname);
goto abort;
goto abort; }
} }
for(n = JSON_FindIndexedChild(gltf.r, "extensionsUsed", 0); n; n = n->sibling) for(n = JSON_FindIndexedChild(gltf.r, "extensionsUsed", 0); n; n = n->sibling)