]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - model_brush.c
fixed some dynamic lighting bugs related to glowing self
[xonotic/darkplaces.git] / model_brush.c
index e42ec490b4a5149b6911420ff81e90f9587481a5..c91368de3b2bfd2ca61507ac877135cbcc7e3e5c 100644 (file)
@@ -19,15 +19,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "quakedef.h"
+#include "image.h"
+
+// note: model_shared.c sets up r_notexture, and r_surf_notexture
 
 qbyte mod_novis[(MAX_MAP_LEAFS + 7)/ 8];
 
-cvar_t r_subdivide_size = {CVAR_SAVE, "r_subdivide_size", "128"};
+//cvar_t r_subdivide_size = {CVAR_SAVE, "r_subdivide_size", "128"};
 cvar_t halflifebsp = {0, "halflifebsp", "0"};
 cvar_t r_novis = {0, "r_novis", "0"};
 cvar_t r_miplightmaps = {CVAR_SAVE, "r_miplightmaps", "0"};
 cvar_t r_lightmaprgba = {0, "r_lightmaprgba", "1"};
-cvar_t r_vertexsurfacesthreshold = {CVAR_SAVE, "r_vertexsurfacesthreshold", "0"};
+cvar_t r_nosurftextures = {0, "r_nosurftextures", "0"};
+cvar_t r_sortsurfaces = {0, "r_sortsurfaces", "0"};
+
+#define NUM_DETAILTEXTURES 1
+static rtexture_t *detailtextures[NUM_DETAILTEXTURES];
+static rtexturepool_t *detailtexturepool;
 
 /*
 ===============
@@ -36,18 +44,63 @@ Mod_BrushInit
 */
 void Mod_BrushInit (void)
 {
-       Cvar_RegisterVariable(&r_subdivide_size);
+//     Cvar_RegisterVariable(&r_subdivide_size);
        Cvar_RegisterVariable(&halflifebsp);
        Cvar_RegisterVariable(&r_novis);
        Cvar_RegisterVariable(&r_miplightmaps);
        Cvar_RegisterVariable(&r_lightmaprgba);
-       Cvar_RegisterVariable(&r_vertexsurfacesthreshold);
+       Cvar_RegisterVariable(&r_nosurftextures);
+       Cvar_RegisterVariable(&r_sortsurfaces);
        memset(mod_novis, 0xff, sizeof(mod_novis));
 }
 
