]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - model_shared.c
add DeviceLost and DeviceRestored functions to R_Modules system
[xonotic/darkplaces.git] / model_shared.c
index edf096aaeba004612a3ee13bca1f0f15cca08705..eff2960c3548c798be946ecbb25af4c7b1cc3f5b 100644 (file)
@@ -25,8 +25,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "image.h"
 #include "r_shadow.h"
+#include "polygon.h"
 
 cvar_t r_mipskins = {CVAR_SAVE, "r_mipskins", "0", "mipmaps model skins so they render faster in the distance and do not display noise artifacts, can cause discoloration of skins if they contain undesirable border colors"};
+cvar_t mod_generatelightmaps_unitspersample = {CVAR_SAVE, "mod_generatelightmaps_unitspersample", "8", "lightmap resolution"};
+cvar_t mod_generatelightmaps_borderpixels = {CVAR_SAVE, "mod_generatelightmaps_borderpixels", "2", "extra space around polygons to prevent sampling artifacts"};
+cvar_t mod_generatelightmaps_texturesize = {CVAR_SAVE, "mod_generatelightmaps_texturesize", "1024", "size of lightmap textures"};
+cvar_t mod_generatelightmaps_lightmapsamples = {CVAR_SAVE, "mod_generatelightmaps_lightmapsamples", "16", "number of shadow tests done per lightmap pixel"};
+cvar_t mod_generatelightmaps_vertexsamples = {CVAR_SAVE, "mod_generatelightmaps_vertexsamples", "16", "number of shadow tests done per vertex"};
+cvar_t mod_generatelightmaps_gridsamples = {CVAR_SAVE, "mod_generatelightmaps_gridsamples", "64", "number of shadow tests done per lightgrid cell"};
+cvar_t mod_generatelightmaps_lightmapradius = {CVAR_SAVE, "mod_generatelightmaps_lightmapradius", "16", "sampling area around each lightmap pixel"};
+cvar_t mod_generatelightmaps_vertexradius = {CVAR_SAVE, "mod_generatelightmaps_vertexradius", "16", "sampling area around each vertex"};
+cvar_t mod_generatelightmaps_gridradius = {CVAR_SAVE, "mod_generatelightmaps_gridradius", "64", "sampling area around each lightgrid cell center"};
 
 dp_model_t *loadmodel;
 
@@ -82,6 +92,7 @@ static void mod_shutdown(void)
                        Mod_UnloadModel(mod);
 
        Mod_FreeQ3Shaders();
+       Mod_Skeletal_FreeBuffers();
 }
 
 static void mod_newmap(void)
@@ -91,21 +102,23 @@ static void mod_newmap(void)
        int nummodels = Mem_ExpandableArray_IndexRange(&models);
        dp_model_t *mod;
 
-       R_SkinFrame_PrepareForPurge();
        for (i = 0;i < nummodels;i++)
        {
-               if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->mempool && mod->data_textures)
+               if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->mempool)
                {
-                       for (j = 0;j < mod->num_textures;j++)
+                       for (j = 0;j < mod->num_textures && mod->data_textures;j++)
                        {
                                for (k = 0;k < mod->data_textures[j].numskinframes;k++)
                                        R_SkinFrame_MarkUsed(mod->data_textures[j].skinframes[k]);
                                for (k = 0;k < mod->data_textures[j].backgroundnumskinframes;k++)
                                        R_SkinFrame_MarkUsed(mod->data_textures[j].backgroundskinframes[k]);
                        }
+                       if (mod->brush.solidskyskinframe)
+                               R_SkinFrame_MarkUsed(mod->brush.solidskyskinframe);
+                       if (mod->brush.alphaskyskinframe)
+                               R_SkinFrame_MarkUsed(mod->brush.alphaskyskinframe);
                }
        }
-       R_SkinFrame_Purge();
 
        if (!cl_stainmaps_clearonload.integer)
                return;
@@ -136,7 +149,7 @@ Mod_Init
 static void Mod_Print(void);
 static void Mod_Precache (void);
 static void Mod_Decompile_f(void);
-static void Mod_BuildVBOs(void);
+static void Mod_GenerateLightmaps_f(void);
 void Mod_Init (void)
 {
        mod_mempool = Mem_AllocPool("modelinfo", 0, NULL);
@@ -147,14 +160,26 @@ void Mod_Init (void)
        Mod_SpriteInit();
 
        Cvar_RegisterVariable(&r_mipskins);
+       Cvar_RegisterVariable(&mod_generatelightmaps_unitspersample);
+       Cvar_RegisterVariable(&mod_generatelightmaps_borderpixels);
+       Cvar_RegisterVariable(&mod_generatelightmaps_texturesize);
+
+       Cvar_RegisterVariable(&mod_generatelightmaps_lightmapsamples);
+       Cvar_RegisterVariable(&mod_generatelightmaps_vertexsamples);
+       Cvar_RegisterVariable(&mod_generatelightmaps_gridsamples);
+       Cvar_RegisterVariable(&mod_generatelightmaps_lightmapradius);
+       Cvar_RegisterVariable(&mod_generatelightmaps_vertexradius);
+       Cvar_RegisterVariable(&mod_generatelightmaps_gridradius);
+
        Cmd_AddCommand ("modellist", Mod_Print, "prints a list of loaded models");
        Cmd_AddCommand ("modelprecache", Mod_Precache, "load a model");
        Cmd_AddCommand ("modeldecompile", Mod_Decompile_f, "exports a model in several formats for editing purposes");
+       Cmd_AddCommand ("mod_generatelightmaps", Mod_GenerateLightmaps_f, "rebuilds lighting on current worldmodel");
 }
 
 void Mod_RenderInit(void)
 {
-       R_RegisterModule("Models", mod_start, mod_shutdown, mod_newmap);
+       R_RegisterModule("Models", mod_start, mod_shutdown, mod_newmap, NULL, NULL);
 }
 
 void Mod_UnloadModel (dp_model_t *mod)
@@ -169,12 +194,24 @@ void Mod_UnloadModel (dp_model_t *mod)
        strlcpy(name, mod->name, sizeof(name));
        parentmodel = mod->brush.parentmodel;
        used = mod->used;
-       if (mod->surfmesh.ebo3i)
-               R_Mesh_DestroyBufferObject(mod->surfmesh.ebo3i);
-       if (mod->surfmesh.ebo3s)
-               R_Mesh_DestroyBufferObject(mod->surfmesh.ebo3s);
-       if (mod->surfmesh.vbo)
-               R_Mesh_DestroyBufferObject(mod->surfmesh.vbo);
+       if (mod->mempool)
+       {
+               if (mod->surfmesh.vertexpositionbuffer)
+                       R_Mesh_DestroyMeshBuffer(mod->surfmesh.vertexpositionbuffer);
+               mod->surfmesh.vertexpositionbuffer = NULL;
+               if (mod->surfmesh.vertexmeshbuffer)
+                       R_Mesh_DestroyMeshBuffer(mod->surfmesh.vertexmeshbuffer);
+               mod->surfmesh.vertexmeshbuffer = NULL;
+               if (mod->surfmesh.data_element3i_indexbuffer)
+                       R_Mesh_DestroyMeshBuffer(mod->surfmesh.data_element3i_indexbuffer);
+               mod->surfmesh.data_element3i_indexbuffer = NULL;
+               if (mod->surfmesh.data_element3s_indexbuffer)
+                       R_Mesh_DestroyMeshBuffer(mod->surfmesh.data_element3s_indexbuffer);
+               mod->surfmesh.data_element3s_indexbuffer = NULL;
+               if (mod->surfmesh.vbo_vertexbuffer)
+                       R_Mesh_DestroyMeshBuffer(mod->surfmesh.vbo_vertexbuffer);
+               mod->surfmesh.vbo_vertexbuffer = NULL;
+       }
        // free textures/memory attached to the model
        R_FreeTexturePool(&mod->texturepool);
        Mem_FreePool(&mod->mempool);
@@ -230,7 +267,7 @@ int Mod_FrameGroupify_ParseGroups(const char *buf, mod_framegroupify_parsegroups
                        if (!COM_ParseToken_Simple(&bufptr, true, false))
                                break;
                        if (strcmp(com_token, "\n"))
-                               loop = atoi(com_token);
+                               loop = atoi(com_token) != 0;
                        else
                                loop = true;
                }
