X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_shared.c;h=e7d3228d13f8ed5e1fc377ccaf412ffaa1bea85c;hp=19bbbc0a3735e5c04d75a01b459fd1a47ab0a1e2;hb=de8cab7a1429f923f9015baf2ce95875900cb5e9;hpb=ab329398d377012aeb267575b6f7e52a04c35096 diff --git a/model_shared.c b/model_shared.c index 19bbbc0a..e7d3228d 100644 --- a/model_shared.c +++ b/model_shared.c @@ -27,19 +27,42 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "r_shadow.h" #include "polygon.h" -cvar_t r_mipskins = {CVAR_CLIENT | 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 r_mipnormalmaps = {CVAR_CLIENT | CVAR_SAVE, "r_mipnormalmaps", "1", "mipmaps normalmaps (turning it off looks sharper but may have aliasing)"}; -cvar_t mod_generatelightmaps_unitspersample = {CVAR_CLIENT | CVAR_SAVE, "mod_generatelightmaps_unitspersample", "8", "lightmap resolution"}; -cvar_t mod_generatelightmaps_borderpixels = {CVAR_CLIENT | CVAR_SAVE, "mod_generatelightmaps_borderpixels", "2", "extra space around polygons to prevent sampling artifacts"}; -cvar_t mod_generatelightmaps_texturesize = {CVAR_CLIENT | CVAR_SAVE, "mod_generatelightmaps_texturesize", "1024", "size of lightmap textures"}; -cvar_t mod_generatelightmaps_lightmapsamples = {CVAR_CLIENT | CVAR_SAVE, "mod_generatelightmaps_lightmapsamples", "16", "number of shadow tests done per lightmap pixel"}; -cvar_t mod_generatelightmaps_vertexsamples = {CVAR_CLIENT | CVAR_SAVE, "mod_generatelightmaps_vertexsamples", "16", "number of shadow tests done per vertex"}; -cvar_t mod_generatelightmaps_gridsamples = {CVAR_CLIENT | CVAR_SAVE, "mod_generatelightmaps_gridsamples", "64", "number of shadow tests done per lightgrid cell"}; -cvar_t mod_generatelightmaps_lightmapradius = {CVAR_CLIENT | CVAR_SAVE, "mod_generatelightmaps_lightmapradius", "16", "sampling area around each lightmap pixel"}; -cvar_t mod_generatelightmaps_vertexradius = {CVAR_CLIENT | CVAR_SAVE, "mod_generatelightmaps_vertexradius", "16", "sampling area around each vertex"}; -cvar_t mod_generatelightmaps_gridradius = {CVAR_CLIENT | CVAR_SAVE, "mod_generatelightmaps_gridradius", "64", "sampling area around each lightgrid cell center"}; - -dp_model_t *loadmodel; +cvar_t r_mipskins = {CF_CLIENT | CF_ARCHIVE, "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 r_mipnormalmaps = {CF_CLIENT | CF_ARCHIVE, "r_mipnormalmaps", "1", "mipmaps normalmaps (turning it off looks sharper but may have aliasing)"}; +cvar_t mod_generatelightmaps_unitspersample = {CF_CLIENT | CF_ARCHIVE, "mod_generatelightmaps_unitspersample", "8", "lightmap resolution"}; +cvar_t mod_generatelightmaps_borderpixels = {CF_CLIENT | CF_ARCHIVE, "mod_generatelightmaps_borderpixels", "2", "extra space around polygons to prevent sampling artifacts"}; +cvar_t mod_generatelightmaps_texturesize = {CF_CLIENT | CF_ARCHIVE, "mod_generatelightmaps_texturesize", "1024", "size of lightmap textures"}; +cvar_t mod_generatelightmaps_lightmapsamples = {CF_CLIENT | CF_ARCHIVE, "mod_generatelightmaps_lightmapsamples", "16", "number of shadow tests done per lightmap pixel"}; +cvar_t mod_generatelightmaps_vertexsamples = {CF_CLIENT | CF_ARCHIVE, "mod_generatelightmaps_vertexsamples", "16", "number of shadow tests done per vertex"}; +cvar_t mod_generatelightmaps_gridsamples = {CF_CLIENT | CF_ARCHIVE, "mod_generatelightmaps_gridsamples", "64", "number of shadow tests done per lightgrid cell"}; +cvar_t mod_generatelightmaps_lightmapradius = {CF_CLIENT | CF_ARCHIVE, "mod_generatelightmaps_lightmapradius", "16", "sampling area around each lightmap pixel"}; +cvar_t mod_generatelightmaps_vertexradius = {CF_CLIENT | CF_ARCHIVE, "mod_generatelightmaps_vertexradius", "16", "sampling area around each vertex"}; +cvar_t mod_generatelightmaps_gridradius = {CF_CLIENT | CF_ARCHIVE, "mod_generatelightmaps_gridradius", "64", "sampling area around each lightgrid cell center"}; + +model_t *loadmodel; + +// Supported model formats +static modloader_t loader[] = +{ + {"obj", NULL, 0, Mod_OBJ_Load}, + {NULL, "IDPO", 4, Mod_IDP0_Load}, + {NULL, "IDP2", 4, Mod_IDP2_Load}, + {NULL, "IDP3", 4, Mod_IDP3_Load}, + {NULL, "IDSP", 4, Mod_IDSP_Load}, + {NULL, "IDS2", 4, Mod_IDS2_Load}, + {NULL, "\035", 1, Mod_Q1BSP_Load}, + {NULL, "\036", 1, Mod_HLBSP_Load}, + {NULL, "BSP2", 4, Mod_BSP2_Load}, + {NULL, "2PSB", 4, Mod_2PSB_Load}, + {NULL, "IBSP", 4, Mod_IBSP_Load}, + {NULL, "VBSP", 4, Mod_VBSP_Load}, + {NULL, "ZYMOTICMODEL", 13, Mod_ZYMOTICMODEL_Load}, + {NULL, "DARKPLACESMODEL", 16, Mod_DARKPLACESMODEL_Load}, + {NULL, "PSKMODEL", 9, Mod_PSKMODEL_Load}, + {NULL, "INTERQUAKEMODEL", 16, Mod_INTERQUAKEMODEL_Load}, + {"map", NULL, 0, Mod_MAP_Load}, + {NULL, NULL, 0, NULL} +}; static mempool_t *mod_mempool; static memexpandablearray_t models; @@ -47,7 +70,7 @@ static memexpandablearray_t models; static mempool_t* q3shaders_mem; typedef struct q3shader_hash_entry_s { - q3shaderinfo_t shader; + shader_t shader; struct q3shader_hash_entry_s* chain; } q3shader_hash_entry_t; #define Q3SHADER_HASH_SIZE 1021 @@ -63,16 +86,16 @@ static void mod_start(void) { int i, count; int nummodels = (int)Mem_ExpandableArray_IndexRange(&models); - dp_model_t *mod; + model_t *mod; SCR_PushLoadingScreen("Loading models", 1.0); count = 0; for (i = 0;i < nummodels;i++) - if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*') + if ((mod = (model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*') if (mod->used) ++count; for (i = 0;i < nummodels;i++) - if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*') + if ((mod = (model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*') if (mod->used) { SCR_PushLoadingScreen(mod->name, 1.0 / count); @@ -86,10 +109,10 @@ static void mod_shutdown(void) { int i; int nummodels = (int)Mem_ExpandableArray_IndexRange(&models); - dp_model_t *mod; + model_t *mod; for (i = 0;i < nummodels;i++) - if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && (mod->loaded || mod->mempool)) + if ((mod = (model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && (mod->loaded || mod->mempool)) Mod_UnloadModel(mod); Mod_FreeQ3Shaders(); @@ -101,11 +124,11 @@ static void mod_newmap(void) msurface_t *surface; int i, j, k, l, surfacenum, ssize, tsize; int nummodels = (int)Mem_ExpandableArray_IndexRange(&models); - dp_model_t *mod; + model_t *mod; for (i = 0;i < nummodels;i++) { - if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->mempool) + if ((mod = (model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->mempool) { for (j = 0;j < mod->num_textures && mod->data_textures;j++) { @@ -127,7 +150,7 @@ static void mod_newmap(void) for (i = 0;i < nummodels;i++) { - if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->mempool && mod->data_surfaces) + if ((mod = (model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->mempool && mod->data_surfaces) { for (surfacenum = 0, surface = mod->data_surfaces;surfacenum < mod->num_surfaces;surfacenum++, surface++) { @@ -155,7 +178,7 @@ static void Mod_GenerateLightmaps_f(cmd_state_t *cmd); void Mod_Init (void) { mod_mempool = Mem_AllocPool("modelinfo", 0, NULL); - Mem_ExpandableArray_NewArray(&models, mod_mempool, sizeof(dp_model_t), 16); + Mem_ExpandableArray_NewArray(&models, mod_mempool, sizeof(model_t), 16); Mod_BrushInit(); Mod_AliasInit(); @@ -174,10 +197,10 @@ void Mod_Init (void) Cvar_RegisterVariable(&mod_generatelightmaps_vertexradius); Cvar_RegisterVariable(&mod_generatelightmaps_gridradius); - Cmd_AddCommand(&cmd_client, "modellist", Mod_Print_f, "prints a list of loaded models"); - Cmd_AddCommand(&cmd_client, "modelprecache", Mod_Precache_f, "load a model"); - Cmd_AddCommand(&cmd_client, "modeldecompile", Mod_Decompile_f, "exports a model in several formats for editing purposes"); - Cmd_AddCommand(&cmd_client, "mod_generatelightmaps", Mod_GenerateLightmaps_f, "rebuilds lighting on current worldmodel"); + Cmd_AddCommand(CF_CLIENT, "modellist", Mod_Print_f, "prints a list of loaded models"); + Cmd_AddCommand(CF_CLIENT, "modelprecache", Mod_Precache_f, "load a model"); + Cmd_AddCommand(CF_CLIENT, "modeldecompile", Mod_Decompile_f, "exports a model in several formats for editing purposes"); + Cmd_AddCommand(CF_CLIENT, "mod_generatelightmaps", Mod_GenerateLightmaps_f, "rebuilds lighting on current worldmodel"); } void Mod_RenderInit(void) @@ -185,11 +208,11 @@ void Mod_RenderInit(void) R_RegisterModule("Models", mod_start, mod_shutdown, mod_newmap, NULL, NULL); } -void Mod_UnloadModel (dp_model_t *mod) +void Mod_UnloadModel (model_t *mod) { char name[MAX_QPATH]; - qboolean used; - dp_model_t *parentmodel; + qbool used; + model_t *parentmodel; if (developer_loading.integer) Con_Printf("unloading model %s\n", mod->name); @@ -221,7 +244,7 @@ void Mod_UnloadModel (dp_model_t *mod) R_FreeTexturePool(&mod->texturepool); Mem_FreePool(&mod->mempool); // clear the struct to make it available - memset(mod, 0, sizeof(dp_model_t)); + memset(mod, 0, sizeof(model_t)); // restore the fields we want to preserve strlcpy(mod->name, name, sizeof(mod->name)); mod->brush.parentmodel = parentmodel; @@ -235,7 +258,7 @@ static void R_Model_Null_Draw(entity_render_t *ent) } -typedef void (*mod_framegroupify_parsegroups_t) (unsigned int i, int start, int len, float fps, qboolean loop, const char *name, void *pass); +typedef void (*mod_framegroupify_parsegroups_t) (unsigned int i, int start, int len, float fps, qbool loop, const char *name, void *pass); static int Mod_FrameGroupify_ParseGroups(const char *buf, mod_framegroupify_parsegroups_t cb, void *pass) { @@ -243,7 +266,7 @@ static int Mod_FrameGroupify_ParseGroups(const char *buf, mod_framegroupify_pars int start, len; float fps; unsigned int i; - qboolean loop; + qbool loop; char name[64]; bufptr = buf; @@ -310,9 +333,9 @@ static int Mod_FrameGroupify_ParseGroups(const char *buf, mod_framegroupify_pars return i; } -static void Mod_FrameGroupify_ParseGroups_Store (unsigned int i, int start, int len, float fps, qboolean loop, const char *name, void *pass) +static void Mod_FrameGroupify_ParseGroups_Store (unsigned int i, int start, int len, float fps, qbool loop, const char *name, void *pass) { - dp_model_t *mod = (dp_model_t *) pass; + model_t *mod = (model_t *) pass; animscene_t *anim = &mod->animscenes[i]; if(name) strlcpy(anim->name, name, sizeof(anim[i].name)); @@ -325,7 +348,7 @@ static void Mod_FrameGroupify_ParseGroups_Store (unsigned int i, int start, int //Con_Printf("frame group %d is %d %d %f %d\n", i, start, len, fps, loop); } -static void Mod_FrameGroupify(dp_model_t *mod, const char *buf) +static void Mod_FrameGroupify(model_t *mod, const char *buf) { unsigned int cnt; @@ -346,7 +369,7 @@ static void Mod_FrameGroupify(dp_model_t *mod, const char *buf) Mod_FrameGroupify_ParseGroups(buf, Mod_FrameGroupify_ParseGroups_Store, mod); } -static void Mod_FindPotentialDeforms(dp_model_t *mod) +static void Mod_FindPotentialDeforms(model_t *mod) { int i, j; texture_t *texture; @@ -380,9 +403,8 @@ Mod_LoadModel Loads a model ================== */ -dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk) +model_t *Mod_LoadModel(model_t *mod, qbool crash, qbool checkdisk) { - int num; unsigned int crc; void *buf; fs_offset_t filesize = 0; @@ -490,46 +512,46 @@ dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk) if (buf) { + int i; + const char *ext = FS_FileExtension(mod->name); char *bufend = (char *)buf + filesize; - // all models use memory, so allocate a memory pool mod->mempool = Mem_AllocPool(mod->name, 0, NULL); - num = LittleLong(*((int *)buf)); - // call the apropriate loader + // We need to have a reference to the base model in case we're parsing submodels loadmodel = mod; - 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); - else if (!memcmp(buf, "IDSP", 4)) Mod_IDSP_Load(mod, buf, bufend); - else if (!memcmp(buf, "IDS2", 4)) Mod_IDS2_Load(mod, buf, bufend); - else if (!memcmp(buf, "IBSP", 4)) Mod_IBSP_Load(mod, buf, bufend); - 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 || !memcmp(buf, "BSP2", 4) || !memcmp(buf, "2PSB", 4)) 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(vabuf, sizeof(vabuf), "%s.framegroups", mod->name), tempmempool, false, &filesize); - if(buf) + + // Call the appropriate loader. Try matching magic bytes. + for (i = 0; loader[i].Load; i++) { - Mod_FrameGroupify(mod, (const char *)buf); - Mem_Free(buf); - } + // Headerless formats can just load based on extension. Otherwise match the magic string. + if((loader[i].extension && !strcasecmp(ext, loader[i].extension) && !loader[i].header) || + (loader[i].header && !memcmp(buf, loader[i].header, loader[i].headersize))) + { + // Matched. Load it. + loader[i].Load(mod, buf, bufend); + Mem_Free(buf); + + Mod_FindPotentialDeforms(mod); + + buf = FS_LoadFile(va(vabuf, sizeof(vabuf), "%s.framegroups", mod->name), tempmempool, false, &filesize); + if(buf) + { + Mod_FrameGroupify(mod, (const char *)buf); + Mem_Free(buf); + } - Mod_BuildVBOs(); + Mod_SetDrawSkyAndWater(mod); + Mod_BuildVBOs(); + break; + } + } + if(!loader[i].Load) + Con_Printf(CON_ERROR "Mod_LoadModel: model \"%s\" is of unknown/unsupported type\n", mod->name); } else if (crash) - { // LadyHavoc: Sys_Error was *ANNOYING* - Con_Printf ("Mod_LoadModel: %s not found\n", mod->name); - } + Con_Printf (CON_ERROR "Mod_LoadModel: %s not found\n", mod->name); // no fatal errors occurred, so this model is ready to use. mod->loaded = true; @@ -543,9 +565,9 @@ void Mod_ClearUsed(void) { int i; int nummodels = (int)Mem_ExpandableArray_IndexRange(&models); - dp_model_t *mod; + model_t *mod; for (i = 0;i < nummodels;i++) - if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0]) + if ((mod = (model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0]) mod->used = false; } @@ -553,10 +575,10 @@ void Mod_PurgeUnused(void) { int i; int nummodels = (int)Mem_ExpandableArray_IndexRange(&models); - dp_model_t *mod; + model_t *mod; for (i = 0;i < nummodels;i++) { - if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && !mod->used) + if ((mod = (model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && !mod->used) { Mod_UnloadModel(mod); Mem_ExpandableArray_FreeRecord(&models, mod); @@ -570,18 +592,15 @@ Mod_FindName ================== */ -dp_model_t *Mod_FindName(const char *name, const char *parentname) +model_t *Mod_FindName(const char *name, const char *parentname) { int i; int nummodels; - dp_model_t *mod; + model_t *mod; if (!parentname) parentname = ""; - // if we're not dedicatd, the renderer calls will crash without video - Host_StartVideo(); - nummodels = (int)Mem_ExpandableArray_IndexRange(&models); if (!name[0]) @@ -590,7 +609,7 @@ dp_model_t *Mod_FindName(const char *name, const char *parentname) // search the currently loaded models for (i = 0;i < nummodels;i++) { - if ((mod = (dp_model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && !strcmp(mod->name, name) && ((!mod->brush.parentmodel && !parentname[0]) || (mod->brush.parentmodel && parentname[0] && !strcmp(mod->brush.parentmodel->name, parentname)))) + if ((mod = (model_t*) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && !strcmp(mod->name, name) && ((!mod->brush.parentmodel && !parentname[0]) || (mod->brush.parentmodel && parentname[0] && !strcmp(mod->brush.parentmodel->name, parentname)))) { mod->used = true; return mod; @@ -598,7 +617,7 @@ dp_model_t *Mod_FindName(const char *name, const char *parentname) } // no match found, create a new one - mod = (dp_model_t *) Mem_ExpandableArray_AllocRecord(&models); + mod = (model_t *) Mem_ExpandableArray_AllocRecord(&models); strlcpy(mod->name, name, sizeof(mod->name)); if (parentname[0]) mod->brush.parentmodel = Mod_FindName(parentname, NULL); @@ -609,6 +628,8 @@ dp_model_t *Mod_FindName(const char *name, const char *parentname) return mod; } +extern qbool vid_opened; + /* ================== Mod_ForName @@ -616,9 +637,14 @@ Mod_ForName Loads in a model for the given name ================== */ -dp_model_t *Mod_ForName(const char *name, qboolean crash, qboolean checkdisk, const char *parentname) +model_t *Mod_ForName(const char *name, qbool crash, qbool checkdisk, const char *parentname) { - dp_model_t *model; + model_t *model; + + // FIXME: So we don't crash if a server is started early. + if(!vid_opened) + CL_StartVideo(); + model = Mod_FindName(name, parentname); if (!model->loaded || checkdisk) Mod_LoadModel(model, crash, checkdisk); @@ -636,15 +662,15 @@ void Mod_Reload(void) { int i, count; int nummodels = (int)Mem_ExpandableArray_IndexRange(&models); - dp_model_t *mod; + model_t *mod; SCR_PushLoadingScreen("Reloading models", 1.0); count = 0; for (i = 0;i < nummodels;i++) - if ((mod = (dp_model_t *) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*' && mod->used) + if ((mod = (model_t *) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*' && mod->used) ++count; for (i = 0;i < nummodels;i++) - if ((mod = (dp_model_t *) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*' && mod->used) + if ((mod = (model_t *) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*' && mod->used) { SCR_PushLoadingScreen(mod->name, 1.0 / count); Mod_LoadModel(mod, true, true); @@ -667,12 +693,12 @@ static void Mod_Print_f(cmd_state_t *cmd) { int i; int nummodels = (int)Mem_ExpandableArray_IndexRange(&models); - dp_model_t *mod; + model_t *mod; Con_Print("Loaded models:\n"); for (i = 0;i < nummodels;i++) { - if ((mod = (dp_model_t *) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*') + if ((mod = (model_t *) Mem_ExpandableArray_RecordAtIndex(&models, i)) && mod->name[0] && mod->name[0] != '*') { if (mod->brush.numsubmodels) Con_Printf("%4iK %s (%i submodels)\n", mod->mempool ? (int)((mod->mempool->totalsize + 1023) / 1024) : 0, mod->name, mod->brush.numsubmodels); @@ -709,7 +735,7 @@ int Mod_BuildVertexRemapTableFromElements(int numelements, const int *elements, return count; } -qboolean Mod_ValidateElements(int *element3i, unsigned short *element3s, int numtriangles, int firstvertex, int numvertices, const char *filename, int fileline) +qbool Mod_ValidateElements(int *element3i, unsigned short *element3s, int numtriangles, int firstvertex, int numvertices, const char *filename, int fileline) { int first = firstvertex, last = first + numvertices - 1, numelements = numtriangles * 3; int i; @@ -751,7 +777,7 @@ qboolean Mod_ValidateElements(int *element3i, unsigned short *element3s, int num } if (invalidintcount || invalidshortcount || invalidmismatchcount) { - Con_Printf("Mod_ValidateElements(%i, %i, %i, %p, %p) called at %s:%d", numelements, first, last, element3i, element3s, filename, fileline); + Con_Printf("Mod_ValidateElements(%i, %i, %i, %p, %p) called at %s:%d", numelements, first, last, (void *)element3i, (void *)element3s, filename, fileline); Con_Printf(", %i elements are invalid in element3i (example: element3i[%i] == %i)", invalidintcount, invalidintexample, element3i ? element3i[invalidintexample] : 0); Con_Printf(", %i elements are invalid in element3s (example: element3s[%i] == %i)", invalidshortcount, invalidshortexample, element3s ? element3s[invalidshortexample] : 0); Con_Printf(", %i elements mismatch between element3i and element3s (example: element3s[%i] is %i and element3i[%i] is %i)", invalidmismatchcount, invalidmismatchexample, element3s ? element3s[invalidmismatchexample] : 0, invalidmismatchexample, element3i ? element3i[invalidmismatchexample] : 0); @@ -777,7 +803,7 @@ qboolean Mod_ValidateElements(int *element3i, unsigned short *element3s, int num } // warning: this is an expensive function! -void Mod_BuildNormals(int firstvertex, int numvertices, int numtriangles, const float *vertex3f, const int *elements, float *normal3f, qboolean areaweighting) +void Mod_BuildNormals(int firstvertex, int numvertices, int numtriangles, const float *vertex3f, const int *elements, float *normal3f, qbool areaweighting) { int i, j; const int *element; @@ -864,7 +890,7 @@ static void Mod_BuildBumpVectors(const float *v0, const float *v1, const float * #endif // warning: this is a very expensive function! -void Mod_BuildTextureVectorsFromNormals(int firstvertex, int numvertices, int numtriangles, const float *vertex3f, const float *texcoord2f, const float *normal3f, const int *elements, float *svector3f, float *tvector3f, qboolean areaweighting) +void Mod_BuildTextureVectorsFromNormals(int firstvertex, int numvertices, int numtriangles, const float *vertex3f, const float *texcoord2f, const float *normal3f, const int *elements, float *svector3f, float *tvector3f, qbool areaweighting) { int i, tnum; float sdir[3], tdir[3], normal[3], *svec, *tvec; @@ -944,7 +970,7 @@ void Mod_BuildTextureVectorsFromNormals(int firstvertex, int numvertices, int nu } } -void Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriangles, qboolean lightmapoffsets, qboolean vertexcolors) +void Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriangles, qbool lightmapoffsets, qbool vertexcolors) { unsigned char *data; data = (unsigned char *)Mem_Alloc(mempool, numvertices * (3 + 3 + 3 + 3 + 2 + 2 + (vertexcolors ? 4 : 0)) * sizeof(float) + numvertices * (lightmapoffsets ? 1 : 0) * sizeof(int) + numtriangles * sizeof(int[3]) + (numvertices <= 65536 ? numtriangles * sizeof(unsigned short[3]) : 0)); @@ -1064,7 +1090,7 @@ static void Mod_ShadowMesh_CreateVBOs(shadowmesh_t *mesh) } } -shadowmesh_t *Mod_ShadowMesh_Finish(shadowmesh_t *mesh, qboolean createvbo) +shadowmesh_t *Mod_ShadowMesh_Finish(shadowmesh_t *mesh, qbool createvbo) { if (mesh->numverts >= 3 && mesh->numtriangles >= 1) { @@ -1161,10 +1187,10 @@ void Mod_ShadowMesh_Free(shadowmesh_t *mesh) Mem_Free(mesh); } -void Mod_CreateCollisionMesh(dp_model_t *mod) +void Mod_CreateCollisionMesh(model_t *mod) { int k, numcollisionmeshtriangles; - qboolean usesinglecollisionmesh = false; + qbool usesinglecollisionmesh = false; const msurface_t *surface = NULL; mempool_t *mempool = mod->mempool; @@ -1173,9 +1199,9 @@ void Mod_CreateCollisionMesh(dp_model_t *mod) // 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++) + for (k = mod->submodelsurfaces_start;k < mod->submodelsurfaces_end;k++) { - surface = mod->data_surfaces + mod->firstmodelsurface + k; + surface = mod->data_surfaces + k; if (!strcmp(surface->texture->name, "collision") || !strcmp(surface->texture->name, "collisionconvex")) // found collision mesh { usesinglecollisionmesh = true; @@ -1191,9 +1217,9 @@ void Mod_CreateCollisionMesh(dp_model_t *mod) Mod_ShadowMesh_AddMesh(mod->brush.collisionmesh, mod->surfmesh.data_vertex3f, surface->num_triangles, (mod->surfmesh.data_element3i + 3 * surface->num_firsttriangle)); else { - for (k = 0;k < mod->nummodelsurfaces;k++) + for (k = mod->submodelsurfaces_start; k < mod->submodelsurfaces_end; k++) { - surface = mod->data_surfaces + mod->firstmodelsurface + k; + surface = mod->data_surfaces + k; if (!(surface->texture->supercontents & SUPERCONTENTS_SOLID)) continue; Mod_ShadowMesh_AddMesh(mod->brush.collisionmesh, mod->surfmesh.data_vertex3f, surface->num_triangles, (mod->surfmesh.data_element3i + 3 * surface->num_firsttriangle)); @@ -1267,7 +1293,7 @@ static void Mod_ConstructTerrainPatchFromBGRA(const unsigned char *imagepixels, #endif #if 0 -void Mod_Terrain_SurfaceRecurseChunk(dp_model_t *model, int stepsize, int x, int y) +void Mod_Terrain_SurfaceRecurseChunk(model_t *model, int stepsize, int x, int y) { float mins[3]; float maxs[3]; @@ -1338,7 +1364,7 @@ void Mod_Terrain_SurfaceRecurseChunk(dp_model_t *model, int stepsize, int x, int // TODO: emit skirt vertices } -void Mod_Terrain_UpdateSurfacesForViewOrigin(dp_model_t *model) +void Mod_Terrain_UpdateSurfacesForViewOrigin(model_t *model) { for (y = 0;y < model->terrain.size[1];y += model->terrain. Mod_Terrain_SurfaceRecurseChunk(model, model->terrain.maxstepsize, x, y); @@ -1373,7 +1399,7 @@ void Mod_FreeQ3Shaders(void) Mem_FreePool(&q3shaders_mem); } -static void Q3Shader_AddToHash (q3shaderinfo_t* shader) +static void Q3Shader_AddToHash (shader_t* shader) { unsigned short hash = CRC_Block_CaseInsensitive ((const unsigned char *)shader->name, strlen (shader->name)); q3shader_hash_entry_t* entry = q3shader_data->hash + (hash % Q3SHADER_HASH_SIZE); @@ -1428,7 +1454,7 @@ static void Q3Shader_AddToHash (q3shaderinfo_t* shader) /* else: head of chain, in hash entry array */ entry = lastEntry; } - memcpy (&entry->shader, shader, sizeof (q3shaderinfo_t)); + memcpy (&entry->shader, shader, sizeof (shader_t)); } void Mod_LoadQ3Shaders(void) @@ -1438,14 +1464,14 @@ void Mod_LoadQ3Shaders(void) fssearch_t *search; char *f; const char *text; - q3shaderinfo_t shader; + shader_t shader; 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 custsurfaceflags[256]; int numcustsurfaceflags; - qboolean dpshaderkill; + qbool dpshaderkill; Mod_FreeQ3Shaders(); @@ -1500,7 +1526,7 @@ void Mod_LoadQ3Shaders(void) } // parse shaders - search = FS_Search("scripts/*.shader", true, false); + search = FS_Search("scripts/*.shader", true, false, NULL); if (!search) return; for (fileindex = 0;fileindex < search->numfilenames;fileindex++) @@ -2184,7 +2210,7 @@ void Mod_LoadQ3Shaders(void) Mem_Free(custsurfaceparmnames[j]); } -q3shaderinfo_t *Mod_LookupQ3Shader(const char *name) +shader_t *Mod_LookupQ3Shader(const char *name) { unsigned short hash; q3shader_hash_entry_t* entry; @@ -2235,11 +2261,11 @@ texture_shaderpass_t *Mod_CreateShaderPassFromQ3ShaderLayer(mempool_t *mempool, return shaderpass; } -qboolean Mod_LoadTextureFromQ3Shader(mempool_t *mempool, const char *modelname, texture_t *texture, const char *name, qboolean warnmissing, qboolean fallback, int defaulttexflags, int defaultmaterialflags) +qbool Mod_LoadTextureFromQ3Shader(mempool_t *mempool, const char *modelname, texture_t *texture, const char *name, qbool warnmissing, qbool fallback, int defaulttexflags, int defaultmaterialflags) { int texflagsmask, texflagsor; - qboolean success = true; - q3shaderinfo_t *shader; + qbool success = true; + shader_t *shader; if (!name) name = ""; strlcpy(texture->name, name, sizeof(texture->name)); @@ -2650,7 +2676,7 @@ void Mod_LoadCustomMaterial(mempool_t *mempool, texture_t *texture, const char * texture->backgroundcurrentskinframe = NULL; } -void Mod_UnloadCustomMaterial(texture_t *texture, qboolean purgeskins) +void Mod_UnloadCustomMaterial(texture_t *texture, qbool purgeskins) { long unsigned int i, j; for (i = 0; i < sizeof(texture->shaderpasses) / sizeof(texture->shaderpasses[0]); i++) @@ -2852,37 +2878,80 @@ void Mod_VertexRangeFromElements(int numelements, const int *elements, int *firs *lastvertexpointer = lastvertex; } -void Mod_MakeSortedSurfaces(dp_model_t *mod) +void Mod_SetDrawSkyAndWater(model_t* mod) +{ + int j; + uint64_t basematerialflags = 0; + // by default assume there is no sky or water used in this model + mod->DrawSky = NULL; + mod->DrawAddWaterPlanes = NULL; + // combine all basematerialflags observed in the submodelsurfaces range, then check for special flags + for (j = mod->submodelsurfaces_start; j < mod->submodelsurfaces_end; j++) + if (mod->data_surfaces[j].texture) + basematerialflags |= mod->data_surfaces[j].texture->basematerialflags; + if (basematerialflags & MATERIALFLAG_SKY) + mod->DrawSky = R_Mod_DrawSky; + if (basematerialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION | MATERIALFLAG_CAMERA)) + mod->DrawAddWaterPlanes = R_Mod_DrawAddWaterPlanes; +} + +typedef struct Mod_MakeSortedSurfaces_qsortsurface_s +{ + int surfaceindex; + q3deffect_t* effect; + texture_t* texture; + rtexture_t* lightmaptexture; +} +Mod_MakeSortedSurfaces_qsortsurface_t; + +static int Mod_MakeSortedSurfaces_qsortfunc(const void *a, const void *b) +{ + const Mod_MakeSortedSurfaces_qsortsurface_t* l = (Mod_MakeSortedSurfaces_qsortsurface_t*)a; + const Mod_MakeSortedSurfaces_qsortsurface_t* r = (Mod_MakeSortedSurfaces_qsortsurface_t*)b; + if (l->effect < r->effect) + return -1; + if (l->effect > r->effect) + return 1; + if (l->texture < r->texture) + return -1; + if (l->texture > r->texture) + return 1; + if (l->lightmaptexture < r->lightmaptexture) + return -1; + if (l->lightmaptexture > r->lightmaptexture) + return 1; + if (l->surfaceindex < r->surfaceindex) + return -1; + if (l->surfaceindex > r->surfaceindex) + return 1; + return 0; +} + +void Mod_MakeSortedSurfaces(model_t *mod) { // make an optimal set of texture-sorted batches to draw... - int j, t; - int *firstsurfacefortexture; - int *numsurfacesfortexture; - if (!mod->sortedmodelsurfaces) - mod->sortedmodelsurfaces = (int *) Mem_Alloc(loadmodel->mempool, mod->nummodelsurfaces * sizeof(*mod->sortedmodelsurfaces)); - firstsurfacefortexture = (int *) Mem_Alloc(tempmempool, mod->num_textures * sizeof(*firstsurfacefortexture)); - numsurfacesfortexture = (int *) Mem_Alloc(tempmempool, mod->num_textures * sizeof(*numsurfacesfortexture)); - memset(numsurfacesfortexture, 0, mod->num_textures * sizeof(*numsurfacesfortexture)); - for (j = 0;j < mod->nummodelsurfaces;j++) - { - const msurface_t *surface = mod->data_surfaces + j + mod->firstmodelsurface; - t = (int)(surface->texture - mod->data_textures); - numsurfacesfortexture[t]++; - } - j = 0; - for (t = 0;t < mod->num_textures;t++) - { - firstsurfacefortexture[t] = j; - j += numsurfacesfortexture[t]; - } - for (j = 0;j < mod->nummodelsurfaces;j++) + int j, k; + Mod_MakeSortedSurfaces_qsortsurface_t *info; + + if(cls.state == ca_dedicated) + return; + + info = (Mod_MakeSortedSurfaces_qsortsurface_t*)R_FrameData_Alloc(mod->num_surfaces * sizeof(*info)); + if (!mod->modelsurfaces_sorted) + mod->modelsurfaces_sorted = (int *) Mem_Alloc(loadmodel->mempool, mod->num_surfaces * sizeof(*mod->modelsurfaces_sorted)); + // the goal is to sort by submodel (can't change which submodel a surface belongs to), and then by effects and textures + for (j = 0; j < mod->num_surfaces; j++) { - const msurface_t *surface = mod->data_surfaces + j + mod->firstmodelsurface; - t = (int)(surface->texture - mod->data_textures); - mod->sortedmodelsurfaces[firstsurfacefortexture[t]++] = j + mod->firstmodelsurface; + info[j].surfaceindex = j; + info[j].effect = mod->data_surfaces[j].effect; + info[j].texture = mod->data_surfaces[j].texture; + info[j].lightmaptexture = mod->data_surfaces[j].lightmaptexture; } - Mem_Free(firstsurfacefortexture); - Mem_Free(numsurfacesfortexture); + for (k = 0; k < mod->brush.numsubmodels; k++) + if (mod->brush.submodels[k]->submodelsurfaces_end > mod->brush.submodels[k]->submodelsurfaces_start + 1) + qsort(info + mod->brush.submodels[k]->submodelsurfaces_start, (size_t)mod->brush.submodels[k]->submodelsurfaces_end - mod->brush.submodels[k]->submodelsurfaces_start, sizeof(*info), Mod_MakeSortedSurfaces_qsortfunc); + for (j = 0; j < mod->num_surfaces; j++) + mod->modelsurfaces_sorted[j] = info[j].surfaceindex; } void Mod_BuildVBOs(void) @@ -2954,7 +3023,7 @@ void Mod_BuildVBOs(void) } extern cvar_t mod_obj_orientation; -static void Mod_Decompile_OBJ(dp_model_t *model, const char *filename, const char *mtlfilename, const char *originalfilename) +static void Mod_Decompile_OBJ(model_t *model, const char *filename, const char *mtlfilename, const char *originalfilename) { int submodelindex, vertexindex, surfaceindex, triangleindex, textureindex, countvertices = 0, countsurfaces = 0, countfaces = 0, counttextures = 0; int a, b, c; @@ -2968,7 +3037,7 @@ static void Mod_Decompile_OBJ(dp_model_t *model, const char *filename, const cha const msurface_t *surface; const int maxtextures = 256; char *texturenames = (char *) Z_Malloc(maxtextures * MAX_QPATH); - dp_model_t *submodel; + model_t *submodel; // construct the mtllib file l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "# mtllib for %s exported by darkplaces engine\n", originalfilename); @@ -3035,9 +3104,9 @@ static void Mod_Decompile_OBJ(dp_model_t *model, const char *filename, const cha if (l > 0) outbufferpos += l; submodel = model->brush.numsubmodels ? model->brush.submodels[submodelindex] : model; - for (surfaceindex = 0;surfaceindex < submodel->nummodelsurfaces;surfaceindex++) + for (surfaceindex = submodel->submodelsurfaces_start;surfaceindex < submodel->submodelsurfaces_end;surfaceindex++) { - surface = model->data_surfaces + submodel->sortedmodelsurfaces[surfaceindex]; + surface = model->data_surfaces + surfaceindex; l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "usemtl %s\n", (surface->texture && surface->texture->name[0]) ? surface->texture->name : "default"); if (l > 0) outbufferpos += l; @@ -3075,7 +3144,7 @@ static void Mod_Decompile_OBJ(dp_model_t *model, const char *filename, const cha Con_Printf("Wrote %s (%i bytes, %i vertices, %i faces, %i surfaces with %i distinct textures)\n", filename, (int)outbufferpos, countvertices, countfaces, countsurfaces, counttextures); } -static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int firstpose, int numposes, qboolean writetriangles) +static void Mod_Decompile_SMD(model_t *model, const char *filename, int firstpose, int numposes, qbool writetriangles) { int countnodes = 0, counttriangles = 0, countframes = 0; int surfaceindex; @@ -3242,7 +3311,7 @@ decompiles a model to editable files static void Mod_Decompile_f(cmd_state_t *cmd) { int i, j, k, l, first, count; - dp_model_t *mod; + model_t *mod; char inname[MAX_QPATH]; char outname[MAX_QPATH]; char mtlname[MAX_QPATH]; @@ -3403,7 +3472,7 @@ void Mod_AllocLightmap_Free(mod_alloclightmap_state_t *state) memset(state, 0, sizeof(*state)); } -qboolean Mod_AllocLightmap_Block(mod_alloclightmap_state_t *state, int blockwidth, int blockheight, int *outx, int *outy) +qbool Mod_AllocLightmap_Block(mod_alloclightmap_state_t *state, int blockwidth, int blockheight, int *outx, int *outy) { mod_alloclightmap_row_t *row; int y; @@ -3503,7 +3572,7 @@ static lightmaplight_t *mod_generatelightmaps_lightinfo; 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) +static void Mod_GenerateLightmaps_LightPoint(model_t *model, const vec3_t pos, vec3_t ambient, vec3_t diffuse, vec3_t lightdir) { int i; int index; @@ -3572,7 +3641,7 @@ static void Mod_GenerateLightmaps_LightPoint(dp_model_t *model, const vec3_t pos VectorCopy(dir, lightdir); } -static void Mod_GenerateLightmaps_CreateLights_ComputeSVBSP_InsertSurfaces(const dp_model_t *model, svbsp_t *svbsp, const float *mins, const float *maxs) +static void Mod_GenerateLightmaps_CreateLights_ComputeSVBSP_InsertSurfaces(const model_t *model, svbsp_t *svbsp, const float *mins, const float *maxs) { int surfaceindex; int triangleindex; @@ -3581,8 +3650,9 @@ static void Mod_GenerateLightmaps_CreateLights_ComputeSVBSP_InsertSurfaces(const 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++) + for (surfaceindex = model->submodelsurfaces_start;surfaceindex < model->submodelsurfaces_end;surfaceindex++) { + surface = model->data_surfaces + surfaceindex; if (!BoxesOverlap(surface->mins, surface->maxs, mins, maxs)) continue; if (surface->texture->basematerialflags & MATERIALFLAG_NOSHADOW) @@ -3597,7 +3667,7 @@ static void Mod_GenerateLightmaps_CreateLights_ComputeSVBSP_InsertSurfaces(const } } -static void Mod_GenerateLightmaps_CreateLights_ComputeSVBSP(dp_model_t *model, lightmaplight_t *lightinfo) +static void Mod_GenerateLightmaps_CreateLights_ComputeSVBSP(model_t *model, lightmaplight_t *lightinfo) { int maxnodes = 1<<14; svbsp_node_t *nodes; @@ -3636,7 +3706,7 @@ static void Mod_GenerateLightmaps_CreateLights_ComputeSVBSP(dp_model_t *model, l Mem_Free(nodes); } -static void Mod_GenerateLightmaps_CreateLights(dp_model_t *model) +static void Mod_GenerateLightmaps_CreateLights(model_t *model) { int index; int result; @@ -3675,7 +3745,7 @@ static void Mod_GenerateLightmaps_CreateLights(dp_model_t *model) } } -static void Mod_GenerateLightmaps_DestroyLights(dp_model_t *model) +static void Mod_GenerateLightmaps_DestroyLights(model_t *model) { int i; if (mod_generatelightmaps_lightinfo) @@ -3689,7 +3759,7 @@ static void Mod_GenerateLightmaps_DestroyLights(dp_model_t *model) mod_generatelightmaps_numlights = 0; } -static qboolean Mod_GenerateLightmaps_SamplePoint_SVBSP(const svbsp_t *svbsp, const float *pos) +static qbool Mod_GenerateLightmaps_SamplePoint_SVBSP(const svbsp_t *svbsp, const float *pos) { const svbsp_node_t *node; const svbsp_node_t *nodes = svbsp->nodes; @@ -3838,7 +3908,7 @@ static void Mod_GenerateLightmaps_GridSample(const float *pos, q3dlightgrid_t *s 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) +static void Mod_GenerateLightmaps_InitSampleOffsets(model_t *model) { float radius[3]; float temp[3]; @@ -3860,7 +3930,7 @@ static void Mod_GenerateLightmaps_InitSampleOffsets(dp_model_t *model) } } -static void Mod_GenerateLightmaps_DestroyLightmaps(dp_model_t *model) +static void Mod_GenerateLightmaps_DestroyLightmaps(model_t *model) { msurface_t *surface; int surfaceindex; @@ -3889,7 +3959,7 @@ static void Mod_GenerateLightmaps_DestroyLightmaps(dp_model_t *model) } } -static void Mod_GenerateLightmaps_UnweldTriangles(dp_model_t *model) +static void Mod_GenerateLightmaps_UnweldTriangles(model_t *model) { msurface_t *surface; int surfaceindex; @@ -3992,7 +4062,7 @@ static void Mod_GenerateLightmaps_UnweldTriangles(dp_model_t *model) model->brush.submodels[i]->surfmesh = model->surfmesh; } -static void Mod_GenerateLightmaps_CreateTriangleInformation(dp_model_t *model) +static void Mod_GenerateLightmaps_CreateTriangleInformation(model_t *model) { msurface_t *surface; int surfaceindex; @@ -4034,7 +4104,7 @@ static void Mod_GenerateLightmaps_CreateTriangleInformation(dp_model_t *model) } } -static void Mod_GenerateLightmaps_DestroyTriangleInformation(dp_model_t *model) +static void Mod_GenerateLightmaps_DestroyTriangleInformation(model_t *model) { if (mod_generatelightmaps_lightmaptriangles) Mem_Free(mod_generatelightmaps_lightmaptriangles); @@ -4043,7 +4113,7 @@ static void Mod_GenerateLightmaps_DestroyTriangleInformation(dp_model_t *model) float lmaxis[3][3] = {{1, 0, 0}, {0, 1, 0}, {0, 0, 1}}; -static void Mod_GenerateLightmaps_CreateLightmaps(dp_model_t *model) +static void Mod_GenerateLightmaps_CreateLightmaps(model_t *model) { msurface_t *surface; int surfaceindex; @@ -4297,14 +4367,14 @@ static void Mod_GenerateLightmaps_CreateLightmaps(dp_model_t *model) } } -static void Mod_GenerateLightmaps_UpdateVertexColors(dp_model_t *model) +static void Mod_GenerateLightmaps_UpdateVertexColors(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) +static void Mod_GenerateLightmaps_UpdateLightGrid(model_t *model) { int x; int y; @@ -4327,10 +4397,10 @@ static void Mod_GenerateLightmaps_UpdateLightGrid(dp_model_t *model) } extern cvar_t mod_q3bsp_nolightmaps; -static void Mod_GenerateLightmaps(dp_model_t *model) +static void Mod_GenerateLightmaps(model_t *model) { //lightmaptriangle_t *lightmaptriangles = Mem_Alloc(model->mempool, model->surfmesh.num_triangles * sizeof(lightmaptriangle_t)); - dp_model_t *oldloadmodel = loadmodel; + model_t *oldloadmodel = loadmodel; loadmodel = model; Mod_GenerateLightmaps_InitSampleOffsets(model); @@ -4363,29 +4433,29 @@ static void Mod_GenerateLightmaps_f(cmd_state_t *cmd) Mod_GenerateLightmaps(cl.worldmodel); } -void Mod_Mesh_Create(dp_model_t *mod, const char *name) +void Mod_Mesh_Create(model_t *mod, const char *name) { memset(mod, 0, sizeof(*mod)); strlcpy(mod->name, name, sizeof(mod->name)); mod->mempool = Mem_AllocPool(name, 0, NULL); mod->texturepool = R_AllocTexturePool(); - mod->Draw = R_Q1BSP_Draw; - mod->DrawDepth = R_Q1BSP_DrawDepth; - mod->DrawDebug = R_Q1BSP_DrawDebug; - mod->DrawPrepass = R_Q1BSP_DrawPrepass; - mod->GetLightInfo = R_Q1BSP_GetLightInfo; - mod->DrawShadowMap = R_Q1BSP_DrawShadowMap; - mod->DrawLight = R_Q1BSP_DrawLight; + mod->Draw = R_Mod_Draw; + mod->DrawDepth = R_Mod_DrawDepth; + mod->DrawDebug = R_Mod_DrawDebug; + mod->DrawPrepass = R_Mod_DrawPrepass; + mod->GetLightInfo = R_Mod_GetLightInfo; + mod->DrawShadowMap = R_Mod_DrawShadowMap; + mod->DrawLight = R_Mod_DrawLight; } -void Mod_Mesh_Destroy(dp_model_t *mod) +void Mod_Mesh_Destroy(model_t *mod) { Mod_UnloadModel(mod); } // resets the mesh model to have no geometry to render, ready for a new frame - // the mesh will be prepared for rendering later using Mod_Mesh_Finalize -void Mod_Mesh_Reset(dp_model_t *mod) +void Mod_Mesh_Reset(model_t *mod) { mod->num_surfaces = 0; mod->surfmesh.num_vertices = 0; @@ -4395,7 +4465,7 @@ void Mod_Mesh_Reset(dp_model_t *mod) mod->DrawAddWaterPlanes = NULL; // will be set if a texture needs it } -texture_t *Mod_Mesh_GetTexture(dp_model_t *mod, const char *name, int defaultdrawflags, int defaulttexflags, int defaultmaterialflags) +texture_t *Mod_Mesh_GetTexture(model_t *mod, const char *name, int defaultdrawflags, int defaulttexflags, int defaultmaterialflags) { int i; texture_t *t; @@ -4413,7 +4483,7 @@ texture_t *Mod_Mesh_GetTexture(dp_model_t *mod, const char *name, int defaultdra mod->data_surfaces[i].texture = mod->data_textures + (mod->data_surfaces[i].texture - oldtextures); } t = &mod->data_textures[mod->num_textures++]; - Mod_LoadTextureFromQ3Shader(mod->mempool, mod->name, t, name, false, true, defaulttexflags, defaultmaterialflags); + Mod_LoadTextureFromQ3Shader(mod->mempool, mod->name, t, name, true, true, defaulttexflags, defaultmaterialflags); t->mesh_drawflag = drawflag; t->mesh_defaulttexflags = defaulttexflags; t->mesh_defaultmaterialflags = defaultmaterialflags; @@ -4447,7 +4517,7 @@ texture_t *Mod_Mesh_GetTexture(dp_model_t *mod, const char *name, int defaultdra return t; } -msurface_t *Mod_Mesh_AddSurface(dp_model_t *mod, texture_t *tex, qboolean batchwithprevioussurface) +msurface_t *Mod_Mesh_AddSurface(model_t *mod, texture_t *tex, qbool batchwithprevioussurface) { msurface_t *surf; // batch if possible; primarily useful for UI rendering where bounding boxes don't matter @@ -4458,7 +4528,7 @@ msurface_t *Mod_Mesh_AddSurface(dp_model_t *mod, texture_t *tex, qboolean batchw { mod->max_surfaces = 2 * max(mod->num_surfaces, 64); mod->data_surfaces = (msurface_t *)Mem_Realloc(mod->mempool, mod->data_surfaces, mod->max_surfaces * sizeof(*mod->data_surfaces)); - mod->sortedmodelsurfaces = (int *)Mem_Realloc(mod->mempool, mod->sortedmodelsurfaces, mod->max_surfaces * sizeof(*mod->sortedmodelsurfaces)); + mod->modelsurfaces_sorted = (int *)Mem_Realloc(mod->mempool, mod->modelsurfaces_sorted, mod->max_surfaces * sizeof(*mod->modelsurfaces_sorted)); } surf = mod->data_surfaces + mod->num_surfaces; mod->num_surfaces++; @@ -4467,13 +4537,13 @@ msurface_t *Mod_Mesh_AddSurface(dp_model_t *mod, texture_t *tex, qboolean batchw surf->num_firsttriangle = mod->surfmesh.num_triangles; surf->num_firstvertex = mod->surfmesh.num_vertices; if (tex->basematerialflags & (MATERIALFLAG_SKY)) - mod->DrawSky = R_Q1BSP_DrawSky; + mod->DrawSky = R_Mod_DrawSky; if (tex->basematerialflags & (MATERIALFLAG_WATERSHADER | MATERIALFLAG_REFRACTION | MATERIALFLAG_REFLECTION | MATERIALFLAG_CAMERA)) - mod->DrawAddWaterPlanes = R_Q1BSP_DrawAddWaterPlanes; + mod->DrawAddWaterPlanes = R_Mod_DrawAddWaterPlanes; return surf; } -int Mod_Mesh_IndexForVertex(dp_model_t *mod, msurface_t *surf, float x, float y, float z, float nx, float ny, float nz, float s, float t, float u, float v, float r, float g, float b, float a) +int Mod_Mesh_IndexForVertex(model_t *mod, msurface_t *surf, float x, float y, float z, float nx, float ny, float nz, float s, float t, float u, float v, float r, float g, float b, float a) { int hashindex, h, vnum, mask; surfmesh_t *mesh = &mod->surfmesh; @@ -4552,7 +4622,7 @@ int Mod_Mesh_IndexForVertex(dp_model_t *mod, msurface_t *surf, float x, float y, return vnum; } -void Mod_Mesh_AddTriangle(dp_model_t *mod, msurface_t *surf, int e0, int e1, int e2) +void Mod_Mesh_AddTriangle(model_t *mod, msurface_t *surf, int e0, int e1, int e2) { surfmesh_t *mesh = &mod->surfmesh; if (mesh->max_triangles == mesh->num_triangles) @@ -4571,39 +4641,36 @@ void Mod_Mesh_AddTriangle(dp_model_t *mod, msurface_t *surf, int e0, int e1, int surf->num_triangles++; } -static void Mod_Mesh_MakeSortedSurfaces(dp_model_t *mod) +static void Mod_Mesh_MakeSortedSurfaces(model_t *mod) { int i, j; texture_t *tex; - msurface_t *surf, *surf2; + unsigned char* included = (unsigned char *)R_FrameData_Alloc(mod->num_surfaces * sizeof(unsigned char)); // build the sorted surfaces list properly to reduce material setup // this is easy because we're just sorting on texture and don't care about the order of textures - mod->nummodelsurfaces = 0; + mod->submodelsurfaces_start = 0; + mod->submodelsurfaces_end = 0; for (i = 0; i < mod->num_surfaces; i++) - mod->data_surfaces[i].included = false; + included[i] = 0; for (i = 0; i < mod->num_surfaces; i++) { - surf = mod->data_surfaces + i; - if (surf->included) + if (included[i]) continue; - tex = surf->texture; + tex = mod->data_surfaces[i].texture; // j = i is intentional for (j = i; j < mod->num_surfaces; j++) { - surf2 = mod->data_surfaces + j; - if (surf2->included) - continue; - if (surf2->texture == tex) + if (!included[j] && mod->data_surfaces[j].texture == tex) { - surf2->included = true; - mod->sortedmodelsurfaces[mod->nummodelsurfaces++] = j; + included[j] = 1; + mod->modelsurfaces_sorted[mod->submodelsurfaces_end++] = j; } } } } -static void Mod_Mesh_ComputeBounds(dp_model_t *mod) +static void Mod_Mesh_ComputeBounds(model_t *mod) { int i; vec_t x2a, x2b, y2a, y2b, z2a, z2b, x2, y2, z2, yawradius, rotatedradius; @@ -4659,10 +4726,10 @@ static void Mod_Mesh_ComputeBounds(dp_model_t *mod) } } -void Mod_Mesh_Validate(dp_model_t *mod) +void Mod_Mesh_Validate(model_t *mod) { int i; - qboolean warned = false; + qbool warned = false; for (i = 0; i < mod->num_surfaces; i++) { msurface_t *surf = mod->data_surfaces + i; @@ -4683,7 +4750,7 @@ void Mod_Mesh_Validate(dp_model_t *mod) } } -static void Mod_Mesh_UploadDynamicBuffers(dp_model_t *mod) +static void Mod_Mesh_UploadDynamicBuffers(model_t *mod) { mod->surfmesh.data_element3s_indexbuffer = mod->surfmesh.data_element3s ? R_BufferData_Store(mod->surfmesh.num_triangles * sizeof(short[3]), mod->surfmesh.data_element3s, R_BUFFERDATA_INDEX16, &mod->surfmesh.data_element3s_bufferoffset) : NULL; mod->surfmesh.data_element3i_indexbuffer = mod->surfmesh.data_element3i ? R_BufferData_Store(mod->surfmesh.num_triangles * sizeof(int[3]), mod->surfmesh.data_element3i, R_BUFFERDATA_INDEX32, &mod->surfmesh.data_element3i_bufferoffset) : NULL; @@ -4698,12 +4765,13 @@ static void Mod_Mesh_UploadDynamicBuffers(dp_model_t *mod) mod->surfmesh.data_skeletalweight4ub_vertexbuffer = mod->surfmesh.data_skeletalweight4ub ? R_BufferData_Store(mod->surfmesh.num_vertices * sizeof(unsigned char[4]), mod->surfmesh.data_skeletalweight4ub, R_BUFFERDATA_VERTEX, &mod->surfmesh.data_skeletalweight4ub_bufferoffset) : NULL; } -void Mod_Mesh_Finalize(dp_model_t *mod) +void Mod_Mesh_Finalize(model_t *mod) { if (gl_paranoid.integer) Mod_Mesh_Validate(mod); Mod_Mesh_ComputeBounds(mod); Mod_Mesh_MakeSortedSurfaces(mod); - Mod_BuildTextureVectorsFromNormals(0, mod->surfmesh.num_vertices, mod->surfmesh.num_triangles, mod->surfmesh.data_vertex3f, mod->surfmesh.data_texcoordtexture2f, mod->surfmesh.data_normal3f, mod->surfmesh.data_element3i, mod->surfmesh.data_svector3f, mod->surfmesh.data_tvector3f, true); + if(!r_refdef.draw2dstage) + Mod_BuildTextureVectorsFromNormals(0, mod->surfmesh.num_vertices, mod->surfmesh.num_triangles, mod->surfmesh.data_vertex3f, mod->surfmesh.data_texcoordtexture2f, mod->surfmesh.data_normal3f, mod->surfmesh.data_element3i, mod->surfmesh.data_svector3f, mod->surfmesh.data_tvector3f, true); Mod_Mesh_UploadDynamicBuffers(mod); }