-void Mod_Brush_SERAddEntity(void)
+void Mod_BrushStartup (void)
 {
-       R_Clip_AddBox(currentrenderentity->mins, currentrenderentity->maxs, R_Entity_Callback, currentrenderentity, NULL);
+       int i, x, y, light;
+       float vc[3], vx[3], vy[3], vn[3], lightdir[3];
+#define DETAILRESOLUTION 256
+       qbyte data[DETAILRESOLUTION][DETAILRESOLUTION][4], noise[DETAILRESOLUTION][DETAILRESOLUTION];
+       detailtexturepool = R_AllocTexturePool();
+       lightdir[0] = 0.5;
+       lightdir[1] = 1;
+       lightdir[2] = -0.25;
+       VectorNormalize(lightdir);
+       for (i = 0;i < NUM_DETAILTEXTURES;i++)
+       {
+               fractalnoise(&noise[0][0], DETAILRESOLUTION, DETAILRESOLUTION >> 4);
+               for (y = 0;y < DETAILRESOLUTION;y++)
+               {
+                       for (x = 0;x < DETAILRESOLUTION;x++)
+                       {
+                               vc[0] = x;
+                               vc[1] = y;
+                               vc[2] = noise[y][x] * (1.0f / 32.0f);
+                               vx[0] = x + 1;
+                               vx[1] = y;
+                               vx[2] = noise[y][(x + 1) % DETAILRESOLUTION] * (1.0f / 32.0f);
+                               vy[0] = x;
+                               vy[1] = y + 1;
+                               vy[2] = noise[(y + 1) % DETAILRESOLUTION][x] * (1.0f / 32.0f);
+                               VectorSubtract(vx, vc, vx);
+                               VectorSubtract(vy, vc, vy);
+                               CrossProduct(vx, vy, vn);
+                               VectorNormalize(vn);
+                               light = 128 - DotProduct(vn, lightdir) * 128;
+                               light = bound(0, light, 255);
+                               data[y][x][0] = data[y][x][1] = data[y][x][2] = light;
+                               data[y][x][3] = 255;
+                       }
+               }
+               detailtextures[i] = R_LoadTexture2D(detailtexturepool, va("detailtexture%i", i), DETAILRESOLUTION, DETAILRESOLUTION, &data[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_PRECACHE, NULL);
+       }
+}
+
+void Mod_BrushShutdown (void)
+{
+       int i;
+       for (i = 0;i < NUM_DETAILTEXTURES;i++)
+               R_FreeTexture(detailtextures[i]);
+       R_FreeTexturePool(&detailtexturepool);
 }
 
 /*
@@ -55,13 +108,14 @@ void Mod_Brush_SERAddEntity(void)
 Mod_PointInLeaf
 ===============
 */
-mleaf_t *Mod_PointInLeaf (vec3_t p, model_t *model)
+mleaf_t *Mod_PointInLeaf (const vec3_t p, model_t *model)
 {
-       mnode_t         *node;
+       mnode_t *node;
+
+       if (model == NULL)
+               return NULL;
 
        Mod_CheckLoaded(model);
-//     if (!model || !model->nodes)
-//             Sys_Error ("Mod_PointInLeaf: bad model");
 
        // LordHavoc: modified to start at first clip node,
        // in other words: first node of the (sub)model
@@ -72,46 +126,38 @@ mleaf_t *Mod_PointInLeaf (vec3_t p, model_t *model)
        return (mleaf_t *)node;
 }
 
+int Mod_PointContents (const vec3_t p, model_t *model)
+{
+       mnode_t *node;
+
+       if (model == NULL)
+               return CONTENTS_EMPTY;
+
+       Mod_CheckLoaded(model);
+
+       // LordHavoc: modified to start at first clip node,
+       // in other words: first node of the (sub)model
+       node = model->nodes + model->hulls[0].firstclipnode;
+       while (node->contents == 0)
+               node = node->children[(node->plane->type < 3 ? p[node->plane->type] : DotProduct (p,node->plane->normal)) < node->plane->dist];
+
+       return ((mleaf_t *)node)->contents;
+}
+
 void Mod_FindNonSolidLocation(vec3_t pos, model_t *mod)
 {
-       if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
-       pos[0]-=1;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
-       pos[0]+=2;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
+       if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
+       pos[0]-=1;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
+       pos[0]+=2;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
        pos[0]-=1;
-       pos[1]-=1;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
-       pos[1]+=2;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
+       pos[1]-=1;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
+       pos[1]+=2;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
        pos[1]-=1;
-       pos[2]-=1;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
-       pos[2]+=2;if (Mod_PointInLeaf(pos, mod)->contents != CONTENTS_SOLID) return;
+       pos[2]-=1;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
+       pos[2]+=2;if (Mod_PointContents(pos, mod) != CONTENTS_SOLID) return;
        pos[2]-=1;
 }
 
-/*
-mleaf_t *Mod_PointInLeaf (vec3_t p, model_t *model)
-{
-       mnode_t         *node;
-       float           d;
-       mplane_t        *plane;
-
-       if (!model || !model->nodes)
-               Sys_Error ("Mod_PointInLeaf: bad model");
-
-       node = model->nodes;
-       while (1)
-       {
-               if (node->contents < 0)
-                       return (mleaf_t *)node;
-               plane = node->plane;
-               d = DotProduct (p,plane->normal) - plane->dist;
-               if (d > 0)
-                       node = node->children[0];
-               else
-                       node = node->children[1];
-       }
-
-       return NULL;    // never reached
-}
-*/
 
 /*
 ===================
@@ -128,18 +174,6 @@ static qbyte *Mod_DecompressVis (qbyte *in, model_t *model)
        row = (model->numleafs+7)>>3;
        out = decompressed;
 
-       /*
-       if (!in)
-       {       // no vis info, so make all visible
-               while (row)
-               {
-                       *out++ = 0xff;
-                       row--;
-               }
-               return decompressed;
-       }
-       */
-
        do
        {
                if (*in)
@@ -167,40 +201,6 @@ qbyte *Mod_LeafPVS (mleaf_t *leaf, model_t *model)
        return Mod_DecompressVis (leaf->compressed_vis, model);
 }
 
-void Mod_SetupNoTexture(void)
-{
-       int x, y;
-       qbyte pix[16][16][4];
-
-       for (y = 0;y < 16;y++)
-       {
-               for (x = 0;x < 16;x++)
-               {
-                       if ((y < 8) ^ (x < 8))
-                       {
-                               pix[y][x][0] = 128;
-                               pix[y][x][1] = 128;
-                               pix[y][x][2] = 128;
-                               pix[y][x][3] = 255;
-                       }
-                       else
-                       {
-                               pix[y][x][0] = 64;
-                               pix[y][x][1] = 64;
-                               pix[y][x][2] = 64;
-                               pix[y][x][3] = 255;
-                       }
-               }
-       }
-
-       memset(&loadmodel->notexture, 0, sizeof(texture_t));
-       strcpy(loadmodel->notexture.name, "notexture");
-       loadmodel->notexture.width = 16;
-       loadmodel->notexture.height = 16;
-       loadmodel->notexture.flags = 0;
-       loadmodel->notexture.texture = R_LoadTexture(loadmodel->texturepool, "notexture", 16, 16, &pix[0][0][0], TEXTYPE_RGBA, TEXF_MIPMAP);
-}
-
 /*
 =================
 Mod_LoadTextures
@@ -208,36 +208,60 @@ Mod_LoadTextures
 */
 static void Mod_LoadTextures (lump_t *l)
 {
-       int                             i, j, k, num, max, altmax, mtwidth, mtheight, *dofs;
-       miptex_t                *dmiptex;
-       texture_t               *tx, *tx2, *anims[10], *altanims[10];
-       dmiptexlump_t   *m;
-       qbyte                   *data, *mtdata, *data2;
-       char                    name[256];
-
-       Mod_SetupNoTexture();
+       int i, j, k, num, max, altmax, mtwidth, mtheight, *dofs, incomplete;
+       miptex_t *dmiptex;
+       texture_t *tx, *tx2, *anims[10], *altanims[10];
+       dmiptexlump_t *m;
+       qbyte *data, *mtdata;
+       char name[256];
+       qbyte *basepixels, *bumppixels, *nmappixels, *glosspixels, *glowpixels, *maskpixels;
+       int basepixels_width, basepixels_height, bumppixels_width, bumppixels_height;
+       int nmappixels_width, nmappixels_height, glosspixels_width, glosspixels_height;
+       int glowpixels_width, glowpixels_height, maskpixels_width, maskpixels_height;
+       rtexture_t *detailtexture;
+
+       loadmodel->textures = NULL;
 
        if (!l->filelen)
-       {
-               loadmodel->textures = NULL;
                return;
-       }
 
        m = (dmiptexlump_t *)(mod_base + l->fileofs);
 
        m->nummiptex = LittleLong (m->nummiptex);
 
-       loadmodel->numtextures = m->nummiptex;
-       loadmodel->textures = Mem_Alloc(loadmodel->mempool, m->nummiptex * sizeof(*loadmodel->textures));
+       // add two slots for notexture walls and notexture liquids
+       loadmodel->numtextures = m->nummiptex + 2;
+       loadmodel->textures = Mem_Alloc(loadmodel->mempool, loadmodel->numtextures * sizeof(texture_t));
+
+       // fill out all slots with notexture
+       for (i = 0, tx = loadmodel->textures;i < loadmodel->numtextures;i++, tx++)
+       {
+               tx->width = 16;
+               tx->height = 16;
+               tx->texture = r_notexture;
+               tx->shader = &Cshader_wall_lightmap;
+               if (i == loadmodel->numtextures - 1)
+               {
+                       tx->flags = SURF_DRAWTURB | SURF_LIGHTBOTHSIDES;
+                       tx->shader = &Cshader_water;
+               }
+       }
 
        // just to work around bounds checking when debugging with it (array index out of bounds error thing)
        dofs = m->dataofs;
+       // LordHavoc: mostly rewritten map texture loader
        for (i = 0;i < m->nummiptex;i++)
        {
                dofs[i] = LittleLong(dofs[i]);
-               if (dofs[i] == -1)
+               if (dofs[i] == -1 || r_nosurftextures.integer)
                        continue;
                dmiptex = (miptex_t *)((qbyte *)m + dofs[i]);
+
+               // make sure name is no more than 15 characters
+               for (j = 0;dmiptex->name[j] && j < 15;j++)
+                       name[j] = dmiptex->name[j];
+               name[j] = 0;
+
                mtwidth = LittleLong (dmiptex->width);
                mtheight = LittleLong (dmiptex->height);
                mtdata = NULL;
@@ -246,193 +270,267 @@ static void Mod_LoadTextures (lump_t *l)
                {
                        // texture included
                        if (j < 40 || j + mtwidth * mtheight > l->filelen)
-                               Host_Error ("Texture %s is corrupt or incomplete\n", dmiptex->name);
+                       {
+                               Con_Printf ("Texture \"%s\" in \"%s\"is corrupt or incomplete\n", dmiptex->name, loadmodel->name);
+                               continue;
+                       }
                        mtdata = (qbyte *)dmiptex + j;
                }
 
                if ((mtwidth & 15) || (mtheight & 15))
-                       Host_Error ("Texture %s is not 16 aligned", dmiptex->name);
-               // LordHavoc: rewriting the map texture loader for GLQuake
-               tx = Mem_Alloc(loadmodel->mempool, sizeof(texture_t));
-               memset(tx, 0, sizeof(texture_t));
-               tx->anim_total = 0;
-               tx->alternate_anims = NULL;
-               loadmodel->textures[i] = tx;
-
-               // LordHavoc: force all names to lowercase and make sure they are terminated while copying
-               for (j = 0;dmiptex->name[j] && j < 15;j++)
-               {
-                       if (dmiptex->name[j] >= 'A' && dmiptex->name[j] <= 'Z')
-                               tx->name[j] = dmiptex->name[j] + ('a' - 'A');
-                       else
-                               tx->name[j] = dmiptex->name[j];
-               }
-               for (;j < 16;j++)
-                       tx->name[j] = 0;
+                       Con_Printf ("warning: texture \"%s\" in \"%s\" is not 16 aligned", dmiptex->name, loadmodel->name);
+
+               // LordHavoc: force all names to lowercase
+               for (j = 0;name[j];j++)
+                       if (name[j] >= 'A' && name[j] <= 'Z')
+                               name[j] += 'a' - 'A';
+
+               tx = loadmodel->textures + i;
+               strcpy(tx->name, name);
+               tx->width = mtwidth;
+               tx->height = mtheight;
 
                if (!tx->name[0])
                {
-                       Con_Printf("warning: unnamed texture in %s\n", loadmodel->name);
                        sprintf(tx->name, "unnamed%i", i);
+                       Con_Printf("warning: unnamed texture in %s, renaming to %s\n", loadmodel->name, tx->name);
                }
 
-               tx->width = mtwidth;
-               tx->height = mtheight;
-               tx->texture = NULL;
-               tx->glowtexture = NULL;
-               tx->fogtexture = NULL;
+               basepixels = NULL;basepixels_width = 0;basepixels_height = 0;
+               bumppixels = NULL;bumppixels_width = 0;bumppixels_height = 0;
+               nmappixels = NULL;nmappixels_width = 0;nmappixels_height = 0;
+               glosspixels = NULL;glosspixels_width = 0;glosspixels_height = 0;
+               glowpixels = NULL;glowpixels_width = 0;glowpixels_height = 0;
+               maskpixels = NULL;maskpixels_width = 0;maskpixels_height = 0;
+               detailtexture = NULL;
 
-               if (!loadmodel->ishlbsp && !strncmp(tx->name,"sky",3) && mtwidth == 256 && mtheight == 128) // LordHavoc: HL sky textures are entirely unrelated
+               // LordHavoc: HL sky textures are entirely different than quake
+               if (!loadmodel->ishlbsp && !strncmp(tx->name, "sky", 3) && mtwidth == 256 && mtheight == 128)
                {
-                       data = loadimagepixels(tx->name, false, 0, 0);
-                       if (data)
+                       if (loadmodel->isworldmodel)
                        {
-                               if (image_width == 256 && image_height == 128)
+                               data = loadimagepixels(tx->name, false, 0, 0);
+                               if (data)
                                {
-                                       if (loadmodel->isworldmodel)
-                                               R_InitSky (data, 4);
-                                       Mem_Free(data);
-                               }
-                               else
-                               {
-                                       Mem_Free(data);
-                                       Host_Error("Mod_LoadTextures: replacement sky image must be 256x128 pixels\n");
+                                       if (image_width == 256 && image_height == 128)
+                                       {
+                                               R_InitSky (data, 4);
+                                               Mem_Free(data);
+                                       }
+                                       else
+                                       {
+                                               Mem_Free(data);
+                                               Con_Printf ("Invalid replacement texture for sky \"%s\" in %\"%s\", must be 256x128 pixels\n", tx->name, loadmodel->name);
+                                               if (mtdata != NULL)
+                                                       R_InitSky (mtdata, 1);
+                                       }
                                }
+                               else if (mtdata != NULL)
+                                       R_InitSky (mtdata, 1);
                        }
-                       else if (loadmodel->isworldmodel)
-                               R_InitSky (mtdata, 1);
-               }
-               else if ((tx->texture = loadtextureimagewithmask(loadmodel->texturepool, tx->name, 0, 0, false, true, true)))
-               {
-                       tx->fogtexture = image_masktex;
-                       strcpy(name, tx->name);
-                       strcat(name, "_glow");
-                       tx->glowtexture = loadtextureimage(loadmodel->texturepool, name, 0, 0, false, true, true);
                }
                else
                {
-                       if (loadmodel->ishlbsp)
+                       if ((basepixels = loadimagepixels(tx->name, false, 0, 0)) != NULL)
                        {
-                               if (mtdata && (data = W_ConvertWAD3Texture(dmiptex)))
+                               basepixels_width = image_width;
+                               basepixels_height = image_height;
+                       }
+                       // _luma is supported for tenebrae compatibility
+                       // (I think it's a very stupid name, but oh well)
+                       if ((glowpixels = loadimagepixels(va("%s_glow", tx->name), false, 0, 0)) != NULL
+                        || (glowpixels = loadimagepixels(va("%s_luma", tx->name), false, 0, 0)) != NULL)
+                       {
+                               glowpixels_width = image_width;
+                               glowpixels_height = image_height;
+                       }
+                       if ((bumppixels = loadimagepixels(va("%s_bump", tx->name), false, 0, 0)) != NULL)
+                       {
+                               bumppixels_width = image_width;
+                               bumppixels_height = image_height;
+                       }
+                       if ((glosspixels = loadimagepixels(va("%s_gloss", tx->name), false, 0, 0)) != NULL)
+                       {
+                               glosspixels_width = image_width;
+                               glosspixels_height = image_height;
+                       }
+                       if (!basepixels)
+                       {
+                               if (loadmodel->ishlbsp)
                                {
-                                       // texture included
-                                       tx->texture = R_LoadTexture (loadmodel->texturepool, tx->name, image_width, image_height, data, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE);
-                                       if (R_TextureHasAlpha(tx->texture))
+                                       // internal texture overrides wad
+                                       if (mtdata && (basepixels = W_ConvertWAD3Texture(dmiptex)) != NULL)
                                        {
-                                               // make mask texture
-                                               for (j = 0;j < image_width * image_height;j++)
-                                                       data[j*4+0] = data[j*4+1] = data[j*4+2] = 255;
-                                               strcpy(name, tx->name);
-                                               strcat(name, "_fog");
-                                               tx->fogtexture = R_LoadTexture (loadmodel->texturepool, name, image_width, image_height, data, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE);
+                                               basepixels_width = image_width;
+                                               basepixels_height = image_height;
                                        }
-                                       Mem_Free(data);
-                               }
-                               else if ((data = W_GetTexture(tx->name)))
-                               {
-                                       // get the size from the wad texture
-                                       tx->width = image_width;
-                                       tx->height = image_height;
-                                       tx->texture = R_LoadTexture (loadmodel->texturepool, tx->name, image_width, image_height, data, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE);
-                                       if (R_TextureHasAlpha(tx->texture))
+                                       else if ((basepixels = W_GetTexture(tx->name)) != NULL)
                                        {
-                                               // make mask texture
-                                               for (j = 0;j < image_width * image_height;j++)
-                                                       data[j*4+0] = data[j*4+1] = data[j*4+2] = 255;
-                                               strcpy(name, tx->name);
-                                               strcat(name, "_fog");
-                                               tx->fogtexture = R_LoadTexture (loadmodel->texturepool, name, image_width, image_height, data, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE);
+                                               // get the size from the wad texture
+                                               tx->width = basepixels_width = image_width;
+                                               tx->height = basepixels_height = image_height;
                                        }
-                                       Mem_Free(data);
                                }
                                else
                                {
-                                       tx->width = 16;
-                                       tx->height = 16;
-                                       tx->texture = loadmodel->notexture.texture;
-                               }
-                       }
-                       else
-                       {
-                               if (mtdata) // texture included
-                               {
-                                       int fullbrights;
-                                       data = mtdata;
-                                       fullbrights = false;
-                                       if (r_fullbrights.value && tx->name[0] != '*')
+                                       if (mtdata) // texture included
                                        {
-                                               for (j = 0;j < tx->width*tx->height;j++)
+                                               if (r_fullbrights.integer && tx->name[0] != '*')
                                                {
-                                                       if (data[j] >= 224) // fullbright
+                                                       basepixels_width = tx->width;
+                                                       basepixels_height = tx->height;
+                                                       basepixels = Mem_Alloc(loadmodel->mempool, basepixels_width * basepixels_height * 4);
+                                                       Image_Copy8bitRGBA(mtdata, basepixels, basepixels_width * basepixels_height, palette_nofullbrights);
+                                                       if (!glowpixels)
                                                        {
-                                                               fullbrights = true;
-                                                               break;
+                                                               for (j = 0;j < tx->width*tx->height;j++)
+                                                                       if (((qbyte *)&palette_onlyfullbrights[mtdata[j]])[3] > 0) // fullbright
+                                                                               break;
+                                                               if (j < tx->width * tx->height)
+                                                               {
+                                                                       glowpixels_width = tx->width;
+                                                                       glowpixels_height = tx->height;
+                                                                       glowpixels = Mem_Alloc(loadmodel->mempool, glowpixels_width * glowpixels_height * 4);
+                                                                       Image_Copy8bitRGBA(mtdata, glowpixels, glowpixels_width * glowpixels_height, palette_onlyfullbrights);
+                                                               }
                                                        }
                                                }
+                                               else
+                                               {
+                                                       basepixels_width = tx->width;
+                                                       basepixels_height = tx->height;
+                                                       basepixels = Mem_Alloc(loadmodel->mempool, basepixels_width * basepixels_height * 4);
+                                                       Image_Copy8bitRGBA(mtdata, basepixels, tx->width * tx->height, palette_complete);
+                                               }
                                        }
-                                       if (fullbrights)
-                                       {
-                                               data2 = Mem_Alloc(loadmodel->mempool, tx->width*tx->height);
-                                               for (j = 0;j < tx->width*tx->height;j++)
-                                                       data2[j] = data[j] >= 224 ? 0 : data[j]; // no fullbrights
-                                               tx->texture = R_LoadTexture (loadmodel->texturepool, tx->name, tx->width, tx->height, data2, TEXTYPE_QPALETTE, TEXF_MIPMAP | TEXF_PRECACHE);
-                                               strcpy(name, tx->name);
-                                               strcat(name, "_glow");
-                                               for (j = 0;j < tx->width*tx->height;j++)
-                                                       data2[j] = data[j] >= 224 ? data[j] : 0; // only fullbrights
-                                               tx->glowtexture = R_LoadTexture (loadmodel->texturepool, name, tx->width, tx->height, data2, TEXTYPE_QPALETTE, TEXF_MIPMAP | TEXF_PRECACHE);
-                                               Mem_Free(data2);
-                                       }
-                                       else
-                                               tx->texture = R_LoadTexture (loadmodel->texturepool, tx->name, tx->width, tx->height, data, TEXTYPE_QPALETTE, TEXF_MIPMAP | TEXF_PRECACHE);
                                }
-                               else // no texture, and no external replacement texture was found
+                       }
+               }
+
+               if (basepixels)
+               {
+                       for (j = 3;j < basepixels_width * basepixels_height * 4;j += 4)
+                               if (basepixels[j] < 255)
+                                       break;
+                       if (j < basepixels_width * basepixels_height * 4)
+                       {
+                               maskpixels = Mem_Alloc(loadmodel->mempool, basepixels_width * basepixels_height * 4);
+                               maskpixels_width = basepixels_width;
+                               maskpixels_height = basepixels_height;
+                               for (j = 0;j < basepixels_width * basepixels_height * 4;j += 4)
                                {
-                                       tx->width = 16;
-                                       tx->height = 16;
-                                       tx->texture = loadmodel->notexture.texture;
+                                       maskpixels[j+0] = 255;
+                                       maskpixels[j+1] = 255;
+                                       maskpixels[j+2] = 255;
+                                       maskpixels[j+3] = basepixels[j+3];
                                }
                        }
+
+                       if (!bumppixels)
+                       {
+                               bumppixels = Mem_Alloc(loadmodel->mempool, basepixels_width * basepixels_height * 4);
+                               bumppixels_width = basepixels_width;
+                               bumppixels_height = basepixels_height;
+                               memcpy(bumppixels, basepixels, bumppixels_width * bumppixels_height * 4);
+                       }
+
+                       if (!nmappixels && bumppixels)
+                       {
+                               nmappixels = Mem_Alloc(loadmodel->mempool, bumppixels_width * bumppixels_height * 4);
+                               nmappixels_width = bumppixels_width;
+                               nmappixels_height = bumppixels_height;
+                               Image_HeightmapToNormalmap(bumppixels, nmappixels, nmappixels_width, nmappixels_height, false, 1);
+                       }
+               }
+
+               if (!detailtexture)
+                       detailtexture = detailtextures[i % NUM_DETAILTEXTURES];
+
+               if (basepixels)
+               {
+                       tx->texture = R_LoadTexture2D (loadmodel->texturepool, tx->name, basepixels_width, basepixels_height, basepixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
+                       if (nmappixels)
+                               tx->nmaptexture = R_LoadTexture2D (loadmodel->texturepool, va("%s_nmap", tx->name), basepixels_width, basepixels_height, nmappixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
+                       if (glosspixels)
+                               tx->glosstexture = R_LoadTexture2D (loadmodel->texturepool, va("%s_gloss", tx->name), glosspixels_width, glosspixels_height, glosspixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
+                       if (glowpixels)
+                               tx->glowtexture = R_LoadTexture2D (loadmodel->texturepool, va("%s_glow", tx->name), glowpixels_width, glowpixels_height, glowpixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
+                       if (maskpixels)
+                               tx->fogtexture = R_LoadTexture2D (loadmodel->texturepool, va("%s_mask", tx->name), maskpixels_width, maskpixels_height, maskpixels, TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_ALPHA | TEXF_PRECACHE, NULL);
+                       tx->detailtexture = detailtexture;
+               }
+               else
+               {
+                       // no texture found
+                       tx->width = 16;
+                       tx->height = 16;
+                       tx->texture = r_notexture;
+                       tx->nmaptexture = NULL;
+                       tx->glosstexture = NULL;
+                       tx->glowtexture = NULL;
+                       tx->fogtexture = NULL;
+                       tx->detailtexture = NULL;
                }
 
+               if (basepixels)
+                       Mem_Free(basepixels);
+               if (bumppixels)
+                       Mem_Free(bumppixels);
+               if (nmappixels)
+                       Mem_Free(nmappixels);
+               if (glosspixels)
+                       Mem_Free(glosspixels);
+               if (glowpixels)
+                       Mem_Free(glowpixels);
+               if (maskpixels)
+                       Mem_Free(maskpixels);
+
                if (tx->name[0] == '*')
                {
-                       tx->flags |= (SURF_DRAWTURB | SURF_LIGHTBOTHSIDES);
+                       tx->flags |= SURF_DRAWTURB | SURF_LIGHTBOTHSIDES;
                        // LordHavoc: some turbulent textures should be fullbright and solid
                        if (!strncmp(tx->name,"*lava",5)
                         || !strncmp(tx->name,"*teleport",9)
                         || !strncmp(tx->name,"*rift",5)) // Scourge of Armagon texture
-                               tx->flags |= (SURF_DRAWFULLBRIGHT | SURF_DRAWNOALPHA | SURF_CLIPSOLID);
+                               tx->flags |= SURF_DRAWFULLBRIGHT | SURF_DRAWNOALPHA;
+                       else
+                               tx->flags |= SURF_WATERALPHA;
+                       tx->shader = &Cshader_water;
                }
                else if (tx->name[0] == 's' && tx->name[1] == 'k' && tx->name[2] == 'y')
-                       tx->flags |= (SURF_DRAWSKY | SURF_CLIPSOLID);
+               {
+                       tx->flags |= SURF_DRAWSKY;
+                       tx->shader = &Cshader_sky;
+               }
                else
                {
                        tx->flags |= SURF_LIGHTMAP;
-                       if (!R_TextureHasAlpha(tx->texture))
-                               tx->flags |= SURF_CLIPSOLID;
+                       if (!tx->fogtexture)
+                               tx->flags |= SURF_SHADOWCAST | SURF_SHADOWLIGHT;
+                       tx->shader = &Cshader_wall_lightmap;
                }
+
+               // start out with no animation
+               tx->currentframe[0] = tx;
+               tx->currentframe[1] = tx;
        }
 
-//
-// sequence the animations
-//
+       // sequence the animations
        for (i = 0;i < m->nummiptex;i++)
        {
-               tx = loadmodel->textures[i];
-               if (!tx || tx->name[0] != '+')
+               tx = loadmodel->textures + i;
+               if (!tx || tx->name[0] != '+' || tx->name[1] == 0 || tx->name[2] == 0)
                        continue;
-               if (tx->anim_total)
+               if (tx->anim_total[0] || tx->anim_total[1])
                        continue;       // already sequenced
 
                // find the number of frames in the animation
                memset (anims, 0, sizeof(anims));
                memset (altanims, 0, sizeof(altanims));
-               max = altmax = 0;
 
                for (j = i;j < m->nummiptex;j++)
                {
-                       tx2 = loadmodel->textures[j];
+                       tx2 = loadmodel->textures + j;
                        if (!tx2 || tx2->name[0] != '+' || strcmp (tx2->name+2, tx->name+2))
                                continue;
 
@@ -442,107 +540,1252 @@ static void Mod_LoadTextures (lump_t *l)
                        else if (num >= 'a' && num <= 'j')
                                altanims[num - 'a'] = tx2;
                        else
-                               Host_Error ("Bad animating texture %s", tx->name);
+                               Con_Printf ("Bad animating texture %s\n", tx->name);
                }
 
+               max = altmax = 0;
                for (j = 0;j < 10;j++)
                {
-                       if (anims[j] != NULL)
+                       if (anims[j])
                                max = j + 1;
-                       if (altanims[j] != NULL)
+                       if (altanims[j])
                                altmax = j + 1;
                }
+               //Con_Printf("linking animation %s (%i:%i frames)\n\n", tx->name, max, altmax);
 
-               // link them all together
+               incomplete = false;
+               for (j = 0;j < max;j++)
+               {
+                       if (!anims[j])
+                       {
+                               Con_Printf ("Missing frame %i of %s\n", j, tx->name);
+                               incomplete = true;
+                       }
+               }
+               for (j = 0;j < altmax;j++)
+               {
+                       if (!altanims[j])
+                       {
+                               Con_Printf ("Missing altframe %i of %s\n", j, tx->name);
+                               incomplete = true;
+                       }
+               }
+               if (incomplete)
+                       continue;
+
+               if (altmax < 1)
+               {
+                       // if there is no alternate animation, duplicate the primary
+                       // animation into the alternate
+                       altmax = max;
+                       for (k = 0;k < 10;k++)
+                               altanims[k] = anims[k];
+               }
+
+               // link together the primary animation
                for (j = 0;j < max;j++)
                {
                        tx2 = anims[j];
-                       if (!tx2)
-                               Host_Error ("Missing frame %i of %s", j, tx->name);
-                       tx2->anim_total = max;
-                       tx2->alternate_anims = altanims[0]; // NULL if there is no alternate
+                       tx2->animated = true;
+                       tx2->anim_total[0] = max;
+                       tx2->anim_total[1] = altmax;
                        for (k = 0;k < 10;k++)
-                               tx2->anim_frames[k] = anims[k];
+                       {
+                               tx2->anim_frames[0][k] = anims[k];
+                               tx2->anim_frames[1][k] = altanims[k];
+                       }
                }
 
-               for (j = 0;j < altmax;j++)
+               // if there really is an alternate anim...
+               if (anims[0] != altanims[0])
+               {
+                       // link together the alternate animation
+                       for (j = 0;j < altmax;j++)
+                       {
+                               tx2 = altanims[j];
+                               tx2->animated = true;
+                               // the primary/alternate are reversed here
+                               tx2->anim_total[0] = altmax;
+                               tx2->anim_total[1] = max;
+                               for (k = 0;k < 10;k++)
+                               {
+                                       tx2->anim_frames[0][k] = altanims[k];
+                                       tx2->anim_frames[1][k] = anims[k];
+                               }
+                       }
+               }
+       }
+}
+
+/*
+=================
+Mod_LoadLighting
+=================
+*/
+static void Mod_LoadLighting (lump_t *l)
+{
+       int i;
+       qbyte *in, *out, *data, d;
+       char litfilename[1024];
+       loadmodel->lightdata = NULL;
+       if (loadmodel->ishlbsp) // LordHavoc: load the colored lighting data straight
+       {
+               loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, l->filelen);
+               memcpy (loadmodel->lightdata, mod_base + l->fileofs, l->filelen);
+       }
+       else // LordHavoc: bsp version 29 (normal white lighting)
+       {
+               // LordHavoc: hope is not lost yet, check for a .lit file to load
+               strcpy(litfilename, loadmodel->name);
+               COM_StripExtension(litfilename, litfilename);
+               strcat(litfilename, ".lit");
+               data = (qbyte*) COM_LoadFile (litfilename, false);
+               if (data)
+               {
+                       if (loadsize > 8 && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T')
+                       {
+                               i = LittleLong(((int *)data)[1]);
+                               if (i == 1)
+                               {
+                                       Con_DPrintf("%s loaded", litfilename);
+                                       loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, loadsize - 8);
+                                       memcpy(loadmodel->lightdata, data + 8, loadsize - 8);
+                                       Mem_Free(data);
+                                       return;
+                               }
+                               else
+                               {
+                                       Con_Printf("Unknown .lit file version (%d)\n", i);
+                                       Mem_Free(data);
+                               }
+                       }
+                       else
+                       {
+                               if (loadsize == 8)
+                                       Con_Printf("Empty .lit file, ignoring\n");
+                               else
+                                       Con_Printf("Corrupt .lit file (old version?), ignoring\n");
+                               Mem_Free(data);
+                       }
+               }
+               // LordHavoc: oh well, expand the white lighting data
+               if (!l->filelen)
+                       return;
+               loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, l->filelen*3);
+               in = loadmodel->lightdata + l->filelen*2; // place the file at the end, so it will not be overwritten until the very last write
+               out = loadmodel->lightdata;
+               memcpy (in, mod_base + l->fileofs, l->filelen);
+               for (i = 0;i < l->filelen;i++)
+               {
+                       d = *in++;
+                       *out++ = d;
+                       *out++ = d;
+                       *out++ = d;
+               }
+       }
+}
+
+void Mod_LoadLightList(void)
+{
+       int a, n, numlights;
+       char lightsfilename[1024], *s, *t, *lightsstring;
+       mlight_t *e;
+
+       strcpy(lightsfilename, loadmodel->name);
+       COM_StripExtension(lightsfilename, lightsfilename);
+       strcat(lightsfilename, ".lights");
+       s = lightsstring = (char *) COM_LoadFile (lightsfilename, false);
+       if (s)
+       {
+               numlights = 0;
+               while (*s)
+               {
+                       while (*s && *s != '\n')
+                               s++;
+                       if (!*s)
+                       {
+                               Mem_Free(lightsstring);
+                               Host_Error("lights file must end with a newline\n");
+                       }
+                       s++;
+                       numlights++;
+               }
+               loadmodel->lights = Mem_Alloc(loadmodel->mempool, numlights * sizeof(mlight_t));
+               s = lightsstring;
+               n = 0;
+               while (*s && n < numlights)
+               {
+                       t = s;
+                       while (*s && *s != '\n')
+                               s++;
+                       if (!*s)
+                       {
+                               Mem_Free(lightsstring);
+                               Host_Error("misparsed lights file!\n");
+                       }
+                       e = loadmodel->lights + n;
+                       *s = 0;
+                       a = sscanf(t, "%f %f %f %f %f %f %f %f %f %f %f %f %f %d", &e->origin[0], &e->origin[1], &e->origin[2], &e->falloff, &e->light[0], &e->light[1], &e->light[2], &e->subtract, &e->spotdir[0], &e->spotdir[1], &e->spotdir[2], &e->spotcone, &e->distbias, &e->style);
+                       *s = '\n';
+                       if (a != 14)
+                       {
+                               Mem_Free(lightsstring);
+                               Host_Error("invalid lights file, found %d parameters on line %i, should be 14 parameters (origin[0] origin[1] origin[2] falloff light[0] light[1] light[2] subtract spotdir[0] spotdir[1] spotdir[2] spotcone distancebias style)\n", a, n + 1);
+                       }
+                       s++;
+                       n++;
+               }
+               if (*s)
+               {
+                       Mem_Free(lightsstring);
+                       Host_Error("misparsed lights file!\n");
+               }
+               loadmodel->numlights = numlights;
+               Mem_Free(lightsstring);
+       }
+}
+
+
+
+/*
+// svbspmesh_t is in model_brush.h
+
+typedef struct svbsppolygon_s
+{
+       struct svbsppolygon_s *next;
+       int numverts;
+       float *verts;
+       float normal[3], dist;
+}
+svbsppolygon_t;
+
+typedef struct svbspnode_s
+{
+       // true if this is a leaf (has no children), not a node
+       int isleaf;
+       // (shared) parent node
+       struct svbspnode_s *parent;
+       // (leaf) dark or lit leaf
+       int dark;
+       // (leaf) polygons bounding this leaf
+       svbsppolygon_t *polygons;
+       // (node) children
+       struct svbspnode_s *children[2];
+       // (node) splitting plane
+       float normal[3], dist;
+}
+svbspnode_t;
+
+svbspnode_t *Mod_SVBSP_AllocNode(svbspnode_t *parent, svbspnode_t *child0, svbspnode_t *child1, float *normal, float dist)
+{
+       svbspnode_t *node;
+       node = Mem_Alloc(loadmodel->mempool, sizeof(svbspnode_t));
+       node->parent = parent;
+       node->children[0] = child0;
+       node->children[1] = child1;
+       VectorCopy(normal, node->normal);
+       node->dist = dist;
+       return node;
+}
+
+svbspnode_t *Mod_SVBSP_AllocLeaf(svbspnode_t *parent, int dark)
+{
+       svbspnode_t *leaf;
+       leaf = Mem_Alloc(loadmodel->mempool, sizeof(svbspnode_t));
+       leaf->isleaf = true;
+       leaf->parent = parent;
+       leaf->dark = dark;
+       return leaf;
+}
+
+svbspnode_t *Mod_SVBSP_NewTree(void)
+{
+       return Mod_SVBSP_AllocLeaf(NULL, false);
+}
+
+void Mod_SVBSP_FreeTree(svbspnode_t *node)
+{
+       if (!node->isleaf)
+       {
+               Mod_SVBSP_FreeTree(node->children[0]);
+               Mod_SVBSP_FreeTree(node->children[1]);
+       }
+       Mem_Free(node);
+}
+
+void Mod_SVBSP_RecursiveAddPolygon(svbspnode_t *node, int numverts, float *verts, float *normal, float dist, int constructmode)
+{
+       int i, j, numvertsfront, numvertsback, maxverts, counts[3];
+       float *vertsfront, *vertsback, *v, d, temp[3];
+       float dists[4096];
+       qbyte sides[4096];
+       svbsppolygon_t *poly;
+       if (node->isleaf)
+       {
+               if (constructmode == 0)
+               {
+                       // construct tree structure
+                       node->isleaf = false;
+                       node->children[0] = Mod_SVBSP_AllocLeaf(node, false);
+                       node->children[1] = Mod_SVBSP_AllocLeaf(node, false);
+                       VectorCopy(normal, node->normal);
+                       node->dist = dist;
+               }
+               else if (constructmode == 1)
+               {
+                       // mark dark leafs
+                       node->dark = true;
+               }
+               else
+               {
+                       // link polygons into lit leafs only (this is the optimization)
+                       if (!node->dark)
+                       {
+                               poly = Mem_Alloc(loadmodel->mempool, sizeof(svbsppolygon_t) + numverts * sizeof(float[3]));
+                               poly->numverts = numverts;
+                               poly->verts = (float *)(poly + 1);
+                               VectorCopy(normal, poly->normal);
+                               poly->dist = dist;
+                               memcpy(poly->verts, verts, numverts * sizeof(float[3]));
+                               poly->next = node->polygons;
+                               node->polygons = poly;
+                       }
+               }
+       }
+       else
+       {
+               counts[SIDE_FRONT] = counts[SIDE_BACK] = counts[SIDE_ON] = 0;
+               for (i = 0, v = verts;i < numverts;i++, v += 3)
+               {
+                       dists[i] = DotProduct(v, node->normal) - node->dist;
+                       if (dists[i] >= 0.1)
+                               sides[i] = SIDE_FRONT;
+                       else if (dists[i] <= -0.1)
+                               sides[i] = SIDE_BACK;
+                       else
+                               sides[i] = SIDE_ON;
+                       counts[sides[i]]++;
+               }
+               if (counts[SIDE_FRONT] && counts[SIDE_BACK])
+               {
+                       // some front, some back...  sliced
+                       numvertsfront = 0;
+                       numvertsback = 0;
+                       // this is excessive, but nice for safety...
+                       maxverts = numverts + 4;
+                       vertsfront = Mem_Alloc(loadmodel->mempool, maxverts * sizeof(float[3]));
+                       vertsback = Mem_Alloc(loadmodel->mempool, maxverts * sizeof(float[3]));
+                       for (i = 0, j = numverts - 1;i < numverts;j = i, i++)
+                       {
+                               if (sides[j] == SIDE_FRONT)
+                               {
+                                       VectorCopy(&verts[j * 3], &vertsfront[numvertsfront * 3]);
+                                       numvertsfront++;
+                                       if (sides[i] == SIDE_BACK)
+                                       {
+                                               d = dists[j] / (dists[j] - dists[i]);
+                                               VectorSubtract(&verts[i * 3], &verts[j * 3], temp);
+                                               VectorMA(&verts[j * 3], d, temp, temp);
+                                               VectorCopy(temp, &vertsfront[numvertsfront * 3]);
+                                               VectorCopy(temp, &vertsback[numvertsback * 3]);
+                                               numvertsfront++;
+                                               numvertsback++;
+                                       }
+                               }
+                               else if (sides[j] == SIDE_BACK)
+                               {
+                                       VectorCopy(&verts[j * 3], &vertsback[numvertsback * 3]);
+                                       numvertsback++;
+                                       if (sides[i] == SIDE_FRONT)
+                                       {
+                                               d = dists[j] / (dists[j] - dists[i]);
+                                               VectorSubtract(&verts[i * 3], &verts[j * 3], temp);
+                                               VectorMA(&verts[j * 3], d, temp, temp);
+                                               VectorCopy(temp, &vertsfront[numvertsfront * 3]);
+                                               VectorCopy(temp, &vertsback[numvertsback * 3]);
+                                               numvertsfront++;
+                                               numvertsback++;
+                                       }
+                               }
+                               else
+                               {
+                                       VectorCopy(&verts[j * 3], &vertsfront[numvertsfront * 3]);
+                                       VectorCopy(&verts[j * 3], &vertsback[numvertsback * 3]);
+                                       numvertsfront++;
+                                       numvertsback++;
+                               }
+                       }
+                       Mod_SVBSP_RecursiveAddPolygon(node->children[1], numvertsfront, vertsfront, normal, dist, constructmode);
+                       Mod_SVBSP_RecursiveAddPolygon(node->children[0], numvertsback, vertsback, normal, dist, constructmode);
+                       Mem_Free(vertsfront);
+                       Mem_Free(vertsback);
+               }
+               else if (counts[SIDE_BACK])
+                       Mod_SVBSP_RecursiveAddPolygon(node->children[0], numverts, verts, normal, dist, constructmode);
+               else if (counts[SIDE_FRONT])
+                       Mod_SVBSP_RecursiveAddPolygon(node->children[1], numverts, verts, normal, dist, constructmode);
+               else
+               {
+                       // mode 0 is constructing tree, don't make unnecessary splits
+                       if (constructmode == 1)
+                       {
+                               // marking dark leafs
+                               // send it down the side it is not facing
+                               Mod_SVBSP_RecursiveAddPolygon(node->children[DotProduct(node->normal, normal) < 0], numverts, verts, normal, dist, constructmode);
+                       }
+                       else if (constructmode == 2)
+                       {
+                               // linking polygons into lit leafs only
+                               // send it down the side it is facing
+                               Mod_SVBSP_RecursiveAddPolygon(node->children[DotProduct(node->normal, normal) >= 0], numverts, verts, normal, dist, constructmode);
+                       }
+               }
+       }
+}
+
+int svbsp_count_nodes;
+int svbsp_count_leafs;
+int svbsp_count_polygons;
+int svbsp_count_darkleafs;
+int svbsp_count_originalpolygons;
+int svbsp_count_meshs;
+int svbsp_count_triangles;
+int svbsp_count_vertices;
+
+void Mod_SVBSP_AddPolygon(svbspnode_t *root, int numverts, float *verts, int constructmode, float *test, int linenumber)
+{
+       int i;
+       float normal[3], dist, dir0[3], dir1[3], *v0, *v1, *v2;
+       svbsp_count_originalpolygons++;
+       for (i = 0, v0 = verts + (numverts - 2) * 3, v1 = verts + (numverts - 1) * 3, v2 = verts;i < numverts;i++, v0 = v1, v1 = v2, v2 += 3)
+       {
+               VectorSubtract(v0, v1, dir0);
+               VectorSubtract(v2, v1, dir1);
+               CrossProduct(dir0, dir1, normal);
+               if (DotProduct(normal, normal) >= 0.1)
+                       break;
+       }
+       if (i == numverts)
+               return;
+       VectorNormalize(normal);
+       dist = DotProduct(verts, normal);
+       if (test && DotProduct(test, normal) > dist + 0.1)
+               Con_Printf("%i %f %f %f %f : %f %f %f %f\n", linenumber, normal[0], normal[1], normal[2], dist, test[0], test[1], test[2], DotProduct(test, normal));
+       Mod_SVBSP_RecursiveAddPolygon(root, numverts, verts, normal, dist, constructmode);
+}
+
+void Mod_SVBSP_RecursiveGatherStats(svbspnode_t *node)
+{
+       svbsppolygon_t *poly;
+       for (poly = node->polygons;poly;poly = poly->next)
+               svbsp_count_polygons++;
+       if (node->isleaf)
+       {
+               svbsp_count_leafs++;
+               if (node->dark)
+                       svbsp_count_darkleafs++;
+       }
+       else
+       {
+               svbsp_count_nodes++;
+               Mod_SVBSP_RecursiveGatherStats(node->children[0]);
+               Mod_SVBSP_RecursiveGatherStats(node->children[1]);
+       }
+}
+
+svbspmesh_t *Mod_SVBSP_AllocMesh(int maxverts)
+{
+       svbspmesh_t *mesh;
+       mesh = Mem_Alloc(loadmodel->mempool, sizeof(svbspmesh_t) + maxverts * sizeof(float[4]) + maxverts * sizeof(int[3]));
+       mesh->maxverts = maxverts;
+       mesh->maxtriangles = maxverts;
+       mesh->numverts = 0;
+       mesh->numtriangles = 0;
+       mesh->verts = (float *)(mesh + 1);
+       mesh->elements = (int *)(mesh->verts + mesh->maxverts * 4);
+       return mesh;
+}
+
+svbspmesh_t *Mod_SVBSP_ReAllocMesh(svbspmesh_t *oldmesh)
+{
+       svbspmesh_t *newmesh;
+       newmesh = Mem_Alloc(loadmodel->mempool, sizeof(svbspmesh_t) + oldmesh->numverts * sizeof(float[4]) + oldmesh->numtriangles * sizeof(int[3]));
+       newmesh->maxverts = newmesh->numverts = oldmesh->numverts;
+       newmesh->maxtriangles = newmesh->numtriangles = oldmesh->numtriangles;
+       newmesh->verts = (float *)(newmesh + 1);
+       newmesh->elements = (int *)(newmesh->verts + newmesh->maxverts * 4);
+       memcpy(newmesh->verts, oldmesh->verts, newmesh->numverts * sizeof(float[4]));
+       memcpy(newmesh->elements, oldmesh->elements, newmesh->numtriangles * sizeof(int[3]));
+       return newmesh;
+}
+
+void Mod_SVBSP_RecursiveBuildTriangleMeshs(svbspmesh_t *firstmesh, svbspnode_t *node)
+{
+       svbsppolygon_t *poly;
+       svbspmesh_t *mesh;
+       int i, j, k;
+       float *v, *m, temp[3];
+       if (node->isleaf)
+       {
+               for (poly = node->polygons;poly;poly = poly->next)
+               {
+                       mesh = firstmesh;
+                       while (poly->numverts + mesh->numverts > mesh->maxverts || (poly->numverts - 2) + mesh->numtriangles > mesh->maxtriangles)
+                       {
+                               if (mesh->next == NULL)
+                                       mesh->next = Mod_SVBSP_AllocMesh(max(1000, poly->numverts));
+                               mesh = mesh->next;
+                       }
+                       for (i = 0, v = poly->verts;i < poly->numverts - 2;i++, v += 3)
+                       {
+                               for (k = 0;k < 3;k++)
+                               {
+                                       if (k == 0)
+                                               v = poly->verts;
+                                       else if (k == 1)
+                                               v = poly->verts + (i + 1) * 3;
+                                       else if (k == 2)
+                                               v = poly->verts + (i + 2) * 3;
+                                       for (j = 0, m = mesh->verts;j < mesh->numverts;j++, m += 4)
+                                       {
+                                               VectorSubtract(v, m, temp);
+                                               if (DotProduct(temp, temp) < 0.1)
+                                                       break;
+                                       }
+                                       if (j == mesh->numverts)
+                                       {
+                                               mesh->numverts++;
+                                               VectorCopy(v, m);
+                                       }
+                                       mesh->elements[mesh->numtriangles * 3 + k] = j;
+                               }
+                               mesh->numtriangles++;
+                       }
+               }
+       }
+       else
+       {
+               Mod_SVBSP_RecursiveBuildTriangleMeshs(firstmesh, node->children[0]);
+               Mod_SVBSP_RecursiveBuildTriangleMeshs(firstmesh, node->children[1]);
+       }
+}
+
+svbspmesh_t *Mod_SVBSP_BuildTriangleMeshs(svbspnode_t *root, vec3_t mins, vec3_t maxs)
+{
+       svbspmesh_t *firstmesh, *mesh, *newmesh, *nextmesh;
+       int i;
+       float *v;
+       firstmesh = Mod_SVBSP_AllocMesh(1000);
+       Mod_SVBSP_RecursiveBuildTriangleMeshs(firstmesh, root);
+       // reallocate meshs to conserve space
+       for (mesh = firstmesh, firstmesh = NULL;mesh;mesh = nextmesh)
+       {
+               svbsp_count_meshs++;
+               svbsp_count_triangles += mesh->numtriangles;
+               svbsp_count_vertices += mesh->numverts;
+
+               // calculate bbox
+               if (firstmesh == NULL)
+               {
+                       VectorCopy(mesh->verts, mins);
+                       VectorCopy(mesh->verts, maxs);
+               }
+               for (i = 0, v = mesh->verts;i < mesh->numverts;i++, v += 4)
+               {
+                       if (mins[0] > v[0]) mins[0] = v[0];if (maxs[0] < v[0]) maxs[0] = v[0];
+                       if (mins[1] > v[1]) mins[1] = v[1];if (maxs[1] < v[1]) maxs[1] = v[1];
+                       if (mins[2] > v[2]) mins[2] = v[2];if (maxs[2] < v[2]) maxs[2] = v[2];
+               }
+
+               nextmesh = mesh->next;
+               newmesh = Mod_SVBSP_ReAllocMesh(mesh);
+               newmesh->next = firstmesh;
+               firstmesh = newmesh;
+               Mem_Free(mesh);
+       }
+       return firstmesh;
+}
+
+void Mod_SVBSP_FreeTriangleMeshs(svbspmesh_t *mesh)
+{
+       svbspmesh_t *nextmesh;
+       for (;mesh;mesh = nextmesh)
+       {
+               nextmesh = mesh->next;
+               Mem_Free(mesh);
+       }
+}
+*/
+
+typedef struct svpolygon_s
+{
+       struct svpolygon_s *next;
+       int maxverts;
+       int numverts;
+       float *verts;
+       float normal[3], dist;
+}
+svpolygon_t;
+
+typedef struct svbrush_s
+{
+       struct svbrush_s *next;
+       svpolygon_t *polygons;
+       vec3_t mins, maxs;
+}
+svbrush_t;
+
+typedef struct svworld_s
+{
+       svbrush_t *brushs;
+}
+svworld_t;
+
+svworld_t *Mod_ShadowBrush_NewWorld(mempool_t *mempool)
+{
+       return Mem_Alloc(mempool, sizeof(svworld_t));
+}
+
+void Mod_ShadowBrush_FreeWorld(svworld_t *world)
+{
+       svbrush_t *brush, *brushnext;
+       svpolygon_t *poly, *polynext;
+       for (brush = world->brushs;brush;brush = brushnext)
+       {
+               brushnext = brush->next;
+               for (poly = brush->polygons;poly;poly = polynext)
+               {
+                       polynext = poly->next;
+                       Mem_Free(poly);
+               }
+               Mem_Free(brush);
+       }
+       Mem_Free(world);
+}
+
+svbrush_t *Mod_ShadowBrush_BeginBrush(mempool_t *mempool)
+{
+       return Mem_Alloc(mempool, sizeof(svbrush_t));
+}
+
+void Mod_ShadowBrush_AddPolygon(mempool_t *mempool, svbrush_t *brush, int numverts, float *verts)
+{
+       int i;
+       float normal[3], dist, dir0[3], dir1[3], *v0, *v1, *v2;
+       svpolygon_t *poly;
+       for (i = 0, v0 = verts + (numverts - 2) * 3, v1 = verts + (numverts - 1) * 3, v2 = verts;i < numverts;i++, v0 = v1, v1 = v2, v2 += 3)
+       {
+               VectorSubtract(v0, v1, dir0);
+               VectorSubtract(v2, v1, dir1);
+               CrossProduct(dir0, dir1, normal);
+               if (DotProduct(normal, normal) >= 0.1)
+                       break;
+       }
+       if (i == numverts)
+               return;
+       VectorNormalize(normal);
+       dist = DotProduct(verts, normal);
+
+       poly = Mem_Alloc(mempool, sizeof(svpolygon_t) + numverts * sizeof(float[3]));
+       poly->numverts = numverts;
+       poly->verts = (float *)(poly + 1);
+       VectorCopy(normal, poly->normal);
+       poly->dist = dist;
+       poly->next = brush->polygons;
+       brush->polygons = poly;
+       memcpy(poly->verts, verts, numverts * sizeof(float[3]));
+}
+
+void Mod_ShadowBrush_AddPolygonI(mempool_t *mempool, svbrush_t *brush, int numverts, float *verts)
+{
+       int i;
+       float normal[3], dist, dir0[3], dir1[3], *v0, *v1, *v2;
+       svpolygon_t *poly;
+       for (i = 0, v0 = verts + (numverts - 2) * 3, v1 = verts + (numverts - 1) * 3, v2 = verts;i < numverts;i++, v0 = v1, v1 = v2, v2 += 3)
+       {
+               VectorSubtract(v0, v1, dir0);
+               VectorSubtract(v2, v1, dir1);
+               CrossProduct(dir0, dir1, normal);
+               if (DotProduct(normal, normal) >= 0.1)
+                       break;
+       }
+       if (i == numverts)
+               return;
+       VectorNormalize(normal);
+       dist = DotProduct(verts, normal);
+       VectorNegate(normal, normal);
+       dist = -dist;
+
+       poly = Mem_Alloc(mempool, sizeof(svpolygon_t) + numverts * sizeof(float[3]));
+       poly->numverts = numverts;
+       poly->verts = (float *)(poly + 1);
+       VectorCopy(normal, poly->normal);
+       poly->dist = dist;
+       poly->next = brush->polygons;
+       brush->polygons = poly;
+       for (i = 0, v0 = verts + (numverts - 1) * 3, v1 = poly->verts;i < numverts;i++, v0 -= 3, v1 += 3)
+               VectorCopy(v0, v1);
+}
+
+void Mod_ShadowBrush_EndBrush(svworld_t *world, svbrush_t *brush)
+{
+       int i;
+       float *v;
+       svpolygon_t *poly;
+       if (!brush->polygons)
+       {
+               Mem_Free(brush);
+               return;
+       }
+       brush->next = world->brushs;
+       world->brushs = brush;
+       VectorCopy(brush->polygons->verts, brush->mins);
+       VectorCopy(brush->polygons->verts, brush->maxs);
+       for (poly = brush->polygons;poly;poly = poly->next)
+       {
+               for (i = 0, v = poly->verts;i < poly->numverts;i++, v += 3)
+               {
+                       if (brush->mins[0] > v[0]) brush->mins[0] = v[0];if (brush->maxs[0] < v[0]) brush->maxs[0] = v[0];
+                       if (brush->mins[1] > v[1]) brush->mins[1] = v[1];if (brush->maxs[1] < v[1]) brush->maxs[1] = v[1];
+                       if (brush->mins[2] > v[2]) brush->mins[2] = v[2];if (brush->maxs[2] < v[2]) brush->maxs[2] = v[2];
+               }
+       }
+}
+
+void Mod_ShadowBrush_ProcessWorld(mempool_t *mempool, svworld_t *world)
+{
+       /*
+       for (clipbrush = world->brushs;clipbrush;clipbrush = clipbrush->next)
+       {
+               for (brush = world->brushs;brush;brush = brush->next)
+               {
+                       if (brush != clipbrush
+                        && brush->mins[0] <= clipbrush->maxs[0]
+                        && brush->maxs[0] >= clipbrush->mins[0]
+                        && brush->mins[1] <= clipbrush->maxs[1]
+                        && brush->maxs[1] >= clipbrush->mins[1]
+                        && brush->mins[2] <= clipbrush->maxs[2]
+                        && brush->maxs[2] >= clipbrush->mins[2])
+                               continue;
+                       for (poly = brush->polygons;poly;poly = poly->next)
+                       {
+
+                       }
+               }
+       }
+       */
+}
+
+shadowmesh_t *Mod_ShadowBrush_BuildMeshs(mempool_t *mempool, svworld_t *world)
+{
+       shadowmesh_t *mesh;
+       svbrush_t *brush;
+       svpolygon_t *poly;
+       mesh = Mod_ShadowMesh_Begin(mempool);
+       for (brush = world->brushs;brush;brush = brush->next)
+               for (poly = brush->polygons;poly;poly = poly->next)
+                       Mod_ShadowMesh_AddPolygon(mempool, mesh, poly->numverts, poly->verts);
+       mesh = Mod_ShadowMesh_Finish(mempool, mesh);
+       return mesh;
+}
+
+void Mod_ProcessLightList(void)
+{
+       int j, k, *mark, lnum;
+       mlight_t *e;
+       msurface_t *surf;
+       float dist;
+       mleaf_t *leaf;
+       qbyte *pvs;
+       for (lnum = 0, e = loadmodel->lights;lnum < loadmodel->numlights;lnum++, e++)
+       {
+               e->cullradius2 = DotProduct(e->light, e->light) / (e->falloff * e->falloff * 8192.0f * 8192.0f);// + 4096.0f;
+               if (e->cullradius2 > 4096.0f * 4096.0f)
+                       e->cullradius2 = 4096.0f * 4096.0f;
+               e->cullradius = e->lightradius = sqrt(e->cullradius2);
+               leaf = Mod_PointInLeaf(e->origin, loadmodel);
+               if (leaf->compressed_vis)
+                       pvs = Mod_DecompressVis (leaf->compressed_vis, loadmodel);
+               else
+                       pvs = mod_novis;
+               for (j = 0;j < loadmodel->numsurfaces;j++)
+                       loadmodel->surfacevisframes[j] = -1;
+               for (j = 0, leaf = loadmodel->leafs + 1;j < loadmodel->numleafs - 1;j++, leaf++)
+               {
+                       if (pvs[j >> 3] & (1 << (j & 7)))
+                       {
+                               for (k = 0, mark = leaf->firstmarksurface;k < leaf->nummarksurfaces;k++, mark++)
+                               {
+                                       surf = loadmodel->surfaces + *mark;
+                                       if (surf->number != *mark)
+                                               Con_Printf("%d != %d\n", surf->number, *mark);
+                                       dist = DotProduct(e->origin, surf->plane->normal) - surf->plane->dist;
+                                       if (surf->flags & SURF_PLANEBACK)
+                                               dist = -dist;
+                                       if (dist > 0 && dist < e->cullradius)
+                                               loadmodel->surfacevisframes[*mark] = -2;
+                               }
+                       }
+               }
+               // build list of light receiving surfaces
+               e->numsurfaces = 0;
+               for (j = 0;j < loadmodel->numsurfaces;j++)
+                       if (loadmodel->surfacevisframes[j] == -2)
+                               e->numsurfaces++;
+               e->surfaces = NULL;
+               if (e->numsurfaces > 0)
+               {
+                       e->surfaces = Mem_Alloc(loadmodel->mempool, sizeof(msurface_t *) * e->numsurfaces);
+                       e->numsurfaces = 0;
+                       for (j = 0;j < loadmodel->numsurfaces;j++)
+                               if (loadmodel->surfacevisframes[j] == -2)
+                                       e->surfaces[e->numsurfaces++] = loadmodel->surfaces + j;
+               }
+#if 1
+               {
+               // find bounding box and sphere of lit surfaces
+               // (these will be used for creating a shape to clip the light)
+               float *v, temp[3], radius2;
+               radius2 = 0;
+               for (j = 0;j < e->numsurfaces;j++)
+               {
+                       surf = e->surfaces[j];
+                       if (j == 0)
+                       {
+                               VectorCopy(surf->poly_verts, e->mins);
+                               VectorCopy(surf->poly_verts, e->maxs);
+                       }
+                       for (k = 0, v = surf->poly_verts;k < surf->poly_numverts;k++, v += 3)
+                       {
+                               if (e->mins[0] > v[0]) e->mins[0] = v[0];if (e->maxs[0] < v[0]) e->maxs[0] = v[0];
+                               if (e->mins[1] > v[1]) e->mins[1] = v[1];if (e->maxs[1] < v[1]) e->maxs[1] = v[1];
+                               if (e->mins[2] > v[2]) e->mins[2] = v[2];if (e->maxs[2] < v[2]) e->maxs[2] = v[2];
+                               VectorSubtract(v, e->origin, temp);
+                               dist = DotProduct(temp, temp);
+                               if (radius2 < dist)
+                                       radius2 = dist;
+                       }
+               }
+               if (e->cullradius2 > radius2)
                {
-                       tx2 = altanims[j];
-                       if (!tx2)
-                               Host_Error ("Missing frame %i of %s", j, tx->name);
-                       tx2->anim_total = altmax;
-                       tx2->alternate_anims = anims[0]; // NULL if there is no alternate
-                       for (k = 0;k < 10;k++)
-                               tx2->anim_frames[k] = altanims[k];
+                       e->cullradius2 = radius2;
+                       e->cullradius = sqrt(e->cullradius2);
                }
-       }
-}
-
-/*
-=================
-Mod_LoadLighting
-=================
-*/
-static void Mod_LoadLighting (lump_t *l)
-{
-       int i;
-       qbyte *in, *out, *data, d;
-       char litfilename[1024];
-       loadmodel->lightdata = NULL;
-       if (loadmodel->ishlbsp) // LordHavoc: load the colored lighting data straight
-       {
-               loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, l->filelen);
-               memcpy (loadmodel->lightdata, mod_base + l->fileofs, l->filelen);
-       }
-       else // LordHavoc: bsp version 29 (normal white lighting)
-       {
-               // LordHavoc: hope is not lost yet, check for a .lit file to load
-               strcpy(litfilename, loadmodel->name);
-               COM_StripExtension(litfilename, litfilename);
-               strcat(litfilename, ".lit");
-               data = (qbyte*) COM_LoadFile (litfilename, false);
-               if (data)
+               }
+#endif
+#if 1
+               e->mins[0] = e->origin[0] - e->cullradius;
+               e->maxs[0] = e->origin[0] + e->cullradius;
+               e->mins[1] = e->origin[1] - e->cullradius;
+               e->maxs[1] = e->origin[1] + e->cullradius;
+               e->mins[2] = e->origin[2] - e->cullradius;
+               e->maxs[2] = e->origin[2] + e->cullradius;
+#endif
+#if 1
+               // clip shadow volumes against eachother to remove unnecessary
+               // polygons (and sections of polygons)
                {
-                       if (loadsize > 8 && data[0] == 'Q' && data[1] == 'L' && data[2] == 'I' && data[3] == 'T')
+                       vec3_t temp;
+                       //vec3_t polymins, polymaxs;
+                       int maxverts = 4;
+                       float *verts = Mem_Alloc(loadmodel->mempool, maxverts * sizeof(float[3]));
+                       float f, *v0, *v1, projectdistance;
+                       svworld_t *svworld;
+                       svbrush_t *svbrush;
+
+                       svworld = Mod_ShadowBrush_NewWorld(loadmodel->mempool);
+#if 0
                        {
-                               i = LittleLong(((int *)data)[1]);
-                               if (i == 1)
+                       vec3_t outermins, outermaxs, innermins, innermaxs;
+                       innermins[0] = e->mins[0] - 1;
+                       innermins[1] = e->mins[1] - 1;
+                       innermins[2] = e->mins[2] - 1;
+                       innermaxs[0] = e->maxs[0] + 1;
+                       innermaxs[1] = e->maxs[1] + 1;
+                       innermaxs[2] = e->maxs[2] + 1;
+                       outermins[0] = loadmodel->normalmins[0] - 1;
+                       outermins[1] = loadmodel->normalmins[1] - 1;
+                       outermins[2] = loadmodel->normalmins[2] - 1;
+                       outermaxs[0] = loadmodel->normalmaxs[0] + 1;
+                       outermaxs[1] = loadmodel->normalmaxs[1] + 1;
+                       outermaxs[2] = loadmodel->normalmaxs[2] + 1;
+                       // add bounding box around the whole shadow volume set,
+                       // facing inward to limit light area, with an outer bounding box
+                       // facing outward (this is needed by the shadow rendering method)
+                       // X major
+                       svbrush = Mod_ShadowBrush_BeginBrush(loadmodel->mempool);
+                       verts[ 0] = innermaxs[0];verts[ 1] = innermins[1];verts[ 2] = innermaxs[2];
+                       verts[ 3] = innermaxs[0];verts[ 4] = innermins[1];verts[ 5] = innermins[2];
+                       verts[ 6] = innermaxs[0];verts[ 7] = innermaxs[1];verts[ 8] = innermins[2];
+                       verts[ 9] = innermaxs[0];verts[10] = innermaxs[1];verts[11] = innermaxs[2];
+                       Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, 4, verts);
+                       verts[ 0] = outermaxs[0];verts[ 1] = outermaxs[1];verts[ 2] = outermaxs[2];
+                       verts[ 3] = outermaxs[0];verts[ 4] = outermaxs[1];verts[ 5] = outermins[2];
+                       verts[ 6] = outermaxs[0];verts[ 7] = outermins[1];verts[ 8] = outermins[2];
+                       verts[ 9] = outermaxs[0];verts[10] = outermins[1];verts[11] = outermaxs[2];
+                       Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, 4, verts);
+                       Mod_ShadowBrush_EndBrush(svworld, svbrush);
+                       // X minor
+                       svbrush = Mod_ShadowBrush_BeginBrush(loadmodel->mempool);
+                       verts[ 0] = innermins[0];verts[ 1] = innermaxs[1];verts[ 2] = innermaxs[2];
+                       verts[ 3] = innermins[0];verts[ 4] = innermaxs[1];verts[ 5] = innermins[2];
+                       verts[ 6] = innermins[0];verts[ 7] = innermins[1];verts[ 8] = innermins[2];
+                       verts[ 9] = innermins[0];verts[10] = innermins[1];verts[11] = innermaxs[2];
+                       Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, 4, verts);
+                       verts[ 0] = outermins[0];verts[ 1] = outermins[1];verts[ 2] = outermaxs[2];
+                       verts[ 3] = outermins[0];verts[ 4] = outermins[1];verts[ 5] = outermins[2];
+                       verts[ 6] = outermins[0];verts[ 7] = outermaxs[1];verts[ 8] = outermins[2];
+                       verts[ 9] = outermins[0];verts[10] = outermaxs[1];verts[11] = outermaxs[2];
+                       Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, 4, verts);
+                       Mod_ShadowBrush_EndBrush(svworld, svbrush);
+                       // Y major
+                       svbrush = Mod_ShadowBrush_BeginBrush(loadmodel->mempool);
+                       verts[ 0] = innermaxs[0];verts[ 1] = innermaxs[1];verts[ 2] = innermaxs[2];
+                       verts[ 3] = innermaxs[0];verts[ 4] = innermaxs[1];verts[ 5] = innermins[2];
+                       verts[ 6] = innermins[0];verts[ 7] = innermaxs[1];verts[ 8] = innermins[2];
+                       verts[ 9] = innermins[0];verts[10] = innermaxs[1];verts[11] = innermaxs[2];
+                       Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, 4, verts);
+                       verts[ 0] = outermins[0];verts[ 1] = outermaxs[1];verts[ 2] = outermaxs[2];
+                       verts[ 3] = outermins[0];verts[ 4] = outermaxs[1];verts[ 5] = outermins[2];
+                       verts[ 6] = outermaxs[0];verts[ 7] = outermaxs[1];verts[ 8] = outermins[2];
+                       verts[ 9] = outermaxs[0];verts[10] = outermaxs[1];verts[11] = outermaxs[2];
+                       Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, 4, verts);
+                       Mod_ShadowBrush_EndBrush(svworld, svbrush);
+                       // Y minor
+                       svbrush = Mod_ShadowBrush_BeginBrush(loadmodel->mempool);
+                       verts[ 0] = innermins[0];verts[ 1] = innermins[1];verts[ 2] = innermaxs[2];
+                       verts[ 3] = innermins[0];verts[ 4] = innermins[1];verts[ 5] = innermins[2];
+                       verts[ 6] = innermaxs[0];verts[ 7] = innermins[1];verts[ 8] = innermins[2];
+                       verts[ 9] = innermaxs[0];verts[10] = innermins[1];verts[11] = innermaxs[2];
+                       Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, 4, verts);
+                       verts[ 0] = outermaxs[0];verts[ 1] = outermins[1];verts[ 2] = outermaxs[2];
+                       verts[ 3] = outermaxs[0];verts[ 4] = outermins[1];verts[ 5] = outermins[2];
+                       verts[ 6] = outermins[0];verts[ 7] = outermins[1];verts[ 8] = outermins[2];
+                       verts[ 9] = outermins[0];verts[10] = outermins[1];verts[11] = outermaxs[2];
+                       Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, 4, verts);
+                       Mod_ShadowBrush_EndBrush(svworld, svbrush);
+                       // Z major
+                       svbrush = Mod_ShadowBrush_BeginBrush(loadmodel->mempool);
+                       verts[ 0] = innermaxs[0];verts[ 1] = innermins[1];verts[ 2] = innermaxs[2];
+                       verts[ 3] = innermaxs[0];verts[ 4] = innermaxs[1];verts[ 5] = innermaxs[2];
+                       verts[ 6] = innermins[0];verts[ 7] = innermaxs[1];verts[ 8] = innermaxs[2];
+                       verts[ 9] = innermins[0];verts[10] = innermins[1];verts[11] = innermaxs[2];
+                       Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, 4, verts);
+                       verts[ 0] = outermaxs[0];verts[ 1] = outermaxs[1];verts[ 2] = outermaxs[2];
+                       verts[ 3] = outermaxs[0];verts[ 4] = outermins[1];verts[ 5] = outermaxs[2];
+                       verts[ 6] = outermins[0];verts[ 7] = outermins[1];verts[ 8] = outermaxs[2];
+                       verts[ 9] = outermins[0];verts[10] = outermaxs[1];verts[11] = outermaxs[2];
+                       Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, 4, verts);
+                       Mod_ShadowBrush_EndBrush(svworld, svbrush);
+                       // Z minor
+                       svbrush = Mod_ShadowBrush_BeginBrush(loadmodel->mempool);
+                       verts[ 0] = innermaxs[0];verts[ 1] = innermaxs[1];verts[ 2] = innermins[2];
+                       verts[ 3] = innermaxs[0];verts[ 4] = innermins[1];verts[ 5] = innermins[2];
+                       verts[ 6] = innermins[0];verts[ 7] = innermins[1];verts[ 8] = innermins[2];
+                       verts[ 9] = innermins[0];verts[10] = innermaxs[1];verts[11] = innermins[2];
+                       Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, 4, verts);
+                       verts[ 0] = outermaxs[0];verts[ 1] = outermins[1];verts[ 2] = outermins[2];
+                       verts[ 3] = outermaxs[0];verts[ 4] = outermaxs[1];verts[ 5] = outermins[2];
+                       verts[ 6] = outermins[0];verts[ 7] = outermaxs[1];verts[ 8] = outermins[2];
+                       verts[ 9] = outermins[0];verts[10] = outermins[1];verts[11] = outermins[2];
+                       Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, 4, verts);
+                       Mod_ShadowBrush_EndBrush(svworld, svbrush);
+                       }
+#endif
+#define SHADOWCASTFRONT 1
+#if SHADOWCASTFRONT
+                       for (j = 0;j < e->numsurfaces;j++)
+                       {
+                               surf = e->surfaces[j];
+#else
+                       for (j = 0, surf = loadmodel->surfaces + loadmodel->firstmodelsurface;j < loadmodel->nummodelsurfaces;j++, surf++)
+                       {
+#endif
+                               if (!(surf->flags & SURF_CLIPSOLID))
+                                       continue;
+                               f = DotProduct(e->origin, surf->plane->normal) - surf->plane->dist;
+                               if (surf->flags & SURF_PLANEBACK)
+                                       f = -f;
+#if SHADOWCASTFRONT
+                               projectdistance = e->cullradius - f;
+#else
+                               projectdistance = e->cullradius + f;
+#endif
+                               if (projectdistance < 0.1 || projectdistance > e->cullradius)
+                                       continue;
+                               VectorSubtract(e->origin, surf->poly_center, temp);
+                               if (DotProduct(temp, temp) > (surf->poly_radius2 + e->cullradius2))
+                                       continue;
+                               /*
+                               VectorCopy(surf->poly_verts, polymins);
+                               VectorCopy(surf->poly_verts, polymaxs);
+                               for (k = 0, v0 = surf->poly_verts;k < surf->poly_numverts;k++, v0 += 3)
                                {
-                                       Con_DPrintf("%s loaded", litfilename);
-                                       loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, loadsize - 8);
-                                       memcpy(loadmodel->lightdata, data + 8, loadsize - 8);
-                                       Mem_Free(data);
-                                       return;
+                                       if (polymins[0] > v0[0]) polymins[0] = v0[0];if (polymaxs[0] < v0[0]) polymaxs[0] = v0[0];
+                                       if (polymins[1] > v0[1]) polymins[1] = v0[1];if (polymaxs[1] < v0[1]) polymaxs[1] = v0[1];
+                                       if (polymins[2] > v0[2]) polymins[2] = v0[2];if (polymaxs[2] < v0[2]) polymaxs[2] = v0[2];
                                }
-                               else
+                               if (polymins[0] > e->maxs[0] || polymaxs[0] < e->mins[0]
+                                || polymins[1] > e->maxs[1] || polymaxs[1] < e->mins[1]
+                                || polymins[2] > e->maxs[2] || polymaxs[2] < e->mins[2])
+                                       continue;
+                               */
+                               if (maxverts < surf->poly_numverts)
                                {
-                                       Con_Printf("Unknown .lit file version (%d)\n", i);
-                                       Mem_Free(data);
+                                       maxverts = surf->poly_numverts;
+                                       if (verts)
+                                               Mem_Free(verts);
+                                       verts = Mem_Alloc(loadmodel->mempool, maxverts * sizeof(float[3]));
                                }
+                               svbrush = Mod_ShadowBrush_BeginBrush(loadmodel->mempool);
+#if SHADOWCASTFRONT
+                               // copy the original polygon, for the front cap of the volume
+                               for (k = 0, v0 = surf->poly_verts, v1 = verts;k < surf->poly_numverts;k++, v0 += 3, v1 += 3)
+                                       VectorCopy(v0, v1);
+                               Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, surf->poly_numverts, verts);
+                               // project the original polygon, reversed, for the back cap of the volume
+                               for (k = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = verts;k < surf->poly_numverts;k++, v0 -= 3, v1 += 3)
+                               {
+                                       VectorSubtract(v0, e->origin, temp);
+                                       VectorNormalize(temp);
+                                       VectorMA(v0, projectdistance, temp, v1);
+                               }
+                               Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, surf->poly_numverts, verts);
+                               // project the shadow volume sides
+                               for (k = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = surf->poly_verts;k < surf->poly_numverts;k++, v0 = v1, v1 += 3)
+                               {
+                                       VectorCopy(v1, &verts[0]);
+                                       VectorCopy(v0, &verts[3]);
+                                       VectorCopy(v0, &verts[6]);
+                                       VectorCopy(v1, &verts[9]);
+                                       VectorSubtract(&verts[6], e->origin, temp);
+                                       VectorNormalize(temp);
+                                       VectorMA(&verts[6], projectdistance, temp, &verts[6]);
+                                       VectorSubtract(&verts[9], e->origin, temp);
+                                       VectorNormalize(temp);
+                                       VectorMA(&verts[9], projectdistance, temp, &verts[9]);
+                                       Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, 4, verts);
+                               }
+#else
+                               // copy the original polygon, reversed, for the front cap of the volume
+                               for (k = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = verts;k < surf->poly_numverts;k++, v0 -= 3, v1 += 3)
+                                       VectorCopy(v0, v1);
+                               Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, surf->poly_numverts, verts);
+                               // project the original polygon, for the back cap of the volume
+                               for (k = 0, v0 = surf->poly_verts, v1 = verts;k < surf->poly_numverts;k++, v0 += 3, v1 += 3)
+                               {
+                                       VectorSubtract(v0, e->origin, temp);
+                                       VectorNormalize(temp);
+                                       VectorMA(v0, projectdistance, temp, v1);
+                               }
+                               Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, surf->poly_numverts, verts);
+                               // project the shadow volume sides
+                               for (k = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = surf->poly_verts;k < surf->poly_numverts;k++, v0 = v1, v1 += 3)
+                               {
+                                       VectorCopy(v0, &verts[0]);
+                                       VectorCopy(v1, &verts[3]);
+                                       VectorCopy(v1, &verts[6]);
+                                       VectorCopy(v0, &verts[9]);
+                                       VectorSubtract(&verts[6], e->origin, temp);
+                                       VectorNormalize(temp);
+                                       VectorMA(&verts[6], projectdistance, temp, &verts[6]);
+                                       VectorSubtract(&verts[9], e->origin, temp);
+                                       VectorNormalize(temp);
+                                       VectorMA(&verts[9], projectdistance, temp, &verts[9]);
+                                       Mod_ShadowBrush_AddPolygon(loadmodel->mempool, svbrush, 4, verts);
+                               }
+#endif
+                               Mod_ShadowBrush_EndBrush(svworld, svbrush);
                        }