@@ -258,7 +295,7 @@ void Mod_FrameGroupify_ParseGroups_Store (unsigned int i, int start, int len, fl
 {
        dp_model_t *mod = (dp_model_t *) pass;
        animscene_t *anim = &mod->animscenes[i];
-       dpsnprintf(anim->name, sizeof(anim[i].name), "groupified_%d", i);
+       dpsnprintf(anim->name, sizeof(anim[i].name), "groupified_%d_anim", i);
        anim->firstframe = bound(0, start, mod->num_poses - 1);
        anim->framecount = bound(1, len, mod->num_poses - anim->firstframe);
        anim->framerate = max(1, fps);
@@ -287,6 +324,31 @@ void Mod_FrameGroupify(dp_model_t *mod, const char *buf)
        Mod_FrameGroupify_ParseGroups(buf, Mod_FrameGroupify_ParseGroups_Store, mod);
 }
 
+void Mod_FindPotentialDeforms(dp_model_t *mod)
+{
+       int i, j;
+       texture_t *texture;
+       mod->wantnormals = false;
+       mod->wanttangents = false;
+       for (i = 0;i < mod->num_textures;i++)
+       {
+               texture = mod->data_textures + i;
+               if (texture->tcgen.tcgen == Q3TCGEN_ENVIRONMENT)
+                       mod->wantnormals = true;
+               for (j = 0;j < Q3MAXDEFORMS;j++)
+               {
+                       if (texture->deforms[j].deform == Q3DEFORM_AUTOSPRITE)
+                       {
+                               mod->wanttangents = true;
+                               mod->wantnormals = true;
+                               break;
+                       }
+                       if (texture->deforms[j].deform != Q3DEFORM_NONE)
+                               mod->wantnormals = true;
+               }
+       }
+}
+
 /*
 ==================
 Mod_LoadModel
@@ -318,7 +380,7 @@ dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk)
                        Con_Printf("loading model %s\n", mod->name);
 
                mod->used = true;
-               mod->crc = -1;
+               mod->crc = (unsigned int)-1;
                mod->loaded = false;
 
                VectorClear(mod->normalmins);
@@ -408,7 +470,7 @@ dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk)
                num = LittleLong(*((int *)buf));
                // call the apropriate loader
                loadmodel = mod;
-                    if (!strcasecmp(FS_FileExtension(mod->name), "obj")) Mod_OBJ_Load(mod, buf, bufend);
+               if (!strcasecmp(FS_FileExtension(mod->name), "obj")) Mod_OBJ_Load(mod, buf, bufend);
                else if (!memcmp(buf, "IDPO", 4)) Mod_IDP0_Load(mod, buf, bufend);
                else if (!memcmp(buf, "IDP2", 4)) Mod_IDP2_Load(mod, buf, bufend);
                else if (!memcmp(buf, "IDP3", 4)) Mod_IDP3_Load(mod, buf, bufend);
@@ -418,15 +480,18 @@ dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk)
                else if (!memcmp(buf, "ZYMOTICMODEL", 12)) Mod_ZYMOTICMODEL_Load(mod, buf, bufend);
                else if (!memcmp(buf, "DARKPLACESMODEL", 16)) Mod_DARKPLACESMODEL_Load(mod, buf, bufend);
                else if (!memcmp(buf, "ACTRHEAD", 8)) Mod_PSKMODEL_Load(mod, buf, bufend);
+               else if (!memcmp(buf, "INTERQUAKEMODEL", 16)) Mod_INTERQUAKEMODEL_Load(mod, buf, bufend);
                else if (strlen(mod->name) >= 4 && !strcmp(mod->name + strlen(mod->name) - 4, ".map")) Mod_MAP_Load(mod, buf, bufend);
                else if (num == BSPVERSION || num == 30) Mod_Q1BSP_Load(mod, buf, bufend);
                else Con_Printf("Mod_LoadModel: model \"%s\" is of unknown/unsupported type\n", mod->name);
                Mem_Free(buf);
 
+               Mod_FindPotentialDeforms(mod);
+                                       
                buf = FS_LoadFile (va("%s.framegroups", mod->name), tempmempool, false, &filesize);
                if(buf)
                {
-                       Mod_FrameGroupify(mod, buf);
+                       Mod_FrameGroupify(mod, (const char *)buf);
                        Mem_Free(buf);
                }
 
@@ -630,12 +695,13 @@ void Mod_BuildTriangleNeighbors(int *neighbors, const int *elements, int numtria
                int element[2];
        }
        edgehashentry_t;
-       edgehashentry_t *edgehash[TRIANGLEEDGEHASH], *edgehashentries, edgehashentriesbuffer[TRIANGLEEDGEHASH*3], *hash;
-       memset(edgehash, 0, sizeof(edgehash));
-       edgehashentries = edgehashentriesbuffer;
+       static edgehashentry_t **edgehash;
+       edgehashentry_t *edgehashentries, *hash;
+       if (!numtriangles)
+               return;
+       edgehash = (edgehashentry_t **)Mem_Alloc(tempmempool, TRIANGLEEDGEHASH * sizeof(*edgehash));
        // if there are too many triangles for the stack array, allocate larger buffer
-       if (numtriangles > TRIANGLEEDGEHASH)
-               edgehashentries = (edgehashentry_t *)Mem_Alloc(tempmempool, numtriangles * 3 * sizeof(edgehashentry_t));
+       edgehashentries = (edgehashentry_t *)Mem_Alloc(tempmempool, numtriangles * 3 * sizeof(edgehashentry_t));
        // find neighboring triangles
        for (i = 0, e = elements, n = neighbors;i < numtriangles;i++, e += 3, n += 3)
        {
@@ -684,8 +750,8 @@ void Mod_BuildTriangleNeighbors(int *neighbors, const int *elements, int numtria
                CL_KeepaliveMessage(false);
        }
        // free the allocated buffer
-       if (edgehashentries != edgehashentriesbuffer)
-               Mem_Free(edgehashentries);
+       Mem_Free(edgehashentries);
+       Mem_Free(edgehash);
 }
 #else
 // very slow but simple way
@@ -965,6 +1031,8 @@ shadowmesh_t *Mod_ShadowMesh_Alloc(mempool_t *mempool, int maxverts, int maxtria
        newmesh->maxtriangles = maxtriangles;
        newmesh->numverts = 0;
        newmesh->numtriangles = 0;
+       memset(newmesh->sideoffsets, 0, sizeof(newmesh->sideoffsets));
+       memset(newmesh->sidetotals, 0, sizeof(newmesh->sidetotals));
 
        newmesh->vertex3f = (float *)data;data += maxverts * sizeof(float[3]);
        if (light)
@@ -995,6 +1063,8 @@ shadowmesh_t *Mod_ShadowMesh_ReAlloc(mempool_t *mempool, shadowmesh_t *oldmesh,
        newmesh = Mod_ShadowMesh_Alloc(mempool, oldmesh->numverts, oldmesh->numtriangles, oldmesh->map_diffuse, oldmesh->map_specular, oldmesh->map_normal, light, neighbors, false);
        newmesh->numverts = oldmesh->numverts;
        newmesh->numtriangles = oldmesh->numtriangles;
+       memcpy(newmesh->sideoffsets, oldmesh->sideoffsets, sizeof(oldmesh->sideoffsets));
+       memcpy(newmesh->sidetotals, oldmesh->sidetotals, sizeof(oldmesh->sidetotals));
 
        memcpy(newmesh->vertex3f, oldmesh->vertex3f, oldmesh->numverts * sizeof(float[3]));
        if (newmesh->svector3f && oldmesh->svector3f)
@@ -1117,24 +1187,60 @@ shadowmesh_t *Mod_ShadowMesh_Begin(mempool_t *mempool, int maxverts, int maxtria
 
 static void Mod_ShadowMesh_CreateVBOs(shadowmesh_t *mesh)
 {
-       if (!gl_support_arb_vertex_buffer_object)
+       if (!mesh->numverts)
                return;
 
-       // element buffer is easy because it's just one array
-       if (mesh->numtriangles)
+       // build r_vertexmesh_t array
+       // (compressed interleaved array for faster rendering)
+       if (!mesh->vertexmesh && mesh->texcoord2f)
        {
-               if (mesh->element3s)
-                       mesh->ebo3s = R_Mesh_CreateStaticBufferObject(GL_ELEMENT_ARRAY_BUFFER_ARB, mesh->element3s, mesh->numtriangles * sizeof(unsigned short[3]), "shadowmesh");
-               else
-                       mesh->ebo3i = R_Mesh_CreateStaticBufferObject(GL_ELEMENT_ARRAY_BUFFER_ARB, mesh->element3i, mesh->numtriangles * sizeof(unsigned int[3]), "shadowmesh");
+               int vertexindex;
+               int numvertices = mesh->numverts;
+               r_vertexmesh_t *vertexmesh;
+               mesh->vertexmesh = vertexmesh = (r_vertexmesh_t*)Mem_Alloc(loadmodel->mempool, numvertices * sizeof(*mesh->vertexmesh));
+               for (vertexindex = 0;vertexindex < numvertices;vertexindex++, vertexmesh++)
+               {
+                       VectorCopy(mesh->vertex3f + 3*vertexindex, vertexmesh->vertex3f);
+                       VectorScale(mesh->svector3f + 3*vertexindex, 1.0f, vertexmesh->svector3f);
+                       VectorScale(mesh->tvector3f + 3*vertexindex, 1.0f, vertexmesh->tvector3f);
+                       VectorScale(mesh->normal3f + 3*vertexindex, 1.0f, vertexmesh->normal3f);
+                       Vector2Copy(mesh->texcoord2f + 2*vertexindex, vertexmesh->texcoordtexture2f);
+               }
        }
 
+       // build r_vertexposition_t array
+       if (!mesh->vertexposition)
+       {
+               int vertexindex;
+               int numvertices = mesh->numverts;
+               r_vertexposition_t *vertexposition;
+               mesh->vertexposition = vertexposition = (r_vertexposition_t*)Mem_Alloc(loadmodel->mempool, numvertices * sizeof(*mesh->vertexposition));
+               for (vertexindex = 0;vertexindex < numvertices;vertexindex++, vertexposition++)
+                       VectorCopy(mesh->vertex3f + 3*vertexindex, vertexposition->vertex3f);
+       }
+
+       // upload r_vertexmesh_t array as a buffer
+       if (mesh->vertexmesh && !mesh->vertexmeshbuffer)
+               mesh->vertexmeshbuffer = R_Mesh_CreateMeshBuffer(mesh->vertexmesh, mesh->numverts * sizeof(*mesh->vertexmesh), loadmodel->name, false, false);
+
+       // upload r_vertexposition_t array as a buffer
+       if (mesh->vertexposition && !mesh->vertexpositionbuffer)
+               mesh->vertexpositionbuffer = R_Mesh_CreateMeshBuffer(mesh->vertexposition, mesh->numverts * sizeof(*mesh->vertexposition), loadmodel->name, false, false);
+
+       // upload short indices as a buffer
+       if (mesh->element3s && !mesh->element3s_indexbuffer)
+               mesh->element3s_indexbuffer = R_Mesh_CreateMeshBuffer(mesh->element3s, mesh->numtriangles * sizeof(short[3]), loadmodel->name, true, false);
+
+       // upload int indices as a buffer
+       if (mesh->element3i && !mesh->element3i_indexbuffer && !mesh->element3s)
+               mesh->element3i_indexbuffer = R_Mesh_CreateMeshBuffer(mesh->element3i, mesh->numtriangles * sizeof(int[3]), loadmodel->name, true, false);
+
        // vertex buffer is several arrays and we put them in the same buffer
        //
        // is this wise?  the texcoordtexture2f array is used with dynamic
        // vertex/svector/tvector/normal when rendering animated models, on the
        // other hand animated models don't use a lot of vertices anyway...
-       if (mesh->numverts)
+       if (!mesh->vbo_vertexbuffer)
        {
                size_t size;
                unsigned char *mem;
@@ -1150,7 +1256,7 @@ static void Mod_ShadowMesh_CreateVBOs(shadowmesh_t *mesh)
                if (mesh->tvector3f         ) memcpy(mem + mesh->vbooffset_tvector3f         , mesh->tvector3f         , mesh->numverts * sizeof(float[3]));
                if (mesh->normal3f          ) memcpy(mem + mesh->vbooffset_normal3f          , mesh->normal3f          , mesh->numverts * sizeof(float[3]));
                if (mesh->texcoord2f        ) memcpy(mem + mesh->vbooffset_texcoord2f        , mesh->texcoord2f        , mesh->numverts * sizeof(float[2]));
-               mesh->vbo = R_Mesh_CreateStaticBufferObject(GL_ARRAY_BUFFER_ARB, mem, size, "shadowmesh");
+               mesh->vbo_vertexbuffer = R_Mesh_CreateMeshBuffer(mem, size, "shadowmesh", false, false);
                Mem_Free(mem);
        }
 }
@@ -1239,17 +1345,50 @@ void Mod_ShadowMesh_Free(shadowmesh_t *mesh)
        shadowmesh_t *nextmesh;
        for (;mesh;mesh = nextmesh)
        {
-               if (mesh->ebo3i)
-                       R_Mesh_DestroyBufferObject(mesh->ebo3i);
-               if (mesh->ebo3s)
-                       R_Mesh_DestroyBufferObject(mesh->ebo3s);
-               if (mesh->vbo)
-                       R_Mesh_DestroyBufferObject(mesh->vbo);
+               if (mesh->vertexpositionbuffer)
+                       R_Mesh_DestroyMeshBuffer(mesh->vertexpositionbuffer);
+               if (mesh->vertexmeshbuffer)
+                       R_Mesh_DestroyMeshBuffer(mesh->vertexmeshbuffer);
+               if (mesh->element3i_indexbuffer)
+                       R_Mesh_DestroyMeshBuffer(mesh->element3i_indexbuffer);
+               if (mesh->element3s_indexbuffer)
+                       R_Mesh_DestroyMeshBuffer(mesh->element3s_indexbuffer);
+               if (mesh->vbo_vertexbuffer)
+                       R_Mesh_DestroyMeshBuffer(mesh->vbo_vertexbuffer);
                nextmesh = mesh->next;
                Mem_Free(mesh);
        }
 }
 
+void Mod_CreateCollisionMesh(dp_model_t *mod)
+{
+       int k;
+       int numcollisionmeshtriangles;
+       const msurface_t *surface;
+       mempool_t *mempool = mod->mempool;
+       if (!mempool && mod->brush.parentmodel)
+               mempool = mod->brush.parentmodel->mempool;
+       // make a single combined collision mesh for physics engine use
+       // TODO rewrite this to use the collision brushes as source, to fix issues with e.g. common/caulk which creates no drawsurface
+       numcollisionmeshtriangles = 0;
+       for (k = 0;k < mod->nummodelsurfaces;k++)
+       {
+               surface = mod->data_surfaces + mod->firstmodelsurface + k;
+               if (!(surface->texture->supercontents & SUPERCONTENTS_SOLID))
+                       continue;
+               numcollisionmeshtriangles += surface->num_triangles;
+       }
+       mod->brush.collisionmesh = Mod_ShadowMesh_Begin(mempool, numcollisionmeshtriangles * 3, numcollisionmeshtriangles, NULL, NULL, NULL, false, false, true);
+       for (k = 0;k < mod->nummodelsurfaces;k++)
+       {
+               surface = mod->data_surfaces + mod->firstmodelsurface + k;
+               if (!(surface->texture->supercontents & SUPERCONTENTS_SOLID))
+                       continue;
+               Mod_ShadowMesh_AddMesh(mempool, mod->brush.collisionmesh, NULL, NULL, NULL, mod->surfmesh.data_vertex3f, NULL, NULL, NULL, NULL, surface->num_triangles, (mod->surfmesh.data_element3i + 3 * surface->num_firsttriangle));
+       }
+       mod->brush.collisionmesh = Mod_ShadowMesh_Finish(mempool, mod->brush.collisionmesh, false, true, false);
+}
+
 void Mod_GetTerrainVertex3fTexCoord2fFromBGRA(const unsigned char *imagepixels, int imagewidth, int imageheight, int ix, int iy, float *vertex3f, float *texcoord2f, matrix4x4_t *pixelstepmatrix, matrix4x4_t *pixeltexturestepmatrix)
 {
        float v[3], tc[3];
@@ -1313,16 +1452,106 @@ void Mod_ConstructTerrainPatchFromBGRA(const unsigned char *imagepixels, int ima
                        Mod_GetTerrainVertexFromBGRA(imagepixels, imagewidth, imageheight, ix, iy, vertex3f, texcoord2f, svector3f, tvector3f, normal3f, pixelstepmatrix, pixeltexturestepmatrix);
 }
 
-q3wavefunc_t Mod_LoadQ3Shaders_EnumerateWaveFunc(const char *s)
+#if 0
+void Mod_Terrain_SurfaceRecurseChunk(dp_model_t *model, int stepsize, int x, int y)
+{
+       float mins[3];
+       float maxs[3];
+       float chunkwidth = min(stepsize, model->terrain.width - 1 - x);
+       float chunkheight = min(stepsize, model->terrain.height - 1 - y);
+       float viewvector[3];
+       unsigned int firstvertex;
+       unsigned int *e;
+       float *v;
+       if (chunkwidth < 2 || chunkheight < 2)
+               return;
+       VectorSet(mins, model->terrain.mins[0] +  x    * stepsize * model->terrain.scale[0], model->terrain.mins[1] +  y    * stepsize * model->terrain.scale[1], model->terrain.mins[2]);
+       VectorSet(maxs, model->terrain.mins[0] + (x+1) * stepsize * model->terrain.scale[0], model->terrain.mins[1] + (y+1) * stepsize * model->terrain.scale[1], model->terrain.maxs[2]);
+       viewvector[0] = bound(mins[0], localvieworigin, maxs[0]) - model->terrain.vieworigin[0];
+       viewvector[1] = bound(mins[1], localvieworigin, maxs[1]) - model->terrain.vieworigin[1];
+       viewvector[2] = bound(mins[2], localvieworigin, maxs[2]) - model->terrain.vieworigin[2];
+       if (stepsize > 1 && VectorLength(viewvector) < stepsize*model->terrain.scale[0]*r_terrain_lodscale.value)
+       {
+               // too close for this stepsize, emit as 4 chunks instead
+               stepsize /= 2;
+               Mod_Terrain_SurfaceRecurseChunk(model, stepsize, x, y);
+               Mod_Terrain_SurfaceRecurseChunk(model, stepsize, x+stepsize, y);
+               Mod_Terrain_SurfaceRecurseChunk(model, stepsize, x, y+stepsize);
+               Mod_Terrain_SurfaceRecurseChunk(model, stepsize, x+stepsize, y+stepsize);
+               return;
+       }
+       // emit the geometry at stepsize into our vertex buffer / index buffer
+       // we add two columns and two rows for skirt
+       outwidth = chunkwidth+2;
+       outheight = chunkheight+2;
+       outwidth2 = outwidth-1;
+       outheight2 = outheight-1;
+       outwidth3 = outwidth+1;
+       outheight3 = outheight+1;
+       firstvertex = numvertices;
+       e = model->terrain.element3i + numtriangles;
+       numtriangles += chunkwidth*chunkheight*2+chunkwidth*2*2+chunkheight*2*2;
+       v = model->terrain.vertex3f + numvertices;
+       numvertices += (chunkwidth+1)*(chunkheight+1)+(chunkwidth+1)*2+(chunkheight+1)*2;
+       // emit the triangles (note: the skirt is treated as two extra rows and two extra columns)
+       for (ty = 0;ty < outheight;ty++)
+       {
+               for (tx = 0;tx < outwidth;tx++)
+               {
+                       *e++ = firstvertex + (ty  )*outwidth3+(tx  );
+                       *e++ = firstvertex + (ty  )*outwidth3+(tx+1);
+                       *e++ = firstvertex + (ty+1)*outwidth3+(tx+1);
+                       *e++ = firstvertex + (ty  )*outwidth3+(tx  );
+                       *e++ = firstvertex + (ty+1)*outwidth3+(tx+1);
+                       *e++ = firstvertex + (ty+1)*outwidth3+(tx  );
+               }
+       }
+       // TODO: emit surface vertices (x+tx*stepsize, y+ty*stepsize)
+       for (ty = 0;ty <= outheight;ty++)
+       {
+               skirtrow = ty == 0 || ty == outheight;
+               ry = y+bound(1, ty, outheight)*stepsize;
+               for (tx = 0;tx <= outwidth;tx++)
+               {
+                       skirt = skirtrow || tx == 0 || tx == outwidth;
+                       rx = x+bound(1, tx, outwidth)*stepsize;
+                       v[0] = rx*scale[0];
+                       v[1] = ry*scale[1];
+                       v[2] = heightmap[ry*terrainwidth+rx]*scale[2];
+                       v += 3;
+               }
+       }
+       // TODO: emit skirt vertices
+}
+
+void Mod_Terrain_UpdateSurfacesForViewOrigin(dp_model_t *model)
+{
+       for (y = 0;y < model->terrain.size[1];y += model->terrain.
+       Mod_Terrain_SurfaceRecurseChunk(model, model->terrain.maxstepsize, x, y);
+       Mod_Terrain_BuildChunk(model, 
+}
+#endif
+
+int Mod_LoadQ3Shaders_EnumerateWaveFunc(const char *s)
 {
-       if (!strcasecmp(s, "sin"))             return Q3WAVEFUNC_SIN;
-       if (!strcasecmp(s, "square"))          return Q3WAVEFUNC_SQUARE;
-       if (!strcasecmp(s, "triangle"))        return Q3WAVEFUNC_TRIANGLE;
-       if (!strcasecmp(s, "sawtooth"))        return Q3WAVEFUNC_SAWTOOTH;
-       if (!strcasecmp(s, "inversesawtooth")) return Q3WAVEFUNC_INVERSESAWTOOTH;
-       if (!strcasecmp(s, "noise"))           return Q3WAVEFUNC_NOISE;
+       int offset = 0;
+       if (!strncasecmp(s, "user", 4)) // parse stuff like "user1sin", always user<n>func
+       {
+               offset = bound(0, s[4] - '0', 9);
+               offset = (offset + 1) << Q3WAVEFUNC_USER_SHIFT;
+               s += 4;
+               if(*s)
+                       ++s;
+       }
+       if (!strcasecmp(s, "sin"))             return offset | Q3WAVEFUNC_SIN;
+       if (!strcasecmp(s, "square"))          return offset | Q3WAVEFUNC_SQUARE;
+       if (!strcasecmp(s, "triangle"))        return offset | Q3WAVEFUNC_TRIANGLE;
+       if (!strcasecmp(s, "sawtooth"))        return offset | Q3WAVEFUNC_SAWTOOTH;
+       if (!strcasecmp(s, "inversesawtooth")) return offset | Q3WAVEFUNC_INVERSESAWTOOTH;
+       if (!strcasecmp(s, "noise"))           return offset | Q3WAVEFUNC_NOISE;
+       if (!strcasecmp(s, "none"))            return offset | Q3WAVEFUNC_NONE;
        Con_DPrintf("Mod_LoadQ3Shaders: unknown wavefunc %s\n", s);
-       return Q3WAVEFUNC_NONE;
+       return offset | Q3WAVEFUNC_NONE;
 }
 
 void Mod_FreeQ3Shaders(void)
@@ -1344,7 +1573,7 @@ static void Q3Shader_AddToHash (q3shaderinfo_t* shader)
                        end = ((unsigned char *) (&shader->Q3SHADERINFO_COMPARE_END)) + sizeof(shader->Q3SHADERINFO_COMPARE_END);
                        start2 = (unsigned char *) (&entry->shader.Q3SHADERINFO_COMPARE_START);
                        if(memcmp(start, start2, end - start))
-                               Con_Printf("Shader '%s' already defined, ignoring mismatching redeclaration\n", shader->name);
+                               Con_DPrintf("Shader '%s' already defined, ignoring mismatching redeclaration\n", shader->name);
                        else
                                Con_DPrintf("Shader '%s' already defined\n", shader->name);
                        return;
@@ -1371,7 +1600,7 @@ static void Q3Shader_AddToHash (q3shaderinfo_t* shader)
        memcpy (&entry->shader, shader, sizeof (q3shaderinfo_t));
 }
 
-extern cvar_t r_picmipworld;
+extern cvar_t mod_q3shader_default_offsetmapping;
 void Mod_LoadQ3Shaders(void)
 {
        int j;
@@ -1383,6 +1612,9 @@ void Mod_LoadQ3Shaders(void)
        q3shaderinfo_layer_t *layer;
        int numparameters;
        char parameter[TEXTURE_MAXFRAMES + 4][Q3PATHLENGTH];
+       char *custsurfaceparmnames[256]; // VorteX: q3map2 has 64 but well, someone will need more
+       unsigned long custsurfaceparms[256]; 
+       int numcustsurfaceparms;
 
        Mod_FreeQ3Shaders();
 
@@ -1394,6 +1626,49 @@ void Mod_LoadQ3Shaders(void)
        Mem_ExpandableArray_NewArray (&q3shader_data->char_ptrs,
                q3shaders_mem, sizeof (char**), 256);
 
+       // parse custinfoparms.txt
+       numcustsurfaceparms = 0;
+       if ((text = f = (char *)FS_LoadFile("scripts/custinfoparms.txt", tempmempool, false, NULL)) != NULL)
+       {
+               if (!COM_ParseToken_QuakeC(&text, false) || strcasecmp(com_token, "{"))
+                       Con_DPrintf("scripts/custinfoparms.txt: contentflags section parsing error - expected \"{\", found \"%s\"\n", com_token);
+               else
+               {
+                       while (COM_ParseToken_QuakeC(&text, false))
+                               if (!strcasecmp(com_token, "}"))
+                                       break;
+                       // custom surfaceflags section
+                       if (!COM_ParseToken_QuakeC(&text, false) || strcasecmp(com_token, "{"))
+                               Con_DPrintf("scripts/custinfoparms.txt: surfaceflags section parsing error - expected \"{\", found \"%s\"\n", com_token);
+                       else
+                       {
+                               while(COM_ParseToken_QuakeC(&text, false))
+                               {
+                                       if (!strcasecmp(com_token, "}"))
+                                               break;  
+                                       // register surfaceflag
+                                       if (numcustsurfaceparms >= 256)
+                                       {
+                                               Con_Printf("scripts/custinfoparms.txt: surfaceflags section parsing error - max 256 surfaceflags exceeded\n");
+                                               break;
+                                       }
+                                       // name
+                                       j = strlen(com_token)+1;
+                                       custsurfaceparmnames[numcustsurfaceparms] = (char *)Mem_Alloc(tempmempool, j);
+                                       strlcpy(custsurfaceparmnames[numcustsurfaceparms], com_token, j+1);
+                                       // value
+                                       if (COM_ParseToken_QuakeC(&text, false))
+                                               custsurfaceparms[numcustsurfaceparms] = strtol(com_token, NULL, 0);
+                                       else
+                                               custsurfaceparms[numcustsurfaceparms] = 0;
+                                       numcustsurfaceparms++;
+                               }
+                       }
+               }
+               Mem_Free(f);
+       }
+
+       // parse shaders
        search = FS_Search("scripts/*.shader", true, false);
        if (!search)
                return;
@@ -1412,11 +1687,15 @@ void Mod_LoadQ3Shaders(void)
                        shader.reflectfactor = 1;
                        Vector4Set(shader.reflectcolor4f, 1, 1, 1, 1);
                        shader.r_water_wateralpha = 1;
+                       shader.offsetmapping = (mod_q3shader_default_offsetmapping.value) ? OFFSETMAPPING_DEFAULT : OFFSETMAPPING_OFF;
+                       shader.offsetscale = 1;
+                       shader.specularscalemod = 1;
+                       shader.specularpowermod = 1;
 
                        strlcpy(shader.name, com_token, sizeof(shader.name));
                        if (!COM_ParseToken_QuakeC(&text, false) || strcasecmp(com_token, "{"))
                        {
-                               Con_Printf("%s parsing error - expected \"{\", found \"%s\"\n", search->filenames[fileindex], com_token);
+                               Con_DPrintf("%s parsing error - expected \"{\", found \"%s\"\n", search->filenames[fileindex], com_token);
                                break;
                        }
                        while (COM_ParseToken_QuakeC(&text, false))
@@ -1452,20 +1731,24 @@ void Mod_LoadQ3Shaders(void)
                                                {
                                                        if (j < TEXTURE_MAXFRAMES + 4)
                                                        {
-                                                               strlcpy(parameter[j], com_token, sizeof(parameter[j]));
+                                                               // remap dp_water to dpwater, dp_reflect to dpreflect, etc.
+                                                               if(j == 0 && !strncasecmp(com_token, "dp_", 3))
+                                                                       dpsnprintf(parameter[j], sizeof(parameter[j]), "dp%s", &com_token[3]);
+                                                               else
+                                                                       strlcpy(parameter[j], com_token, sizeof(parameter[j]));
                                                                numparameters = j + 1;
                                                        }
                                                        if (!COM_ParseToken_QuakeC(&text, true))
                                                                break;
                                                }
-                                               for (j = numparameters;j < TEXTURE_MAXFRAMES + 4;j++)
-                                                       parameter[j][0] = 0;
-                                               if (developer.integer >= 100)
+                                               //for (j = numparameters;j < TEXTURE_MAXFRAMES + 4;j++)
+                                               //      parameter[j][0] = 0;
+                                               if (developer_insane.integer)
                                                {
-                                                       Con_Printf("%s %i: ", shader.name, shader.numlayers - 1);
+                                                       Con_DPrintf("%s %i: ", shader.name, shader.numlayers - 1);
                                                        for (j = 0;j < numparameters;j++)
-                                                               Con_Printf(" %s", parameter[j]);
-                                                       Con_Print("\n");
+                                                               Con_DPrintf(" %s", parameter[j]);
+                                                       Con_DPrint("\n");
                                                }
                                                if (numparameters >= 2 && !strcasecmp(parameter[0], "blendfunc"))
                                                {
@@ -1657,7 +1940,7 @@ void Mod_LoadQ3Shaders(void)
                                                        shader.textureblendalpha = true;
                                                }
                                        }
-                                       layer->texflags = TEXF_ALPHA | TEXF_PRECACHE;
+                                       layer->texflags = TEXF_ALPHA;
                                        if (!(shader.surfaceparms & Q3SURFACEPARM_NOMIPMAPS))
                                                layer->texflags |= TEXF_MIPMAP;
                                        if (!(shader.textureflags & Q3TEXTUREFLAG_NOPICMIP))
@@ -1671,22 +1954,26 @@ void Mod_LoadQ3Shaders(void)
                                {
                                        if (j < TEXTURE_MAXFRAMES + 4)
                                        {
-                                               strlcpy(parameter[j], com_token, sizeof(parameter[j]));
+                                               // remap dp_water to dpwater, dp_reflect to dpreflect, etc.
+                                               if(j == 0 && !strncasecmp(com_token, "dp_", 3))
+                                                       dpsnprintf(parameter[j], sizeof(parameter[j]), "dp%s", &com_token[3]);
+                                               else
+                                                       strlcpy(parameter[j], com_token, sizeof(parameter[j]));
                                                numparameters = j + 1;
                                        }
                                        if (!COM_ParseToken_QuakeC(&text, true))
                                                break;
                                }
-                               for (j = numparameters;j < TEXTURE_MAXFRAMES + 4;j++)
-                                       parameter[j][0] = 0;
+                               //for (j = numparameters;j < TEXTURE_MAXFRAMES + 4;j++)
+                               //      parameter[j][0] = 0;
                                if (fileindex == 0 && !strcasecmp(com_token, "}"))
                                        break;
-                               if (developer.integer >= 100)
+                               if (developer_insane.integer)
                                {
-                                       Con_Printf("%s: ", shader.name);
+                                       Con_DPrintf("%s: ", shader.name);
                                        for (j = 0;j < numparameters;j++)
-                                               Con_Printf(" %s", parameter[j]);
-                                       Con_Print("\n");
+                                               Con_DPrintf(" %s", parameter[j]);
+                                       Con_DPrint("\n");
                                }
                                if (numparameters < 1)
                                        continue;
@@ -1757,12 +2044,29 @@ void Mod_LoadQ3Shaders(void)
                                        else if (!strcasecmp(parameter[1], "antiportal"))
                                                shader.surfaceparms |= Q3SURFACEPARM_ANTIPORTAL;
                                        else
-                                               Con_DPrintf("%s parsing warning: unknown surfaceparm \"%s\"\n", search->filenames[fileindex], parameter[1]);
+                                       {
+                                               // try custom surfaceparms
+                                               for (j = 0; j < numcustsurfaceparms; j++)
+                                               {
+                                                       if (!strcasecmp(custsurfaceparmnames[j], parameter[1]))
+                                                       {
+                                                               shader.surfaceparms |= custsurfaceparms[j];
+                                                               break;
+                                                       }
+                                               }
+                                               // failed all
+                                               if (j == numcustsurfaceparms)
+                                                       Con_DPrintf("%s parsing warning: unknown surfaceparm \"%s\"\n", search->filenames[fileindex], parameter[1]);
+                                       }
                                }
                                else if (!strcasecmp(parameter[0], "dpshadow"))
                                        shader.dpshadow = true;
                                else if (!strcasecmp(parameter[0], "dpnoshadow"))
                                        shader.dpnoshadow = true;
+                               else if (!strcasecmp(parameter[0], "dpreflectcube"))
+                                       strlcpy(shader.dpreflectcube, parameter[1], sizeof(shader.dpreflectcube));
+                               else if (!strcasecmp(parameter[0], "dpmeshcollisions"))
+                                       shader.dpmeshcollisions = true;
                                else if (!strcasecmp(parameter[0], "sky") && numparameters >= 2)
                                {
                                        // some q3 skies don't have the sky parm set
@@ -1787,19 +2091,23 @@ void Mod_LoadQ3Shaders(void)
                                        shader.textureflags |= Q3TEXTUREFLAG_NOPICMIP;
                                else if (!strcasecmp(parameter[0], "polygonoffset"))
                                        shader.textureflags |= Q3TEXTUREFLAG_POLYGONOFFSET;
-                               else if (!strcasecmp(parameter[0], "dp_refract") && numparameters >= 5)
+                               else if (!strcasecmp(parameter[0], "dprefract") && numparameters >= 5)
                                {
                                        shader.textureflags |= Q3TEXTUREFLAG_REFRACTION;
                                        shader.refractfactor = atof(parameter[1]);
                                        Vector4Set(shader.refractcolor4f, atof(parameter[2]), atof(parameter[3]), atof(parameter[4]), 1);
                                }
-                               else if (!strcasecmp(parameter[0], "dp_reflect") && numparameters >= 6)
+                               else if (!strcasecmp(parameter[0], "dpreflect") && numparameters >= 6)
                                {
                                        shader.textureflags |= Q3TEXTUREFLAG_REFLECTION;
                                        shader.reflectfactor = atof(parameter[1]);
                                        Vector4Set(shader.reflectcolor4f, atof(parameter[2]), atof(parameter[3]), atof(parameter[4]), atof(parameter[5]));
                                }
-                               else if (!strcasecmp(parameter[0], "dp_water") && numparameters >= 12)
+                               else if (!strcasecmp(parameter[0], "dpcamera"))
+                               {
+                                       shader.textureflags |= Q3TEXTUREFLAG_CAMERA;
+                               }
+                               else if (!strcasecmp(parameter[0], "dpwater") && numparameters >= 12)
                                {
                                        shader.textureflags |= Q3TEXTUREFLAG_WATERSHADER;
                                        shader.reflectmin = atof(parameter[1]);
@@ -1810,6 +2118,26 @@ void Mod_LoadQ3Shaders(void)
                                        Vector4Set(shader.reflectcolor4f, atof(parameter[8]), atof(parameter[9]), atof(parameter[10]), 1);
                                        shader.r_water_wateralpha = atof(parameter[11]);
                                }
+                               else if (!strcasecmp(parameter[0], "dpglossintensitymod") && numparameters >= 2)
+                               {
+                                       shader.specularscalemod = atof(parameter[1]);
+                               }
+                               else if (!strcasecmp(parameter[0], "dpglossexponentmod") && numparameters >= 2)
+                               {
+                                       shader.specularpowermod = atof(parameter[1]);
+                               }
+                               else if (!strcasecmp(parameter[0], "dpoffsetmapping") && numparameters >= 3)
+                               {
+                                       if (!strcasecmp(parameter[1], "disable") || !strcasecmp(parameter[1], "none") || !strcasecmp(parameter[1], "off"))
+                                               shader.offsetmapping = OFFSETMAPPING_OFF;
+                                       else if (!strcasecmp(parameter[1], "default"))
+                                               shader.offsetmapping = OFFSETMAPPING_DEFAULT;
+                                       else if (!strcasecmp(parameter[1], "linear"))
+                                               shader.offsetmapping = OFFSETMAPPING_LINEAR;
+                                       else if (!strcasecmp(parameter[1], "relief"))
+                                               shader.offsetmapping = OFFSETMAPPING_RELIEF;
+                                       shader.offsetscale = atof(parameter[2]);
+                               }
                                else if (!strcasecmp(parameter[0], "deformvertexes") && numparameters >= 2)
                                {
                                        int i, deformindex;
@@ -1876,12 +2204,16 @@ void Mod_LoadQ3Shaders(void)
                        }
                        // fix up multiple reflection types
                        if(shader.textureflags & Q3TEXTUREFLAG_WATERSHADER)
-                               shader.textureflags &= ~(Q3TEXTUREFLAG_REFRACTION | Q3TEXTUREFLAG_REFLECTION);
+                               shader.textureflags &= ~(Q3TEXTUREFLAG_REFRACTION | Q3TEXTUREFLAG_REFLECTION | Q3TEXTUREFLAG_CAMERA);
 
                        Q3Shader_AddToHash (&shader);
                }
                Mem_Free(f);
        }
+       FS_FreeSearch(search);
+       // free custinfoparm values
+       for (j = 0; j < numcustsurfaceparms; j++)
+               Mem_Free(custsurfaceparmnames[j]);
 }
 
 q3shaderinfo_t *Mod_LookupQ3Shader(const char *name)
@@ -1917,6 +2249,14 @@ qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qbool
                texflagsmask &= ~TEXF_PICMIP;
        if(!(defaulttexflags & TEXF_COMPRESS))
                texflagsmask &= ~TEXF_COMPRESS;
+       // unless later loaded from the shader
+       texture->offsetmapping = (mod_q3shader_default_offsetmapping.value) ? OFFSETMAPPING_DEFAULT : OFFSETMAPPING_OFF;
+       texture->offsetscale = 1;
+       texture->specularscalemod = 1;
+       texture->specularpowermod = 1; 
+       // WHEN ADDING DEFAULTS HERE, REMEMBER TO SYNC TO SHADER LOADING ABOVE
+       // HERE, AND Q1BSP LOADING
+       // JUST GREP FOR "specularscalemod = 1".
 
        if (shader)
        {
@@ -1953,6 +2293,8 @@ qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qbool
                        texture->basematerialflags |= MATERIALFLAG_REFLECTION;
                if (shader->textureflags & Q3TEXTUREFLAG_WATERSHADER)
                        texture->basematerialflags |= MATERIALFLAG_WATERSHADER;
+               if (shader->textureflags & Q3TEXTUREFLAG_CAMERA)
+                       texture->basematerialflags |= MATERIALFLAG_CAMERA;
                texture->customblendfunc[0] = GL_ONE;
                texture->customblendfunc[1] = GL_ZERO;
                if (shader->numlayers > 0)
@@ -2051,31 +2393,94 @@ nothing                GL_ZERO GL_ONE
                texture->reflectfactor = shader->reflectfactor;
                Vector4Copy(shader->reflectcolor4f, texture->reflectcolor4f);
                texture->r_water_wateralpha = shader->r_water_wateralpha;
+               texture->offsetmapping = shader->offsetmapping;
+               texture->offsetscale = shader->offsetscale;
+               texture->specularscalemod = shader->specularscalemod;
+               texture->specularpowermod = shader->specularpowermod;
+               if (shader->dpreflectcube[0])
+                       texture->reflectcubetexture = R_GetCubemap(shader->dpreflectcube);
+
+               // set up default supercontents (on q3bsp this is overridden by the q3bsp loader)
+               texture->supercontents = SUPERCONTENTS_SOLID | SUPERCONTENTS_OPAQUE;
+               if (shader->surfaceparms & Q3SURFACEPARM_LAVA         ) texture->supercontents  = SUPERCONTENTS_LAVA         ;
+               if (shader->surfaceparms & Q3SURFACEPARM_SLIME        ) texture->supercontents  = SUPERCONTENTS_SLIME        ;
+               if (shader->surfaceparms & Q3SURFACEPARM_WATER        ) texture->supercontents  = SUPERCONTENTS_WATER        ;
+               if (shader->surfaceparms & Q3SURFACEPARM_NONSOLID     ) texture->supercontents  = 0                          ;
+               if (shader->surfaceparms & Q3SURFACEPARM_PLAYERCLIP   ) texture->supercontents  = SUPERCONTENTS_PLAYERCLIP   ;
+               if (shader->surfaceparms & Q3SURFACEPARM_BOTCLIP      ) texture->supercontents  = SUPERCONTENTS_MONSTERCLIP  ;
+               if (shader->surfaceparms & Q3SURFACEPARM_SKY          ) texture->supercontents  = SUPERCONTENTS_SKY          ;
+
+       //      if (shader->surfaceparms & Q3SURFACEPARM_ALPHASHADOW  ) texture->supercontents |= SUPERCONTENTS_ALPHASHADOW  ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_AREAPORTAL   ) texture->supercontents |= SUPERCONTENTS_AREAPORTAL   ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_CLUSTERPORTAL) texture->supercontents |= SUPERCONTENTS_CLUSTERPORTAL;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_DETAIL       ) texture->supercontents |= SUPERCONTENTS_DETAIL       ;
+               if (shader->surfaceparms & Q3SURFACEPARM_DONOTENTER   ) texture->supercontents |= SUPERCONTENTS_DONOTENTER   ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_FOG          ) texture->supercontents |= SUPERCONTENTS_FOG          ;
+               if (shader->surfaceparms & Q3SURFACEPARM_LAVA         ) texture->supercontents |= SUPERCONTENTS_LAVA         ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_LIGHTFILTER  ) texture->supercontents |= SUPERCONTENTS_LIGHTFILTER  ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_METALSTEPS   ) texture->supercontents |= SUPERCONTENTS_METALSTEPS   ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_NODAMAGE     ) texture->supercontents |= SUPERCONTENTS_NODAMAGE     ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_NODLIGHT     ) texture->supercontents |= SUPERCONTENTS_NODLIGHT     ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_NODRAW       ) texture->supercontents |= SUPERCONTENTS_NODRAW       ;
+               if (shader->surfaceparms & Q3SURFACEPARM_NODROP       ) texture->supercontents |= SUPERCONTENTS_NODROP       ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_NOIMPACT     ) texture->supercontents |= SUPERCONTENTS_NOIMPACT     ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_NOLIGHTMAP   ) texture->supercontents |= SUPERCONTENTS_NOLIGHTMAP   ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_NOMARKS      ) texture->supercontents |= SUPERCONTENTS_NOMARKS      ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_NOMIPMAPS    ) texture->supercontents |= SUPERCONTENTS_NOMIPMAPS    ;
+               if (shader->surfaceparms & Q3SURFACEPARM_NONSOLID     ) texture->supercontents &=~SUPERCONTENTS_SOLID        ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_ORIGIN       ) texture->supercontents |= SUPERCONTENTS_ORIGIN       ;
+               if (shader->surfaceparms & Q3SURFACEPARM_PLAYERCLIP   ) texture->supercontents |= SUPERCONTENTS_PLAYERCLIP   ;
+               if (shader->surfaceparms & Q3SURFACEPARM_SKY          ) texture->supercontents |= SUPERCONTENTS_SKY          ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_SLICK        ) texture->supercontents |= SUPERCONTENTS_SLICK        ;
+               if (shader->surfaceparms & Q3SURFACEPARM_SLIME        ) texture->supercontents |= SUPERCONTENTS_SLIME        ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_STRUCTURAL   ) texture->supercontents |= SUPERCONTENTS_STRUCTURAL   ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_TRANS        ) texture->supercontents |= SUPERCONTENTS_TRANS        ;
+               if (shader->surfaceparms & Q3SURFACEPARM_WATER        ) texture->supercontents |= SUPERCONTENTS_WATER        ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_POINTLIGHT   ) texture->supercontents |= SUPERCONTENTS_POINTLIGHT   ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_HINT         ) texture->supercontents |= SUPERCONTENTS_HINT         ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_DUST         ) texture->supercontents |= SUPERCONTENTS_DUST         ;
+               if (shader->surfaceparms & Q3SURFACEPARM_BOTCLIP      ) texture->supercontents |= SUPERCONTENTS_BOTCLIP      | SUPERCONTENTS_MONSTERCLIP;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_LIGHTGRID    ) texture->supercontents |= SUPERCONTENTS_LIGHTGRID    ;
+       //      if (shader->surfaceparms & Q3SURFACEPARM_ANTIPORTAL   ) texture->supercontents |= SUPERCONTENTS_ANTIPORTAL   ;
+
+               if (shader->dpmeshcollisions)
+                       texture->basematerialflags |= MATERIALFLAG_MESHCOLLISIONS;
        }
        else if (!strcmp(texture->name, "noshader") || !texture->name[0])
        {
-               if (developer.integer >= 100)
-                       Con_Printf("^1%s:^7 using fallback noshader material for ^3\"%s\"\n", loadmodel->name, name);
+               if (developer_extra.integer)
+                       Con_DPrintf("^1%s:^7 using fallback noshader material for ^3\"%s\"\n", loadmodel->name, name);
                texture->surfaceparms = 0;
+               texture->supercontents = SUPERCONTENTS_SOLID | SUPERCONTENTS_OPAQUE;
        }
        else if (!strcmp(texture->name, "common/nodraw") || !strcmp(texture->name, "textures/common/nodraw"))
        {
-               if (developer.integer >= 100)
-                       Con_Printf("^1%s:^7 using fallback nodraw material for ^3\"%s\"\n", loadmodel->name, name);
+               if (developer_extra.integer)
+                       Con_DPrintf("^1%s:^7 using fallback nodraw material for ^3\"%s\"\n", loadmodel->name, name);
                texture->surfaceparms = 0;
                texture->basematerialflags = MATERIALFLAG_NODRAW | MATERIALFLAG_NOSHADOW;
+               texture->supercontents = SUPERCONTENTS_SOLID;
        }
        else
        {
-               if (developer.integer >= 100)
-                       Con_Printf("^1%s:^7 No shader found for texture ^3\"%s\"\n", loadmodel->name, texture->name);
+               if (developer_extra.integer)
+                       Con_DPrintf("^1%s:^7 No shader found for texture ^3\"%s\"\n", loadmodel->name, texture->name);
                texture->surfaceparms = 0;
                if (texture->surfaceflags & Q3SURFACEFLAG_NODRAW)
+               {
                        texture->basematerialflags |= MATERIALFLAG_NODRAW | MATERIALFLAG_NOSHADOW;
+                       texture->supercontents = SUPERCONTENTS_SOLID;
+               }
                else if (texture->surfaceflags & Q3SURFACEFLAG_SKY)
+               {
                        texture->basematerialflags |= MATERIALFLAG_SKY | MATERIALFLAG_NOSHADOW;
+                       texture->supercontents = SUPERCONTENTS_SKY;
+               }
                else
+               {
                        texture->basematerialflags |= MATERIALFLAG_WALL;
+                       texture->supercontents = SUPERCONTENTS_SOLID | SUPERCONTENTS_OPAQUE;
+               }
                texture->numskinframes = 1;
                if(cls.state == ca_dedicated)
                {
@@ -2085,10 +2490,9 @@ nothing                GL_ZERO GL_ONE
                {
                        if (fallback)
                        {
-                               qboolean has_alpha;
-                               if ((texture->skinframes[0] = R_SkinFrame_LoadExternal_CheckAlpha(texture->name, defaulttexflags, false, &has_alpha)))
+                               if ((texture->skinframes[0] = R_SkinFrame_LoadExternal(texture->name, defaulttexflags, false)))
                                {
-                                       if(has_alpha && (defaulttexflags & TEXF_ALPHA))
+                                       if(texture->skinframes[0]->hasalpha)
                                                texture->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW;
                                }
                                else
@@ -2136,7 +2540,7 @@ tag_weapon,
 tag_torso,
 */
        memset(word, 0, sizeof(word));
-       for (i = 0;i < MAX_SKINS && (data = text = (char *)FS_LoadFile(va("%s_%i.skin", loadmodel->name, i), tempmempool, true, NULL));i++)
+       for (i = 0;i < 256 && (data = text = (char *)FS_LoadFile(va("%s_%i.skin", loadmodel->name, i), tempmempool, true, NULL));i++)
        {
                // If it's the first file we parse
                if (skinfile == NULL)
@@ -2325,31 +2729,80 @@ void Mod_MakeSortedSurfaces(dp_model_t *mod)
        Mem_Free(numsurfacesfortexture);
 }
 
-static void Mod_BuildVBOs(void)
+void Mod_BuildVBOs(void)
 {
-       if (!gl_support_arb_vertex_buffer_object)
+       if (!loadmodel->surfmesh.num_vertices)
                return;
 
-       // element buffer is easy because it's just one array
-       if (loadmodel->surfmesh.num_triangles)
+       if (gl_paranoid.integer && loadmodel->surfmesh.data_element3s && loadmodel->surfmesh.data_element3i)
        {
-               if (loadmodel->surfmesh.data_element3s)
+               int i;
+               for (i = 0;i < loadmodel->surfmesh.num_triangles*3;i++)
                {
-                       int i;
-                       for (i = 0;i < loadmodel->surfmesh.num_triangles*3;i++)
+                       if (loadmodel->surfmesh.data_element3s[i] != loadmodel->surfmesh.data_element3i[i])
+                       {
+                               Con_Printf("Mod_BuildVBOs: element %u is incorrect (%u should be %u)\n", i, loadmodel->surfmesh.data_element3s[i], loadmodel->surfmesh.data_element3i[i]);
                                loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i];
-                       loadmodel->surfmesh.ebo3s = R_Mesh_CreateStaticBufferObject(GL_ELEMENT_ARRAY_BUFFER_ARB, loadmodel->surfmesh.data_element3s, loadmodel->surfmesh.num_triangles * sizeof(unsigned short[3]), loadmodel->name);
+                       }
                }
-               else
-                       loadmodel->surfmesh.ebo3i = R_Mesh_CreateStaticBufferObject(GL_ELEMENT_ARRAY_BUFFER_ARB, loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles * sizeof(unsigned int[3]), loadmodel->name);
        }
 
+       // build r_vertexmesh_t array
+       // (compressed interleaved array for faster rendering)
+       if (!loadmodel->surfmesh.vertexmesh)
+       {
+               int vertexindex;
+               int numvertices = loadmodel->surfmesh.num_vertices;
+               r_vertexmesh_t *vertexmesh;
+               loadmodel->surfmesh.vertexmesh = vertexmesh = (r_vertexmesh_t*)Mem_Alloc(loadmodel->mempool, numvertices * sizeof(*loadmodel->surfmesh.vertexmesh));
+               for (vertexindex = 0;vertexindex < numvertices;vertexindex++, vertexmesh++)
+               {
+                       VectorCopy(loadmodel->surfmesh.data_vertex3f + 3*vertexindex, vertexmesh->vertex3f);
+                       VectorScale(loadmodel->surfmesh.data_svector3f + 3*vertexindex, 1.0f, vertexmesh->svector3f);
+                       VectorScale(loadmodel->surfmesh.data_tvector3f + 3*vertexindex, 1.0f, vertexmesh->tvector3f);
+                       VectorScale(loadmodel->surfmesh.data_normal3f + 3*vertexindex, 1.0f, vertexmesh->normal3f);
+                       if (loadmodel->surfmesh.data_lightmapcolor4f)
+                               Vector4Scale(loadmodel->surfmesh.data_lightmapcolor4f + 4*vertexindex, 255.0f, vertexmesh->color4ub);
+                       Vector2Copy(loadmodel->surfmesh.data_texcoordtexture2f + 2*vertexindex, vertexmesh->texcoordtexture2f);
+                       if (loadmodel->surfmesh.data_texcoordlightmap2f)
+                               Vector2Scale(loadmodel->surfmesh.data_texcoordlightmap2f + 2*vertexindex, 1.0f, vertexmesh->texcoordlightmap2f);
+               }
+       }
+
+       // build r_vertexposition_t array
+       if (!loadmodel->surfmesh.vertexposition)
+       {
+               int vertexindex;
+               int numvertices = loadmodel->surfmesh.num_vertices;
+               r_vertexposition_t *vertexposition;
+               loadmodel->surfmesh.vertexposition = vertexposition = (r_vertexposition_t*)Mem_Alloc(loadmodel->mempool, numvertices * sizeof(*loadmodel->surfmesh.vertexposition));
+               for (vertexindex = 0;vertexindex < numvertices;vertexindex++, vertexposition++)
+                       VectorCopy(loadmodel->surfmesh.data_vertex3f + 3*vertexindex, vertexposition->vertex3f);
+       }
+
+       // upload r_vertexmesh_t array as a buffer
+       if (loadmodel->surfmesh.vertexmesh && !loadmodel->surfmesh.vertexmeshbuffer)
+               loadmodel->surfmesh.vertexmeshbuffer = R_Mesh_CreateMeshBuffer(loadmodel->surfmesh.vertexmesh, loadmodel->surfmesh.num_vertices * sizeof(*loadmodel->surfmesh.vertexmesh), loadmodel->name, false, false);
+
+       // upload r_vertexposition_t array as a buffer
+       if (loadmodel->surfmesh.vertexposition && !loadmodel->surfmesh.vertexpositionbuffer)
+               loadmodel->surfmesh.vertexpositionbuffer = R_Mesh_CreateMeshBuffer(loadmodel->surfmesh.vertexposition, loadmodel->surfmesh.num_vertices * sizeof(*loadmodel->surfmesh.vertexposition), loadmodel->name, false, false);
+
+       // upload short indices as a buffer
+       if (loadmodel->surfmesh.data_element3s && !loadmodel->surfmesh.data_element3s_indexbuffer)
+               loadmodel->surfmesh.data_element3s_indexbuffer = R_Mesh_CreateMeshBuffer(loadmodel->surfmesh.data_element3s, loadmodel->surfmesh.num_triangles * sizeof(short[3]), loadmodel->name, true, false);
+
+       // upload int indices as a buffer
+       if (loadmodel->surfmesh.data_element3i && !loadmodel->surfmesh.data_element3i_indexbuffer && !loadmodel->surfmesh.data_element3s)
+               loadmodel->surfmesh.data_element3i_indexbuffer = R_Mesh_CreateMeshBuffer(loadmodel->surfmesh.data_element3i, loadmodel->surfmesh.num_triangles * sizeof(int[3]), loadmodel->name, true, false);
+
+       // only build a vbo if one has not already been created (this is important for brush models which load specially)
        // vertex buffer is several arrays and we put them in the same buffer
        //
        // is this wise?  the texcoordtexture2f array is used with dynamic
        // vertex/svector/tvector/normal when rendering animated models, on the
        // other hand animated models don't use a lot of vertices anyway...
-       if (loadmodel->surfmesh.num_vertices)
+       if (!loadmodel->surfmesh.vbo_vertexbuffer)
        {
                size_t size;
                unsigned char *mem;
@@ -2369,7 +2822,7 @@ static void Mod_BuildVBOs(void)
                if (loadmodel->surfmesh.data_texcoordtexture2f ) memcpy(mem + loadmodel->surfmesh.vbooffset_texcoordtexture2f , loadmodel->surfmesh.data_texcoordtexture2f , loadmodel->surfmesh.num_vertices * sizeof(float[2]));
                if (loadmodel->surfmesh.data_texcoordlightmap2f) memcpy(mem + loadmodel->surfmesh.vbooffset_texcoordlightmap2f, loadmodel->surfmesh.data_texcoordlightmap2f, loadmodel->surfmesh.num_vertices * sizeof(float[2]));
                if (loadmodel->surfmesh.data_lightmapcolor4f   ) memcpy(mem + loadmodel->surfmesh.vbooffset_lightmapcolor4f   , loadmodel->surfmesh.data_lightmapcolor4f   , loadmodel->surfmesh.num_vertices * sizeof(float[4]));
-               loadmodel->surfmesh.vbo = R_Mesh_CreateStaticBufferObject(GL_ARRAY_BUFFER_ARB, mem, size, loadmodel->name);
+               loadmodel->surfmesh.vbo_vertexbuffer = R_Mesh_CreateMeshBuffer(mem, size, loadmodel->name, false, false);
                Mem_Free(mem);
        }
 }
