Skullernet to Sync branch merge

doc/client.asciidoc

@@ -697,6 +697,9 @@ gl_bilerp_pics::
       - 1 — enabled for large pictures that don't fit into the scrap
       - 2 — enabled for all pictures, including the scrap texture itself
 
+gl_bilerp_skies::
+    Enables bilinear filtering of skybox textures. Default value is 1 (enabled).
+
 gl_upscale_pcx::
     Enables upscaling of PCX images using HQ2x and HQ4x filters. This improves
     rendering quality when screen scaling is used. Default value is 0.
@@ -727,6 +730,18 @@ gl_fog::
     Enable re-release fog effect. Only effective when using GLSL backend.
     Default value is 1 (enabled).
 
+gl_bloom::
+    Enable re-release bloom effect. Only effective when using GLSL backend.
+    Default value is 0 (disabled). Higher values specify number of blurring
+    filter iterations (typical value is 1).
+
+gl_bloom_sigma::
+    Specifies strength parameter of gaussian blur filter used for the bloom
+    effect. Default value is 4.
+
+NOTE: Bloom only works with glowmaps. Enabling it with non-remastered content
+(or glowmaps disabled) is a waste of resources.
+
 gl_flarespeed::
     Specifies flare fading effect speed. Default value is 8. Set this to 0
     to disable fading.
@@ -764,6 +779,12 @@ gl_dotshading::
     truly 3D-ish by simulating diffuse lighting from a fake light source.
     Default value is 1 (enabled).
 