-                       else
-                       {
-                               if (loadsize == 8)
-                                       Con_Printf("Empty .lit file, ignoring\n");
-                               else
-                                       Con_Printf("Corrupt .lit file (old version?), ignoring\n");
-                               Mem_Free(data);
-                       }
+                       // clip away hidden polygons
+                       Mod_ShadowBrush_ProcessWorld(loadmodel->mempool, svworld);
+                       // build the triangle mesh
+                       e->shadowvolume = Mod_ShadowBrush_BuildMeshs(loadmodel->mempool, svworld);
+                       Mod_ShadowBrush_FreeWorld(svworld);
                }
-               // LordHavoc: oh well, expand the white lighting data
-               if (!l->filelen)
-                       return;
-               loadmodel->lightdata = Mem_Alloc(loadmodel->mempool, l->filelen*3);
-               in = loadmodel->lightdata + l->filelen*2; // place the file at the end, so it will not be overwritten until the very last write
-               out = loadmodel->lightdata;
-               memcpy (in, mod_base + l->fileofs, l->filelen);
-               for (i = 0;i < l->filelen;i++)
+#elif 0
+               // build svbsp (shadow volume bsp)
                {
-                       d = *in++;
-                       *out++ = d;
-                       *out++ = d;
-                       *out++ = d;
+                       int maxverts = 0, constructmode;
+                       float *verts = NULL, projectdistance, *v0, *v1, f, temp[3];
+                       svbspnode_t *svbsproot;
+                       svbsproot = Mod_SVBSP_NewTree();
+                       // we do this in three stages:
+                       // 1. construct the svbsp structure
+                       // 2. mark which leafs are dark (shadow)
+                       // 3. link polygons into only leafs that are not dark
+                       // this results in polygons that are only on the outside of the
+                       // shadow volume, removing polygons that are inside the shadow
+                       // volume (which waste time)
+                       for (constructmode = 0;constructmode < 3;constructmode++)
+                       {
+                               svbsp_count_originalpolygons = 0;
+#if 1
+                               for (j = 0, surf = loadmodel->surfaces + loadmodel->firstmodelsurface;j < loadmodel->nummodelsurfaces;j++, surf++)
+                               {
+                                       if (!(surf->flags & SURF_SHADOWCAST))
+                                               continue;
+                                       /*
+                                       if (surf->poly_maxs[0] < e->mins[0]
+                                        || surf->poly_mins[0] > e->maxs[0]
+                                        || surf->poly_maxs[1] < e->mins[1]
+                                        || surf->poly_mins[1] > e->maxs[1]
+                                        || surf->poly_maxs[2] < e->mins[2]
+                                        || surf->poly_mins[2] > e->maxs[2])
+                                               continue;
+                                       */
+                                       f = DotProduct(e->origin, surf->plane->normal) - surf->plane->dist;
+                                       if (surf->flags & SURF_PLANEBACK)
+                                               f = -f;
+                                       projectdistance = e->cullradius + f;
+                                       if (projectdistance < 0.1 || projectdistance > e->cullradius)
+                                               continue;
+                                       /*
+                                       // find the nearest vertex of the projected volume
+                                       for (k = 0, v0 = surf->poly_verts;k < surf->poly_numverts;k++, v0 += 3)
+                                       {
+                                               VectorSubtract(v0, e->origin, temp);
+                                               VectorNormalize(temp);
+                                               if (maxdist00 > v0[0] - e->origin[0]) maxdist00 = v0[0] - e->origin[0];
+                                               if (maxdist01 < e->origin[0] - v0[0]) maxdist01 = e->origin[0] - v0[0];
+                                               if (maxdist10 > v0[1] - e->origin[1]) maxdist10 = v0[1] - e->origin[1];
+                                               if (maxdist11 < e->origin[1] - v0[1]) maxdist11 = e->origin[1] - v0[1];
+                                               if (maxdist20 > v0[2] - e->origin[2]) maxdist20 = v0[2] - e->origin[2];
+                                               if (maxdist21 < e->origin[2] - v0[2]) maxdist21 = e->origin[2] - v0[2];
+                                               dist =
+
+                                               dist = DotProduct(temp, temp);
+                                               if (bestdist > dist)
+                                               {
+                                                       bestdist = dist;
+                                                       VectorCopy(temp, bestvec);
+                                               }
+                                       }
+                                       projectdistance = e->cullradius - sqrt(bestdist);
+                                       if (projectdistance < 0.1)
+                                               continue;
+                                       for (k = 0, v0 = surf->poly_verts;k < surf->poly_numverts;k++, v0 += 3)
+                                       {
+                                               VectorNormalize(temp);
+                                               if (temp[0] > 0)
+                                               {
+                                                       dist = (e->maxs[0] - e->origin[0]) / temp[0];
+                                                       if (maxdist >
+                                               }
+                                               else if (temp[0] < 0)
+                                                       dist = (e->mins[0] - e->origin[0]) / temp[0];
+                                               dist =
+                                               VectorMA(v0, projectdistance, temp, temp);
+                                               dist = (temp[0]
+                                               VectorSubtract(temp, e->origin,
+                                       }
+                                       */
+                                       VectorSubtract(e->origin, surf->poly_center, temp);
+                                       if (DotProduct(temp, temp) > (surf->poly_radius2 + e->cullradius2))
+                                               continue;
+                                       if (maxverts < surf->poly_numverts)
+                                       {
+                                               maxverts = surf->poly_numverts;
+                                               if (verts)
+                                                       Mem_Free(verts);
+                                               verts = Mem_Alloc(loadmodel->mempool, maxverts * sizeof(float[3]));
+                                       }
+                                       // copy the original polygon, reversed, for the front cap of the volume
+                                       for (k = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = verts;k < surf->poly_numverts;k++, v0 -= 3, v1 += 3)
+                                               VectorCopy(v0, v1);
+                                       Mod_SVBSP_AddPolygon(svbsproot, surf->poly_numverts, verts, constructmode, surf->poly_center, __LINE__);
+                                       // project the original polygon, for the back cap of the volume
+                                       for (k = 0, v0 = surf->poly_verts, v1 = verts;k < surf->poly_numverts;k++, v0 += 3, v1 += 3)
+                                       {
+                                               VectorSubtract(v0, e->origin, temp);
+                                               VectorNormalize(temp);
+                                               VectorMA(v0, projectdistance, temp, v1);
+                                       }
+                                       Mod_SVBSP_AddPolygon(svbsproot, surf->poly_numverts, verts, constructmode, surf->poly_center, __LINE__);
+                                       // project the shadow volume sides
+                                       for (k = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = surf->poly_verts;k < surf->poly_numverts;k++, v0 = v1, v1 += 3)
+                                       {
+                                               VectorCopy(v0, &verts[0]);
+                                               VectorCopy(v1, &verts[3]);
+                                               VectorCopy(v1, &verts[6]);
+                                               VectorCopy(v0, &verts[9]);
+                                               VectorSubtract(&verts[6], e->origin, temp);
+                                               VectorNormalize(temp);
+                                               VectorMA(&verts[6], projectdistance, temp, &verts[6]);
+                                               VectorSubtract(&verts[9], e->origin, temp);
+                                               VectorNormalize(temp);
+                                               VectorMA(&verts[9], projectdistance, temp, &verts[9]);
+                                               Mod_SVBSP_AddPolygon(svbsproot, 4, verts, constructmode, surf->poly_center, __LINE__);
+                                       }
+                               }
+#else
+                               for (j = 0;j < e->numsurfaces;j++)
+                               {
+                                       surf = e->surfaces[j];
+                                       if (!(surf->flags & SURF_SHADOWCAST))
+                                               continue;
+                                       f = DotProduct(e->origin, surf->plane->normal) - surf->plane->dist;
+                                       if (surf->flags & SURF_PLANEBACK)
+                                               f = -f;
+                                       projectdistance = e->cullradius - f;
+                                       if (projectdistance < 0.1 || projectdistance > e->cullradius)
+                                               continue;
+                                       VectorSubtract(e->origin, surf->poly_center, temp);
+                                       if (DotProduct(temp, temp) > (surf->poly_radius2 + e->cullradius2))
+                                               continue;
+                                       if (maxverts < surf->poly_numverts)
+                                       {
+                                               maxverts = surf->poly_numverts;
+                                               if (verts)
+                                                       Mem_Free(verts);
+                                               verts = Mem_Alloc(loadmodel->mempool, maxverts * sizeof(float[3]));
+                                       }
+                                       // copy the original polygon, for the front cap of the volume
+                                       for (k = 0, v0 = surf->poly_verts, v1 = verts;k < surf->poly_numverts;k++, v0 += 3, v1 += 3)
+                                               VectorCopy(v0, v1);
+                                       Mod_SVBSP_AddPolygon(svbsproot, surf->poly_numverts, verts, constructmode, surf->poly_center, __LINE__);
+                                       // project the original polygon, reversed, for the back cap of the volume
+                                       for (k = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = verts;k < surf->poly_numverts;k++, v0 -= 3, v1 += 3)
+                                       {
+                                               VectorSubtract(v0, e->origin, temp);
+                                               VectorNormalize(temp);
+                                               VectorMA(v0, projectdistance, temp, v1);
+                                       }
+                                       Mod_SVBSP_AddPolygon(svbsproot, surf->poly_numverts, verts, constructmode, surf->poly_center, __LINE__);
+                                       // project the shadow volume sides
+                                       for (k = 0, v0 = surf->poly_verts + (surf->poly_numverts - 1) * 3, v1 = surf->poly_verts;k < surf->poly_numverts;k++, v0 = v1, v1 += 3)
+                                       {
+                                               VectorCopy(v1, &verts[0]);
+                                               VectorCopy(v0, &verts[3]);
+                                               VectorCopy(v0, &verts[6]);
+                                               VectorCopy(v1, &verts[9]);
+                                               VectorSubtract(&verts[6], e->origin, temp);
+                                               VectorNormalize(temp);
+                                               VectorMA(&verts[6], projectdistance, temp, &verts[6]);
+                                               VectorSubtract(&verts[9], e->origin, temp);
+                                               VectorNormalize(temp);
+                                               VectorMA(&verts[9], projectdistance, temp, &verts[9]);
+                                               Mod_SVBSP_AddPolygon(svbsproot, 4, verts, constructmode, surf->poly_center, __LINE__);
+                                       }
+                               }
+#endif
+                       }
+                       if (verts)
+                               Mem_Free(verts);
+
+                       svbsp_count_nodes = 0;
+                       svbsp_count_leafs = 0;
+                       svbsp_count_polygons = 0;
+                       svbsp_count_darkleafs = 0;
+                       svbsp_count_meshs = 0;
+                       svbsp_count_triangles = 0;
+                       svbsp_count_vertices = 0;
+                       e->shadowvolume = Mod_SVBSP_BuildTriangleMeshs(svbsproot, e->shadowvolumemins, e->shadowvolumemaxs);
+                       Mod_SVBSP_RecursiveGatherStats(svbsproot);
+                       Mod_SVBSP_FreeTree(svbsproot);
+                       Con_Printf("light %d (radius %d) has %d surfaces, svbsp contains %d nodes, %d leafs, %d are dark (%d%%), %d original polygons, %d polygons stored (%d%%), %d meshs %d vertices %d triangles\n", lnum, (int)e->cullradius, e->numsurfaces, svbsp_count_nodes, svbsp_count_leafs, svbsp_count_darkleafs, svbsp_count_leafs ? (100 * svbsp_count_darkleafs / svbsp_count_leafs) : 0, svbsp_count_originalpolygons, svbsp_count_polygons, svbsp_count_originalpolygons ? (100 * svbsp_count_polygons / svbsp_count_originalpolygons) : 0, svbsp_count_meshs, svbsp_count_triangles, svbsp_count_vertices);
                }