@@ -2399,13 +2852,14 @@ static void Mod_Decompile_OBJ(dp_model_t *model, const char *filename, const cha
                countvertices += surface->num_vertices;
                countfaces += surface->num_triangles;
                texname = (surface->texture && surface->texture->name[0]) ? surface->texture->name : "default";
-               for (textureindex = 0;textureindex < maxtextures && texturenames[textureindex*MAX_QPATH];textureindex++)
+               for (textureindex = 0;textureindex < counttextures;textureindex++)
                        if (!strcmp(texturenames + textureindex * MAX_QPATH, texname))
                                break;
+               if (textureindex < counttextures)
+                       continue; // already wrote this material entry
                if (textureindex >= maxtextures)
                        continue; // just a precaution
-               if (counttextures < textureindex + 1)
-                       counttextures = textureindex + 1;
+               textureindex = counttextures++;
                strlcpy(texturenames + textureindex * MAX_QPATH, texname, MAX_QPATH);
                if (outbufferpos >= outbuffermax >> 1)
                {
@@ -2485,9 +2939,7 @@ static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int first
        int transformindex;
        int poseindex;
        int cornerindex;
-       float modelscale;
        const int *e;
-       const float *pose;
        size_t l;
        size_t outbufferpos = 0;
        size_t outbuffermax = 0x100000;
@@ -2496,16 +2948,6 @@ static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int first
        l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "version 1\nnodes\n");
        if (l > 0)
                outbufferpos += l;
-       modelscale = 1;
-       if(model->num_poses >= 0)
-               modelscale = sqrt(model->data_poses[0] * model->data_poses[0] + model->data_poses[1] * model->data_poses[1] + model->data_poses[2] * model->data_poses[2]);
-       if(fabs(modelscale - 1) > 1e-4)
-       {
-               if(firstpose == 0) // only print the when writing the reference pose
-                       Con_Printf("The model has an old-style model scale of %f\n", modelscale);
-       }
-       else
-               modelscale = 1;
        for (transformindex = 0;transformindex < model->num_bones;transformindex++)
        {
                if (outbufferpos >= outbuffermax >> 1)
@@ -2524,17 +2966,17 @@ static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int first
        l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "end\nskeleton\n");
        if (l > 0)
                outbufferpos += l;
-       for (poseindex = 0, pose = model->data_poses + model->num_bones * 12 * firstpose;poseindex < numposes;poseindex++)
+       for (poseindex = 0;poseindex < numposes;poseindex++)
        {
                countframes++;
                l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "time %i\n", poseindex);
                if (l > 0)
                        outbufferpos += l;
-               for (transformindex = 0;transformindex < model->num_bones;transformindex++, pose += 12)
+               for (transformindex = 0;transformindex < model->num_bones;transformindex++)
                {
-                       float a, b, c;
                        float angles[3];
-                       float mtest[3][4];
+                       float mtest[4][3];
+                       matrix4x4_t posematrix;
                        if (outbufferpos >= outbuffermax >> 1)
                        {
                                outbuffermax *= 2;
@@ -2546,32 +2988,21 @@ static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int first
 
                        // strangely the smd angles are for a transposed matrix, so we
                        // have to generate a transposed matrix, then convert that...
-                       mtest[0][0] = pose[ 0];
-                       mtest[0][1] = pose[ 4];
-                       mtest[0][2] = pose[ 8];
-                       mtest[0][3] = pose[ 3];
-                       mtest[1][0] = pose[ 1];
-                       mtest[1][1] = pose[ 5];
-                       mtest[1][2] = pose[ 9];
-                       mtest[1][3] = pose[ 7];
-                       mtest[2][0] = pose[ 2];
-                       mtest[2][1] = pose[ 6];
-                       mtest[2][2] = pose[10];
-                       mtest[2][3] = pose[11];
+                       Matrix4x4_FromBonePose6s(&posematrix, model->num_posescale, model->data_poses6s + 6*(model->num_bones * poseindex + transformindex));
+                       Matrix4x4_ToArray12FloatGL(&posematrix, mtest[0]);
                        AnglesFromVectors(angles, mtest[0], mtest[2], false);
                        if (angles[0] >= 180) angles[0] -= 360;
                        if (angles[1] >= 180) angles[1] -= 360;
                        if (angles[2] >= 180) angles[2] -= 360;
 
-                       a = DEG2RAD(angles[ROLL]);
-                       b = DEG2RAD(angles[PITCH]);
-                       c = DEG2RAD(angles[YAW]);
-
 #if 0
 {
+                       float a = DEG2RAD(angles[ROLL]);
+                       float b = DEG2RAD(angles[PITCH]);
+                       float c = DEG2RAD(angles[YAW]);
                        float cy, sy, cp, sp, cr, sr;
-                       float test[3][4];
-                       // smd matrix construction, for comparing to non-transposed m
+                       float test[4][3];
+                       // smd matrix construction, for comparing
                        sy = sin(c);
                        cy = cos(c);
                        sp = sin(b);
@@ -2580,20 +3011,20 @@ static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int first
                        cr = cos(a);
 
                        test[0][0] = cp*cy;
-                       test[1][0] = cp*sy;
-                       test[2][0] = -sp;
-                       test[0][1] = sr*sp*cy+cr*-sy;
+                       test[0][1] = cp*sy;
+                       test[0][2] = -sp;
+                       test[1][0] = sr*sp*cy+cr*-sy;
                        test[1][1] = sr*sp*sy+cr*cy;
-                       test[2][1] = sr*cp;
-                       test[0][2] = (cr*sp*cy+-sr*-sy);
-                       test[1][2] = (cr*sp*sy+-sr*cy);
+                       test[1][2] = sr*cp;
+                       test[2][0] = (cr*sp*cy+-sr*-sy);
+                       test[2][1] = (cr*sp*sy+-sr*cy);
                        test[2][2] = cr*cp;
-                       test[0][3] = pose[3];
-                       test[1][3] = pose[7];
-                       test[2][3] = pose[11];
+                       test[3][0] = pose[9];
+                       test[3][1] = pose[10];
+                       test[3][2] = pose[11];
 }
 #endif
-                       l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f\n", transformindex, pose[3] * modelscale, pose[7] * modelscale, pose[11] * modelscale, DEG2RAD(angles[ROLL]), DEG2RAD(angles[PITCH]), DEG2RAD(angles[YAW]));
+                       l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f\n", transformindex, mtest[3][0], mtest[3][1], mtest[3][2], DEG2RAD(angles[ROLL]), DEG2RAD(angles[PITCH]), DEG2RAD(angles[YAW]));
                        if (l > 0)
                                outbufferpos += l;
                }
@@ -2628,12 +3059,19 @@ static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int first
                                        const float *v = model->surfmesh.data_vertex3f + index * 3;
                                        const float *vn = model->surfmesh.data_normal3f + index * 3;
                                        const float *vt = model->surfmesh.data_texcoordtexture2f + index * 2;
-                                       const int *wi = model->surfmesh.data_vertexweightindex4i + index * 4;
-                                       const float *wf = model->surfmesh.data_vertexweightinfluence4f + index * 4;
-                                            if (wf[3]) l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f %f %f 4 %i %f %i %f %i %f %i %f\n", wi[0], v[0], v[1], v[2], vn[0], vn[1], vn[2], vt[0], 1 - vt[1], wi[0], wf[0], wi[1], wf[1], wi[2], wf[2], wi[3], wf[3]);
-                                       else if (wf[2]) l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f %f %f 3 %i %f %i %f %i %f\n"      , wi[0], v[0], v[1], v[2], vn[0], vn[1], vn[2], vt[0], 1 - vt[1], wi[0], wf[0], wi[1], wf[1], wi[2], wf[2]);
-                                       else if (wf[1]) l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f %f %f 2 %i %f %i %f\n"            , wi[0], v[0], v[1], v[2], vn[0], vn[1], vn[2], vt[0], 1 - vt[1], wi[0], wf[0], wi[1], wf[1]);
-                                       else            l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f %f %f\n"                          , wi[0], v[0], v[1], v[2], vn[0], vn[1], vn[2], vt[0], 1 - vt[1]);
+                                       const int b = model->surfmesh.blends[index];
+                                       if (b < model->num_bones)
+                                               l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f %f %f\n"                          , b, v[0], v[1], v[2], vn[0], vn[1], vn[2], vt[0], 1 - vt[1]);
+                                       else
+                                       {
+                                               const blendweights_t *w = model->surfmesh.data_blendweights + b - model->num_bones;
+                                               const unsigned char *wi = w->index;
+                                               const unsigned char *wf = w->influence;
+                                           if (wf[3]) l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f %f %f 4 %i %f %i %f %i %f %i %f\n", wi[0], v[0], v[1], v[2], vn[0], vn[1], vn[2], vt[0], 1 - vt[1], wi[0], wf[0]/255.0f, wi[1], wf[1]/255.0f, wi[2], wf[2]/255.0f, wi[3], wf[3]/255.0f);
+                                               else if (wf[2]) l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f %f %f 3 %i %f %i %f %i %f\n"      , wi[0], v[0], v[1], v[2], vn[0], vn[1], vn[2], vt[0], 1 - vt[1], wi[0], wf[0]/255.0f, wi[1], wf[1]/255.0f, wi[2], wf[2]/255.0f);
+                                               else if (wf[1]) l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f %f %f 2 %i %f %i %f\n"            , wi[0], v[0], v[1], v[2], vn[0], vn[1], vn[2], vt[0], 1 - vt[1], wi[0], wf[0]/255.0f, wi[1], wf[1]/255.0f);
+                                               else            l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "%3i %f %f %f %f %f %f %f %f\n"                          , wi[0], v[0], v[1], v[2], vn[0], vn[1], vn[2], vt[0], 1 - vt[1]);
+                                       }
                                        if (l > 0)
                                                outbufferpos += l;
                                }