+gl_shadows::
+    Enables drawing stencil shadows underneath 3D models. Default value is 0.
+      - 0 — disabled
+      - 1 — enabled, constant alpha
+      - 2 — enabled, alpha fade with distance
+
 gl_saturation::
     Enables grayscaling of world textures. 1 keeps original colors, 0 converts
     textures to grayscale format (this may save some video memory and speed up

inc/client/client.h

@@ -26,8 +26,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "shared/ghud.h"
 #endif
 
-#define CHAR_WIDTH  8
-#define CHAR_HEIGHT 8
+#define CONCHAR_WIDTH  8
+#define CONCHAR_HEIGHT 8
 
 // only begin attenuating sound volumes when outside the FULLVOLUME range
 #define SOUND_FULLVOLUME        80
@@ -38,6 +38,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 void CL_PreInit(void);
 
+void SCR_DebugGraph(float value, int color);
+
 #if USE_CLIENT
 
 #define MAX_LOCAL_SERVERS   16

inc/common/bsp.h

@@ -75,7 +75,7 @@ typedef struct {
 #define SURF_COLOR_MASK (SURF_TRANS_MASK | SURF_WARP)
 
 #define SURF_NOLM_MASK_REMASTER     (SURF_SKY | SURF_NODRAW)
-#define SURF_NOLM_MASK_DEFAULT      (SURF_COLOR_MASK | SURF_FLOWING | SURF_NOLM_MASK_REMASTER)
+#define SURF_NOLM_MASK_DEFAULT      (SURF_COLOR_MASK | SURF_NOLM_MASK_REMASTER)
 
 #define DSURF_PLANEBACK     1
 
@@ -115,21 +115,21 @@ typedef struct mface_s {
 typedef struct mnode_s {
     /* ======> */
     cplane_t            *plane;     // never NULL to differentiate from leafs
+    struct mnode_s      *parent;
+
 #if USE_REF
     vec3_t              mins;
     vec3_t              maxs;
-
     unsigned            visframe;
 #endif
-    struct mnode_s      *parent;
     /* <====== */
 
-    struct mnode_s      *children[2];
-
 #if USE_REF
     int                 numfaces;
     mface_t             *firstface;
 #endif
+
+    struct mnode_s      *children[2];
 } mnode_t;
 
 typedef struct {
@@ -147,16 +147,16 @@ typedef struct {
 typedef struct {
     /* ======> */
     cplane_t            *plane;     // always NULL to differentiate from nodes
+    struct mnode_s      *parent;
+
 #if USE_REF
     vec3_t              mins;
     vec3_t              maxs;
-
     unsigned            visframe;
 #endif
-    struct mnode_s      *parent;
     /* <====== */
 
-    int             contents;
+    int             contents[2];    // 0 - original, 1 - merged
     int             cluster;
     int             area;
     int             numleafbrushes;
@@ -572,9 +572,9 @@ typedef struct {
 //#if USE_REF
     lightgrid_t     lightgrid;
 
-    qboolean        lm_decoupled;
-//#endif
-    qboolean        extended;
+    bool            lm_decoupled;
+    bool            extended;   // QBSP extended format
+    bool            has_bspx;   // has BSPX header
 
     char            name[1];
 } bsp_t;
@@ -593,6 +593,7 @@ typedef struct {
     cplane_t    plane;
     float       s, t;
     float       fraction;
+    vec3_t      pos;
 } lightpoint_t;
 
 void BSP_LightPoint(lightpoint_t *point, const vec3_t start, const vec3_t end, const mnode_t *headnode, int nolm_mask);

inc/common/cmodel.h

@@ -46,7 +46,7 @@ void        CM_Init(void);
 
 void        CM_FreeMap(cm_t *cm);
 int         CM_LoadMap(cm_t *cm, const char *name);
-void        CM_LoadOverrides(cm_t *cm, char *server, size_t server_size);
+void        CM_LoadOverride(cm_t *cm, char *server, size_t server_size);
 
 const mnode_t   *CM_NodeNum(const cm_t *cm, int number);
 const mleaf_t   *CM_LeafNum(const cm_t *cm, int number);
@@ -60,25 +60,28 @@ const mleaf_t   *CM_LeafNum(const cm_t *cm, int number);
 const mnode_t   *CM_HeadnodeForBox(const vec3_t mins, const vec3_t maxs);
 
 // returns an ORed contents mask
-static inline int CM_PointContents(const vec3_t p, const mnode_t *headnode)
+static inline int CM_PointContents(const vec3_t p, const mnode_t *headnode, bool extended)
 {
     if (!headnode)
         return 0;   // map not loaded
-    return BSP_PointLeaf(headnode, p)->contents;
+    return BSP_PointLeaf(headnode, p)->contents[extended];
 }
 
 int         CM_TransformedPointContents(const vec3_t p, const mnode_t *headnode,
-                                        const vec3_t origin, const vec3_t angles);
+                                        const vec3_t origin, const vec3_t angles,
+                                        bool extended);
 
 void        CM_BoxTrace(trace_t *trace,
                         const vec3_t start, const vec3_t end,
                         const vec3_t mins, const vec3_t maxs,
-                        const mnode_t *headnode, int brushmask);
+                        const mnode_t *headnode, int brushmask,
+                        bool extended);
 void        CM_TransformedBoxTrace(trace_t *trace,
                                    const vec3_t start, const vec3_t end,
                                    const vec3_t mins, const vec3_t maxs,
                                    const mnode_t *headnode, int brushmask,
-                                   const vec3_t origin, const vec3_t angles);
+                                   const vec3_t origin, const vec3_t angles,
+                                   bool extended);
 void        CM_ClipEntity(trace_t *dst, const trace_t *src, struct edict_s *ent);
 
 // call with topnode set to the headnode, returns with topnode

inc/common/common.h

@@ -133,23 +133,29 @@ void G_InitializeExtensions(void);
 #endif
 
 #if USE_DEBUG
+#define COM_DEVELOPER   (developer->integer)
 #define Com_DPrintf(...) \
-    do { if (developer && developer->integer > 0) \
+    do { if (developer && developer->integer >= 1) \
         Com_LPrintf(PRINT_DEVELOPER, __VA_ARGS__); } while (0)
 #define Com_DDPrintf(...) \
-    do { if (developer && developer->integer > 1) \
+    do { if (developer && developer->integer >= 2) \
         Com_LPrintf(PRINT_DEVELOPER, __VA_ARGS__); } while (0)
 #define Com_DDDPrintf(...) \
-    do { if (developer && developer->integer > 2) \
+    do { if (developer && developer->integer >= 3) \
         Com_LPrintf(PRINT_DEVELOPER, __VA_ARGS__); } while (0)
 #define Com_DDDDPrintf(...) \
-    do { if (developer && developer->integer > 3) \
+    do { if (developer && developer->integer >= 4) \
         Com_LPrintf(PRINT_DEVELOPER, __VA_ARGS__); } while (0)
+#define Com_DWPrintf(...) \
+    do { if (developer && developer->integer >= 1) \
+        Com_LPrintf(PRINT_WARNING, __VA_ARGS__); } while (0)
 #else
+#define COM_DEVELOPER   0
 #define Com_DPrintf(...) ((void)0)
 #define Com_DDPrintf(...) ((void)0)
 #define Com_DDDPrintf(...) ((void)0)
 #define Com_DDDDPrintf(...) ((void)0)
+#define Com_DWPrintf(...) ((void)0)
 #endif
 
 #if USE_TESTS

inc/common/crc.h

@@ -0,0 +1,25 @@
+/*
+Copyright (C) 1997-2001 Id Software, Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#pragma once
+
+uint16_t CRC_Block(const byte *start, size_t count);
+
+#if USE_CLIENT
+byte COM_BlockSequenceCRCByte(const byte *base, size_t length, int sequence);
+#endif

inc/refresh/refresh.h

@@ -29,6 +29,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define POWERSUIT_SCALE     4.0f
 #define WEAPONSHELL_SCALE   0.5f
 
+#define RF_TRACKER          BIT_ULL(32)
+
 #define RF_SHELL_MASK       (RF_SHELL_RED | RF_SHELL_GREEN | RF_SHELL_BLUE | \
                              RF_SHELL_DOUBLE | RF_SHELL_HALF_DAM | RF_SHELL_LITE_GREEN)
 
@@ -60,9 +62,9 @@ typedef struct entity_s {
     float   alpha;                  // ignore if RF_TRANSLUCENT isn't set
     color_t rgba;
 
-    qhandle_t   skin;           // NULL for inline skin
-    int         flags;
+    uint64_t    flags;
 
+    qhandle_t   skin;           // NULL for inline skin
     float       scale;
 } entity_t;
 
@@ -76,6 +78,7 @@ typedef struct {
 typedef struct {
     vec3_t  origin;
     int     color;              // -1 => use rgba
+    float   scale;
     float   alpha;
     color_t rgba;
 } particle_t;

inc/shared/game.h

@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #define GAME_API_VERSION_OLD    3       // game uses gclient_old_t
 #define GAME_API_VERSION_AQTION 4       // game uses gclient_t with AQtion extension (aliased to gclient_old_t)
-#define GAME_API_VERSION_NEW    3301    // game uses gclient_new_t
+#define GAME_API_VERSION_NEW    3302    // game uses gclient_new_t
 
 #if USE_NEW_GAME_API
 #define GAME_API_VERSION    GAME_API_VERSION_NEW

inc/shared/shared.h

@@ -1203,11 +1203,12 @@ typedef struct {
     vec3_t      mins, maxs;         // bounding box size
 
     struct edict_s  *groundentity;
+    cplane_t        groundplane;
     int             watertype;
     int             waterlevel;
 
     // callbacks to test the world
-    trace_t     (* q_gameabi trace)(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end);
+    trace_t     (* q_gameabi trace)(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int contentmask);
     int         (*pointcontents)(const vec3_t point);
 } pmove_new_t;
 #endif
@@ -1454,6 +1455,7 @@ enum {
     SPLASH_SLIME,
     SPLASH_LAVA,
     SPLASH_BLOOD,
+    SPLASH_ELECTRIC_N64, // KEX
 };
 
 // sound channels

inc/system/pthread.h

@@ -44,30 +44,39 @@ typedef struct {
     void *(*func)(void *);
     void *arg, *ret;
     HANDLE handle;
-} pthread_t;
+} *pthread_t;
 
 static unsigned __stdcall thread_func(void *arg)
 {
-    pthread_t *t = arg;
+    pthread_t t = arg;
     t->ret = t->func(t->arg);
     return 0;
 }
 
 static inline int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
                                  void *(*start_routine)(void *), void *arg)
 {
-    thread->func = start_routine;
-    thread->arg = arg;
-    thread->handle = (HANDLE)_beginthreadex(NULL, 0, thread_func, thread, 0, NULL);
-    return thread->handle ? 0 : EAGAIN;
+    pthread_t t = calloc(1, sizeof(*t));
+    if (!t)
+        return EAGAIN;
+    t->func = start_routine;
+    t->arg = arg;
+    t->handle = (HANDLE)_beginthreadex(NULL, 0, thread_func, t, 0, NULL);
+    if (!t->handle) {
+        free(t);
+        return EAGAIN;
+    }
+    *thread = t;
+    return 0;
 }
 
 static inline int pthread_join(pthread_t thread, void **retval)
 {
-    int ret = WaitForSingleObject(thread.handle, INFINITE);
-    CloseHandle(thread.handle);
+    int ret = WaitForSingleObject(thread->handle, INFINITE);
+    CloseHandle(thread->handle);
     if (retval)
-        *retval = thread.ret;
+        *retval = thread->ret;
+    free(thread);
     return ret ? EINVAL : 0;
 }
 

meson.build

@@ -13,6 +13,7 @@ common_src = [
   'src/common/cmd.c',
   'src/common/cmodel.c',
   'src/common/common.c',
+  'src/common/crc.c',
   'src/common/cvar.c',
   'src/common/error.c',
   'src/common/field.c',
@@ -37,7 +38,6 @@ common_src = [
 client_src = [
   'src/client/ascii.c',
   'src/client/console.c',
-  'src/client/crc.c',
   'src/client/demo.c',
   'src/client/download.c',
   'src/client/effects.c',

src/client/ascii.c

@@ -233,7 +233,7 @@ static void TH_DrawLayoutString(char *dst, const char *s)
             width = Q_atoi(token);
             token = COM_Parse(&s);
             value = Q_atoi(token);
-            if (value < 0 || value >= MAX_STATS) {
+            if (value < 0 || value >= cl.max_stats) {
                 Com_Error(ERR_DROP, "%s: invalid stat index for num: %i", __func__, value);
             }
             value = cl.frame.ps.stats[value];
@@ -244,7 +244,7 @@ static void TH_DrawLayoutString(char *dst, const char *s)
         if (!strcmp(token, "stat_string")) {
             token = COM_Parse(&s);
             index = Q_atoi(token);
-            if (index < 0 || index >= MAX_STATS) {
+            if (index < 0 || index >= cl.max_stats) {
                 Com_Error(ERR_DROP, "%s: invalid string index for stat_string: %i", __func__, index);
             }
             index = cl.frame.ps.stats[index];
@@ -273,7 +273,7 @@ static void TH_DrawLayoutString(char *dst, const char *s)
         if (!strcmp(token, "if")) {
             token = COM_Parse(&s);
             value = Q_atoi(token);
-            if (value < 0 || value >= MAX_STATS) {
+            if (value < 0 || value >= cl.max_stats) {
                 Com_Error(ERR_DROP, "%s: invalid stat index for if: %i", __func__, value);
             }
             value = cl.frame.ps.stats[value];