+#endif
        }
 }
 
@@ -554,32 +1797,28 @@ Mod_LoadVisibility
 */
 static void Mod_LoadVisibility (lump_t *l)
 {
+       loadmodel->visdata = NULL;
        if (!l->filelen)
-       {
-               loadmodel->visdata = NULL;
                return;
-       }
        loadmodel->visdata = Mem_Alloc(loadmodel->mempool, l->filelen);
        memcpy (loadmodel->visdata, mod_base + l->fileofs, l->filelen);
 }
 
 // used only for HalfLife maps
-void Mod_ParseWadsFromEntityLump(char *data)
+void Mod_ParseWadsFromEntityLump(const char *data)
 {
        char key[128], value[4096];
        char wadname[128];
        int i, j, k;
        if (!data)
                return;
-       data = COM_Parse(data);
-       if (!data)
+       if (!COM_ParseToken(&data))
                return; // error
        if (com_token[0] != '{')
                return; // error
        while (1)
        {
-               data = COM_Parse(data);
-               if (!data)
+               if (!COM_ParseToken(&data))
                        return; // error
                if (com_token[0] == '}')
                        break; // end of worldspawn
@@ -589,8 +1828,7 @@ void Mod_ParseWadsFromEntityLump(char *data)
                        strcpy(key, com_token);
                while (key[strlen(key)-1] == ' ') // remove trailing spaces
                        key[strlen(key)-1] = 0;
-               data = COM_Parse(data);
-               if (!data)
+               if (!COM_ParseToken(&data))
                        return; // error
                strcpy(value, com_token);
                if (!strcmp("wad", key)) // for HalfLife maps
@@ -633,11 +1871,9 @@ Mod_LoadEntities
 */
 static void Mod_LoadEntities (lump_t *l)
 {
+       loadmodel->entities = NULL;
        if (!l->filelen)
-       {
-               loadmodel->entities = NULL;
                return;
-       }
        loadmodel->entities = Mem_Alloc(loadmodel->mempool, l->filelen);
        memcpy (loadmodel->entities, mod_base + l->fileofs, l->filelen);
        if (loadmodel->ishlbsp)
@@ -746,8 +1982,7 @@ static void Mod_LoadTexinfo (lump_t *l)
 {
        texinfo_t *in;
        mtexinfo_t *out;
-       int     i, j, k, count;
-       int             miptex;
+       int i, j, k, count, miptex;
 
        in = (void *)(mod_base + l->fileofs);
        if (l->filelen % sizeof(*in))
@@ -767,18 +2002,27 @@ static void Mod_LoadTexinfo (lump_t *l)
                miptex = LittleLong (in->miptex);
                out->flags = LittleLong (in->flags);
 
-               if (!loadmodel->textures)
-                       out->texture = &loadmodel->notexture;
+               out->texture = NULL;
+               if (loadmodel->textures)
+               {
+                       if ((unsigned int) miptex >= (unsigned int) loadmodel->numtextures)
+                               Con_Printf ("error in model \"%s\": invalid miptex index %i (of %i)\n", loadmodel->name, miptex, loadmodel->numtextures);
+                       else
+                               out->texture = loadmodel->textures + miptex;
+               }
+               if (out->flags & TEX_SPECIAL)
+               {
+                       // if texture chosen is NULL or the shader needs a lightmap,
+                       // force to notexture water shader
+                       if (out->texture == NULL || out->texture->shader->flags & SHADERFLAGS_NEEDLIGHTMAP)
+                               out->texture = loadmodel->textures + (loadmodel->numtextures - 1);
+               }
                else
                {
-                       if (miptex < 0)
-                               Host_Error ("miptex < 0");
-                       if (miptex >= loadmodel->numtextures)
-                               Host_Error ("miptex >= loadmodel->numtextures");
-                       out->texture = loadmodel->textures[miptex];
+                       // if texture chosen is NULL, force to notexture
+                       if (out->texture == NULL)
+                               out->texture = loadmodel->textures + (loadmodel->numtextures - 2);
                }
-               if (!out->texture)
-                       out->texture = &loadmodel->notexture;
        }
 }
 
@@ -854,6 +2098,7 @@ void BoundPoly (int numverts, float *verts, vec3_t mins, vec3_t maxs)
        }
 }
 