@@ -2669,8 +3107,10 @@ static void Mod_Decompile_f(void)
        char animname2[MAX_QPATH];
        char zymtextbuffer[16384];
        char dpmtextbuffer[16384];
+       char framegroupstextbuffer[16384];
        int zymtextsize = 0;
        int dpmtextsize = 0;
+       int framegroupstextsize = 0;
 
        if (Cmd_Argc() != 2)
        {
@@ -2732,16 +3172,20 @@ static void Mod_Decompile_f(void)
                                // individual frame
                                // check for additional frames with same name
                                for (l = 0, k = strlen(animname);animname[l];l++)
-                                       if ((animname[l] < '0' || animname[l] > '9') && animname[l] != '_')
+                                       if(animname[l] < '0' || animname[l] > '9')
                                                k = l + 1;
+                               if(k > 0 && animname[k-1] == '_')
+                                       --k;
                                animname[k] = 0;
                                count = mod->num_poses - first;
                                for (j = i + 1;j < mod->numframes;j++)
                                {
                                        strlcpy(animname2, mod->animscenes[j].name, sizeof(animname2));
                                        for (l = 0, k = strlen(animname2);animname2[l];l++)
-                                               if ((animname2[l] < '0' || animname2[l] > '9') && animname2[l] != '_')
+                                               if(animname2[l] < '0' || animname2[l] > '9')
                                                        k = l + 1;
+                                       if(k > 0 && animname[k-1] == '_')
+                                               --k;
                                        animname2[k] = 0;
                                        if (strcmp(animname2, animname) || mod->animscenes[j].framecount > 1)
                                        {
@@ -2758,19 +3202,1023 @@ static void Mod_Decompile_f(void)
                        Mod_Decompile_SMD(mod, outname, first, count, false);
                        if (zymtextsize < (int)sizeof(zymtextbuffer) - 100)
                        {
-                               l = dpsnprintf(zymtextbuffer + zymtextsize, sizeof(zymtextbuffer) - zymtextsize, "scene %s.smd fps %g\n", animname, mod->animscenes[i].framerate);
+                               l = dpsnprintf(zymtextbuffer + zymtextsize, sizeof(zymtextbuffer) - zymtextsize, "scene %s.smd fps %g %s\n", animname, mod->animscenes[i].framerate, mod->animscenes[i].loop ? "" : " noloop");
                                if (l > 0) zymtextsize += l;
                        }
                        if (dpmtextsize < (int)sizeof(dpmtextbuffer) - 100)
                        {
-                               l = dpsnprintf(dpmtextbuffer + dpmtextsize, sizeof(dpmtextbuffer) - dpmtextsize, "scene %s.smd\n", animname);
+                               l = dpsnprintf(dpmtextbuffer + dpmtextsize, sizeof(dpmtextbuffer) - dpmtextsize, "scene %s.smd fps %g %s\n", animname, mod->animscenes[i].framerate, mod->animscenes[i].loop ? "" : " noloop");
                                if (l > 0) dpmtextsize += l;
                        }
+                       if (framegroupstextsize < (int)sizeof(framegroupstextbuffer) - 100)
+                       {
+                               l = dpsnprintf(framegroupstextbuffer + framegroupstextsize, sizeof(framegroupstextbuffer) - framegroupstextsize, "%d %d %f %d // %s\n", first, count, mod->animscenes[i].framerate, mod->animscenes[i].loop, animname);
+                               if (l > 0) framegroupstextsize += l;
+                       }
                }
                if (zymtextsize)
                        FS_WriteFile(va("%s_decompiled/out_zym.txt", basename), zymtextbuffer, (fs_offset_t)zymtextsize);
                if (dpmtextsize)
                        FS_WriteFile(va("%s_decompiled/out_dpm.txt", basename), dpmtextbuffer, (fs_offset_t)dpmtextsize);
+               if (framegroupstextsize)
+                       FS_WriteFile(va("%s_decompiled.framegroups", basename), framegroupstextbuffer, (fs_offset_t)framegroupstextsize);
+       }
+}
+
+void Mod_AllocLightmap_Init(mod_alloclightmap_state_t *state, int width, int height)
+{
+       int y;
+       memset(state, 0, sizeof(*state));
+       state->width = width;
+       state->height = height;
+       state->currentY = 0;
+       state->rows = (mod_alloclightmap_row_t *)Mem_Alloc(loadmodel->mempool, state->height * sizeof(*state->rows));
+       for (y = 0;y < state->height;y++)
+       {
+               state->rows[y].currentX = 0;
+               state->rows[y].rowY = -1;
+       }
+}
+
+void Mod_AllocLightmap_Reset(mod_alloclightmap_state_t *state)
+{
+       int y;
+       state->currentY = 0;
+       for (y = 0;y < state->height;y++)
+       {
+               state->rows[y].currentX = 0;
+               state->rows[y].rowY = -1;
+       }
+}
+
+void Mod_AllocLightmap_Free(mod_alloclightmap_state_t *state)
+{
+       if (state->rows)
+               Mem_Free(state->rows);
+       memset(state, 0, sizeof(*state));
+}
+
+qboolean Mod_AllocLightmap_Block(mod_alloclightmap_state_t *state, int blockwidth, int blockheight, int *outx, int *outy)
+{
+       mod_alloclightmap_row_t *row;
+       int y;
+
+       row = state->rows + blockheight;
+       if ((row->rowY < 0) || (row->currentX + blockwidth > state->width))
+       {
+               if (state->currentY + blockheight <= state->height)
+               {
+                       // use the current allocation position
+                       row->rowY = state->currentY;
+                       row->currentX = 0;
+                       state->currentY += blockheight;
+               }
+               else
+               {
+                       // find another position
+                       for (y = blockheight;y < state->height;y++)
+                       {
+                               if ((state->rows[y].rowY >= 0) && (state->rows[y].currentX + blockwidth <= state->width))
+                               {
+                                       row = state->rows + y;
+                                       break;
+                               }
+                       }
+                       if (y == state->height)
+                               return false;
+               }
        }
+       *outy = row->rowY;
+       *outx = row->currentX;
+       row->currentX += blockwidth;
+
+       return true;
+}
+
+typedef struct lightmapsample_s
+{
+       float pos[3];
+       float sh1[4][3];
+       float *vertex_color;
+       unsigned char *lm_bgr;
+       unsigned char *lm_dir;
 }