+#if 0
 #define MAX_SUBDIVPOLYTRIANGLES 4096
 #define MAX_SUBDIVPOLYVERTS (MAX_SUBDIVPOLYTRIANGLES * 3)
 
@@ -961,32 +2206,26 @@ can be done reasonably.
 */
 void Mod_GenerateWarpMesh (msurface_t *surf)
 {
-       int                             i, j;
-       surfvertex_t    *v;
-       surfmesh_t              *mesh;
+       int i, j;
+       surfvertex_t *v;
+       surfmesh_t *mesh;
 
        subdivpolytriangles = 0;
        subdivpolyverts = 0;
        SubdividePolygon (surf->poly_numverts, surf->poly_verts);
+       if (subdivpolytriangles < 1)
+               Host_Error("Mod_GenerateWarpMesh: no triangles?\n");
 
-       mesh = &surf->mesh;
+       surf->mesh = mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + subdivpolytriangles * sizeof(int[3]) + subdivpolyverts * sizeof(surfvertex_t));
        mesh->numverts = subdivpolyverts;
        mesh->numtriangles = subdivpolytriangles;
-       if (mesh->numtriangles < 1)
-               Host_Error("Mod_GenerateWarpMesh: no triangles?\n");
-       mesh->index = Mem_Alloc(loadmodel->mempool, mesh->numtriangles * sizeof(int[3]) + mesh->numverts * sizeof(surfvertex_t));
-       mesh->vertex = (surfvertex_t *)((long) mesh->index + mesh->numtriangles * sizeof(int[3]));
+       mesh->vertex = (surfvertex_t *)(mesh + 1);
+       mesh->index = (int *)(mesh->vertex + mesh->numverts);
        memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
 
        for (i = 0;i < mesh->numtriangles;i++)
-       {
                for (j = 0;j < 3;j++)
-               {
                        mesh->index[i*3+j] = subdivpolyindex[i][j];
-                       //if (mesh->index[i] < 0 || mesh->index[i] >= mesh->numverts)
-                       //      Host_Error("Mod_GenerateWarpMesh: invalid index generated\n");
-               }
-       }
 
        for (i = 0, v = mesh->vertex;i < subdivpolyverts;i++, v++)
        {
@@ -995,93 +2234,64 @@ void Mod_GenerateWarpMesh (msurface_t *surf)
                v->st[1] = DotProduct (v->v, surf->texinfo->vecs[1]);
        }
 }
+#endif
 
-void Mod_GenerateVertexLitMesh (msurface_t *surf)
+surfmesh_t *Mod_AllocSurfMesh(int numverts, int numtriangles)
 {
-       int                             i, is, it, *index, smax, tmax;
-       float                   *in, s, t;
-       surfvertex_t    *out;
-       surfmesh_t              *mesh;
-
-       //surf->flags |= SURF_LIGHTMAP;
-       smax = surf->extents[0] >> 4;
-       tmax = surf->extents[1] >> 4;
-       surf->lightmaptexturestride = 0;
-       surf->lightmaptexture = NULL;
-
-       mesh = &surf->mesh;
-       mesh->numverts = surf->poly_numverts;
-       mesh->numtriangles = surf->poly_numverts - 2;
-       mesh->index = Mem_Alloc(loadmodel->mempool, mesh->numtriangles * sizeof(int[3]) + mesh->numverts * sizeof(surfvertex_t));
-       mesh->vertex = (surfvertex_t *)((long) mesh->index + mesh->numtriangles * sizeof(int[3]));
-       memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
-
-       index = mesh->index;
-       for (i = 0;i < mesh->numtriangles;i++)
-       {
-               *index++ = 0;
-               *index++ = i + 1;
-               *index++ = i + 2;
-       }
-
-       for (i = 0, in = surf->poly_verts, out = mesh->vertex;i < mesh->numverts;i++, in += 3, out++)
-       {
-               VectorCopy (in, out->v);
-
-               s = DotProduct (out->v, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3];
-               t = DotProduct (out->v, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3];
-
-               out->st[0] = s / surf->texinfo->texture->width;
-               out->st[1] = t / surf->texinfo->texture->height;
-
-               s = (s + 8 - surf->texturemins[0]) * (1.0 / 16.0);
-               t = (t + 8 - surf->texturemins[1]) * (1.0 / 16.0);
-
-               // lightmap coordinates
-               out->uv[0] = 0;
-               out->uv[1] = 0;
-
-               // LordHavoc: calc lightmap data offset for vertex lighting to use
-               is = (int) s;
-               it = (int) t;
-               is = bound(0, is, smax);
-               it = bound(0, it, tmax);
-               out->lightmapoffset = ((it * (smax+1) + is) * 3);
-       }
+       surfmesh_t *mesh;
+       mesh = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t) + numtriangles * sizeof(int[6]) + numverts * (4 + 4 + 4 + 4 + 4 + 4 + 4 + 1) * sizeof(float));
+       mesh->numverts = numverts;
+       mesh->numtriangles = numtriangles;
+       mesh->verts = (float *)(mesh + 1);
+       mesh->str = mesh->verts + mesh->numverts * 4;
+       mesh->uvw = mesh->str + mesh->numverts * 4;
+       mesh->abc = mesh->uvw + mesh->numverts * 4;
+       mesh->svectors = (float *)(mesh->abc + mesh->numverts * 4);
+       mesh->tvectors = mesh->svectors + mesh->numverts * 4;
+       mesh->normals = mesh->tvectors + mesh->numverts * 4;
+       mesh->lightmapoffsets = (int *)(mesh->normals + mesh->numverts * 4);
+       mesh->index = mesh->lightmapoffsets + mesh->numverts;
+       mesh->triangleneighbors = mesh->index + mesh->numtriangles * 3;
+       return mesh;
 }
 
-void Mod_GenerateLightmappedMesh (msurface_t *surf)
+void Mod_GenerateWallMesh (msurface_t *surf, int vertexonly)
 {
-       int                             i, is, it, *index, smax, tmax;
-       float                   *in, s, t, xbase, ybase, xscale, yscale;
-       surfvertex_t    *out;
-       surfmesh_t              *mesh;
+       int i, iu, iv, *index, smax, tmax;
+       float *in, s, t, u, v, ubase, vbase, uscale, vscale, normal[3];
+       surfmesh_t *mesh;
 
-       surf->flags |= SURF_LIGHTMAP;
        smax = surf->extents[0] >> 4;
        tmax = surf->extents[1] >> 4;
-       if (r_miplightmaps.integer)
+
+       if (vertexonly)
        {
-               surf->lightmaptexturestride = (surf->extents[0]>>4)+1;
-               surf->lightmaptexture = R_ProceduralTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_MIPMAP | TEXF_PRECACHE, NULL, NULL, 0);
+               surf->lightmaptexturestride = 0;
+               surf->lightmaptexture = NULL;
+               uscale = 0;
+               vscale = 0;
+               ubase = 0;
+               vbase = 0;
        }
        else
        {
-               surf->lightmaptexturestride = R_CompatibleFragmentWidth((surf->extents[0]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, 0);
-               surf->lightmaptexture = R_ProceduralTexture(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_PRECACHE, NULL, NULL, 0);
+               surf->flags |= SURF_LIGHTMAP;
+               if (r_miplightmaps.integer)
+               {
+                       surf->lightmaptexturestride = (surf->extents[0]>>4)+1;
+                       surf->lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_MIPMAP | TEXF_PRECACHE, NULL);
+               }
+               else
+               {
+                       surf->lightmaptexturestride = R_CompatibleFragmentWidth((surf->extents[0]>>4)+1, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, 0);
+                       surf->lightmaptexture = R_LoadTexture2D(loadmodel->texturepool, NULL, surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_PRECACHE, NULL);
+               }
+               R_FragmentLocation(surf->lightmaptexture, NULL, NULL, &ubase, &vbase, &uscale, &vscale);
+               uscale = (uscale - ubase) * 16.0 / ((surf->extents[0] & ~15) + 16);
+               vscale = (vscale - vbase) * 16.0 / ((surf->extents[1] & ~15) + 16);
        }
-//     surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, va("lightmap%08x", lightmapnum), surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_FRAGMENT | TEXF_PRECACHE);
-//     surf->lightmaptexture = R_LoadTexture(loadmodel->texturepool, va("lightmap%08x", lightmapnum), surf->lightmaptexturestride, (surf->extents[1]>>4)+1, NULL, loadmodel->lightmaprgba ? TEXTYPE_RGBA : TEXTYPE_RGB, TEXF_PRECACHE);
-       R_FragmentLocation(surf->lightmaptexture, NULL, NULL, &xbase, &ybase, &xscale, &yscale);
-       xscale = (xscale - xbase) * 16.0 / ((surf->extents[0] & ~15) + 16);
-       yscale = (yscale - ybase) * 16.0 / ((surf->extents[1] & ~15) + 16);
 
-       mesh = &surf->mesh;
-       mesh->numverts = surf->poly_numverts;
-       mesh->numtriangles = surf->poly_numverts - 2;
-       mesh->index = Mem_Alloc(loadmodel->mempool, mesh->numtriangles * sizeof(int[3]) + mesh->numverts * sizeof(surfvertex_t));
-       mesh->vertex = (surfvertex_t *)((long) mesh->index + mesh->numtriangles * sizeof(int[3]));
-       memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
+       surf->mesh = mesh = Mod_AllocSurfMesh(surf->poly_numverts, surf->poly_numverts - 2);
 
        index = mesh->index;
        for (i = 0;i < mesh->numtriangles;i++)
@@ -1090,49 +2300,49 @@ void Mod_GenerateLightmappedMesh (msurface_t *surf)
                *index++ = i + 1;
                *index++ = i + 2;
        }
+       Mod_BuildTriangleNeighbors(mesh->triangleneighbors, mesh->index, mesh->numtriangles);
 
-       for (i = 0, in = surf->poly_verts, out = mesh->vertex;i < mesh->numverts;i++, in += 3, out++)
+       VectorCopy(surf->plane->normal, normal);
+       if (surf->flags & SURF_PLANEBACK)
+               VectorNegate(normal, normal);
+       for (i = 0, in = surf->poly_verts;i < mesh->numverts;i++, in += 3)
        {
-               VectorCopy (in, out->v);
-
-               s = DotProduct (out->v, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3];
-               t = DotProduct (out->v, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3];
-
-               out->st[0] = s / surf->texinfo->texture->width;
-               out->st[1] = t / surf->texinfo->texture->height;
-
-               s = (s + 8 - surf->texturemins[0]) * (1.0 / 16.0);
-               t = (t + 8 - surf->texturemins[1]) * (1.0 / 16.0);
-
-               // lightmap coordinates
-               out->uv[0] = s * xscale + xbase;
-               out->uv[1] = t * yscale + ybase;
-
+               s = DotProduct (in, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3];
+               t = DotProduct (in, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3];
+               u = (s + 8 - surf->texturemins[0]) * (1.0 / 16.0);
+               v = (t + 8 - surf->texturemins[1]) * (1.0 / 16.0);
                // LordHavoc: calc lightmap data offset for vertex lighting to use
-               is = (int) s;
-               it = (int) t;
-               is = bound(0, is, smax);
-               it = bound(0, it, tmax);
-               out->lightmapoffset = ((it * (smax+1) + is) * 3);
+               iu = (int) u;
+               iv = (int) v;
+               iu = bound(0, iu, smax);
+               iv = bound(0, iv, tmax);
+               u = u * uscale + ubase;
+               v = v * vscale + vbase;
+
+               mesh->verts[i * 4 + 0] = in[0];
+               mesh->verts[i * 4 + 1] = in[1];
+               mesh->verts[i * 4 + 2] = in[2];
+               mesh->str[i * 4 + 0] = s / surf->texinfo->texture->width;
+               mesh->str[i * 4 + 1] = t / surf->texinfo->texture->height;
+               mesh->uvw[i * 4 + 0] = u;
+               mesh->uvw[i * 4 + 1] = v;
+               mesh->abc[i * 4 + 0] = s * (1.0f / 16.0f);
+               mesh->abc[i * 4 + 1] = t * (1.0f / 16.0f);
+               mesh->lightmapoffsets[i] = ((iv * (smax+1) + iu) * 3);
        }