+lightmapsample_t;
+
+typedef struct lightmapvertex_s
+{
+       int index;
+       float pos[3];
+       float normal[3];
+       float texcoordbase[2];
+       float texcoordlightmap[2];
+       float lightcolor[4];
+}
+lightmapvertex_t;
+
+typedef struct lightmaptriangle_s
+{
+       int triangleindex;
+       int surfaceindex;
+       int lightmapindex;
+       int axis;
+       int lmoffset[2];
+       int lmsize[2];
+       // 2D modelspace coordinates of min corner
+       // snapped to lightmap grid but not in grid coordinates
+       float lmbase[2];
+       // 2D modelspace to lightmap coordinate scale
+       float lmscale[2];
+       float vertex[3][3];
+       float mins[3];
+       float maxs[3];
+}
+lightmaptriangle_t;
+
+typedef struct lightmaplight_s
+{
+       float origin[3];
+       float radius;
+       float iradius;
+       float radius2;
+       float color[3];
+       svbsp_t svbsp;
+}
+lightmaplight_t;
+
+lightmaptriangle_t *mod_generatelightmaps_lightmaptriangles;
+
+#define MAX_LIGHTMAPSAMPLES 64
+static int mod_generatelightmaps_numoffsets[3];
+static float mod_generatelightmaps_offsets[3][MAX_LIGHTMAPSAMPLES][3];
 