+       Mod_BuildTextureVectorsAndNormals(mesh->numverts, mesh->numtriangles, mesh->verts, mesh->str, mesh->index, mesh->svectors, mesh->tvectors, mesh->normals);
 }
 
 void Mod_GenerateVertexMesh (msurface_t *surf)
 {
-       int                             i, *index;
-       float                   *in;
-       surfvertex_t    *out;
-       surfmesh_t              *mesh;
+       int i, *index;
+       float *in, s, t, normal[3];
+       surfmesh_t *mesh;
 
        surf->lightmaptexturestride = 0;
        surf->lightmaptexture = NULL;
 
-       mesh = &surf->mesh;
-       mesh->numverts = surf->poly_numverts;
-       mesh->numtriangles = surf->poly_numverts - 2;
-       mesh->index = Mem_Alloc(loadmodel->mempool, mesh->numtriangles * sizeof(int[3]) + mesh->numverts * sizeof(surfvertex_t));
-       mesh->vertex = (surfvertex_t *)((long) mesh->index + mesh->numtriangles * sizeof(int[3]));
-       memset(mesh->vertex, 0, mesh->numverts * sizeof(surfvertex_t));
+       surf->mesh = mesh = Mod_AllocSurfMesh(surf->poly_numverts, surf->poly_numverts - 2);
 
        index = mesh->index;
        for (i = 0;i < mesh->numtriangles;i++)
@@ -1141,21 +2351,32 @@ void Mod_GenerateVertexMesh (msurface_t *surf)
                *index++ = i + 1;
                *index++ = i + 2;
        }
+       Mod_BuildTriangleNeighbors(mesh->triangleneighbors, mesh->index, mesh->numtriangles);
 
-       for (i = 0, in = surf->poly_verts, out = mesh->vertex;i < mesh->numverts;i++, in += 3, out++)
+       VectorCopy(surf->plane->normal, normal);
+       if (surf->flags & SURF_PLANEBACK)
+               VectorNegate(normal, normal);
+       for (i = 0, in = surf->poly_verts;i < mesh->numverts;i++, in += 3)
        {
-               VectorCopy (in, out->v);
-               out->st[0] = (DotProduct (out->v, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3]) / surf->texinfo->texture->width;
-               out->st[1] = (DotProduct (out->v, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3]) / surf->texinfo->texture->height;
+               s = (DotProduct (in, surf->texinfo->vecs[0]) + surf->texinfo->vecs[0][3]);
+               t = (DotProduct (in, surf->texinfo->vecs[1]) + surf->texinfo->vecs[1][3]);
+               mesh->verts[i * 4 + 0] = in[0];
+               mesh->verts[i * 4 + 1] = in[1];
+               mesh->verts[i * 4 + 2] = in[2];
+               mesh->str[i * 4 + 0] = s / surf->texinfo->texture->width;
+               mesh->str[i * 4 + 1] = t / surf->texinfo->texture->height;
+               mesh->uvw[i * 4 + 0] = 0;
+               mesh->uvw[i * 4 + 1] = 0;
+               mesh->abc[i * 4 + 0] = s * (1.0f / 16.0f);
+               mesh->abc[i * 4 + 1] = t * (1.0f / 16.0f);
        }
+       Mod_BuildTextureVectorsAndNormals(mesh->numverts, mesh->numtriangles, mesh->verts, mesh->str, mesh->index, mesh->svectors, mesh->tvectors, mesh->normals);
 }
 
 void Mod_GenerateSurfacePolygon (msurface_t *surf)
 {
-       float           *vert;
-       int                     i;
-       int                     lindex;
-       float           *vec;
+       int i, lindex;
+       float *vec, *vert, mins[3], maxs[3], temp[3], dist;
 
        // convert edges back to a normal polygon
        surf->poly_numverts = surf->numedges;
@@ -1170,6 +2391,33 @@ void Mod_GenerateSurfacePolygon (msurface_t *surf)
                VectorCopy (vec, vert);
                vert += 3;
        }
+       vert = surf->poly_verts;
+       VectorCopy(vert, mins);
+       VectorCopy(vert, maxs);
+       vert += 3;
+       for (i = 1;i < surf->poly_numverts;i++)
+       {
+               if (mins[0] > vert[0]) mins[0] = vert[0];if (maxs[0] < vert[0]) maxs[0] = vert[0];
+               if (mins[1] > vert[1]) mins[1] = vert[1];if (maxs[1] < vert[1]) maxs[1] = vert[1];
+               if (mins[2] > vert[2]) mins[2] = vert[2];if (maxs[2] < vert[2]) maxs[2] = vert[2];
+               vert += 3;
+       }
+       VectorCopy(mins, surf->poly_mins);
+       VectorCopy(maxs, surf->poly_maxs);
+       surf->poly_center[0] = (mins[0] + maxs[0]) * 0.5f;
+       surf->poly_center[1] = (mins[1] + maxs[1]) * 0.5f;
+       surf->poly_center[2] = (mins[2] + maxs[2]) * 0.5f;
+       surf->poly_radius2 = 0;
+       vert = surf->poly_verts;
+       for (i = 0;i < surf->poly_numverts;i++)
+       {
+               VectorSubtract(vert, surf->poly_center, temp);
+               dist = DotProduct(temp, temp);
+               if (surf->poly_radius2 < dist)
+                       surf->poly_radius2 = dist;
+               vert += 3;
+       }
+       surf->poly_radius = sqrt(surf->poly_radius2);
 }
 
 /*
@@ -1179,9 +2427,9 @@ Mod_LoadFaces
 */
 static void Mod_LoadFaces (lump_t *l)
 {
-       dface_t         *in;
+       dface_t *in;
        msurface_t      *out;
-       int                     i, count, surfnum, planenum, side, ssize, tsize;
+       int i, count, surfnum, planenum, ssize, tsize;
 
        in = (void *)(mod_base + l->fileofs);
        if (l->filelen % sizeof(*in))
@@ -1191,19 +2439,29 @@ static void Mod_LoadFaces (lump_t *l)
 
        loadmodel->surfaces = out;
        loadmodel->numsurfaces = count;
+       loadmodel->surfacevisframes = Mem_Alloc(loadmodel->mempool, count * sizeof(int));
+       loadmodel->surfacepvsframes = Mem_Alloc(loadmodel->mempool, count * sizeof(int));
 
        for (surfnum = 0;surfnum < count;surfnum++, in++, out++)
        {
+               out->number = surfnum;
                // FIXME: validate edges, texinfo, etc?
                out->firstedge = LittleLong(in->firstedge);
                out->numedges = LittleShort(in->numedges);
+               if ((unsigned int) out->firstedge + (unsigned int) out->numedges > (unsigned int) loadmodel->numsurfedges)
+                       Host_Error("Mod_LoadFaces: invalid edge range (firstedge %i, numedges %i, model edges %i)\n", out->firstedge, out->numedges, loadmodel->numsurfedges);
 
-               out->texinfo = loadmodel->texinfo + LittleShort (in->texinfo);
+               i = LittleShort (in->texinfo);
+               if ((unsigned int) i >= (unsigned int) loadmodel->numtexinfo)
+                       Host_Error("Mod_LoadFaces: invalid texinfo index %i (model has %i texinfos)\n", i, loadmodel->numtexinfo);
+               out->texinfo = loadmodel->texinfo + i;
                out->flags = out->texinfo->texture->flags;
 
                planenum = LittleShort(in->planenum);
-               side = LittleShort(in->side);
-               if (side)
+               if ((unsigned int) planenum >= (unsigned int) loadmodel->numplanes)
+                       Host_Error("Mod_LoadFaces: invalid plane index %i (model has %i planes)\n", planenum, loadmodel->numplanes);
+
+               if (LittleShort(in->side))
                        out->flags |= SURF_PLANEBACK;
 
                out->plane = loadmodel->planes + planenum;
@@ -1213,8 +2471,6 @@ static void Mod_LoadFaces (lump_t *l)
 
                // force lightmap upload on first time seeing the surface
                out->cached_dlight = true;
-               out->cached_ambient = -1000;
-               out->cached_lightscalebit = -1000;
 
                CalcSurfaceExtents (out);
 
@@ -1233,108 +2489,21 @@ static void Mod_LoadFaces (lump_t *l)
                        out->samples = loadmodel->lightdata + (i * 3);
 
                Mod_GenerateSurfacePolygon(out);
-
-               if (out->texinfo->texture->flags & SURF_DRAWSKY)
-               {
-                       out->shader = &Cshader_sky;
-                       out->samples = NULL;
-                       Mod_GenerateWarpMesh (out);
-                       continue;
-               }
-
-               if (out->texinfo->texture->flags & SURF_DRAWTURB)
-               {
-                       if (out->texinfo->texture->glowtexture)
-                               out->shader = &Cshader_water_glow;
-                       else
-                               out->shader = &Cshader_water;
-                       /*
-                       for (i=0 ; i<2 ; i++)
-                       {
-                               out->extents[i] = 16384*1024;
-                               out->texturemins[i] = -8192*1024;
-                       }
-                       */
-                       out->samples = NULL;
-                       Mod_GenerateWarpMesh (out);
-                       continue;
-               }
-
-               if (!R_TextureHasAlpha(out->texinfo->texture->texture))
-                       out->flags |= SURF_CLIPSOLID;
-               if (out->texinfo->flags & TEX_SPECIAL)
-               {
-                       // qbsp couldn't find the texture for this surface, but it was either turb or sky...  assume turb
-                       if (out->texinfo->texture->glowtexture)
-                               out->shader = &Cshader_water_glow;
-                       else
-                               out->shader = &Cshader_water;
-                       out->shader = &Cshader_water;
-                       out->samples = NULL;
-                       Mod_GenerateWarpMesh (out);
-               }
-               else if ((out->extents[0]+1) > (256*16) || (out->extents[1]+1) > (256*16))
-               {
-                       Con_Printf ("Bad surface extents, converting to fullbright polygon");
-                       if (out->texinfo->texture->glowtexture)
-                               out->shader = &Cshader_wall_fullbright_glow;
-                       else
-                               out->shader = &Cshader_wall_fullbright;
-                       out->samples = NULL;
-                       Mod_GenerateVertexMesh(out);
-               }
-               else
+               if (out->texinfo->texture->shader == &Cshader_wall_lightmap)
                {
+                       if ((out->extents[0] >> 4) + 1 > (256) || (out->extents[1] >> 4) + 1 > (256))
+                               Host_Error ("Bad surface extents");
+                       Mod_GenerateWallMesh (out, false);
                        // stainmap for permanent marks on walls
                        out->stainsamples = Mem_Alloc(loadmodel->mempool, ssize * tsize * 3);
                        // clear to white
                        memset(out->stainsamples, 255, ssize * tsize * 3);
-                       if (out->extents[0] < r_vertexsurfacesthreshold.integer && out->extents[1] < r_vertexsurfacesthreshold.integer)
-                       {
-                               if (out->texinfo->texture->glowtexture)
-                                       out->shader = &Cshader_wall_vertex_glow;
-                               else
-                                       out->shader = &Cshader_wall_vertex;
-                               Mod_GenerateVertexLitMesh(out);
-                       }
-                       else
-                       {
-                               if (out->texinfo->texture->glowtexture)
-                                       out->shader = &Cshader_wall_lightmap_glow;
-                               else
-                                       out->shader = &Cshader_wall_lightmap;
-                               Mod_GenerateLightmappedMesh(out);
-                       }
                }
+               else
+                       Mod_GenerateVertexMesh (out);
        }
 }
 
-static model_t *sortmodel;
-
-static int Mod_SurfaceQSortCompare(const void *voida, const void *voidb)
-{
-       const msurface_t *a, *b;
-       a = *((const msurface_t **)voida);
-       b = *((const msurface_t **)voidb);
-       if (a->shader != b->shader)
-               return (long) a->shader - (long) b->shader;
-       if (a->texinfo->texture != b->texinfo->texture);
-               return a->texinfo->texture - b->texinfo->texture;
-       return 0;
-}
-
-static void Mod_BrushSortedSurfaces(model_t *model, mempool_t *pool)
-{
-       int surfnum;
-       sortmodel = model;
-       sortmodel->modelsortedsurfaces = Mem_Alloc(pool, sortmodel->nummodelsurfaces * sizeof(msurface_t *));
-       for (surfnum = 0;surfnum < sortmodel->nummodelsurfaces;surfnum++)
-               sortmodel->modelsortedsurfaces[surfnum] = &sortmodel->surfaces[surfnum + sortmodel->firstmodelsurface];
-
-       qsort(sortmodel->modelsortedsurfaces, sortmodel->nummodelsurfaces, sizeof(msurface_t *), Mod_SurfaceQSortCompare);
-}
-
-
 /*
 =================
 Mod_SetParent
@@ -1440,15 +2609,7 @@ static void Mod_LoadLeafs (lump_t *l)
                for (j=0 ; j<4 ; j++)
                        out->ambient_sound_level[j] = in->ambient_level[j];
 
-               // gl underwater warp
-               // LordHavoc: disabled underwater warping
-               /*
-               if (out->contents != CONTENTS_EMPTY)
-               {
-                       for (j=0 ; j<out->nummarksurfaces ; j++)
-                               out->firstmarksurface[j]->flags |= SURF_UNDERWATER;
-               }
-               */
+               // FIXME: Insert caustics here
        }
 }
 
@@ -1485,6 +2646,7 @@ static void Mod_LoadClipnodes (lump_t *l)
                hull->clip_maxs[0] = 16;
                hull->clip_maxs[1] = 16;
                hull->clip_maxs[2] = 36;
+               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
 
                hull = &loadmodel->hulls[2];
                hull->clipnodes = out;
@@ -1497,6 +2659,7 @@ static void Mod_LoadClipnodes (lump_t *l)
                hull->clip_maxs[0] = 32;
                hull->clip_maxs[1] = 32;
                hull->clip_maxs[2] = 32;
+               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
 
                hull = &loadmodel->hulls[3];
                hull->clipnodes = out;
@@ -1509,6 +2672,7 @@ static void Mod_LoadClipnodes (lump_t *l)
                hull->clip_maxs[0] = 16;
                hull->clip_maxs[1] = 16;
                hull->clip_maxs[2] = 18;
+               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
        }
        else
        {
@@ -1523,6 +2687,7 @@ static void Mod_LoadClipnodes (lump_t *l)
                hull->clip_maxs[0] = 16;
                hull->clip_maxs[1] = 16;
                hull->clip_maxs[2] = 32;
+               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
 
                hull = &loadmodel->hulls[2];
                hull->clipnodes = out;
@@ -1535,6 +2700,7 @@ static void Mod_LoadClipnodes (lump_t *l)
                hull->clip_maxs[0] = 32;
                hull->clip_maxs[1] = 32;
                hull->clip_maxs[2] = 64;
+               VectorSubtract(hull->clip_maxs, hull->clip_mins, hull->clip_size);
        }
 
        for (i=0 ; i<count ; i++, out++, in++)
@@ -1586,21 +2752,21 @@ Mod_LoadMarksurfaces
 */
 static void Mod_LoadMarksurfaces (lump_t *l)
 {
-       int             i, j;
-       short   *in;
+       int i, j;
+       short *in;
 
        in = (void *)(mod_base + l->fileofs);
        if (l->filelen % sizeof(*in))
                Host_Error ("MOD_LoadBmodel: funny lump size in %s",loadmodel->name);
        loadmodel->nummarksurfaces = l->filelen / sizeof(*in);
-       loadmodel->marksurfaces = Mem_Alloc(loadmodel->mempool, loadmodel->nummarksurfaces * sizeof(msurface_t *));
+       loadmodel->marksurfaces = Mem_Alloc(loadmodel->mempool, loadmodel->nummarksurfaces * sizeof(int));
 
        for (i = 0;i < loadmodel->nummarksurfaces;i++)
        {
                j = (unsigned) LittleShort(in[i]);
                if (j >= loadmodel->numsurfaces)
                        Host_Error ("Mod_ParseMarksurfaces: bad surface number");
-               loadmodel->marksurfaces[i] = loadmodel->surfaces + j;
+               loadmodel->marksurfaces[i] = j;
        }
 }
 
@@ -1650,8 +2816,6 @@ static void Mod_LoadPlanes (lump_t *l)
                out->normal[2] = LittleFloat (in->normal[2]);
                out->dist = LittleFloat (in->dist);
 
-               // LordHavoc: recalculated by PlaneClassify, FIXME: validate type and report error if type does not match normal?
-//             out->type = LittleLong (in->type);
                PlaneClassify(out);
        }
 }
@@ -1829,9 +2993,6 @@ static winding_t *ClipWinding (winding_t *in, mplane_t *split, int keepon)
        // free the original winding
        FreeWinding (in);
 
-       // debugging
-       //Mem_CheckSentinels(neww);
-
        return neww;
 }
 
@@ -1944,10 +3105,6 @@ static void DivideWinding (winding_t *in, mplane_t *split, winding_t **front, wi
                VectorCopy (mid, b->points[b->numpoints]);
                b->numpoints++;
        }
-
-       // debugging
-       //Mem_CheckSentinels(f);
-       //Mem_CheckSentinels(b);
 }
 
 typedef struct portal_s
@@ -1971,7 +3128,6 @@ static portal_t *AllocPortal (void)
 {
        portal_t *p;
        p = Mem_Alloc(loadmodel->mempool, sizeof(portal_t));
-       //memset(p, 0, sizeof(portal_t));
        p->chain = portalchain;
        portalchain = p;
        return p;
@@ -2008,8 +3164,6 @@ static void Mod_FinalizePortals(void)
        mleaf_t *leaf, *endleaf;
        winding_t *w;
 
-       //Mem_CheckSentinelsGlobal();
-
        // recalculate bounding boxes for all leafs (because qbsp is very sloppy)
        leaf = loadmodel->leafs;
        endleaf = leaf + loadmodel->numleafs;
@@ -2043,8 +3197,6 @@ static void Mod_FinalizePortals(void)
 
        Mod_RecursiveRecalcNodeBBox(loadmodel->nodes);
 
-       //Mem_CheckSentinelsGlobal();
-
        // tally up portal and point counts
        p = portalchain;
        numportals = 0;
@@ -2064,7 +3216,7 @@ static void Mod_FinalizePortals(void)
        }
        loadmodel->portals = Mem_Alloc(loadmodel->mempool, numportals * sizeof(mportal_t) + numpoints * sizeof(mvertex_t));
        loadmodel->numportals = numportals;
-       loadmodel->portalpoints = (void *) ((long) loadmodel->portals + numportals * sizeof(mportal_t));
+       loadmodel->portalpoints = (void *) ((qbyte *) loadmodel->portals + numportals * sizeof(mportal_t));
        loadmodel->numportalpoints = numpoints;
        // clear all leaf portal chains
        for (i = 0;i < loadmodel->numleafs;i++)
@@ -2135,8 +3287,6 @@ static void Mod_FinalizePortals(void)
                FreePortal(p);
                p = pnext;
        }
-
-       //Mem_CheckSentinelsGlobal();
 }
 
 /*
@@ -2220,8 +3370,6 @@ static void Mod_RecursiveNodePortals (mnode_t *node)
        portal_t *portal, *nextportal, *nodeportal, *splitportal, *temp;
        winding_t *nodeportalwinding, *frontwinding, *backwinding;
 
-       //      CheckLeafPortalConsistancy (node);
-
        // if a leaf, we're done
        if (node->contents)
                return;
@@ -2239,7 +3387,6 @@ static void Mod_RecursiveNodePortals (mnode_t *node)
        nodeportal->plane = *node->plane;
 
        nodeportalwinding = BaseWindingForPlane (node->plane);
-       //Mem_CheckSentinels(nodeportalwinding);
        side = 0;       // shut up compiler warning
        for (portal = (portal_t *)node->portals;portal;portal = portal->next[side])
        {
@@ -2334,61 +3481,57 @@ static void Mod_RecursiveNodePortals (mnode_t *node)
        Mod_RecursiveNodePortals(back);
 }
 
-/*
-void Mod_MakeOutsidePortals(mnode_t *node)
-{
-       int                     i, j;
-       portal_t        *p, *portals[6];
-       mnode_t         *outside_node;
-
-       outside_node = Mem_Alloc(loadmodel->mempool, sizeof(mnode_t));
-       outside_node->contents = CONTENTS_SOLID;
-       outside_node->portals = NULL;
-
-       for (i = 0;i < 3;i++)
-       {
-               for (j = 0;j < 2;j++)
-               {
-                       portals[j*3 + i] = p = AllocPortal ();
-                       memset (&p->plane, 0, sizeof(mplane_t));
-                       p->plane.normal[i] = j ? -1 : 1;
-                       p->plane.dist = -65536;
-                       p->winding = BaseWindingForPlane (&p->plane);
-                       if (j)
-                               AddPortalToNodes (p, outside_node, node);
-                       else
-                               AddPortalToNodes (p, node, outside_node);
-               }
-       }
-
-       // clip the basewindings by all the other planes
-       for (i = 0;i < 6;i++)
-       {
-               for (j = 0;j < 6;j++)
-               {
-                       if (j == i)
-                               continue;
-                       portals[i]->winding = ClipWinding (portals[i]->winding, &portals[j]->plane, true);
-               }
-       }
-}
-*/
 
 static void Mod_MakePortals(void)
 {
-//     Con_Printf("building portals for %s\n", loadmodel->name);
-
        portalchain = NULL;
-//     Mod_MakeOutsidePortals (loadmodel->nodes);
        Mod_RecursiveNodePortals (loadmodel->nodes);
        Mod_FinalizePortals();
 }
 
+static void Mod_BuildSurfaceNeighbors (msurface_t *surfaces, int numsurfaces, mempool_t *mempool)
+{
+       #if 0
+       int surfnum, vertnum, snum, vnum;
+       msurface_t *surf, *s;
+       float *v0, *v1, *v2, *v3;
+       for (surf = surfaces, surfnum = 0;surfnum < numsurfaces;surf++, surfnum++)
+       {
+               surf->neighborsurfaces = Mem_Alloc(mempool, surf->poly_numverts * sizeof(msurface_t *));
+               for (vertnum = 0;vertnum < surf->poly_numverts;vertnum++)
+               {
+                       v0 = surf->poly_verts + ((vertnum + 1) % surf->poly_numverts) * 3;
+                       v1 = surf->poly_verts + vertnum * 3;
+                       surf->neighborsurfaces[vertnum] = NULL;
+                       for (s = surfaces, snum = 0;snum < numsurfaces;s++, snum++)
+                       {
+                               if (s == surf)
+                                       continue;
+                               for (vnum = 0, v2 = s->poly_verts + (s->poly_numverts - 1) * 3, v3 = s->poly_verts;vnum < s->poly_numverts;vnum++, v2 = v3, v3 += 3)
+                               {
+                                       if (v0[0] == v2[0] && v0[1] == v2[1] && v0[2] == v2[2] && v1[0] == v3[0] && v1[1] == v3[1] && v1[2] == v3[2])
+                                       {
+                                               surf->neighborsurfaces[vertnum] = s;
+                                               break;
+                                       }
+                               }
+                               if (vnum < s->poly_numverts)
+                                       break;
+                       }
+               }
+       }
+       #endif
+}
+
 /*
 =================
 Mod_LoadBrushModel
 =================
 */
+extern void R_Model_Brush_DrawSky(entity_render_t *ent);
+extern void R_Model_Brush_Draw(entity_render_t *ent);
+extern void R_Model_Brush_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius);
+extern void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius2, float lightdistbias, float lightsubtract, float *lightcolor);
 void Mod_LoadBrushModel (model_t *mod, void *buffer)
 {
        int                     i, j;
@@ -2396,6 +3539,7 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
        dmodel_t        *bm;
        mempool_t       *mainmempool;
        char            *loadname;
+       model_t         *originalloadmodel;
 
        mod->type = mod_brush;
 
@@ -2403,10 +3547,14 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
 
        i = LittleLong (header->version);
        if (i != BSPVERSION && i != 30)
-               Host_Error ("Mod_LoadBrushModel: %s has wrong version number (%i should be %i or 30 (HalfLife))", mod->name, i, BSPVERSION);
+               Host_Error ("Mod_LoadBrushModel: %s has wrong version number (%i should be %i (Quake) or 30 (HalfLife))", mod->name, i, BSPVERSION);
        mod->ishlbsp = i == 30;
        if (loadmodel->isworldmodel)
+       {
                Cvar_SetValue("halflifebsp", mod->ishlbsp);
+               // until we get a texture for it...
+               R_ResetQuakeSky();
+       }
 
 // swap all the lumps
        mod_base = (qbyte *)header;
@@ -2419,50 +3567,33 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
        // store which lightmap format to use
        mod->lightmaprgba = r_lightmaprgba.integer;
 
-//     Mem_CheckSentinelsGlobal();
-       // LordHavoc: had to move entity loading above everything to allow parsing various settings from worldspawn
        Mod_LoadEntities (&header->lumps[LUMP_ENTITIES]);
-//     Mem_CheckSentinelsGlobal();
        Mod_LoadVertexes (&header->lumps[LUMP_VERTEXES]);
-//     Mem_CheckSentinelsGlobal();
        Mod_LoadEdges (&header->lumps[LUMP_EDGES]);
-//     Mem_CheckSentinelsGlobal();
        Mod_LoadSurfedges (&header->lumps[LUMP_SURFEDGES]);
-//     Mem_CheckSentinelsGlobal();
        Mod_LoadTextures (&header->lumps[LUMP_TEXTURES]);
-//     Mem_CheckSentinelsGlobal();
        Mod_LoadLighting (&header->lumps[LUMP_LIGHTING]);
-//     Mem_CheckSentinelsGlobal();
        Mod_LoadPlanes (&header->lumps[LUMP_PLANES]);
-//     Mem_CheckSentinelsGlobal();
        Mod_LoadTexinfo (&header->lumps[LUMP_TEXINFO]);
-//     Mem_CheckSentinelsGlobal();
        Mod_LoadFaces (&header->lumps[LUMP_FACES]);
-//     Mem_CheckSentinelsGlobal();
        Mod_LoadMarksurfaces (&header->lumps[LUMP_MARKSURFACES]);
-//     Mem_CheckSentinelsGlobal();
        Mod_LoadVisibility (&header->lumps[LUMP_VISIBILITY]);
-//     Mem_CheckSentinelsGlobal();
        Mod_LoadLeafs (&header->lumps[LUMP_LEAFS]);
-//     Mem_CheckSentinelsGlobal();
        Mod_LoadNodes (&header->lumps[LUMP_NODES]);
-//     Mem_CheckSentinelsGlobal();
        Mod_LoadClipnodes (&header->lumps[LUMP_CLIPNODES]);
-//     Mem_CheckSentinelsGlobal();
-//     Mod_LoadEntities (&header->lumps[LUMP_ENTITIES]);
        Mod_LoadSubmodels (&header->lumps[LUMP_MODELS]);
-//     Mem_CheckSentinelsGlobal();
 
        Mod_MakeHull0 ();
-//     Mem_CheckSentinelsGlobal();
        Mod_MakePortals();
-//     Mem_CheckSentinelsGlobal();
 
        mod->numframes = 2;             // regular and alternate animation
 
        mainmempool = mod->mempool;
        loadname = mod->name;
 
+       Mod_LoadLightList ();
+       originalloadmodel = loadmodel;
+
 //
 // set up the submodels (FIXME: this is confusing)
 //
@@ -2489,45 +3620,67 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
                mod->firstmodelsurface = bm->firstface;
                mod->nummodelsurfaces = bm->numfaces;
 
+               // this gets altered below if sky is used
                mod->DrawSky = NULL;
-               // LordHavoc: calculate bmodel bounding box rather than trusting what it says
-               for (j = 0, surf = &mod->surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surf++)
+               mod->Draw = R_Model_Brush_Draw;
+               mod->DrawFakeShadow = NULL;
+               mod->DrawShadowVolume = R_Model_Brush_DrawShadowVolume;
+               mod->DrawLight = R_Model_Brush_DrawLight;
+               mod->texturesurfacechains = Mem_Alloc(originalloadmodel->mempool, mod->numtextures * sizeof(msurface_t *));
+               if (mod->nummodelsurfaces)
                {
-                       // we only need to have a drawsky function if it is used (usually only on world model)
-                       if (surf->shader == &Cshader_sky)
-                               mod->DrawSky = R_DrawBrushModelSky;
-                       for (k = 0;k < surf->numedges;k++)
+                       // LordHavoc: calculate bmodel bounding box rather than trusting what it says
+                       for (j = 0, surf = &mod->surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surf++)
                        {
-                               l = mod->surfedges[k + surf->firstedge];
-                               if (l > 0)
-                                       vec = mod->vertexes[mod->edges[l].v[0]].position;
-                               else
-                                       vec = mod->vertexes[mod->edges[-l].v[1]].position;
-                               if (mod->normalmins[0] > vec[0]) mod->normalmins[0] = vec[0];
-                               if (mod->normalmins[1] > vec[1]) mod->normalmins[1] = vec[1];
-                               if (mod->normalmins[2] > vec[2]) mod->normalmins[2] = vec[2];
-                               if (mod->normalmaxs[0] < vec[0]) mod->normalmaxs[0] = vec[0];
-                               if (mod->normalmaxs[1] < vec[1]) mod->normalmaxs[1] = vec[1];
-                               if (mod->normalmaxs[2] < vec[2]) mod->normalmaxs[2] = vec[2];
-                               dist = vec[0]*vec[0]+vec[1]*vec[1];
-                               if (modelyawradius < dist)
-                                       modelyawradius = dist;
-                               dist += vec[2]*vec[2];
-                               if (modelradius < dist)
-                                       modelradius = dist;
+                               // we only need to have a drawsky function if it is used (usually only on world model)
+                               if (surf->texinfo->texture->shader == &Cshader_sky)
+                                       mod->DrawSky = R_Model_Brush_DrawSky;
+                               // link into texture chain
+                               surf->texturechain = mod->texturesurfacechains[surf->texinfo->texture - mod->textures];
+                               mod->texturesurfacechains[surf->texinfo->texture - mod->textures] = surf;
+                               // calculate bounding shapes
+                               for (k = 0;k < surf->numedges;k++)
+                               {
+                                       l = mod->surfedges[k + surf->firstedge];
+                                       if (l > 0)
+                                               vec = mod->vertexes[mod->edges[l].v[0]].position;
+                                       else
+                                               vec = mod->vertexes[mod->edges[-l].v[1]].position;
+                                       if (mod->normalmins[0] > vec[0]) mod->normalmins[0] = vec[0];
+                                       if (mod->normalmins[1] > vec[1]) mod->normalmins[1] = vec[1];
+                                       if (mod->normalmins[2] > vec[2]) mod->normalmins[2] = vec[2];
+                                       if (mod->normalmaxs[0] < vec[0]) mod->normalmaxs[0] = vec[0];
+                                       if (mod->normalmaxs[1] < vec[1]) mod->normalmaxs[1] = vec[1];
+                                       if (mod->normalmaxs[2] < vec[2]) mod->normalmaxs[2] = vec[2];
+                                       dist = vec[0]*vec[0]+vec[1]*vec[1];
+                                       if (modelyawradius < dist)
+                                               modelyawradius = dist;
+                                       dist += vec[2]*vec[2];
+                                       if (modelradius < dist)
+                                               modelradius = dist;
+                               }
                        }
+                       modelyawradius = sqrt(modelyawradius);
+                       modelradius = sqrt(modelradius);
+                       mod->yawmins[0] = mod->yawmins[1] = -(mod->yawmaxs[0] = mod->yawmaxs[1] = modelyawradius);
+                       mod->yawmins[2] = mod->normalmins[2];
+                       mod->yawmaxs[2] = mod->normalmaxs[2];
+                       mod->rotatedmins[0] = mod->rotatedmins[1] = mod->rotatedmins[2] = -modelradius;
+                       mod->rotatedmaxs[0] = mod->rotatedmaxs[1] = mod->rotatedmaxs[2] = modelradius;
+                       mod->radius = modelradius;
+                       mod->radius2 = modelradius * modelradius;
+                       // LordHavoc: build triangle meshs for entire model's geometry
+                       // (only used for shadow volumes)
+                       mod->shadowmesh = Mod_ShadowMesh_Begin(originalloadmodel->mempool);
+                       for (j = 0, surf = &mod->surfaces[mod->firstmodelsurface];j < mod->nummodelsurfaces;j++, surf++)
+                               if (surf->flags & SURF_SHADOWCAST)
+                                       Mod_ShadowMesh_AddPolygon(originalloadmodel->mempool, mod->shadowmesh, surf->poly_numverts, surf->poly_verts);
+                       mod->shadowmesh = Mod_ShadowMesh_Finish(originalloadmodel->mempool, mod->shadowmesh);
+                       Mod_ShadowMesh_CalcBBox(mod->shadowmesh, mod->shadowmesh_mins, mod->shadowmesh_maxs, mod->shadowmesh_center, &mod->shadowmesh_radius);
                }
-               modelyawradius = sqrt(modelyawradius);
-               modelradius = sqrt(modelradius);
-               mod->yawmins[0] = mod->yawmins[1] = -(mod->yawmaxs[0] = mod->yawmaxs[1] = modelyawradius);
-               mod->yawmins[2] = mod->normalmins[2];
-               mod->yawmaxs[2] = mod->normalmaxs[2];
-               mod->rotatedmins[0] = mod->rotatedmins[1] = mod->rotatedmins[2] = -modelradius;
-               mod->rotatedmaxs[0] = mod->rotatedmaxs[1] = mod->rotatedmaxs[2] = modelradius;
-//             mod->modelradius = modelradius;
-               // LordHavoc: check for empty submodels (lacrima.bsp has such a glitch)
-               if (mod->normalmins[0] > mod->normalmaxs[0] || mod->normalmins[1] > mod->normalmaxs[1] || mod->normalmins[2] > mod->normalmaxs[2])
+               else
                {
+                       // LordHavoc: empty submodel (lacrima.bsp has such a glitch)
                        Con_Printf("warning: empty submodel *%i in %s\n", i+1, loadname);
                        VectorClear(mod->normalmins);
                        VectorClear(mod->normalmaxs);
@@ -2535,22 +3688,14 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
                        VectorClear(mod->yawmaxs);
                        VectorClear(mod->rotatedmins);
                        VectorClear(mod->rotatedmaxs);
-                       //mod->modelradius = 0;
+                       mod->radius = 0;
+                       mod->radius2 = 0;
+                       mod->shadowmesh = NULL;
                }
-
-//             VectorCopy (bm->maxs, mod->maxs);
-//             VectorCopy (bm->mins, mod->mins);
-
-//             mod->radius = RadiusFromBounds (mod->mins, mod->maxs);
+               Mod_BuildSurfaceNeighbors(mod->surfaces + mod->firstmodelsurface, mod->nummodelsurfaces, originalloadmodel->mempool);
 
                mod->numleafs = bm->visleafs;
 
-               mod->SERAddEntity = Mod_Brush_SERAddEntity;
-               mod->Draw = R_DrawBrushModelNormal;
-               mod->DrawShadow = NULL;
-
-               Mod_BrushSortedSurfaces(mod, mainmempool);
-
                // LordHavoc: only register submodels if it is the world
                // (prevents bsp models from replacing world submodels)
                if (loadmodel->isworldmodel && i < (mod->numsubmodels - 1))
@@ -2567,5 +3712,8 @@ void Mod_LoadBrushModel (model_t *mod, void *buffer)
                        mod = loadmodel;
                }
        }
-//     Mem_CheckSentinelsGlobal();
+
+       loadmodel = originalloadmodel;
+       Mod_ProcessLightList ();
 }
+