+static int mod_generatelightmaps_numlights;
+static lightmaplight_t *mod_generatelightmaps_lightinfo;
+
+extern int R_Shadow_GetRTLightInfo(unsigned int lightindex, float *origin, float *radius, float *color);
+extern cvar_t r_shadow_lightattenuationdividebias;
+extern cvar_t r_shadow_lightattenuationlinearscale;
+
+static void Mod_GenerateLightmaps_LightPoint(dp_model_t *model, const vec3_t pos, vec3_t ambient, vec3_t diffuse, vec3_t lightdir)
+{
+       int i;
+       int index;
+       int result;
+       float relativepoint[3];
+       float color[3];
+       float dir[3];
+       float dist;
+       float dist2;
+       float intensity;
+       float sample[5*3];
+       float lightorigin[3];
+       float lightradius;
+       float lightradius2;
+       float lightiradius;
+       float lightcolor[3];
+       trace_t trace;
+       for (i = 0;i < 5*3;i++)
+               sample[i] = 0.0f;
+       for (index = 0;;index++)
+       {
+               result = R_Shadow_GetRTLightInfo(index, lightorigin, &lightradius, lightcolor);
+               if (result < 0)
+                       break;
+               if (result == 0)
+                       continue;
+               lightradius2 = lightradius * lightradius;
+               VectorSubtract(lightorigin, pos, relativepoint);
+               dist2 = VectorLength2(relativepoint);
+               if (dist2 >= lightradius2)
+                       continue;
+               lightiradius = 1.0f / lightradius;
+               dist = sqrt(dist2) * lightiradius;
+               intensity = dist < 1 ? ((1.0f - dist) * r_shadow_lightattenuationlinearscale.value / (r_shadow_lightattenuationdividebias.value + dist*dist)) : 0;
+               if (intensity <= 0)
+                       continue;
+               if (model && model->TraceLine)
+               {
+                       model->TraceLine(model, NULL, NULL, &trace, pos, lightorigin, SUPERCONTENTS_VISBLOCKERMASK);
+                       if (trace.fraction < 1)
+                               continue;
+               }
+               // scale down intensity to add to both ambient and diffuse
+               //intensity *= 0.5f;
+               VectorNormalize(relativepoint);
+               VectorScale(lightcolor, intensity, color);
+               VectorMA(sample    , 0.5f            , color, sample    );
+               VectorMA(sample + 3, relativepoint[0], color, sample + 3);
+               VectorMA(sample + 6, relativepoint[1], color, sample + 6);
+               VectorMA(sample + 9, relativepoint[2], color, sample + 9);
+               // calculate a weighted average light direction as well
+               intensity *= VectorLength(color);
+               VectorMA(sample + 12, intensity, relativepoint, sample + 12);
+       }
+       // calculate the direction we'll use to reduce the sample to a directional light source
+       VectorCopy(sample + 12, dir);
+       //VectorSet(dir, sample[3] + sample[4] + sample[5], sample[6] + sample[7] + sample[8], sample[9] + sample[10] + sample[11]);
+       VectorNormalize(dir);
+       // extract the diffuse color along the chosen direction and scale it
+       diffuse[0] = (dir[0]*sample[3] + dir[1]*sample[6] + dir[2]*sample[ 9] + sample[ 0]);
+       diffuse[1] = (dir[0]*sample[4] + dir[1]*sample[7] + dir[2]*sample[10] + sample[ 1]);
+       diffuse[2] = (dir[0]*sample[5] + dir[1]*sample[8] + dir[2]*sample[11] + sample[ 2]);
+       // subtract some of diffuse from ambient
+       VectorMA(sample, -0.333f, diffuse, ambient);
+       // store the normalized lightdir
+       VectorCopy(dir, lightdir);
+}
+
+static void Mod_GenerateLightmaps_CreateLights_ComputeSVBSP_InsertSurfaces(const dp_model_t *model, svbsp_t *svbsp, const float *mins, const float *maxs)
+{
+       int surfaceindex;
+       int triangleindex;
+       const msurface_t *surface;
+       const float *vertex3f = model->surfmesh.data_vertex3f;
+       const int *element3i = model->surfmesh.data_element3i;
+       const int *e;
+       float v2[3][3];
+       for (surfaceindex = 0, surface = model->data_surfaces;surfaceindex < model->nummodelsurfaces;surfaceindex++, surface++)
+       {
+               if (!BoxesOverlap(surface->mins, surface->maxs, mins, maxs))
+                       continue;
+               if (surface->texture->basematerialflags & MATERIALFLAG_NOSHADOW)
+                       continue;
+               for (triangleindex = 0, e = element3i + 3*surface->num_firsttriangle;triangleindex < surface->num_triangles;triangleindex++, e += 3)
+               {
+                       VectorCopy(vertex3f + 3*e[0], v2[0]);
+                       VectorCopy(vertex3f + 3*e[1], v2[1]);
+                       VectorCopy(vertex3f + 3*e[2], v2[2]);
+                       SVBSP_AddPolygon(svbsp, 3, v2[0], true, NULL, NULL, 0);
+               }
+       }
+}
+
+static void Mod_GenerateLightmaps_CreateLights_ComputeSVBSP(dp_model_t *model, lightmaplight_t *lightinfo)
+{
+       int maxnodes = 1<<14;
+       svbsp_node_t *nodes;
+       float origin[3];
+       float mins[3];
+       float maxs[3];
+       svbsp_t svbsp;
+       VectorSet(mins, lightinfo->origin[0] - lightinfo->radius, lightinfo->origin[1] - lightinfo->radius, lightinfo->origin[2] - lightinfo->radius);
+       VectorSet(maxs, lightinfo->origin[0] + lightinfo->radius, lightinfo->origin[1] + lightinfo->radius, lightinfo->origin[2] + lightinfo->radius);
+       VectorCopy(lightinfo->origin, origin);
+       nodes = (svbsp_node_t *)Mem_Alloc(tempmempool, maxnodes * sizeof(*nodes));
+       for (;;)
+       {
+               SVBSP_Init(&svbsp, origin, maxnodes, nodes);
+               Mod_GenerateLightmaps_CreateLights_ComputeSVBSP_InsertSurfaces(model, &svbsp, mins, maxs);
+               if (svbsp.ranoutofnodes)
+               {
+                       maxnodes *= 16;
+                       if (maxnodes > 1<<22)
+                       {
+                               Mem_Free(nodes);
+                               return;
+                       }
+                       Mem_Free(nodes);
+                       nodes = (svbsp_node_t *)Mem_Alloc(tempmempool, maxnodes * sizeof(*nodes));
+               }
+               else
+                       break;
+       }
+       if (svbsp.numnodes > 0)
+       {
+               svbsp.nodes = (svbsp_node_t *)Mem_Alloc(tempmempool, svbsp.numnodes * sizeof(*nodes));
+               memcpy(svbsp.nodes, nodes, svbsp.numnodes * sizeof(*nodes));
+               lightinfo->svbsp = svbsp;
+       }
+       Mem_Free(nodes);
+}
+
+static void Mod_GenerateLightmaps_CreateLights(dp_model_t *model)
+{
+       int index;
+       int result;
+       lightmaplight_t *lightinfo;
+       float origin[3];
+       float radius;
+       float color[3];
+       mod_generatelightmaps_numlights = 0;
+       for (index = 0;;index++)
+       {
+               result = R_Shadow_GetRTLightInfo(index, origin, &radius, color);
+               if (result < 0)
+                       break;
+               if (result > 0)
+                       mod_generatelightmaps_numlights++;
+       }
+       if (mod_generatelightmaps_numlights > 0)
+       {
+               mod_generatelightmaps_lightinfo = (lightmaplight_t *)Mem_Alloc(tempmempool, mod_generatelightmaps_numlights * sizeof(*mod_generatelightmaps_lightinfo));
+               lightinfo = mod_generatelightmaps_lightinfo;
+               for (index = 0;;index++)
+               {
+                       result = R_Shadow_GetRTLightInfo(index, lightinfo->origin, &lightinfo->radius, lightinfo->color);
+                       if (result < 0)
+                               break;
+                       if (result > 0)
+                               lightinfo++;
+               }
+       }
+       for (index = 0, lightinfo = mod_generatelightmaps_lightinfo;index < mod_generatelightmaps_numlights;index++, lightinfo++)
+       {
+               lightinfo->iradius = 1.0f / lightinfo->radius;
+               lightinfo->radius2 = lightinfo->radius * lightinfo->radius;
+               // TODO: compute svbsp
+               Mod_GenerateLightmaps_CreateLights_ComputeSVBSP(model, lightinfo);
+       }
+}
+
+static void Mod_GenerateLightmaps_DestroyLights(dp_model_t *model)
+{
+       int i;
+       if (mod_generatelightmaps_lightinfo)
+       {
+               for (i = 0;i < mod_generatelightmaps_numlights;i++)
+                       if (mod_generatelightmaps_lightinfo[i].svbsp.nodes)
+                               Mem_Free(mod_generatelightmaps_lightinfo[i].svbsp.nodes);
+               Mem_Free(mod_generatelightmaps_lightinfo);
+       }
+       mod_generatelightmaps_lightinfo = NULL;
+       mod_generatelightmaps_numlights = 0;
+}
+
+static qboolean Mod_GenerateLightmaps_SamplePoint_SVBSP(const svbsp_t *svbsp, const float *pos)
+{
+       const svbsp_node_t *node;
+       const svbsp_node_t *nodes = svbsp->nodes;
+       int num = 0;
+       while (num >= 0)
+       {
+               node = nodes + num;
+               num = node->children[DotProduct(node->plane, pos) < node->plane[3]];
+       }
+       return num == -1; // true if empty, false if solid (shadowed)
+}
+
+static void Mod_GenerateLightmaps_SamplePoint(const float *pos, const float *normal, float *sample, int numoffsets, const float *offsets)
+{
+       int i;
+       float relativepoint[3];
+       float color[3];
+       float offsetpos[3];
+       float dist;
+       float dist2;
+       float intensity;
+       int offsetindex;
+       int hits;
+       int tests;
+       const lightmaplight_t *lightinfo;
+       trace_t trace;
+       for (i = 0;i < 5*3;i++)
+               sample[i] = 0.0f;
+       for (i = 0, lightinfo = mod_generatelightmaps_lightinfo;i < mod_generatelightmaps_numlights;i++, lightinfo++)
+       {
+               //R_SampleRTLights(pos, sample, numoffsets, offsets);
+               VectorSubtract(lightinfo->origin, pos, relativepoint);
+               // don't accept light from behind a surface, it causes bad shading
+               if (normal && DotProduct(relativepoint, normal) <= 0)
+                       continue;
+               dist2 = VectorLength2(relativepoint);
+               if (dist2 >= lightinfo->radius2)
+                       continue;
+               dist = sqrt(dist2) * lightinfo->iradius;
+               intensity = dist < 1 ? ((1.0f - dist) * r_shadow_lightattenuationlinearscale.value / (r_shadow_lightattenuationdividebias.value + dist*dist)) : 0;
+               if (intensity <= 0)
+                       continue;
+               if (cl.worldmodel && cl.worldmodel->TraceLine && numoffsets > 0)
+               {
+                       hits = 0;
+                       tests = 1;
+                       if (Mod_GenerateLightmaps_SamplePoint_SVBSP(&lightinfo->svbsp, pos))
+                               hits++;
+                       for (offsetindex = 1;offsetindex < numoffsets;offsetindex++)
+                       {
+                               VectorAdd(pos, offsets + 3*offsetindex, offsetpos);
+                               if (!normal)
+                               {
+                                       // for light grid we'd better check visibility of the offset point
+                                       cl.worldmodel->TraceLine(cl.worldmodel, NULL, NULL, &trace, pos, offsetpos, SUPERCONTENTS_VISBLOCKERMASK);
+                                       if (trace.fraction < 1)
+                                               VectorLerp(pos, trace.fraction, offsetpos, offsetpos);
+                               }
+                               tests++;
+                               if (Mod_GenerateLightmaps_SamplePoint_SVBSP(&lightinfo->svbsp, offsetpos))
+                                       hits++;
+                       }
+                       if (!hits)
+                               continue;
+                       // scale intensity according to how many rays succeeded
+                       // we know one test is valid, half of the rest will fail...
+                       //if (normal && tests > 1)
+                       //      intensity *= (tests - 1.0f) / tests;
+                       intensity *= (float)hits / tests;
+               }
+               // scale down intensity to add to both ambient and diffuse
+               //intensity *= 0.5f;
+               VectorNormalize(relativepoint);
+               VectorScale(lightinfo->color, intensity, color);
+               VectorMA(sample    , 0.5f            , color, sample    );
+               VectorMA(sample + 3, relativepoint[0], color, sample + 3);
+               VectorMA(sample + 6, relativepoint[1], color, sample + 6);
+               VectorMA(sample + 9, relativepoint[2], color, sample + 9);
+               // calculate a weighted average light direction as well
+               intensity *= VectorLength(color);
+               VectorMA(sample + 12, intensity, relativepoint, sample + 12);
+       }
+}
+
+static void Mod_GenerateLightmaps_LightmapSample(const float *pos, const float *normal, unsigned char *lm_bgr, unsigned char *lm_dir)
+{
+       float sample[5*3];
+       float color[3];
+       float dir[3];
+       float f;
+       Mod_GenerateLightmaps_SamplePoint(pos, normal, sample, mod_generatelightmaps_numoffsets[0], mod_generatelightmaps_offsets[0][0]);
+       //VectorSet(dir, sample[3] + sample[4] + sample[5], sample[6] + sample[7] + sample[8], sample[9] + sample[10] + sample[11]);
+       VectorCopy(sample + 12, dir);
+       VectorNormalize(dir);
+       //VectorAdd(dir, normal, dir);
+       //VectorNormalize(dir);
+       f = DotProduct(dir, normal);
+       f = max(0, f) * 255.0f;
+       VectorScale(sample, f, color);
+       //VectorCopy(normal, dir);
+       VectorSet(dir, (dir[0]+1.0f)*127.5f, (dir[1]+1.0f)*127.5f, (dir[2]+1.0f)*127.5f);
+       lm_bgr[0] = (unsigned char)bound(0.0f, color[2], 255.0f);
+       lm_bgr[1] = (unsigned char)bound(0.0f, color[1], 255.0f);
+       lm_bgr[2] = (unsigned char)bound(0.0f, color[0], 255.0f);
+       lm_bgr[3] = 255;
+       lm_dir[0] = (unsigned char)dir[2];
+       lm_dir[1] = (unsigned char)dir[1];
+       lm_dir[2] = (unsigned char)dir[0];
+       lm_dir[3] = 255;
+}
+
+static void Mod_GenerateLightmaps_VertexSample(const float *pos, const float *normal, float *vertex_color)
+{
+       float sample[5*3];
+       Mod_GenerateLightmaps_SamplePoint(pos, normal, sample, mod_generatelightmaps_numoffsets[1], mod_generatelightmaps_offsets[1][0]);
+       VectorCopy(sample, vertex_color);
+}
+
+static void Mod_GenerateLightmaps_GridSample(const float *pos, q3dlightgrid_t *s)
+{
+       float sample[5*3];
+       float ambient[3];
+       float diffuse[3];
+       float dir[3];
+       Mod_GenerateLightmaps_SamplePoint(pos, NULL, sample, mod_generatelightmaps_numoffsets[2], mod_generatelightmaps_offsets[2][0]);
+       // calculate the direction we'll use to reduce the sample to a directional light source
+       VectorCopy(sample + 12, dir);
+       //VectorSet(dir, sample[3] + sample[4] + sample[5], sample[6] + sample[7] + sample[8], sample[9] + sample[10] + sample[11]);
+       VectorNormalize(dir);
+       // extract the diffuse color along the chosen direction and scale it
+       diffuse[0] = (dir[0]*sample[3] + dir[1]*sample[6] + dir[2]*sample[ 9] + sample[ 0]) * 127.5f;
+       diffuse[1] = (dir[0]*sample[4] + dir[1]*sample[7] + dir[2]*sample[10] + sample[ 1]) * 127.5f;
+       diffuse[2] = (dir[0]*sample[5] + dir[1]*sample[8] + dir[2]*sample[11] + sample[ 2]) * 127.5f;
+       // scale the ambient from 0-2 to 0-255 and subtract some of diffuse
+       VectorScale(sample, 127.5f, ambient);
+       VectorMA(ambient, -0.333f, diffuse, ambient);
+       // encode to the grid format
+       s->ambientrgb[0] = (unsigned char)bound(0.0f, ambient[0], 255.0f);
+       s->ambientrgb[1] = (unsigned char)bound(0.0f, ambient[1], 255.0f);
+       s->ambientrgb[2] = (unsigned char)bound(0.0f, ambient[2], 255.0f);
+       s->diffusergb[0] = (unsigned char)bound(0.0f, diffuse[0], 255.0f);
+       s->diffusergb[1] = (unsigned char)bound(0.0f, diffuse[1], 255.0f);
+       s->diffusergb[2] = (unsigned char)bound(0.0f, diffuse[2], 255.0f);
+       if (dir[2] >= 0.99f) {s->diffusepitch = 0;s->diffuseyaw = 0;}
+       else if (dir[2] <= -0.99f) {s->diffusepitch = 128;s->diffuseyaw = 0;}
+       else {s->diffusepitch = (unsigned char)(acos(dir[2]) * (127.5f/M_PI));s->diffuseyaw = (unsigned char)(atan2(dir[1], dir[0]) * (127.5f/M_PI));}
+}
+
+static void Mod_GenerateLightmaps_InitSampleOffsets(dp_model_t *model)
+{
+       float radius[3];
+       float temp[3];
+       int i, j;
+       memset(mod_generatelightmaps_offsets, 0, sizeof(mod_generatelightmaps_offsets));
+       mod_generatelightmaps_numoffsets[0] = min(MAX_LIGHTMAPSAMPLES, mod_generatelightmaps_lightmapsamples.integer);
+       mod_generatelightmaps_numoffsets[1] = min(MAX_LIGHTMAPSAMPLES, mod_generatelightmaps_vertexsamples.integer);
+       mod_generatelightmaps_numoffsets[2] = min(MAX_LIGHTMAPSAMPLES, mod_generatelightmaps_gridsamples.integer);
+       radius[0] = mod_generatelightmaps_lightmapradius.value;
+       radius[1] = mod_generatelightmaps_vertexradius.value;
+       radius[2] = mod_generatelightmaps_gridradius.value;
+       for (i = 0;i < 3;i++)
+       {
+               for (j = 1;j < mod_generatelightmaps_numoffsets[i];j++)
+               {
+                       VectorRandom(temp);
+                       VectorScale(temp, radius[i], mod_generatelightmaps_offsets[i][j]);
+               }
+       }
+}
+
+static void Mod_GenerateLightmaps_DestroyLightmaps(dp_model_t *model)
+{
+       msurface_t *surface;
+       int surfaceindex;
+       int i;
+       for (surfaceindex = 0;surfaceindex < model->num_surfaces;surfaceindex++)
+       {
+               surface = model->data_surfaces + surfaceindex;
+               surface->lightmaptexture = NULL;
+               surface->deluxemaptexture = NULL;
+       }
+       if (model->brushq3.data_lightmaps)
+       {
+               for (i = 0;i < model->brushq3.num_mergedlightmaps;i++)
+                       if (model->brushq3.data_lightmaps[i])
+                               R_FreeTexture(model->brushq3.data_lightmaps[i]);
+               Mem_Free(model->brushq3.data_lightmaps);
+               model->brushq3.data_lightmaps = NULL;
+       }
+       if (model->brushq3.data_deluxemaps)
+       {
+               for (i = 0;i < model->brushq3.num_mergedlightmaps;i++)
+                       if (model->brushq3.data_deluxemaps[i])
+                               R_FreeTexture(model->brushq3.data_deluxemaps[i]);
+               Mem_Free(model->brushq3.data_deluxemaps);
+               model->brushq3.data_deluxemaps = NULL;
+       }
+}
+
+static void Mod_GenerateLightmaps_UnweldTriangles(dp_model_t *model)
+{
+       msurface_t *surface;
+       int surfaceindex;
+       int vertexindex;
+       int outvertexindex;
+       int i;
+       const int *e;
+       surfmesh_t oldsurfmesh;
+       size_t size;
+       unsigned char *data;
+       oldsurfmesh = model->surfmesh;
+       model->surfmesh.num_triangles = oldsurfmesh.num_triangles;
+       model->surfmesh.num_vertices = oldsurfmesh.num_triangles * 3;
+       size = 0;
+       size += model->surfmesh.num_vertices * sizeof(float[3]);
+       size += model->surfmesh.num_vertices * sizeof(float[3]);
+       size += model->surfmesh.num_vertices * sizeof(float[3]);
+       size += model->surfmesh.num_vertices * sizeof(float[3]);
+       size += model->surfmesh.num_vertices * sizeof(float[2]);
+       size += model->surfmesh.num_vertices * sizeof(float[2]);
+       size += model->surfmesh.num_vertices * sizeof(float[4]);
+       data = (unsigned char *)Mem_Alloc(model->mempool, size);
+       model->surfmesh.data_vertex3f = (float *)data;data += model->surfmesh.num_vertices * sizeof(float[3]);
+       model->surfmesh.data_normal3f = (float *)data;data += model->surfmesh.num_vertices * sizeof(float[3]);
+       model->surfmesh.data_svector3f = (float *)data;data += model->surfmesh.num_vertices * sizeof(float[3]);
+       model->surfmesh.data_tvector3f = (float *)data;data += model->surfmesh.num_vertices * sizeof(float[3]);
+       model->surfmesh.data_texcoordtexture2f = (float *)data;data += model->surfmesh.num_vertices * sizeof(float[2]);
+       model->surfmesh.data_texcoordlightmap2f = (float *)data;data += model->surfmesh.num_vertices * sizeof(float[2]);
+       model->surfmesh.data_lightmapcolor4f = (float *)data;data += model->surfmesh.num_vertices * sizeof(float[4]);
+       if (model->surfmesh.num_vertices > 65536)
+               model->surfmesh.data_element3s = NULL;
+
+       if (model->surfmesh.vertexposition)
+               Mem_Free(model->surfmesh.vertexposition);
+       model->surfmesh.vertexposition = NULL;
+       if (model->surfmesh.vertexmesh)
+               Mem_Free(model->surfmesh.vertexmesh);
+       model->surfmesh.vertexmesh = NULL;
+       if (model->surfmesh.vertexpositionbuffer)
+               R_Mesh_DestroyMeshBuffer(model->surfmesh.vertexpositionbuffer);
+       model->surfmesh.vertexpositionbuffer = NULL;
+       if (model->surfmesh.vertexmeshbuffer)
+               R_Mesh_DestroyMeshBuffer(model->surfmesh.vertexmeshbuffer);
+       model->surfmesh.vertexmeshbuffer = NULL;
+       if (model->surfmesh.data_element3i_indexbuffer)
+               R_Mesh_DestroyMeshBuffer(model->surfmesh.data_element3i_indexbuffer);
+       model->surfmesh.data_element3i_indexbuffer = NULL;
+       if (model->surfmesh.data_element3s_indexbuffer)
+               R_Mesh_DestroyMeshBuffer(model->surfmesh.data_element3s_indexbuffer);
+       model->surfmesh.data_element3s_indexbuffer = NULL;
+       if (model->surfmesh.vbo_vertexbuffer)
+               R_Mesh_DestroyMeshBuffer(model->surfmesh.vbo_vertexbuffer);
+       model->surfmesh.vbo_vertexbuffer = 0;
+
+       // convert all triangles to unique vertex data
+       outvertexindex = 0;
+       for (surfaceindex = 0;surfaceindex < model->num_surfaces;surfaceindex++)
+       {
+               surface = model->data_surfaces + surfaceindex;
+               surface->num_firstvertex = outvertexindex;
+               surface->num_vertices = surface->num_triangles*3;
+               e = oldsurfmesh.data_element3i + surface->num_firsttriangle*3;
+               for (i = 0;i < surface->num_triangles*3;i++)
+               {
+                       vertexindex = e[i];
+                       model->surfmesh.data_vertex3f[outvertexindex*3+0] = oldsurfmesh.data_vertex3f[vertexindex*3+0];
+                       model->surfmesh.data_vertex3f[outvertexindex*3+1] = oldsurfmesh.data_vertex3f[vertexindex*3+1];
+                       model->surfmesh.data_vertex3f[outvertexindex*3+2] = oldsurfmesh.data_vertex3f[vertexindex*3+2];
+                       model->surfmesh.data_normal3f[outvertexindex*3+0] = oldsurfmesh.data_normal3f[vertexindex*3+0];
+                       model->surfmesh.data_normal3f[outvertexindex*3+1] = oldsurfmesh.data_normal3f[vertexindex*3+1];
+                       model->surfmesh.data_normal3f[outvertexindex*3+2] = oldsurfmesh.data_normal3f[vertexindex*3+2];
+                       model->surfmesh.data_svector3f[outvertexindex*3+0] = oldsurfmesh.data_svector3f[vertexindex*3+0];
+                       model->surfmesh.data_svector3f[outvertexindex*3+1] = oldsurfmesh.data_svector3f[vertexindex*3+1];
+                       model->surfmesh.data_svector3f[outvertexindex*3+2] = oldsurfmesh.data_svector3f[vertexindex*3+2];
+                       model->surfmesh.data_tvector3f[outvertexindex*3+0] = oldsurfmesh.data_tvector3f[vertexindex*3+0];
+                       model->surfmesh.data_tvector3f[outvertexindex*3+1] = oldsurfmesh.data_tvector3f[vertexindex*3+1];
+                       model->surfmesh.data_tvector3f[outvertexindex*3+2] = oldsurfmesh.data_tvector3f[vertexindex*3+2];
+                       model->surfmesh.data_texcoordtexture2f[outvertexindex*2+0] = oldsurfmesh.data_texcoordtexture2f[vertexindex*2+0];
+                       model->surfmesh.data_texcoordtexture2f[outvertexindex*2+1] = oldsurfmesh.data_texcoordtexture2f[vertexindex*2+1];
+                       if (oldsurfmesh.data_texcoordlightmap2f)
+                       {
+                               model->surfmesh.data_texcoordlightmap2f[outvertexindex*2+0] = oldsurfmesh.data_texcoordlightmap2f[vertexindex*2+0];
+                               model->surfmesh.data_texcoordlightmap2f[outvertexindex*2+1] = oldsurfmesh.data_texcoordlightmap2f[vertexindex*2+1];
+                       }
+                       if (oldsurfmesh.data_lightmapcolor4f)
+                       {
+                               model->surfmesh.data_lightmapcolor4f[outvertexindex*4+0] = oldsurfmesh.data_lightmapcolor4f[vertexindex*4+0];
+                               model->surfmesh.data_lightmapcolor4f[outvertexindex*4+1] = oldsurfmesh.data_lightmapcolor4f[vertexindex*4+1];
+                               model->surfmesh.data_lightmapcolor4f[outvertexindex*4+2] = oldsurfmesh.data_lightmapcolor4f[vertexindex*4+2];
+                               model->surfmesh.data_lightmapcolor4f[outvertexindex*4+3] = oldsurfmesh.data_lightmapcolor4f[vertexindex*4+3];
+                       }
+                       else
+                               Vector4Set(model->surfmesh.data_lightmapcolor4f + 4*outvertexindex, 1, 1, 1, 1);
+                       model->surfmesh.data_element3i[surface->num_firsttriangle*3+i] = outvertexindex;
+                       outvertexindex++;
+               }
+       }
+       if (model->surfmesh.data_element3s)
+               for (i = 0;i < model->surfmesh.num_triangles*3;i++)
+                       model->surfmesh.data_element3s[i] = model->surfmesh.data_element3i[i];
+
+       // find and update all submodels to use this new surfmesh data
+       for (i = 0;i < model->brush.numsubmodels;i++)
+               model->brush.submodels[i]->surfmesh = model->surfmesh;
+}
+
+static void Mod_GenerateLightmaps_CreateTriangleInformation(dp_model_t *model)
+{
+       msurface_t *surface;
+       int surfaceindex;
+       int i;
+       int axis;
+       float normal[3];
+       const int *e;
+       lightmaptriangle_t *triangle;
+       // generate lightmap triangle structs
+       mod_generatelightmaps_lightmaptriangles = (lightmaptriangle_t *)Mem_Alloc(model->mempool, model->surfmesh.num_triangles * sizeof(lightmaptriangle_t));
+       for (surfaceindex = 0;surfaceindex < model->num_surfaces;surfaceindex++)
+       {
+               surface = model->data_surfaces + surfaceindex;
+               e = model->surfmesh.data_element3i + surface->num_firsttriangle*3;
+               for (i = 0;i < surface->num_triangles;i++)
+               {
+                       triangle = &mod_generatelightmaps_lightmaptriangles[surface->num_firsttriangle+i];
+                       triangle->triangleindex = surface->num_firsttriangle+i;
+                       triangle->surfaceindex = surfaceindex;
+                       VectorCopy(model->surfmesh.data_vertex3f + 3*e[i*3+0], triangle->vertex[0]);
+                       VectorCopy(model->surfmesh.data_vertex3f + 3*e[i*3+1], triangle->vertex[1]);
+                       VectorCopy(model->surfmesh.data_vertex3f + 3*e[i*3+2], triangle->vertex[2]);
+                       // calculate bounds of triangle
+                       triangle->mins[0] = min(triangle->vertex[0][0], min(triangle->vertex[1][0], triangle->vertex[2][0]));
+                       triangle->mins[1] = min(triangle->vertex[0][1], min(triangle->vertex[1][1], triangle->vertex[2][1]));
+                       triangle->mins[2] = min(triangle->vertex[0][2], min(triangle->vertex[1][2], triangle->vertex[2][2]));
+                       triangle->maxs[0] = max(triangle->vertex[0][0], max(triangle->vertex[1][0], triangle->vertex[2][0]));
+                       triangle->maxs[1] = max(triangle->vertex[0][1], max(triangle->vertex[1][1], triangle->vertex[2][1]));
+                       triangle->maxs[2] = max(triangle->vertex[0][2], max(triangle->vertex[1][2], triangle->vertex[2][2]));
+                       // pick an axial projection based on the triangle normal
+                       TriangleNormal(triangle->vertex[0], triangle->vertex[1], triangle->vertex[2], normal);
+                       axis = 0;
+                       if (fabs(normal[1]) > fabs(normal[axis]))
+                               axis = 1;
+                       if (fabs(normal[2]) > fabs(normal[axis]))
+                               axis = 2;
+                       triangle->axis = axis;
+               }
+       }
+}
+
+static void Mod_GenerateLightmaps_DestroyTriangleInformation(dp_model_t *model)
+{
+       if (mod_generatelightmaps_lightmaptriangles)
+               Mem_Free(mod_generatelightmaps_lightmaptriangles);
+       mod_generatelightmaps_lightmaptriangles = NULL;
+}
+
+float lmaxis[3][3] = {{1, 0, 0}, {0, 1, 0}, {0, 0, 1}};
+
+static void Mod_GenerateLightmaps_CreateLightmaps(dp_model_t *model)
+{
+       msurface_t *surface;
+       int surfaceindex;
+       int lightmapindex;
+       int lightmapnumber;
+       int i;
+       int j;
+       int k;
+       int x;
+       int y;
+       int axis;
+       int axis1;
+       int axis2;
+       int retry;
+       int pixeloffset;
+       float trianglenormal[3];
+       float samplecenter[3];
+       float samplenormal[3];
+       float temp[3];
+       float lmiscale[2];
+       float slopex;
+       float slopey;
+       float slopebase;
+       float lmscalepixels;
+       float lmmins;
+       float lmmaxs;
+       float lm_basescalepixels;
+       int lm_borderpixels;
+       int lm_texturesize;
+       //int lm_maxpixels;
+       const int *e;
+       lightmaptriangle_t *triangle;
+       unsigned char *lightmappixels;
+       unsigned char *deluxemappixels;
+       mod_alloclightmap_state_t lmstate;
+
+       // generate lightmap projection information for all triangles
+       if (model->texturepool == NULL)
+               model->texturepool = R_AllocTexturePool();
+       lm_basescalepixels = 1.0f / max(0.0001f, mod_generatelightmaps_unitspersample.value);
+       lm_borderpixels = mod_generatelightmaps_borderpixels.integer;
+       lm_texturesize = bound(lm_borderpixels*2+1, 64, (int)vid.maxtexturesize_2d);
+       //lm_maxpixels = lm_texturesize-(lm_borderpixels*2+1);
+       Mod_AllocLightmap_Init(&lmstate, lm_texturesize, lm_texturesize);
+       lightmapnumber = 0;
+       for (surfaceindex = 0;surfaceindex < model->num_surfaces;surfaceindex++)
+       {
+               surface = model->data_surfaces + surfaceindex;
+               e = model->surfmesh.data_element3i + surface->num_firsttriangle*3;
+               lmscalepixels = lm_basescalepixels;
+               for (retry = 0;retry < 30;retry++)
+               {
+                       // after a couple failed attempts, degrade quality to make it fit
+                       if (retry > 1)
+                               lmscalepixels *= 0.5f;
+                       for (i = 0;i < surface->num_triangles;i++)
+                       {
+                               triangle = &mod_generatelightmaps_lightmaptriangles[surface->num_firsttriangle+i];
+                               triangle->lightmapindex = lightmapnumber;
+                               // calculate lightmap bounds in 3D pixel coordinates, limit size,
+                               // pick two planar axes for projection
+                               // lightmap coordinates here are in pixels
+                               // lightmap projections are snapped to pixel grid explicitly, such
+                               // that two neighboring triangles sharing an edge and projection
+                               // axis will have identical sampl espacing along their shared edge
+                               k = 0;
+                               for (j = 0;j < 3;j++)
+                               {
+                                       if (j == triangle->axis)
+                                               continue;
+                                       lmmins = floor(triangle->mins[j]*lmscalepixels)-lm_borderpixels;
+                                       lmmaxs = floor(triangle->maxs[j]*lmscalepixels)+lm_borderpixels;
+                                       triangle->lmsize[k] = (int)(lmmaxs-lmmins);
+                                       triangle->lmbase[k] = lmmins/lmscalepixels;
+                                       triangle->lmscale[k] = lmscalepixels;
+                                       k++;
+                               }
+                               if (!Mod_AllocLightmap_Block(&lmstate, triangle->lmsize[0], triangle->lmsize[1], &triangle->lmoffset[0], &triangle->lmoffset[1]))
+                                       break;
+                       }
+                       // if all fit in this texture, we're done with this surface
+                       if (i == surface->num_triangles)
+                               break;
+                       // if we haven't maxed out the lightmap size yet, we retry the
+                       // entire surface batch...
+                       if (lm_texturesize * 2 <= min(mod_generatelightmaps_texturesize.integer, (int)vid.maxtexturesize_2d))
+                       {
+                               lm_texturesize *= 2;
+                               surfaceindex = -1;
+                               lightmapnumber = 0;
+                               Mod_AllocLightmap_Free(&lmstate);
+                               Mod_AllocLightmap_Init(&lmstate, lm_texturesize, lm_texturesize);
+                               break;
+                       }
+                       // if we have maxed out the lightmap size, and this triangle does
+                       // not fit in the same texture as the rest of the surface, we have
+                       // to retry the entire surface in a new texture (can only use one)
+                       // with multiple retries, the lightmap quality degrades until it
+                       // fits (or gives up)
+                       if (surfaceindex > 0)
+                               lightmapnumber++;
+                       Mod_AllocLightmap_Reset(&lmstate);
+               }
+       }
+       lightmapnumber++;
+       Mod_AllocLightmap_Free(&lmstate);
+
+       // now put triangles together into lightmap textures, and do not allow
+       // triangles of a surface to go into different textures (as that would
+       // require rewriting the surface list)
+       model->brushq3.deluxemapping_modelspace = true;
+       model->brushq3.deluxemapping = true;
+       model->brushq3.num_mergedlightmaps = lightmapnumber;
+       model->brushq3.data_lightmaps = (rtexture_t **)Mem_Alloc(model->mempool, model->brushq3.num_mergedlightmaps * sizeof(rtexture_t *));
+       model->brushq3.data_deluxemaps = (rtexture_t **)Mem_Alloc(model->mempool, model->brushq3.num_mergedlightmaps * sizeof(rtexture_t *));
+       lightmappixels = (unsigned char *)Mem_Alloc(tempmempool, model->brushq3.num_mergedlightmaps * lm_texturesize * lm_texturesize * 4);
+       deluxemappixels = (unsigned char *)Mem_Alloc(tempmempool, model->brushq3.num_mergedlightmaps * lm_texturesize * lm_texturesize * 4);
+       for (surfaceindex = 0;surfaceindex < model->num_surfaces;surfaceindex++)
+       {
+               surface = model->data_surfaces + surfaceindex;
+               e = model->surfmesh.data_element3i + surface->num_firsttriangle*3;
+               for (i = 0;i < surface->num_triangles;i++)
+               {
+                       triangle = &mod_generatelightmaps_lightmaptriangles[surface->num_firsttriangle+i];
+                       TriangleNormal(triangle->vertex[0], triangle->vertex[1], triangle->vertex[2], trianglenormal);
+                       VectorNormalize(trianglenormal);
+                       VectorCopy(trianglenormal, samplenormal); // FIXME: this is supposed to be interpolated per pixel from vertices
+                       axis = triangle->axis;
+                       axis1 = axis == 0 ? 1 : 0;
+                       axis2 = axis == 2 ? 1 : 2;
+                       lmiscale[0] = 1.0f / triangle->lmscale[0];
+                       lmiscale[1] = 1.0f / triangle->lmscale[1];
+                       if (trianglenormal[axis] < 0)
+                               VectorNegate(trianglenormal, trianglenormal);
+                       CrossProduct(lmaxis[axis2], trianglenormal, temp);slopex = temp[axis] / temp[axis1];
+                       CrossProduct(lmaxis[axis1], trianglenormal, temp);slopey = temp[axis] / temp[axis2];
+                       slopebase = triangle->vertex[0][axis] - triangle->vertex[0][axis1]*slopex - triangle->vertex[0][axis2]*slopey;
+                       for (j = 0;j < 3;j++)
+                       {
+                               float *t2f = model->surfmesh.data_texcoordlightmap2f + e[i*3+j]*2;
+                               t2f[0] = ((triangle->vertex[j][axis1] - triangle->lmbase[0]) * triangle->lmscale[0] + triangle->lmoffset[0]) / lm_texturesize;
+                               t2f[1] = ((triangle->vertex[j][axis2] - triangle->lmbase[1]) * triangle->lmscale[1] + triangle->lmoffset[1]) / lm_texturesize;
+#if 0
+                               samplecenter[axis1] = (t2f[0]*lm_texturesize-triangle->lmoffset[0])*lmiscale[0] + triangle->lmbase[0];
+                               samplecenter[axis2] = (t2f[1]*lm_texturesize-triangle->lmoffset[1])*lmiscale[1] + triangle->lmbase[1];
+                               samplecenter[axis] = samplecenter[axis1]*slopex + samplecenter[axis2]*slopey + slopebase;
+                               Con_Printf("%f:%f %f:%f %f:%f = %f %f\n", triangle->vertex[j][axis1], samplecenter[axis1], triangle->vertex[j][axis2], samplecenter[axis2], triangle->vertex[j][axis], samplecenter[axis], t2f[0], t2f[1]);
+#endif
+                       }
+
+#if 0
+                       switch (axis)
+                       {
+                       default:
+                       case 0:
+                               forward[0] = 0;
+                               forward[1] = 1.0f / triangle->lmscale[0];
+                               forward[2] = 0;
+                               left[0] = 0;
+                               left[1] = 0;
+                               left[2] = 1.0f / triangle->lmscale[1];
+                               up[0] = 1.0f;
+                               up[1] = 0;
+                               up[2] = 0;
+                               origin[0] = 0;
+                               origin[1] = triangle->lmbase[0];
+                               origin[2] = triangle->lmbase[1];
+                               break;
+                       case 1:
+                               forward[0] = 1.0f / triangle->lmscale[0];
+                               forward[1] = 0;
+                               forward[2] = 0;
+                               left[0] = 0;
+                               left[1] = 0;
+                               left[2] = 1.0f / triangle->lmscale[1];
+                               up[0] = 0;
+                               up[1] = 1.0f;
+                               up[2] = 0;
+                               origin[0] = triangle->lmbase[0];
+                               origin[1] = 0;
+                               origin[2] = triangle->lmbase[1];
+                               break;
+                       case 2:
+                               forward[0] = 1.0f / triangle->lmscale[0];
+                               forward[1] = 0;
+                               forward[2] = 0;
+                               left[0] = 0;
+                               left[1] = 1.0f / triangle->lmscale[1];
+                               left[2] = 0;
+                               up[0] = 0;
+                               up[1] = 0;
+                               up[2] = 1.0f;
+                               origin[0] = triangle->lmbase[0];
+                               origin[1] = triangle->lmbase[1];
+                               origin[2] = 0;
+                               break;
+                       }
+                       Matrix4x4_FromVectors(&backmatrix, forward, left, up, origin);
+#endif
+#define LM_DIST_EPSILON (1.0f / 32.0f)
+                       for (y = 0;y < triangle->lmsize[1];y++)
+                       {
+                               pixeloffset = ((triangle->lightmapindex * lm_texturesize + y + triangle->lmoffset[1]) * lm_texturesize + triangle->lmoffset[0]) * 4;
+                               for (x = 0;x < triangle->lmsize[0];x++, pixeloffset += 4)
+                               {
+                                       samplecenter[axis1] = (x+0.5f)*lmiscale[0] + triangle->lmbase[0];
+                                       samplecenter[axis2] = (y+0.5f)*lmiscale[1] + triangle->lmbase[1];
+                                       samplecenter[axis] = samplecenter[axis1]*slopex + samplecenter[axis2]*slopey + slopebase;
+                                       VectorMA(samplecenter, 0.125f, samplenormal, samplecenter);
+                                       Mod_GenerateLightmaps_LightmapSample(samplecenter, samplenormal, lightmappixels + pixeloffset, deluxemappixels + pixeloffset);
+                               }
+                       }
+               }
+       }
+
+       for (lightmapindex = 0;lightmapindex < model->brushq3.num_mergedlightmaps;lightmapindex++)
+       {
+               model->brushq3.data_lightmaps[lightmapindex] = R_LoadTexture2D(model->texturepool, va("lightmap%i", lightmapindex), lm_texturesize, lm_texturesize, lightmappixels + lightmapindex * lm_texturesize * lm_texturesize * 4, TEXTYPE_BGRA, TEXF_FORCELINEAR, -1, NULL);
+               model->brushq3.data_deluxemaps[lightmapindex] = R_LoadTexture2D(model->texturepool, va("deluxemap%i", lightmapindex), lm_texturesize, lm_texturesize, deluxemappixels + lightmapindex * lm_texturesize * lm_texturesize * 4, TEXTYPE_BGRA, TEXF_FORCELINEAR, -1, NULL);
+       }
+
+       if (lightmappixels)
+               Mem_Free(lightmappixels);
+       if (deluxemappixels)
+               Mem_Free(deluxemappixels);
+
+       for (surfaceindex = 0;surfaceindex < model->num_surfaces;surfaceindex++)
+       {
+               surface = model->data_surfaces + surfaceindex;
+               e = model->surfmesh.data_element3i + surface->num_firsttriangle*3;
+               if (!surface->num_triangles)
+                       continue;
+               lightmapindex = mod_generatelightmaps_lightmaptriangles[surface->num_firsttriangle].lightmapindex;
+               surface->lightmaptexture = model->brushq3.data_lightmaps[lightmapindex];
+               surface->deluxemaptexture = model->brushq3.data_deluxemaps[lightmapindex];
+               surface->lightmapinfo = NULL;
+       }
+
+       model->brush.LightPoint = Mod_GenerateLightmaps_LightPoint;
+       model->brushq1.lightdata = NULL;
+       model->brushq1.lightmapupdateflags = NULL;
+       model->brushq1.firstrender = false;
+       model->brushq1.num_lightstyles = 0;
+       model->brushq1.data_lightstyleinfo = NULL;
+       for (i = 0;i < model->brush.numsubmodels;i++)
+       {
+               model->brush.submodels[i]->brushq1.lightmapupdateflags = NULL;
+               model->brush.submodels[i]->brushq1.firstrender = false;
+               model->brush.submodels[i]->brushq1.num_lightstyles = 0;
+               model->brush.submodels[i]->brushq1.data_lightstyleinfo = NULL;
+       }
+}
+
+static void Mod_GenerateLightmaps_UpdateVertexColors(dp_model_t *model)
+{
+       int i;
+       for (i = 0;i < model->surfmesh.num_vertices;i++)
+               Mod_GenerateLightmaps_VertexSample(model->surfmesh.data_vertex3f + 3*i, model->surfmesh.data_normal3f + 3*i, model->surfmesh.data_lightmapcolor4f + 4*i);
+}
+
+static void Mod_GenerateLightmaps_UpdateLightGrid(dp_model_t *model)
+{
+       int x;
+       int y;
+       int z;
+       int index = 0;
+       float pos[3];
+       for (z = 0;z < model->brushq3.num_lightgrid_isize[2];z++)
+       {
+               pos[2] = (model->brushq3.num_lightgrid_imins[2] + z + 0.5f) * model->brushq3.num_lightgrid_cellsize[2];
+               for (y = 0;y < model->brushq3.num_lightgrid_isize[1];y++)
+               {
+                       pos[1] = (model->brushq3.num_lightgrid_imins[1] + y + 0.5f) * model->brushq3.num_lightgrid_cellsize[1];
+                       for (x = 0;x < model->brushq3.num_lightgrid_isize[0];x++, index++)
+                       {
+                               pos[0] = (model->brushq3.num_lightgrid_imins[0] + x + 0.5f) * model->brushq3.num_lightgrid_cellsize[0];
+                               Mod_GenerateLightmaps_GridSample(pos, model->brushq3.data_lightgrid + index);
+                       }
+               }
+       }
+}
+
+extern cvar_t mod_q3bsp_nolightmaps;
+static void Mod_GenerateLightmaps(dp_model_t *model)
+{
+       //lightmaptriangle_t *lightmaptriangles = Mem_Alloc(model->mempool, model->surfmesh.num_triangles * sizeof(lightmaptriangle_t));
+       dp_model_t *oldloadmodel = loadmodel;
+       loadmodel = model;
+
+       Mod_GenerateLightmaps_InitSampleOffsets(model);
+       Mod_GenerateLightmaps_DestroyLightmaps(model);
+       Mod_GenerateLightmaps_UnweldTriangles(model);
+       Mod_GenerateLightmaps_CreateTriangleInformation(model);
+       Mod_GenerateLightmaps_CreateLights(model);
+       if(!mod_q3bsp_nolightmaps.integer)
+               Mod_GenerateLightmaps_CreateLightmaps(model);
+       Mod_GenerateLightmaps_UpdateVertexColors(model);
+       Mod_GenerateLightmaps_UpdateLightGrid(model);
+       Mod_GenerateLightmaps_DestroyLights(model);
+       Mod_GenerateLightmaps_DestroyTriangleInformation(model);
+
+       loadmodel = oldloadmodel;
+}
+
+static void Mod_GenerateLightmaps_f(void)
+{
+       if (Cmd_Argc() != 1)
+       {
+               Con_Printf("usage: mod_generatelightmaps\n");
+               return;
+       }
+       if (!cl.worldmodel)
+       {
+               Con_Printf("no worldmodel loaded\n");
+               return;
+       }
+       Mod_GenerateLightmaps(cl.worldmodel);
+}