X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_alias.c;h=8215251c9a9edd1364501f4baace327148b45f87;hp=f327e0db9290ea4ea649f7dcf12b2072ec423b04;hb=f166f21fa69e9f10fc92217207fa51693dc1b411;hpb=fcadc1494fa4ecbeb51d1ed61d68d84d1360c0f1 diff --git a/model_alias.c b/model_alias.c index f327e0db..8215251c 100644 --- a/model_alias.c +++ b/model_alias.c @@ -22,23 +22,238 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "image.h" #include "r_shadow.h" +cvar_t r_skeletal_debugbone = {0, "r_skeletal_debugbone", "-1"}; +cvar_t r_skeletal_debugbonecomponent = {0, "r_skeletal_debugbonecomponent", "3"}; +cvar_t r_skeletal_debugbonevalue = {0, "r_skeletal_debugbonevalue", "100"}; +cvar_t r_skeletal_debugtranslatex = {0, "r_skeletal_debugtranslatex", "1"}; +cvar_t r_skeletal_debugtranslatey = {0, "r_skeletal_debugtranslatey", "1"}; +cvar_t r_skeletal_debugtranslatez = {0, "r_skeletal_debugtranslatez", "1"}; + void Mod_AliasInit (void) { + Cvar_RegisterVariable(&r_skeletal_debugbone); + Cvar_RegisterVariable(&r_skeletal_debugbonecomponent); + Cvar_RegisterVariable(&r_skeletal_debugbonevalue); + Cvar_RegisterVariable(&r_skeletal_debugtranslatex); + Cvar_RegisterVariable(&r_skeletal_debugtranslatey); + Cvar_RegisterVariable(&r_skeletal_debugtranslatez); +} + +void Mod_Alias_GetMesh_Vertex3f(const model_t *model, const frameblend_t *frameblend, const surfmesh_t *mesh, float *out3f) +{ + if (mesh->num_vertexboneweights) + { + int i, k, blends; + surfmeshvertexboneweight_t *v; + float *out, *matrix, m[12], bonepose[256][12]; + // vertex weighted skeletal + // interpolate matrices and concatenate them to their parents + for (i = 0;i < model->num_bones;i++) + { + for (k = 0;k < 12;k++) + m[k] = 0; + for (blends = 0;blends < 4 && frameblend[blends].lerp > 0;blends++) + { + matrix = model->data_poses + (frameblend[blends].frame * model->num_bones + i) * 12; + for (k = 0;k < 12;k++) + m[k] += matrix[k] * frameblend[blends].lerp; + } + if (i == r_skeletal_debugbone.integer) + m[r_skeletal_debugbonecomponent.integer % 12] += r_skeletal_debugbonevalue.value; + m[3] *= r_skeletal_debugtranslatex.value; + m[7] *= r_skeletal_debugtranslatey.value; + m[11] *= r_skeletal_debugtranslatez.value; + if (model->data_bones[i].parent >= 0) + R_ConcatTransforms(bonepose[model->data_bones[i].parent], m, bonepose[i]); + else + for (k = 0;k < 12;k++) + bonepose[i][k] = m[k]; + } + // blend the vertex bone weights + memset(out3f, 0, mesh->num_vertices * sizeof(float[3])); + v = mesh->data_vertexboneweights; + for (i = 0;i < mesh->num_vertexboneweights;i++, v++) + { + out = out3f + v->vertexindex * 3; + matrix = bonepose[v->boneindex]; + // FIXME: this can very easily be optimized with SSE or 3DNow + out[0] += v->origin[0] * matrix[0] + v->origin[1] * matrix[1] + v->origin[2] * matrix[ 2] + v->origin[3] * matrix[ 3]; + out[1] += v->origin[0] * matrix[4] + v->origin[1] * matrix[5] + v->origin[2] * matrix[ 6] + v->origin[3] * matrix[ 7]; + out[2] += v->origin[0] * matrix[8] + v->origin[1] * matrix[9] + v->origin[2] * matrix[10] + v->origin[3] * matrix[11]; + } + } + else + { + int i, vertcount; + float lerp1, lerp2, lerp3, lerp4; + const float *vertsbase, *verts1, *verts2, *verts3, *verts4; + // vertex morph + if (!mesh->data_morphvertex3f) + Host_Error("model %s has no skeletal or vertex morph animation data\n", model->name); + vertsbase = mesh->data_morphvertex3f; + vertcount = mesh->num_vertices; + verts1 = vertsbase + frameblend[0].frame * vertcount * 3; + lerp1 = frameblend[0].lerp; + if (frameblend[1].lerp) + { + verts2 = vertsbase + frameblend[1].frame * vertcount * 3; + lerp2 = frameblend[1].lerp; + if (frameblend[2].lerp) + { + verts3 = vertsbase + frameblend[2].frame * vertcount * 3; + lerp3 = frameblend[2].lerp; + if (frameblend[3].lerp) + { + verts4 = vertsbase + frameblend[3].frame * vertcount * 3; + lerp4 = frameblend[3].lerp; + for (i = 0;i < vertcount * 3;i++) + VectorMAMAMAM(lerp1, verts1 + i, lerp2, verts2 + i, lerp3, verts3 + i, lerp4, verts4 + i, out3f + i); + } + else + for (i = 0;i < vertcount * 3;i++) + VectorMAMAM(lerp1, verts1 + i, lerp2, verts2 + i, lerp3, verts3 + i, out3f + i); + } + else + for (i = 0;i < vertcount * 3;i++) + VectorMAM(lerp1, verts1 + i, lerp2, verts2 + i, out3f + i); + } + else + memcpy(out3f, verts1, vertcount * sizeof(float[3])); + } +} + +int Mod_Alias_GetTagMatrix(const model_t *model, int poseframe, int tagindex, matrix4x4_t *outmatrix) +{ + const float *boneframe; + float tempbonematrix[12], bonematrix[12]; + Matrix4x4_CreateIdentity(outmatrix); + if (model->num_bones) + { + if (tagindex < 0 || tagindex >= model->num_bones) + return 4; + if (poseframe >= model->num_poses) + return 6; + boneframe = model->data_poses + poseframe * model->num_bones * 12; + memcpy(bonematrix, boneframe + tagindex * 12, sizeof(float[12])); + while (model->data_bones[tagindex].parent >= 0) + { + memcpy(tempbonematrix, bonematrix, sizeof(float[12])); + R_ConcatTransforms(boneframe + model->data_bones[tagindex].parent * 12, tempbonematrix, bonematrix); + tagindex = model->data_bones[tagindex].parent; + } + outmatrix->m[0][0] = bonematrix[0]; + outmatrix->m[0][1] = bonematrix[1]; + outmatrix->m[0][2] = bonematrix[2]; + outmatrix->m[0][3] = bonematrix[3]; + outmatrix->m[1][0] = bonematrix[4]; + outmatrix->m[1][1] = bonematrix[5]; + outmatrix->m[1][2] = bonematrix[6]; + outmatrix->m[1][3] = bonematrix[7]; + outmatrix->m[2][0] = bonematrix[8]; + outmatrix->m[2][1] = bonematrix[9]; + outmatrix->m[2][2] = bonematrix[10]; + outmatrix->m[2][3] = bonematrix[11]; + outmatrix->m[3][0] = 0; + outmatrix->m[3][1] = 0; + outmatrix->m[3][2] = 0; + outmatrix->m[3][3] = 1; + } + else if (model->num_tags) + { + if (tagindex < 0 || tagindex >= model->num_tags) + return 4; + if (poseframe >= model->num_tagframes) + return 6; + *outmatrix = model->data_tags[poseframe * model->num_tags + tagindex].matrix; + } + return 0; +} + +int Mod_Alias_GetTagIndexForName(const model_t *model, unsigned int skin, const char *tagname) +{ + int i; + if (model->data_overridetagnamesforskin && skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)skin].num_overridetagnames) + for (i = 0;i < model->data_overridetagnamesforskin[skin].num_overridetagnames;i++) + if (!strcasecmp(tagname, model->data_overridetagnamesforskin[skin].data_overridetagnames[i].name)) + return i + 1; + if (model->num_bones) + for (i = 0;i < model->num_bones;i++) + if (!strcasecmp(tagname, model->data_bones[i].name)) + return i + 1; + if (model->num_tags) + for (i = 0;i < model->num_tags;i++) + if (!strcasecmp(tagname, model->data_tags[i].name)) + return i + 1; + return 0; +} + +static void Mod_Alias_Mesh_CompileFrameZero(surfmesh_t *mesh) +{ + frameblend_t frameblend[4] = {{0, 1}, {0, 0}, {0, 0}, {0, 0}}; + mesh->data_vertex3f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * sizeof(float[3][4])); + mesh->data_svector3f = mesh->data_vertex3f + mesh->num_vertices * 3; + mesh->data_tvector3f = mesh->data_vertex3f + mesh->num_vertices * 6; + mesh->data_normal3f = mesh->data_vertex3f + mesh->num_vertices * 9; + Mod_Alias_GetMesh_Vertex3f(loadmodel, frameblend, mesh, mesh->data_vertex3f); + Mod_BuildTextureVectorsAndNormals(0, mesh->num_vertices, mesh->num_triangles, mesh->data_vertex3f, mesh->data_texcoordtexture2f, mesh->data_element3i, mesh->data_svector3f, mesh->data_tvector3f, mesh->data_normal3f, true); +} + +static void Mod_MDLMD2MD3_TraceBox(model_t *model, int frame, trace_t *trace, const vec3_t boxstartmins, const vec3_t boxstartmaxs, const vec3_t boxendmins, const vec3_t boxendmaxs, int hitsupercontentsmask) +{ + int i, linetrace; + float segmentmins[3], segmentmaxs[3]; + frameblend_t frameblend[4]; + msurface_t *surface; + surfmesh_t *mesh; + colbrushf_t *thisbrush_start = NULL, *thisbrush_end = NULL; + matrix4x4_t startmatrix, endmatrix; + memset(trace, 0, sizeof(*trace)); + trace->fraction = 1; + trace->realfraction = 1; + trace->hitsupercontentsmask = hitsupercontentsmask; + segmentmins[0] = min(boxstartmins[0], boxendmins[0]); + segmentmins[1] = min(boxstartmins[1], boxendmins[1]); + segmentmins[2] = min(boxstartmins[2], boxendmins[2]); + segmentmaxs[0] = max(boxstartmaxs[0], boxendmaxs[0]); + segmentmaxs[1] = max(boxstartmaxs[1], boxendmaxs[1]); + segmentmaxs[2] = max(boxstartmaxs[2], boxendmaxs[2]); + linetrace = VectorCompare(boxstartmins, boxstartmaxs) && VectorCompare(boxendmins, boxendmaxs); + if (!linetrace) + { + // box trace, performed as brush trace + Matrix4x4_CreateIdentity(&startmatrix); + Matrix4x4_CreateIdentity(&endmatrix); + thisbrush_start = Collision_BrushForBox(&startmatrix, boxstartmins, boxstartmaxs); + thisbrush_end = Collision_BrushForBox(&endmatrix, boxendmins, boxendmaxs); + } + memset(frameblend, 0, sizeof(frameblend)); + frameblend[0].frame = frame; + frameblend[0].lerp = 1; + for (i = 0, surface = model->data_surfaces;i < model->num_surfaces;i++, surface++) + { + mesh = surface->groupmesh; + Mod_Alias_GetMesh_Vertex3f(model, frameblend, mesh, varray_vertex3f); + if (linetrace) + Collision_TraceLineTriangleMeshFloat(trace, boxstartmins, boxendmins, mesh->num_triangles, mesh->data_element3i, varray_vertex3f, SUPERCONTENTS_SOLID, segmentmins, segmentmaxs); + else + Collision_TraceBrushTriangleMeshFloat(trace, thisbrush_start, thisbrush_end, mesh->num_triangles, mesh->data_element3i, varray_vertex3f, SUPERCONTENTS_SOLID, segmentmins, segmentmaxs); + } } static void Mod_CalcAliasModelBBoxes (void) { int vnum, meshnum; float dist, yawradius, radius; - aliasmesh_t *mesh; + surfmesh_t *mesh; float *v; VectorClear(loadmodel->normalmins); VectorClear(loadmodel->normalmaxs); yawradius = 0; radius = 0; - for (meshnum = 0, mesh = loadmodel->alias.aliasdata_meshes;meshnum < loadmodel->alias.aliasnum_meshes;meshnum++, mesh++) + for (meshnum = 0;meshnum < loadmodel->num_surfaces;meshnum++) { - for (vnum = 0, v = mesh->data_aliasvertex3f;vnum < mesh->num_vertices * mesh->num_frames;vnum++, v += 3) + mesh = loadmodel->meshlist[meshnum]; + for (vnum = 0, v = mesh->data_morphvertex3f;vnum < mesh->num_vertices * mesh->num_morphframes;vnum++, v += 3) { if (loadmodel->normalmins[0] > v[0]) loadmodel->normalmins[0] = v[0]; if (loadmodel->normalmins[1] > v[1]) loadmodel->normalmins[1] = v[1]; @@ -120,7 +335,10 @@ static void Mod_MDL_LoadFrames (qbyte* datapointer, int inverts, vec3_t scale, v interval = LittleFloat (intervals->interval); // FIXME: support variable framerate groups if (interval < 0.01f) - Host_Error("Mod_MDL_LoadFrames: invalid interval"); + { + Con_Printf("%s has an invalid interval %f, changing to 0.1\n", loadmodel->name, interval); + interval = 0.1f; + } } // get scene name from first frame @@ -138,8 +356,7 @@ static void Mod_MDL_LoadFrames (qbyte* datapointer, int inverts, vec3_t scale, v { pinframe = (daliasframe_t *)datapointer; datapointer += sizeof(daliasframe_t); - Mod_ConvertAliasVerts(inverts, scale, translate, (trivertx_t *)datapointer, loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + pose * loadmodel->alias.aliasdata_meshes->num_vertices * 3, vertremap); - Mod_BuildTextureVectorsAndNormals(loadmodel->alias.aliasdata_meshes->num_vertices, loadmodel->alias.aliasdata_meshes->num_triangles, loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + pose * loadmodel->alias.aliasdata_meshes->num_vertices * 3, loadmodel->alias.aliasdata_meshes->data_texcoord2f, loadmodel->alias.aliasdata_meshes->data_element3i, loadmodel->alias.aliasdata_meshes->data_aliassvector3f + pose * loadmodel->alias.aliasdata_meshes->num_vertices * 3, loadmodel->alias.aliasdata_meshes->data_aliastvector3f + pose * loadmodel->alias.aliasdata_meshes->num_vertices * 3, loadmodel->alias.aliasdata_meshes->data_aliasnormal3f + pose * loadmodel->alias.aliasdata_meshes->num_vertices * 3); + Mod_ConvertAliasVerts(inverts, scale, translate, (trivertx_t *)datapointer, loadmodel->meshlist[0]->data_morphvertex3f + pose * loadmodel->meshlist[0]->num_vertices * 3, vertremap); datapointer += sizeof(trivertx_t) * inverts; pose++; } @@ -147,109 +364,54 @@ static void Mod_MDL_LoadFrames (qbyte* datapointer, int inverts, vec3_t scale, v } static skinframe_t missingskinframe; -aliaslayer_t mod_alias_layersbuffer[16]; // 7 currently used -void Mod_BuildAliasSkinFromSkinFrame(aliasskin_t *skin, skinframe_t *skinframe) +static void Mod_BuildAliasSkinFromSkinFrame(texture_t *skin, skinframe_t *skinframe) { - aliaslayer_t *layer; - // hack if (skinframe == NULL) { skinframe = &missingskinframe; memset(skinframe, 0, sizeof(*skinframe)); - skinframe->base = r_notexture; + skinframe->base = r_texture_notexture; } - memset(&mod_alias_layersbuffer, 0, sizeof(mod_alias_layersbuffer)); - layer = mod_alias_layersbuffer; - layer->flags = ALIASLAYER_SPECULAR; - layer->texture = skinframe->gloss; - layer->nmap = skinframe->nmap; - layer++; - if (skinframe->merged != NULL) - { - layer->flags = ALIASLAYER_DIFFUSE | ALIASLAYER_NODRAW_IF_COLORMAPPED; - layer->texture = skinframe->merged; - layer->nmap = skinframe->nmap; - layer++; - } - if (skinframe->base != NULL) - { - layer->flags = ALIASLAYER_DIFFUSE; - if (skinframe->merged != NULL) - layer->flags |= ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED; - layer->texture = skinframe->base; - layer->nmap = skinframe->nmap; - layer++; - } - if (skinframe->pants != NULL) - { - layer->flags = ALIASLAYER_DIFFUSE | ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED | ALIASLAYER_COLORMAP_PANTS; - layer->texture = skinframe->pants; - layer->nmap = skinframe->nmap; - layer++; - } - if (skinframe->shirt != NULL) - { - layer->flags = ALIASLAYER_DIFFUSE | ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED | ALIASLAYER_COLORMAP_SHIRT; - layer->texture = skinframe->shirt; - layer->nmap = skinframe->nmap; - layer++; - } - - if (skinframe->glow != NULL) - { - layer->flags = 0; - layer->texture = skinframe->glow; - layer++; - } - - layer->flags = ALIASLAYER_FOG | ALIASLAYER_FORCEDRAW_IF_FIRSTPASS; - layer->texture = skinframe->fog; - layer++; - - skin->flags = 0; - // fog texture only exists if some pixels are transparent... - if (skinframe->fog != NULL) - skin->flags |= ALIASSKIN_TRANSPARENT; - - skin->num_layers = layer - mod_alias_layersbuffer; - skin->data_layers = Mem_Alloc(loadmodel->mempool, skin->num_layers * sizeof(aliaslayer_t)); - memcpy(skin->data_layers, mod_alias_layersbuffer, skin->num_layers * sizeof(aliaslayer_t)); + skin->skin = *skinframe; + skin->currentframe = skin; + skin->basematerialflags = MATERIALFLAG_WALL; + if (skin->skin.fog) + skin->basematerialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_TRANSPARENT; + skin->currentmaterialflags = skin->basematerialflags; } -void Mod_BuildAliasSkinsFromSkinFiles(aliasskin_t *skin, skinfile_t *skinfile, char *meshname, char *shadername) +static void Mod_BuildAliasSkinsFromSkinFiles(texture_t *skin, skinfile_t *skinfile, char *meshname, char *shadername) { int i; skinfileitem_t *skinfileitem; skinframe_t tempskinframe; if (skinfile) { - for (i = 0;skinfile;skinfile = skinfile->next, i++, skin++) + // the skin += loadmodel->num_surfaces part of this is because data_textures on alias models is arranged as [numskins][numsurfaces] + for (i = 0;skinfile;skinfile = skinfile->next, i++, skin += loadmodel->num_surfaces) { memset(skin, 0, sizeof(*skin)); for (skinfileitem = skinfile->items;skinfileitem;skinfileitem = skinfileitem->next) { - if (!strcmp(skinfileitem->name, meshname)) + // leave the skin unitialized (nodraw) if the replacement is "common/nodraw" or "textures/common/nodraw" + if (!strcmp(skinfileitem->name, meshname) && strcmp(skinfileitem->replacement, "common/nodraw") && strcmp(skinfileitem->replacement, "textures/common/nodraw")) { - if (!strcmp(skinfileitem->replacement, "common/nodraw")) - { - } + memset(&tempskinframe, 0, sizeof(tempskinframe)); + if (Mod_LoadSkinFrame(&tempskinframe, skinfileitem->replacement, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, true, false, true)) + Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe); else { - memset(&tempskinframe, 0, sizeof(tempskinframe)); - if (Mod_LoadSkinFrame(&tempskinframe, skinfileitem->replacement, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE, true, false, true)) + if (cls.state != ca_dedicated) + Con_Printf("mesh \"%s\": failed to load skin #%i \"%s\", falling back to mesh's internal shader name \"%s\"\n", meshname, i, skinfileitem->replacement, shadername); + if (Mod_LoadSkinFrame(&tempskinframe, shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, true, false, true)) Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe); else { - Con_Printf("mesh \"%s\": failed to load skin #%i \"%s\", falling back to mesh's internal shader name \"%s\"\n", meshname, i, skinfileitem->replacement, shadername); - if (Mod_LoadSkinFrame(&tempskinframe, shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE, true, false, true)) - Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe); - else - { + if (cls.state != ca_dedicated) Con_Printf("failed to load skin \"%s\"\n", shadername); - Mod_BuildAliasSkinFromSkinFrame(skin, NULL); - } + Mod_BuildAliasSkinFromSkinFrame(skin, NULL); } } } @@ -259,11 +421,12 @@ void Mod_BuildAliasSkinsFromSkinFiles(aliasskin_t *skin, skinfile_t *skinfile, c else { memset(&tempskinframe, 0, sizeof(tempskinframe)); - if (Mod_LoadSkinFrame(&tempskinframe, shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE, true, false, true)) + if (Mod_LoadSkinFrame(&tempskinframe, shadername, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, true, false, true)) Mod_BuildAliasSkinFromSkinFrame(skin, &tempskinframe); else { - Con_Printf("failed to load mesh \"%s\" shader \"%s\"\n", meshname, shadername); + if (cls.state != ca_dedicated) + Con_Printf("Can't find texture \"%s\" for mesh \"%s\", using grey checkerboard\n", shadername, meshname); Mod_BuildAliasSkinFromSkinFrame(skin, NULL); } } @@ -271,14 +434,12 @@ void Mod_BuildAliasSkinsFromSkinFiles(aliasskin_t *skin, skinfile_t *skinfile, c #define BOUNDI(VALUE,MIN,MAX) if (VALUE < MIN || VALUE >= MAX) Host_Error("model %s has an invalid ##VALUE (%d exceeds %d - %d)\n", loadmodel->name, VALUE, MIN, MAX); #define BOUNDF(VALUE,MIN,MAX) if (VALUE < MIN || VALUE >= MAX) Host_Error("model %s has an invalid ##VALUE (%f exceeds %f - %f)\n", loadmodel->name, VALUE, MIN, MAX); -extern void R_Model_Alias_Draw(entity_render_t *ent); -extern void R_Model_Alias_DrawFakeShadow(entity_render_t *ent); -extern void R_Model_Alias_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius); -extern void R_Model_Alias_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz); -void Mod_IDP0_Load(model_t *mod, void *buffer) +void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend) { int i, j, version, totalskins, skinwidth, skinheight, groupframes, groupskins, numverts; float scales, scalet, scale[3], translate[3], interval; + msurface_t *surface; + qbyte *data; mdl_t *pinmodel; stvert_t *pinstverts; dtriangle_t *pintriangles; @@ -291,7 +452,7 @@ void Mod_IDP0_Load(model_t *mod, void *buffer) char name[MAX_QPATH]; skinframe_t tempskinframe; animscene_t *tempskinscenes; - aliasskin_t *tempaliasskins; + texture_t *tempaliasskins; float *vertst; int *vertonseam, *vertremap; skinfile_t *skinfiles; @@ -306,26 +467,36 @@ void Mod_IDP0_Load(model_t *mod, void *buffer) loadmodel->name, version, ALIAS_VERSION); loadmodel->type = mod_alias; - loadmodel->alias.aliastype = ALIASTYPE_ALIAS; loadmodel->DrawSky = NULL; - loadmodel->Draw = R_Model_Alias_Draw; - loadmodel->DrawFakeShadow = R_Model_Alias_DrawFakeShadow; - loadmodel->DrawShadowVolume = R_Model_Alias_DrawShadowVolume; - loadmodel->DrawLight = R_Model_Alias_DrawLight; - - loadmodel->alias.aliasnum_meshes = 1; - loadmodel->alias.aliasdata_meshes = Mem_Alloc(loadmodel->mempool, sizeof(aliasmesh_t)); + loadmodel->Draw = R_Q1BSP_Draw; + loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume; + loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume; + loadmodel->DrawLight = R_Q1BSP_DrawLight; + loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox; + + loadmodel->num_surfaces = 1; + loadmodel->nummodelsurfaces = loadmodel->num_surfaces; + loadmodel->nummeshes = loadmodel->num_surfaces; + data = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->nummeshes * sizeof(surfmesh_t *) + loadmodel->nummeshes * sizeof(surfmesh_t)); + loadmodel->data_surfaces = (void *)data;data += loadmodel->num_surfaces * sizeof(msurface_t); + loadmodel->surfacelist = (void *)data;data += loadmodel->num_surfaces * sizeof(int); + loadmodel->meshlist = (void *)data;data += loadmodel->num_surfaces * sizeof(surfmesh_t *); + for (i = 0;i < loadmodel->num_surfaces;i++) + { + loadmodel->surfacelist[i] = i; + loadmodel->meshlist[i] = (void *)data;data += sizeof(surfmesh_t); + } loadmodel->numskins = LittleLong(pinmodel->numskins); - BOUNDI(loadmodel->numskins,0,256); + BOUNDI(loadmodel->numskins,0,65536); skinwidth = LittleLong (pinmodel->skinwidth); - BOUNDI(skinwidth,0,4096); + BOUNDI(skinwidth,0,65536); skinheight = LittleLong (pinmodel->skinheight); - BOUNDI(skinheight,0,4096); + BOUNDI(skinheight,0,65536); numverts = LittleLong(pinmodel->numverts); BOUNDI(numverts,0,65536); - loadmodel->alias.aliasdata_meshes->num_triangles = LittleLong(pinmodel->numtris); - BOUNDI(loadmodel->alias.aliasdata_meshes->num_triangles,0,65536 / 3); // max elements limit, rather than max triangles limit + loadmodel->meshlist[0]->num_triangles = LittleLong(pinmodel->numtris); + BOUNDI(loadmodel->meshlist[0]->num_triangles,0,65536); loadmodel->numframes = LittleLong(pinmodel->numframes); BOUNDI(loadmodel->numframes,0,65536); loadmodel->synctype = LittleLong (pinmodel->synctype); @@ -365,10 +536,10 @@ void Mod_IDP0_Load(model_t *mod, void *buffer) datapointer += sizeof(stvert_t) * numverts; pintriangles = (dtriangle_t *)datapointer; - datapointer += sizeof(dtriangle_t) * loadmodel->alias.aliasdata_meshes->num_triangles; + datapointer += sizeof(dtriangle_t) * loadmodel->meshlist[0]->num_triangles; startframes = datapointer; - loadmodel->alias.aliasdata_meshes->num_frames = 0; + loadmodel->meshlist[0]->num_morphframes = 0; for (i = 0;i < loadmodel->numframes;i++) { pinframetype = (daliasframetype_t *)datapointer; @@ -387,7 +558,7 @@ void Mod_IDP0_Load(model_t *mod, void *buffer) { datapointer += sizeof(daliasframe_t); datapointer += sizeof(trivertx_t) * numverts; - loadmodel->alias.aliasdata_meshes->num_frames++; + loadmodel->meshlist[0]->num_morphframes++; } } @@ -409,74 +580,73 @@ void Mod_IDP0_Load(model_t *mod, void *buffer) } // load triangle data - loadmodel->alias.aliasdata_meshes->data_element3i = Mem_Alloc(loadmodel->mempool, sizeof(int[3]) * loadmodel->alias.aliasdata_meshes->num_triangles); + loadmodel->meshlist[0]->data_element3i = Mem_Alloc(loadmodel->mempool, sizeof(int[3]) * loadmodel->meshlist[0]->num_triangles); // read the triangle elements - for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles;i++) + for (i = 0;i < loadmodel->meshlist[0]->num_triangles;i++) for (j = 0;j < 3;j++) - loadmodel->alias.aliasdata_meshes->data_element3i[i*3+j] = LittleLong(pintriangles[i].vertindex[j]); + loadmodel->meshlist[0]->data_element3i[i*3+j] = LittleLong(pintriangles[i].vertindex[j]); // validate (note numverts is used because this is the original data) - Mod_ValidateElements(loadmodel->alias.aliasdata_meshes->data_element3i, loadmodel->alias.aliasdata_meshes->num_triangles, numverts, __FILE__, __LINE__); + Mod_ValidateElements(loadmodel->meshlist[0]->data_element3i, loadmodel->meshlist[0]->num_triangles, numverts, __FILE__, __LINE__); // now butcher the elements according to vertonseam and tri->facesfront // and then compact the vertex set to remove duplicates - for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles;i++) + for (i = 0;i < loadmodel->meshlist[0]->num_triangles;i++) if (!LittleLong(pintriangles[i].facesfront)) // backface for (j = 0;j < 3;j++) - if (vertonseam[loadmodel->alias.aliasdata_meshes->data_element3i[i*3+j]]) - loadmodel->alias.aliasdata_meshes->data_element3i[i*3+j] += numverts; + if (vertonseam[loadmodel->meshlist[0]->data_element3i[i*3+j]]) + loadmodel->meshlist[0]->data_element3i[i*3+j] += numverts; // count the usage // (this uses vertremap to count usage to save some memory) for (i = 0;i < numverts*2;i++) vertremap[i] = 0; - for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles*3;i++) - vertremap[loadmodel->alias.aliasdata_meshes->data_element3i[i]]++; + for (i = 0;i < loadmodel->meshlist[0]->num_triangles*3;i++) + vertremap[loadmodel->meshlist[0]->data_element3i[i]]++; // build remapping table and compact array - loadmodel->alias.aliasdata_meshes->num_vertices = 0; + loadmodel->meshlist[0]->num_vertices = 0; for (i = 0;i < numverts*2;i++) { if (vertremap[i]) { - vertremap[i] = loadmodel->alias.aliasdata_meshes->num_vertices; - vertst[loadmodel->alias.aliasdata_meshes->num_vertices*2+0] = vertst[i*2+0]; - vertst[loadmodel->alias.aliasdata_meshes->num_vertices*2+1] = vertst[i*2+1]; - loadmodel->alias.aliasdata_meshes->num_vertices++; + vertremap[i] = loadmodel->meshlist[0]->num_vertices; + vertst[loadmodel->meshlist[0]->num_vertices*2+0] = vertst[i*2+0]; + vertst[loadmodel->meshlist[0]->num_vertices*2+1] = vertst[i*2+1]; + loadmodel->meshlist[0]->num_vertices++; } else vertremap[i] = -1; // not used at all } // remap the elements to the new vertex set - for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles * 3;i++) - loadmodel->alias.aliasdata_meshes->data_element3i[i] = vertremap[loadmodel->alias.aliasdata_meshes->data_element3i[i]]; + for (i = 0;i < loadmodel->meshlist[0]->num_triangles * 3;i++) + loadmodel->meshlist[0]->data_element3i[i] = vertremap[loadmodel->meshlist[0]->data_element3i[i]]; // store the texture coordinates - loadmodel->alias.aliasdata_meshes->data_texcoord2f = Mem_Alloc(loadmodel->mempool, sizeof(float[2]) * loadmodel->alias.aliasdata_meshes->num_vertices); - for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_vertices;i++) + loadmodel->meshlist[0]->data_texcoordtexture2f = Mem_Alloc(loadmodel->mempool, sizeof(float[2]) * loadmodel->meshlist[0]->num_vertices); + for (i = 0;i < loadmodel->meshlist[0]->num_vertices;i++) { - loadmodel->alias.aliasdata_meshes->data_texcoord2f[i*2+0] = vertst[i*2+0]; - loadmodel->alias.aliasdata_meshes->data_texcoord2f[i*2+1] = vertst[i*2+1]; + loadmodel->meshlist[0]->data_texcoordtexture2f[i*2+0] = vertst[i*2+0]; + loadmodel->meshlist[0]->data_texcoordtexture2f[i*2+1] = vertst[i*2+1]; } // load the frames loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes); - loadmodel->alias.aliasdata_meshes->data_aliasvertex3f = Mem_Alloc(loadmodel->mempool, sizeof(float[4][3]) * loadmodel->alias.aliasdata_meshes->num_frames * loadmodel->alias.aliasdata_meshes->num_vertices); - loadmodel->alias.aliasdata_meshes->data_aliassvector3f = loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + loadmodel->alias.aliasdata_meshes->num_frames * loadmodel->alias.aliasdata_meshes->num_vertices * 3 * 1; - loadmodel->alias.aliasdata_meshes->data_aliastvector3f = loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + loadmodel->alias.aliasdata_meshes->num_frames * loadmodel->alias.aliasdata_meshes->num_vertices * 3 * 2; - loadmodel->alias.aliasdata_meshes->data_aliasnormal3f = loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + loadmodel->alias.aliasdata_meshes->num_frames * loadmodel->alias.aliasdata_meshes->num_vertices * 3 * 3; + loadmodel->meshlist[0]->data_morphvertex3f = Mem_Alloc(loadmodel->mempool, sizeof(float[3]) * loadmodel->meshlist[0]->num_morphframes * loadmodel->meshlist[0]->num_vertices); + loadmodel->meshlist[0]->data_neighbor3i = Mem_Alloc(loadmodel->mempool, loadmodel->meshlist[0]->num_triangles * sizeof(int[3])); Mod_MDL_LoadFrames (startframes, numverts, scale, translate, vertremap); - loadmodel->alias.aliasdata_meshes->data_neighbor3i = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_triangles * sizeof(int[3])); - Mod_BuildTriangleNeighbors(loadmodel->alias.aliasdata_meshes->data_neighbor3i, loadmodel->alias.aliasdata_meshes->data_element3i, loadmodel->alias.aliasdata_meshes->num_triangles); + Mod_BuildTriangleNeighbors(loadmodel->meshlist[0]->data_neighbor3i, loadmodel->meshlist[0]->data_element3i, loadmodel->meshlist[0]->num_triangles); Mod_CalcAliasModelBBoxes(); + Mod_Alias_Mesh_CompileFrameZero(loadmodel->meshlist[0]); Mem_Free(vertst); Mem_Free(vertremap); // load the skins - if ((skinfiles = Mod_LoadSkinFiles())) + skinfiles = Mod_LoadSkinFiles(); + loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numskins * sizeof(animscene_t)); + loadmodel->num_textures = loadmodel->num_surfaces; + loadmodel->data_textures = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * totalskins * sizeof(texture_t)); + if (skinfiles) { - loadmodel->alias.aliasdata_meshes->num_skins = totalskins = loadmodel->numskins = Mod_CountSkinFiles(skinfiles); - loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(aliasskin_t)); - Mod_BuildAliasSkinsFromSkinFiles(loadmodel->alias.aliasdata_meshes->data_skins, skinfiles, "default", ""); + Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures, skinfiles, "default", ""); Mod_FreeSkinFiles(skinfiles); - loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins); for (i = 0;i < loadmodel->numskins;i++) { loadmodel->skinscenes[i].firstframe = i; @@ -487,9 +657,6 @@ void Mod_IDP0_Load(model_t *mod, void *buffer) } else { - loadmodel->alias.aliasdata_meshes->num_skins = totalskins; - loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(aliasskin_t)); - loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numskins * sizeof(animscene_t)); totalskins = 0; datapointer = startskins; for (i = 0;i < loadmodel->numskins;i++) @@ -514,7 +681,10 @@ void Mod_IDP0_Load(model_t *mod, void *buffer) interval = LittleFloat(pinskinintervals[0].interval); if (interval < 0.01f) - Host_Error("Mod_IDP0_Load: invalid interval\n"); + { + Con_Printf("%s has an invalid interval %f, changing to 0.1\n", loadmodel->name, interval); + interval = 0.1f; + } } sprintf(loadmodel->skinscenes[i].name, "skin %i", i); @@ -529,16 +699,16 @@ void Mod_IDP0_Load(model_t *mod, void *buffer) sprintf (name, "%s_%i_%i", loadmodel->name, i, j); else sprintf (name, "%s_%i", loadmodel->name, i); - if (!Mod_LoadSkinFrame(&tempskinframe, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_ALPHA, true, false, true)) - Mod_LoadSkinFrame_Internal(&tempskinframe, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_ALPHA, true, false, true, (qbyte *)datapointer, skinwidth, skinheight); - Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + totalskins, &tempskinframe); + if (!Mod_LoadSkinFrame(&tempskinframe, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP, true, false, true)) + Mod_LoadSkinFrame_Internal(&tempskinframe, name, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP, true, false, r_fullbrights.integer, (qbyte *)datapointer, skinwidth, skinheight); + Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, &tempskinframe); datapointer += skinwidth * skinheight; totalskins++; } } // check for skins that don't exist in the model, but do exist as external images // (this was added because yummyluv kept pestering me about support for it) - while (Mod_LoadSkinFrame(&tempskinframe, va("%s_%i", loadmodel->name, loadmodel->numskins), (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_CLAMP | TEXF_ALPHA, true, false, true)) + while (Mod_LoadSkinFrame(&tempskinframe, va("%s_%i", loadmodel->name, loadmodel->numskins), (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PICMIP, true, false, true)) { // expand the arrays to make room tempskinscenes = loadmodel->skinscenes; @@ -546,13 +716,13 @@ void Mod_IDP0_Load(model_t *mod, void *buffer) memcpy(loadmodel->skinscenes, tempskinscenes, loadmodel->numskins * sizeof(animscene_t)); Mem_Free(tempskinscenes); - tempaliasskins = loadmodel->alias.aliasdata_meshes->data_skins; - loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, (totalskins + 1) * sizeof(aliasskin_t)); - memcpy(loadmodel->alias.aliasdata_meshes->data_skins, tempaliasskins, totalskins * sizeof(aliasskin_t)); + tempaliasskins = loadmodel->data_textures; + loadmodel->data_textures = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * (totalskins + 1) * sizeof(texture_t)); + memcpy(loadmodel->data_textures, tempaliasskins, loadmodel->num_surfaces * totalskins * sizeof(texture_t)); Mem_Free(tempaliasskins); // store the info about the new skin - Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + totalskins, &tempskinframe); + Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + totalskins * loadmodel->num_surfaces, &tempskinframe); strcpy(loadmodel->skinscenes[loadmodel->numskins].name, name); loadmodel->skinscenes[loadmodel->numskins].firstframe = totalskins; loadmodel->skinscenes[loadmodel->numskins].framecount = 1; @@ -560,11 +730,18 @@ void Mod_IDP0_Load(model_t *mod, void *buffer) loadmodel->skinscenes[loadmodel->numskins].loop = true; //increase skin counts - loadmodel->alias.aliasdata_meshes->num_skins++; loadmodel->numskins++; totalskins++; } } + + surface = loadmodel->data_surfaces; + surface->texture = loadmodel->data_textures; + surface->groupmesh = loadmodel->meshlist[0]; + surface->num_firsttriangle = 0; + surface->num_triangles = surface->groupmesh->num_triangles; + surface->num_firstvertex = 0; + surface->num_vertices = surface->groupmesh->num_vertices; } static void Mod_MD2_ConvertVerts (vec3_t scale, vec3_t translate, trivertx_t *v, float *out3f, int numverts, int *vertremap) @@ -580,10 +757,12 @@ static void Mod_MD2_ConvertVerts (vec3_t scale, vec3_t translate, trivertx_t *v, } } -void Mod_IDP2_Load(model_t *mod, void *buffer) +void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend) { int i, j, k, hashindex, num, numxyz, numst, xyz, st, skinwidth, skinheight, *vertremap, version, end, numverts; float *stverts, s, t, scale[3], translate[3]; + qbyte *data; + msurface_t *surface; md2_t *pinmodel; qbyte *base, *datapointer; md2frame_t *pinframe; @@ -609,43 +788,53 @@ void Mod_IDP2_Load(model_t *mod, void *buffer) loadmodel->name, version, MD2ALIAS_VERSION); loadmodel->type = mod_alias; - loadmodel->alias.aliastype = ALIASTYPE_ALIAS; loadmodel->DrawSky = NULL; - loadmodel->Draw = R_Model_Alias_Draw; - loadmodel->DrawFakeShadow = R_Model_Alias_DrawFakeShadow; - loadmodel->DrawShadowVolume = R_Model_Alias_DrawShadowVolume; - loadmodel->DrawLight = R_Model_Alias_DrawLight; + loadmodel->Draw = R_Q1BSP_Draw; + loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume; + loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume; + loadmodel->DrawLight = R_Q1BSP_DrawLight; + loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox; - if (LittleLong(pinmodel->num_tris < 1) || LittleLong(pinmodel->num_tris) > (65536 / 3)) + if (LittleLong(pinmodel->num_tris) < 1 || LittleLong(pinmodel->num_tris) > 65536) Host_Error ("%s has invalid number of triangles: %i", loadmodel->name, LittleLong(pinmodel->num_tris)); - if (LittleLong(pinmodel->num_xyz < 1) || LittleLong(pinmodel->num_xyz) > 65536) + if (LittleLong(pinmodel->num_xyz) < 1 || LittleLong(pinmodel->num_xyz) > 65536) Host_Error ("%s has invalid number of vertices: %i", loadmodel->name, LittleLong(pinmodel->num_xyz)); - if (LittleLong(pinmodel->num_frames < 1) || LittleLong(pinmodel->num_frames) > 65536) + if (LittleLong(pinmodel->num_frames) < 1 || LittleLong(pinmodel->num_frames) > 65536) Host_Error ("%s has invalid number of frames: %i", loadmodel->name, LittleLong(pinmodel->num_frames)); - if (LittleLong(pinmodel->num_skins < 0) || LittleLong(pinmodel->num_skins) > 256) + if (LittleLong(pinmodel->num_skins) < 0 || LittleLong(pinmodel->num_skins) > 256) Host_Error ("%s has invalid number of skins: %i", loadmodel->name, LittleLong(pinmodel->num_skins)); end = LittleLong(pinmodel->ofs_end); - if (LittleLong(pinmodel->num_skins) >= 1 && (LittleLong(pinmodel->ofs_skins <= 0) || LittleLong(pinmodel->ofs_skins) >= end)) + if (LittleLong(pinmodel->num_skins) >= 1 && (LittleLong(pinmodel->ofs_skins) <= 0 || LittleLong(pinmodel->ofs_skins) >= end)) Host_Error ("%s is not a valid model", loadmodel->name); - if (LittleLong(pinmodel->ofs_st <= 0) || LittleLong(pinmodel->ofs_st) >= end) + if (LittleLong(pinmodel->ofs_st) <= 0 || LittleLong(pinmodel->ofs_st) >= end) Host_Error ("%s is not a valid model", loadmodel->name); - if (LittleLong(pinmodel->ofs_tris <= 0) || LittleLong(pinmodel->ofs_tris) >= end) + if (LittleLong(pinmodel->ofs_tris) <= 0 || LittleLong(pinmodel->ofs_tris) >= end) Host_Error ("%s is not a valid model", loadmodel->name); - if (LittleLong(pinmodel->ofs_frames <= 0) || LittleLong(pinmodel->ofs_frames) >= end) + if (LittleLong(pinmodel->ofs_frames) <= 0 || LittleLong(pinmodel->ofs_frames) >= end) Host_Error ("%s is not a valid model", loadmodel->name); - if (LittleLong(pinmodel->ofs_glcmds <= 0) || LittleLong(pinmodel->ofs_glcmds) >= end) + if (LittleLong(pinmodel->ofs_glcmds) <= 0 || LittleLong(pinmodel->ofs_glcmds) >= end) Host_Error ("%s is not a valid model", loadmodel->name); - loadmodel->alias.aliasnum_meshes = 1; - loadmodel->alias.aliasdata_meshes = Mem_Alloc(loadmodel->mempool, sizeof(aliasmesh_t)); + loadmodel->num_surfaces = 1; + loadmodel->nummodelsurfaces = loadmodel->num_surfaces; + loadmodel->nummeshes = loadmodel->num_surfaces; + data = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->nummeshes * sizeof(surfmesh_t *) + loadmodel->nummeshes * sizeof(surfmesh_t)); + loadmodel->data_surfaces = (void *)data;data += loadmodel->num_surfaces * sizeof(msurface_t); + loadmodel->surfacelist = (void *)data;data += loadmodel->num_surfaces * sizeof(int); + loadmodel->meshlist = (void *)data;data += loadmodel->num_surfaces * sizeof(surfmesh_t *); + for (i = 0;i < loadmodel->num_surfaces;i++) + { + loadmodel->surfacelist[i] = i; + loadmodel->meshlist[i] = (void *)data;data += sizeof(surfmesh_t); + } loadmodel->numskins = LittleLong(pinmodel->num_skins); numxyz = LittleLong(pinmodel->num_xyz); numst = LittleLong(pinmodel->num_st); - loadmodel->alias.aliasdata_meshes->num_triangles = LittleLong(pinmodel->num_tris); + loadmodel->meshlist[0]->num_triangles = LittleLong(pinmodel->num_tris); loadmodel->numframes = LittleLong(pinmodel->num_frames); - loadmodel->alias.aliasdata_meshes->num_frames = loadmodel->numframes; + loadmodel->meshlist[0]->num_morphframes = loadmodel->numframes; loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numframes * sizeof(animscene_t)); loadmodel->flags = 0; // there are no MD2 flags @@ -653,26 +842,27 @@ void Mod_IDP2_Load(model_t *mod, void *buffer) // load the skins inskin = (void*)(base + LittleLong(pinmodel->ofs_skins)); - if ((skinfiles = Mod_LoadSkinFiles())) + skinfiles = Mod_LoadSkinFiles(); + if (skinfiles) { - loadmodel->alias.aliasdata_meshes->num_skins = loadmodel->numskins = Mod_CountSkinFiles(skinfiles); - loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(aliasskin_t)); - Mod_BuildAliasSkinsFromSkinFiles(loadmodel->alias.aliasdata_meshes->data_skins, skinfiles, "default", ""); + loadmodel->num_textures = loadmodel->num_surfaces; + loadmodel->data_textures = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t)); + Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures, skinfiles, "default", ""); Mod_FreeSkinFiles(skinfiles); } else if (loadmodel->numskins) { // skins found (most likely not a player model) - loadmodel->alias.aliasdata_meshes->num_skins = loadmodel->numskins; - loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(aliasskin_t)); + loadmodel->num_textures = loadmodel->num_surfaces; + loadmodel->data_textures = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t)); for (i = 0;i < loadmodel->numskins;i++, inskin += MD2_SKINNAME) { - if (Mod_LoadSkinFrame(&tempskinframe, inskin, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_CLAMP | TEXF_PRECACHE, true, false, true)) - Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + i, &tempskinframe); + if (Mod_LoadSkinFrame(&tempskinframe, inskin, (r_mipskins.integer ? TEXF_MIPMAP : 0) | TEXF_ALPHA | TEXF_PRECACHE | TEXF_PICMIP, true, false, true)) + Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i * loadmodel->num_surfaces, &tempskinframe); else { - Con_Printf("Mod_IDP2_Load: missing skin \"%s\"\n", inskin); - Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins + i, NULL); + Con_Printf("%s is missing skin \"%s\"\n", loadmodel->name, inskin); + Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i * loadmodel->num_surfaces, NULL); } } } @@ -680,9 +870,9 @@ void Mod_IDP2_Load(model_t *mod, void *buffer) { // no skins (most likely a player model) loadmodel->numskins = 1; - loadmodel->alias.aliasdata_meshes->num_skins = loadmodel->numskins; - loadmodel->alias.aliasdata_meshes->data_skins = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_skins * sizeof(aliasskin_t)); - Mod_BuildAliasSkinFromSkinFrame(loadmodel->alias.aliasdata_meshes->data_skins, NULL); + loadmodel->num_textures = loadmodel->num_surfaces; + loadmodel->data_textures = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t)); + Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures, NULL); } loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins); @@ -709,33 +899,34 @@ void Mod_IDP2_Load(model_t *mod, void *buffer) k = (unsigned short) LittleShort(inst[i*2+1]); if (j >= skinwidth || k >= skinheight) { - Mem_Free(stverts); - Host_Error("Mod_MD2_LoadGeometry: invalid skin coordinate (%i %i) on vert %i of model %s\n", j, k, i, loadmodel->name); + Con_Printf("%s has an invalid skin coordinate (%i %i) on vert %i, changing to 0 0\n", loadmodel->name, j, k, i); + j = 0; + k = 0; } stverts[i*2+0] = j * s; stverts[i*2+1] = k * t; } md2verthash = Mem_Alloc(tempmempool, 256 * sizeof(hash)); - md2verthashdata = Mem_Alloc(tempmempool, loadmodel->alias.aliasdata_meshes->num_triangles * 3 * sizeof(*hash)); + md2verthashdata = Mem_Alloc(tempmempool, loadmodel->meshlist[0]->num_triangles * 3 * sizeof(*hash)); // swap the triangle list num = 0; - loadmodel->alias.aliasdata_meshes->data_element3i = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_triangles * sizeof(int[3])); - for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_triangles;i++) + loadmodel->meshlist[0]->data_element3i = Mem_Alloc(loadmodel->mempool, loadmodel->meshlist[0]->num_triangles * sizeof(int[3])); + for (i = 0;i < loadmodel->meshlist[0]->num_triangles;i++) { for (j = 0;j < 3;j++) { xyz = (unsigned short) LittleShort (intri[i].index_xyz[j]); st = (unsigned short) LittleShort (intri[i].index_st[j]); - if (xyz >= numxyz || st >= numst) + if (xyz >= numxyz) + { + Con_Printf("%s has an invalid xyz index (%i) on triangle %i, resetting to 0\n", loadmodel->name, xyz, i); + xyz = 0; + } + if (st >= numst) { - Mem_Free(md2verthash); - Mem_Free(md2verthashdata); - Mem_Free(stverts); - if (xyz >= numxyz) - Host_Error("Mod_MD2_LoadGeometry: invalid xyz index (%i) on triangle %i of model %s\n", xyz, i, loadmodel->name); - if (st >= numst) - Host_Error("Mod_MD2_LoadGeometry: invalid st index (%i) on triangle %i of model %s\n", st, i, loadmodel->name); + Con_Printf("%s has an invalid st index (%i) on triangle %i, resetting to 0\n", loadmodel->name, st, i); + st = 0; } s = stverts[st*2+0]; t = stverts[st*2+1]; @@ -752,22 +943,22 @@ void Mod_IDP2_Load(model_t *mod, void *buffer) hash->next = md2verthash[hashindex]; md2verthash[hashindex] = hash; } - loadmodel->alias.aliasdata_meshes->data_element3i[i*3+j] = (hash - md2verthashdata); + loadmodel->meshlist[0]->data_element3i[i*3+j] = (hash - md2verthashdata); } } Mem_Free(stverts); numverts = num; - loadmodel->alias.aliasdata_meshes->num_vertices = numverts; + loadmodel->meshlist[0]->num_vertices = numverts; vertremap = Mem_Alloc(loadmodel->mempool, num * sizeof(int)); - loadmodel->alias.aliasdata_meshes->data_texcoord2f = Mem_Alloc(loadmodel->mempool, num * sizeof(float[2])); + loadmodel->meshlist[0]->data_texcoordtexture2f = Mem_Alloc(loadmodel->mempool, num * sizeof(float[2])); for (i = 0;i < num;i++) { hash = md2verthashdata + i; vertremap[i] = hash->xyz; - loadmodel->alias.aliasdata_meshes->data_texcoord2f[i*2+0] = hash->st[0]; - loadmodel->alias.aliasdata_meshes->data_texcoord2f[i*2+1] = hash->st[1]; + loadmodel->meshlist[0]->data_texcoordtexture2f[i*2+0] = hash->st[0]; + loadmodel->meshlist[0]->data_texcoordtexture2f[i*2+1] = hash->st[1]; } Mem_Free(md2verthash); @@ -775,11 +966,8 @@ void Mod_IDP2_Load(model_t *mod, void *buffer) // load the frames datapointer = (base + LittleLong(pinmodel->ofs_frames)); - loadmodel->alias.aliasdata_meshes->data_aliasvertex3f = Mem_Alloc(loadmodel->mempool, numverts * loadmodel->alias.aliasdata_meshes->num_frames * sizeof(float[4][3])); - loadmodel->alias.aliasdata_meshes->data_aliassvector3f = loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + numverts * loadmodel->alias.aliasdata_meshes->num_frames * 3 * 1; - loadmodel->alias.aliasdata_meshes->data_aliastvector3f = loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + numverts * loadmodel->alias.aliasdata_meshes->num_frames * 3 * 2; - loadmodel->alias.aliasdata_meshes->data_aliasnormal3f = loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + numverts * loadmodel->alias.aliasdata_meshes->num_frames * 3 * 3; - for (i = 0;i < loadmodel->alias.aliasdata_meshes->num_frames;i++) + loadmodel->meshlist[0]->data_morphvertex3f = Mem_Alloc(loadmodel->mempool, numverts * loadmodel->meshlist[0]->num_morphframes * sizeof(float[3])); + for (i = 0;i < loadmodel->meshlist[0]->num_morphframes;i++) { pinframe = (md2frame_t *)datapointer; datapointer += sizeof(md2frame_t); @@ -788,8 +976,7 @@ void Mod_IDP2_Load(model_t *mod, void *buffer) scale[j] = LittleFloat(pinframe->scale[j]); translate[j] = LittleFloat(pinframe->translate[j]); } - Mod_MD2_ConvertVerts(scale, translate, (void *)datapointer, loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + i * numverts * 3, numverts, vertremap); - Mod_BuildTextureVectorsAndNormals(loadmodel->alias.aliasdata_meshes->num_vertices, loadmodel->alias.aliasdata_meshes->num_triangles, loadmodel->alias.aliasdata_meshes->data_aliasvertex3f + i * loadmodel->alias.aliasdata_meshes->num_vertices * 3, loadmodel->alias.aliasdata_meshes->data_texcoord2f, loadmodel->alias.aliasdata_meshes->data_element3i, loadmodel->alias.aliasdata_meshes->data_aliassvector3f + i * loadmodel->alias.aliasdata_meshes->num_vertices * 3, loadmodel->alias.aliasdata_meshes->data_aliastvector3f + i * loadmodel->alias.aliasdata_meshes->num_vertices * 3, loadmodel->alias.aliasdata_meshes->data_aliasnormal3f + i * loadmodel->alias.aliasdata_meshes->num_vertices * 3); + Mod_MD2_ConvertVerts(scale, translate, (void *)datapointer, loadmodel->meshlist[0]->data_morphvertex3f + i * numverts * 3, numverts, vertremap); datapointer += numxyz * sizeof(trivertx_t); strcpy(loadmodel->animscenes[i].name, pinframe->name); @@ -801,19 +988,30 @@ void Mod_IDP2_Load(model_t *mod, void *buffer) Mem_Free(vertremap); - loadmodel->alias.aliasdata_meshes->data_neighbor3i = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasdata_meshes->num_triangles * sizeof(int[3])); - Mod_BuildTriangleNeighbors(loadmodel->alias.aliasdata_meshes->data_neighbor3i, loadmodel->alias.aliasdata_meshes->data_element3i, loadmodel->alias.aliasdata_meshes->num_triangles); + loadmodel->meshlist[0]->data_neighbor3i = Mem_Alloc(loadmodel->mempool, loadmodel->meshlist[0]->num_triangles * sizeof(int[3])); + Mod_BuildTriangleNeighbors(loadmodel->meshlist[0]->data_neighbor3i, loadmodel->meshlist[0]->data_element3i, loadmodel->meshlist[0]->num_triangles); Mod_CalcAliasModelBBoxes(); + Mod_Alias_Mesh_CompileFrameZero(loadmodel->meshlist[0]); + + surface = loadmodel->data_surfaces; + surface->groupmesh = loadmodel->meshlist[0]; + surface->texture = loadmodel->data_textures; + surface->num_firsttriangle = 0; + surface->num_triangles = surface->groupmesh->num_triangles; + surface->num_firstvertex = 0; + surface->num_vertices = surface->groupmesh->num_vertices; } -void Mod_IDP3_Load(model_t *mod, void *buffer) +void Mod_IDP3_Load(model_t *mod, void *buffer, void *bufferend) { int i, j, k, version; + qbyte *data; + msurface_t *surface; + surfmesh_t *mesh; md3modelheader_t *pinmodel; md3frameinfo_t *pinframe; md3mesh_t *pinmesh; md3tag_t *pintag; - aliasmesh_t *mesh; skinfile_t *skinfiles; pinmodel = buffer; @@ -826,23 +1024,22 @@ void Mod_IDP3_Load(model_t *mod, void *buffer) loadmodel->name, version, MD3VERSION); skinfiles = Mod_LoadSkinFiles(); - loadmodel->numskins = Mod_CountSkinFiles(skinfiles); if (loadmodel->numskins < 1) loadmodel->numskins = 1; loadmodel->type = mod_alias; - loadmodel->alias.aliastype = ALIASTYPE_ALIAS; loadmodel->DrawSky = NULL; - loadmodel->Draw = R_Model_Alias_Draw; - loadmodel->DrawFakeShadow = R_Model_Alias_DrawFakeShadow; - loadmodel->DrawShadowVolume = R_Model_Alias_DrawShadowVolume; - loadmodel->DrawLight = R_Model_Alias_DrawLight; - loadmodel->flags = 0; + loadmodel->Draw = R_Q1BSP_Draw; + loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume; + loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume; + loadmodel->DrawLight = R_Q1BSP_DrawLight; + loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox; + loadmodel->flags = LittleLong(pinmodel->flags); loadmodel->synctype = ST_RAND; // set up some global info about the model loadmodel->numframes = LittleLong(pinmodel->num_frames); - loadmodel->alias.aliasnum_meshes = LittleLong(pinmodel->num_meshes); + loadmodel->num_surfaces = LittleLong(pinmodel->num_meshes); // make skinscenes for the skins (no groups) loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins); @@ -866,80 +1063,98 @@ void Mod_IDP3_Load(model_t *mod, void *buffer) } // load tags - loadmodel->alias.aliasnum_tagframes = loadmodel->numframes; - loadmodel->alias.aliasnum_tags = LittleLong(pinmodel->num_tags); - loadmodel->alias.aliasdata_tags = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasnum_tagframes * loadmodel->alias.aliasnum_tags * sizeof(aliastag_t)); - for (i = 0, pintag = (md3tag_t *)((qbyte *)pinmodel + LittleLong(pinmodel->lump_tags));i < loadmodel->alias.aliasnum_tagframes * loadmodel->alias.aliasnum_tags;i++, pinframe++) + loadmodel->num_tagframes = loadmodel->numframes; + loadmodel->num_tags = LittleLong(pinmodel->num_tags); + loadmodel->data_tags = Mem_Alloc(loadmodel->mempool, loadmodel->num_tagframes * loadmodel->num_tags * sizeof(aliastag_t)); + for (i = 0, pintag = (md3tag_t *)((qbyte *)pinmodel + LittleLong(pinmodel->lump_tags));i < loadmodel->num_tagframes * loadmodel->num_tags;i++, pintag++) { - strcpy(loadmodel->alias.aliasdata_tags[i].name, pintag->name); - Matrix4x4_CreateIdentity(&loadmodel->alias.aliasdata_tags[i].matrix); + strcpy(loadmodel->data_tags[i].name, pintag->name); + Matrix4x4_CreateIdentity(&loadmodel->data_tags[i].matrix); for (j = 0;j < 3;j++) { for (k = 0;k < 3;k++) - loadmodel->alias.aliasdata_tags[i].matrix.m[j][k] = LittleLong(pintag->rotationmatrix[j * 3 + k]); - loadmodel->alias.aliasdata_tags[i].matrix.m[j][3] = LittleLong(pintag->origin[j]); + loadmodel->data_tags[i].matrix.m[j][k] = LittleFloat(pintag->rotationmatrix[k * 3 + j]); + loadmodel->data_tags[i].matrix.m[j][3] = LittleFloat(pintag->origin[j]); } + //Con_Printf("model \"%s\" frame #%i tag #%i \"%s\"\n", loadmodel->name, i / loadmodel->num_tags, i % loadmodel->num_tags, loadmodel->data_tags[i].name); } // load meshes - loadmodel->alias.aliasdata_meshes = Mem_Alloc(loadmodel->mempool, loadmodel->alias.aliasnum_meshes * sizeof(aliasmesh_t)); - for (i = 0, pinmesh = (md3mesh_t *)((qbyte *)pinmodel + LittleLong(pinmodel->lump_meshes));i < loadmodel->alias.aliasnum_meshes;i++, pinmesh = (md3mesh_t *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_end))) + loadmodel->nummodelsurfaces = loadmodel->num_surfaces; + loadmodel->nummeshes = loadmodel->num_surfaces; + loadmodel->num_textures = loadmodel->num_surfaces; + data = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->nummeshes * sizeof(surfmesh_t *) + loadmodel->nummeshes * sizeof(surfmesh_t) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t)); + loadmodel->data_surfaces = (void *)data;data += loadmodel->num_surfaces * sizeof(msurface_t); + loadmodel->surfacelist = (void *)data;data += loadmodel->num_surfaces * sizeof(int); + loadmodel->meshlist = (void *)data;data += loadmodel->num_surfaces * sizeof(surfmesh_t *); + loadmodel->data_textures = (void *)data;data += loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t); + for (i = 0;i < loadmodel->num_surfaces;i++) + { + loadmodel->surfacelist[i] = i; + loadmodel->meshlist[i] = (void *)data;data += sizeof(surfmesh_t); + } + for (i = 0, pinmesh = (md3mesh_t *)((qbyte *)pinmodel + LittleLong(pinmodel->lump_meshes));i < loadmodel->num_surfaces;i++, pinmesh = (md3mesh_t *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_end))) { if (memcmp(pinmesh->identifier, "IDP3", 4)) Host_Error("Mod_IDP3_Load: invalid mesh identifier (not IDP3)\n"); - mesh = loadmodel->alias.aliasdata_meshes + i; - mesh->num_skins = loadmodel->numskins; - mesh->num_frames = LittleLong(pinmesh->num_frames); + mesh = loadmodel->meshlist[i]; + mesh->num_morphframes = LittleLong(pinmesh->num_frames); mesh->num_vertices = LittleLong(pinmesh->num_vertices); mesh->num_triangles = LittleLong(pinmesh->num_triangles); - mesh->data_skins = Mem_Alloc(loadmodel->mempool, mesh->num_skins * sizeof(aliasskin_t)); mesh->data_element3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3])); mesh->data_neighbor3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3])); - mesh->data_texcoord2f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * sizeof(float[2])); - mesh->data_aliasvertex3f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * mesh->num_frames * sizeof(float[4][3])); - mesh->data_aliassvector3f = mesh->data_aliasvertex3f + mesh->num_vertices * mesh->num_frames * 3 * 1; - mesh->data_aliastvector3f = mesh->data_aliasvertex3f + mesh->num_vertices * mesh->num_frames * 3 * 2; - mesh->data_aliasnormal3f = mesh->data_aliasvertex3f + mesh->num_vertices * mesh->num_frames * 3 * 3; + mesh->data_texcoordtexture2f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * sizeof(float[2])); + mesh->data_morphvertex3f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * mesh->num_morphframes * sizeof(float[3])); for (j = 0;j < mesh->num_triangles * 3;j++) - mesh->data_element3i[j] = LittleLong(((int *)((qbyte *)pinmesh + pinmesh->lump_elements))[j]); + mesh->data_element3i[j] = LittleLong(((int *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_elements)))[j]); for (j = 0;j < mesh->num_vertices;j++) { - mesh->data_texcoord2f[j * 2 + 0] = LittleLong(((float *)((qbyte *)pinmesh + pinmesh->lump_texcoords))[j * 2 + 0]); - mesh->data_texcoord2f[j * 2 + 1] = LittleLong(((float *)((qbyte *)pinmesh + pinmesh->lump_texcoords))[j * 2 + 1]); + mesh->data_texcoordtexture2f[j * 2 + 0] = LittleFloat(((float *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_texcoords)))[j * 2 + 0]); + mesh->data_texcoordtexture2f[j * 2 + 1] = LittleFloat(((float *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_texcoords)))[j * 2 + 1]); } - for (j = 0;j < mesh->num_vertices * mesh->num_frames;j++) + for (j = 0;j < mesh->num_vertices * mesh->num_morphframes;j++) { - mesh->data_aliasvertex3f[j * 3 + 0] = LittleShort(((short *)((qbyte *)pinmesh + pinmesh->lump_framevertices))[j * 4 + 0]) * (1.0f / 64.0f); - mesh->data_aliasvertex3f[j * 3 + 1] = LittleShort(((short *)((qbyte *)pinmesh + pinmesh->lump_framevertices))[j * 4 + 1]) * (1.0f / 64.0f); - mesh->data_aliasvertex3f[j * 3 + 2] = LittleShort(((short *)((qbyte *)pinmesh + pinmesh->lump_framevertices))[j * 4 + 2]) * (1.0f / 64.0f); + mesh->data_morphvertex3f[j * 3 + 0] = LittleShort(((short *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_framevertices)))[j * 4 + 0]) * (1.0f / 64.0f); + mesh->data_morphvertex3f[j * 3 + 1] = LittleShort(((short *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_framevertices)))[j * 4 + 1]) * (1.0f / 64.0f); + mesh->data_morphvertex3f[j * 3 + 2] = LittleShort(((short *)((qbyte *)pinmesh + LittleLong(pinmesh->lump_framevertices)))[j * 4 + 2]) * (1.0f / 64.0f); } - for (j = 0;j < mesh->num_frames;j++) - Mod_BuildTextureVectorsAndNormals(mesh->num_vertices, mesh->num_triangles, mesh->data_aliasvertex3f + j * mesh->num_vertices * 3, mesh->data_texcoord2f, mesh->data_element3i, mesh->data_aliassvector3f + j * mesh->num_vertices * 3, mesh->data_aliastvector3f + j * mesh->num_vertices * 3, mesh->data_aliasnormal3f + j * mesh->num_vertices * 3); Mod_ValidateElements(mesh->data_element3i, mesh->num_triangles, mesh->num_vertices, __FILE__, __LINE__); Mod_BuildTriangleNeighbors(mesh->data_neighbor3i, mesh->data_element3i, mesh->num_triangles); + Mod_Alias_Mesh_CompileFrameZero(mesh); - if (LittleLong(pinmesh->num_shaders) >= 1 && ((md3shader_t *)((qbyte *) pinmesh + pinmesh->lump_shaders))->name[0]) - Mod_BuildAliasSkinsFromSkinFiles(mesh->data_skins, skinfiles, pinmesh->name, ((md3shader_t *)((qbyte *) pinmesh + pinmesh->lump_shaders))->name); + if (LittleLong(pinmesh->num_shaders) >= 1) + Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures + i, skinfiles, pinmesh->name, ((md3shader_t *)((qbyte *) pinmesh + LittleLong(pinmesh->lump_shaders)))->name); else - { - for (j = 0;j < mesh->num_skins;j++) - Mod_BuildAliasSkinFromSkinFrame(mesh->data_skins + j, NULL); - } + for (j = 0;j < loadmodel->numskins;j++) + Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i + j * loadmodel->num_surfaces, NULL); + + surface = loadmodel->data_surfaces + i; + surface->groupmesh = mesh; + surface->texture = loadmodel->data_textures + i; + surface->num_firsttriangle = 0; + surface->num_triangles = mesh->num_triangles; + surface->num_firstvertex = 0; + surface->num_vertices = mesh->num_vertices; } Mod_CalcAliasModelBBoxes(); Mod_FreeSkinFiles(skinfiles); } -extern void R_Model_Zymotic_DrawSky(entity_render_t *ent); -extern void R_Model_Zymotic_Draw(entity_render_t *ent); -extern void R_Model_Zymotic_DrawFakeShadow(entity_render_t *ent); -extern void R_Model_Zymotic_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius); -extern void R_Model_Zymotic_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz); -void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer) +void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer, void *bufferend) { zymtype1header_t *pinmodel, *pheader; qbyte *pbase; + int i, j, k, l, numposes, *bonecount, *vertbonecounts, count, *renderlist, *renderlistend, *outelements, *remapvertices; + float modelradius, corner[2], *poses, *intexcoord2f, *outtexcoord2f; + zymvertex_t *verts, *vertdata; + zymscene_t *scene; + zymbone_t *bone; + char *shadername; + skinfile_t *skinfiles; + qbyte *data; + msurface_t *surface; + surfmesh_t *mesh; pinmodel = (void *)buffer; pbase = buffer; @@ -949,12 +1164,14 @@ void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer) Host_Error ("Mod_ZYMOTICMODEL_Load: only type 1 (skeletal pose) models are currently supported (name = %s)\n", loadmodel->name); loadmodel->type = mod_alias; - loadmodel->alias.aliastype = ALIASTYPE_ZYM; loadmodel->DrawSky = NULL; - loadmodel->Draw = R_Model_Zymotic_Draw; - loadmodel->DrawFakeShadow = NULL;//R_Model_Zymotic_DrawFakeShadow; - loadmodel->DrawShadowVolume = NULL;//R_Model_Zymotic_DrawShadowVolume; - loadmodel->DrawLight = NULL;//R_Model_Zymotic_DrawLight; + loadmodel->Draw = R_Q1BSP_Draw; + loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume; + loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume; + loadmodel->DrawLight = R_Q1BSP_DrawLight; + loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox; + loadmodel->flags = 0; // there are no flags on zym models + loadmodel->synctype = ST_RAND; // byteswap header pheader = pinmodel; @@ -967,11 +1184,11 @@ void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer) pheader->maxs[1] = BigFloat(pinmodel->maxs[1]); pheader->maxs[2] = BigFloat(pinmodel->maxs[2]); pheader->radius = BigFloat(pinmodel->radius); - pheader->numverts = loadmodel->alias.zymnum_verts = BigLong(pinmodel->numverts); - pheader->numtris = loadmodel->alias.zymnum_tris = BigLong(pinmodel->numtris); - pheader->numshaders = loadmodel->alias.zymnum_shaders = BigLong(pinmodel->numshaders); - pheader->numbones = loadmodel->alias.zymnum_bones = BigLong(pinmodel->numbones); - pheader->numscenes = loadmodel->alias.zymnum_scenes = BigLong(pinmodel->numscenes); + pheader->numverts = BigLong(pinmodel->numverts); + pheader->numtris = BigLong(pinmodel->numtris); + pheader->numshaders = BigLong(pinmodel->numshaders); + pheader->numbones = BigLong(pinmodel->numbones); + pheader->numscenes = BigLong(pinmodel->numscenes); pheader->lump_scenes.start = BigLong(pinmodel->lump_scenes.start); pheader->lump_scenes.length = BigLong(pinmodel->lump_scenes.length); pheader->lump_poses.start = BigLong(pinmodel->lump_poses.start); @@ -991,188 +1208,993 @@ void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer) pheader->lump_trizone.start = BigLong(pinmodel->lump_trizone.start); pheader->lump_trizone.length = BigLong(pinmodel->lump_trizone.length); - loadmodel->flags = 0; // there are no flags loadmodel->numframes = pheader->numscenes; - loadmodel->synctype = ST_SYNC; - //loadmodel->numtris = pheader->numtris; - //loadmodel->numverts = 0; + loadmodel->num_surfaces = pheader->numshaders; - { - unsigned int i; - float modelradius, corner[2]; - // model bbox - modelradius = pheader->radius; - for (i = 0;i < 3;i++) - { - loadmodel->normalmins[i] = pheader->mins[i]; - loadmodel->normalmaxs[i] = pheader->maxs[i]; - loadmodel->rotatedmins[i] = -modelradius; - loadmodel->rotatedmaxs[i] = modelradius; - } - corner[0] = max(fabs(loadmodel->normalmins[0]), fabs(loadmodel->normalmaxs[0])); - corner[1] = max(fabs(loadmodel->normalmins[1]), fabs(loadmodel->normalmaxs[1])); - loadmodel->yawmaxs[0] = loadmodel->yawmaxs[1] = sqrt(corner[0]*corner[0]+corner[1]*corner[1]); - if (loadmodel->yawmaxs[0] > modelradius) - loadmodel->yawmaxs[0] = loadmodel->yawmaxs[1] = modelradius; - loadmodel->yawmins[0] = loadmodel->yawmins[1] = -loadmodel->yawmaxs[0]; - loadmodel->yawmins[2] = loadmodel->normalmins[2]; - loadmodel->yawmaxs[2] = loadmodel->normalmaxs[2]; - loadmodel->radius = modelradius; - loadmodel->radius2 = modelradius * modelradius; - } - - { - // FIXME: add shaders, and make them switchable shader sets and... - loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t)); - loadmodel->skinscenes[0].firstframe = 0; - loadmodel->skinscenes[0].framecount = 1; - loadmodel->skinscenes[0].loop = true; - loadmodel->skinscenes[0].framerate = 10; + skinfiles = Mod_LoadSkinFiles(); + if (loadmodel->numskins < 1) loadmodel->numskins = 1; + + // make skinscenes for the skins (no groups) + loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numskins); + for (i = 0;i < loadmodel->numskins;i++) + { + loadmodel->skinscenes[i].firstframe = i; + loadmodel->skinscenes[i].framecount = 1; + loadmodel->skinscenes[i].loop = true; + loadmodel->skinscenes[i].framerate = 10; } + // model bbox + modelradius = pheader->radius; + for (i = 0;i < 3;i++) + { + loadmodel->normalmins[i] = pheader->mins[i]; + loadmodel->normalmaxs[i] = pheader->maxs[i]; + loadmodel->rotatedmins[i] = -modelradius; + loadmodel->rotatedmaxs[i] = modelradius; + } + corner[0] = max(fabs(loadmodel->normalmins[0]), fabs(loadmodel->normalmaxs[0])); + corner[1] = max(fabs(loadmodel->normalmins[1]), fabs(loadmodel->normalmaxs[1])); + loadmodel->yawmaxs[0] = loadmodel->yawmaxs[1] = sqrt(corner[0]*corner[0]+corner[1]*corner[1]); + if (loadmodel->yawmaxs[0] > modelradius) + loadmodel->yawmaxs[0] = loadmodel->yawmaxs[1] = modelradius; + loadmodel->yawmins[0] = loadmodel->yawmins[1] = -loadmodel->yawmaxs[0]; + loadmodel->yawmins[2] = loadmodel->normalmins[2]; + loadmodel->yawmaxs[2] = loadmodel->normalmaxs[2]; + loadmodel->radius = modelradius; + loadmodel->radius2 = modelradius * modelradius; + // go through the lumps, swapping things + //zymlump_t lump_scenes; // zymscene_t scene[numscenes]; // name and other information for each scene (see zymscene struct) + loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes); + scene = (void *) (pheader->lump_scenes.start + pbase); + numposes = pheader->lump_poses.length / pheader->numbones / sizeof(float[3][4]); + for (i = 0;i < pheader->numscenes;i++) { - int i, numposes; - zymscene_t *scene; - // zymlump_t lump_scenes; // zymscene_t scene[numscenes]; // name and other information for each scene (see zymscene struct) - loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, sizeof(animscene_t) * loadmodel->numframes); - scene = (void *) (pheader->lump_scenes.start + pbase); - numposes = pheader->lump_poses.length / pheader->numbones / sizeof(float[3][4]); - for (i = 0;i < pheader->numscenes;i++) - { - memcpy(loadmodel->animscenes[i].name, scene->name, 32); - loadmodel->animscenes[i].firstframe = BigLong(scene->start); - loadmodel->animscenes[i].framecount = BigLong(scene->length); - loadmodel->animscenes[i].framerate = BigFloat(scene->framerate); - loadmodel->animscenes[i].loop = (BigLong(scene->flags) & ZYMSCENEFLAG_NOLOOP) == 0; - if ((unsigned int) loadmodel->animscenes[i].firstframe >= (unsigned int) numposes) - Host_Error("Mod_ZYMOTICMODEL_Load: scene firstframe (%i) >= numposes (%i)\n", loadmodel->animscenes[i].firstframe, numposes); - if ((unsigned int) loadmodel->animscenes[i].firstframe + (unsigned int) loadmodel->animscenes[i].framecount > (unsigned int) numposes) - Host_Error("Mod_ZYMOTICMODEL_Load: scene firstframe (%i) + framecount (%i) >= numposes (%i)\n", loadmodel->animscenes[i].firstframe, loadmodel->animscenes[i].framecount, numposes); - if (loadmodel->animscenes[i].framerate < 0) - Host_Error("Mod_ZYMOTICMODEL_Load: scene framerate (%f) < 0\n", loadmodel->animscenes[i].framerate); - scene++; - } + memcpy(loadmodel->animscenes[i].name, scene->name, 32); + loadmodel->animscenes[i].firstframe = BigLong(scene->start); + loadmodel->animscenes[i].framecount = BigLong(scene->length); + loadmodel->animscenes[i].framerate = BigFloat(scene->framerate); + loadmodel->animscenes[i].loop = (BigLong(scene->flags) & ZYMSCENEFLAG_NOLOOP) == 0; + if ((unsigned int) loadmodel->animscenes[i].firstframe >= (unsigned int) numposes) + Host_Error("%s scene->firstframe (%i) >= numposes (%i)\n", loadmodel->name, loadmodel->animscenes[i].firstframe, numposes); + if ((unsigned int) loadmodel->animscenes[i].firstframe + (unsigned int) loadmodel->animscenes[i].framecount > (unsigned int) numposes) + Host_Error("%s scene->firstframe (%i) + framecount (%i) >= numposes (%i)\n", loadmodel->name, loadmodel->animscenes[i].firstframe, loadmodel->animscenes[i].framecount, numposes); + if (loadmodel->animscenes[i].framerate < 0) + Host_Error("%s scene->framerate (%f) < 0\n", loadmodel->name, loadmodel->animscenes[i].framerate); + scene++; + } + + //zymlump_t lump_poses; // float pose[numposes][numbones][3][4]; // animation data + loadmodel->num_poses = pheader->lump_poses.length / sizeof(float[3][4]); + loadmodel->data_poses = Mem_Alloc(loadmodel->mempool, pheader->lump_poses.length); + poses = (void *) (pheader->lump_poses.start + pbase); + for (i = 0;i < pheader->lump_poses.length / 4;i++) + loadmodel->data_poses[i] = BigFloat(poses[i]); + + //zymlump_t lump_bones; // zymbone_t bone[numbones]; + loadmodel->num_bones = pheader->numbones; + loadmodel->data_bones = Mem_Alloc(loadmodel->mempool, pheader->numbones * sizeof(aliasbone_t)); + bone = (void *) (pheader->lump_bones.start + pbase); + for (i = 0;i < pheader->numbones;i++) + { + memcpy(loadmodel->data_bones[i].name, bone[i].name, sizeof(bone[i].name)); + loadmodel->data_bones[i].flags = BigLong(bone[i].flags); + loadmodel->data_bones[i].parent = BigLong(bone[i].parent); + if (loadmodel->data_bones[i].parent >= i) + Host_Error("%s bone[%i].parent >= %i\n", loadmodel->name, i, i); + } + + //zymlump_t lump_vertbonecounts; // int vertbonecounts[numvertices]; // how many bones influence each vertex (separate mainly to make this compress better) + vertbonecounts = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(int)); + bonecount = (void *) (pheader->lump_vertbonecounts.start + pbase); + for (i = 0;i < pheader->numverts;i++) + { + vertbonecounts[i] = BigLong(bonecount[i]); + if (vertbonecounts[i] < 1) + Host_Error("%s bonecount[%i] < 1\n", loadmodel->name, i); + } + + //zymlump_t lump_verts; // zymvertex_t vert[numvertices]; // see vertex struct + verts = Mem_Alloc(loadmodel->mempool, pheader->lump_verts.length); + vertdata = (void *) (pheader->lump_verts.start + pbase); + for (i = 0;i < pheader->lump_verts.length / (int) sizeof(zymvertex_t);i++) + { + verts[i].bonenum = BigLong(vertdata[i].bonenum); + verts[i].origin[0] = BigFloat(vertdata[i].origin[0]); + verts[i].origin[1] = BigFloat(vertdata[i].origin[1]); + verts[i].origin[2] = BigFloat(vertdata[i].origin[2]); + } + + //zymlump_t lump_texcoords; // float texcoords[numvertices][2]; + outtexcoord2f = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(float[2])); + intexcoord2f = (void *) (pheader->lump_texcoords.start + pbase); + for (i = 0;i < pheader->numverts;i++) + { + outtexcoord2f[i*2+0] = BigFloat(intexcoord2f[i*2+0]); + // flip T coordinate for OpenGL + outtexcoord2f[i*2+1] = 1 - BigFloat(intexcoord2f[i*2+1]); } + //zymlump_t lump_trizone; // byte trizone[numtris]; // see trizone explanation + //loadmodel->alias.zymdata_trizone = Mem_Alloc(loadmodel->mempool, pheader->numtris); + //memcpy(loadmodel->alias.zymdata_trizone, (void *) (pheader->lump_trizone.start + pbase), pheader->numtris); + + loadmodel->nummodelsurfaces = loadmodel->num_surfaces; + loadmodel->nummeshes = loadmodel->num_surfaces; + loadmodel->num_textures = loadmodel->num_surfaces; + data = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->nummeshes * sizeof(surfmesh_t *) + loadmodel->nummeshes * sizeof(surfmesh_t) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t)); + loadmodel->data_surfaces = (void *)data;data += loadmodel->num_surfaces * sizeof(msurface_t); + loadmodel->surfacelist = (void *)data;data += loadmodel->num_surfaces * sizeof(int); + loadmodel->meshlist = (void *)data;data += loadmodel->num_surfaces * sizeof(surfmesh_t *); + loadmodel->data_textures = (void *)data;data += loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t); + for (i = 0;i < loadmodel->num_surfaces;i++) { - int i; - float *poses; - // zymlump_t lump_poses; // float pose[numposes][numbones][3][4]; // animation data - loadmodel->alias.zymdata_poses = Mem_Alloc(loadmodel->mempool, pheader->lump_poses.length); - poses = (void *) (pheader->lump_poses.start + pbase); - for (i = 0;i < pheader->lump_poses.length / 4;i++) - loadmodel->alias.zymdata_poses[i] = BigFloat(poses[i]); + loadmodel->surfacelist[i] = i; + loadmodel->meshlist[i] = (void *)data;data += sizeof(surfmesh_t); } + //zymlump_t lump_shaders; // char shadername[numshaders][32]; // shaders used on this model + //zymlump_t lump_render; // int renderlist[rendersize]; // sorted by shader with run lengths (int count), shaders are sequentially used, each run can be used with glDrawElements (each triangle is 3 int indices) + // byteswap, validate, and swap winding order of tris + count = pheader->numshaders * sizeof(int) + pheader->numtris * sizeof(int[3]); + if (pheader->lump_render.length != count) + Host_Error("%s renderlist is wrong size (%i bytes, should be %i bytes)\n", loadmodel->name, pheader->lump_render.length, count); + renderlist = (void *) (pheader->lump_render.start + pbase); + renderlistend = (void *) ((qbyte *) renderlist + pheader->lump_render.length); + for (i = 0;i < loadmodel->num_surfaces;i++) { - int i; - zymbone_t *bone; - // zymlump_t lump_bones; // zymbone_t bone[numbones]; - loadmodel->alias.zymdata_bones = Mem_Alloc(loadmodel->mempool, pheader->numbones * sizeof(zymbone_t)); - bone = (void *) (pheader->lump_bones.start + pbase); - for (i = 0;i < pheader->numbones;i++) + if (renderlist >= renderlistend) + Host_Error("%s corrupt renderlist (wrong size)\n", loadmodel->name); + count = BigLong(*renderlist);renderlist++; + if (renderlist + count * 3 > renderlistend || (i == pheader->numshaders - 1 && renderlist + count * 3 != renderlistend)) + Host_Error("%s corrupt renderlist (wrong size)\n", loadmodel->name); + mesh = loadmodel->meshlist[i]; + mesh->num_triangles = count; + mesh->data_element3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3])); + mesh->data_neighbor3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3])); + outelements = mesh->data_element3i; + for (j = 0;j < mesh->num_triangles;j++) { - memcpy(loadmodel->alias.zymdata_bones[i].name, bone[i].name, sizeof(bone[i].name)); - loadmodel->alias.zymdata_bones[i].flags = BigLong(bone[i].flags); - loadmodel->alias.zymdata_bones[i].parent = BigLong(bone[i].parent); - if (loadmodel->alias.zymdata_bones[i].parent >= i) - Host_Error("Mod_ZYMOTICMODEL_Load: bone[%i].parent >= %i in %s\n", i, i, loadmodel->name); + outelements[2] = BigLong(renderlist[0]); + outelements[1] = BigLong(renderlist[1]); + outelements[0] = BigLong(renderlist[2]); + if ((unsigned int)outelements[0] >= (unsigned int)pheader->numverts + || (unsigned int)outelements[1] >= (unsigned int)pheader->numverts + || (unsigned int)outelements[2] >= (unsigned int)pheader->numverts) + Host_Error("%s corrupt renderlist (out of bounds index)\n", loadmodel->name); + if (vertbonecounts[outelements[0]] == 0 || vertbonecounts[outelements[1]] == 0 || vertbonecounts[outelements[2]] == 0) + Host_Error("%s corrupt renderlist (references vertex with no bone weights\n", loadmodel->name); + renderlist += 3; + outelements += 3; } + remapvertices = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(int)); + mesh->num_vertices = Mod_BuildVertexRemapTableFromElements(mesh->num_triangles * 3, mesh->data_element3i, pheader->numverts, remapvertices); + for (j = 0;j < mesh->num_triangles * 3;j++) + mesh->data_element3i[j] = remapvertices[mesh->data_element3i[j]]; + mesh->data_texcoordtexture2f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * sizeof(float[2])); + for (j = 0;j < pheader->numverts;j++) + { + if (remapvertices[j] >= 0) + { + mesh->data_texcoordtexture2f[remapvertices[j]*2+0] = outtexcoord2f[j*2+0]; + mesh->data_texcoordtexture2f[remapvertices[j]*2+1] = outtexcoord2f[j*2+1]; + } + } + mesh->num_vertexboneweights = 0; + for (j = 0;j < pheader->numverts;j++) + if (remapvertices[j] >= 0) + mesh->num_vertexboneweights += vertbonecounts[remapvertices[j]]; + mesh->data_vertexboneweights = Mem_Alloc(loadmodel->mempool, mesh->num_vertexboneweights * sizeof(surfmeshvertexboneweight_t)); + mesh->num_vertexboneweights = 0; + // note this vertexboneweight ordering requires that the remapvertices array is sequential numbers (separated by -1 values for omitted vertices) + l = 0; + for (j = 0;j < pheader->numverts;j++) + { + if (remapvertices[j] < 0) + { + l += vertbonecounts[j]; + continue; + } + for (k = 0;k < vertbonecounts[j];k++) + { + // this format really should have had a per vertexweight weight value... + mesh->data_vertexboneweights[mesh->num_vertexboneweights].vertexindex = remapvertices[j]; + mesh->data_vertexboneweights[mesh->num_vertexboneweights].boneindex = verts[l].bonenum; + mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[3] = 1.0f / vertbonecounts[j]; + mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[0] = verts[l].origin[0] * mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[3]; + mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[1] = verts[l].origin[1] * mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[3]; + mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[2] = verts[l].origin[2] * mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[3]; + mesh->num_vertexboneweights++; + l++; + } + } + shadername = (char *) (pheader->lump_shaders.start + pbase) + i * 32; + // since zym models do not have named sections, reuse their shader + // name as the section name + if (shadername[0]) + Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures + i, skinfiles, shadername, shadername); + else + for (j = 0;j < loadmodel->numskins;j++) + Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i + j * loadmodel->num_surfaces, NULL); + + Mod_ValidateElements(mesh->data_element3i, mesh->num_triangles, mesh->num_vertices, __FILE__, __LINE__); + Mod_BuildTriangleNeighbors(mesh->data_neighbor3i, mesh->data_element3i, mesh->num_triangles); + Mod_Alias_Mesh_CompileFrameZero(mesh); + + surface = loadmodel->data_surfaces + i; + surface->groupmesh = mesh; + surface->texture = loadmodel->data_textures + i; + surface->num_firsttriangle = 0; + surface->num_triangles = mesh->num_triangles; + surface->num_firstvertex = 0; + surface->num_vertices = mesh->num_vertices; } + Mem_Free(vertbonecounts); + Mem_Free(verts); + Mem_Free(outtexcoord2f); +} + +void Mod_DARKPLACESMODEL_Load(model_t *mod, void *buffer, void *bufferend) +{ + dpmheader_t *pheader; + dpmframe_t *frame; + dpmbone_t *bone; + dpmmesh_t *dpmmesh; + qbyte *pbase; + int i, j, k; + skinfile_t *skinfiles; + qbyte *data; + + pheader = (void *)buffer; + pbase = buffer; + if (memcmp(pheader->id, "DARKPLACESMODEL\0", 16)) + Host_Error ("Mod_DARKPLACESMODEL_Load: %s is not a darkplaces model\n"); + if (BigLong(pheader->type) != 2) + Host_Error ("Mod_DARKPLACESMODEL_Load: only type 2 (hierarchical skeletal pose) models are currently supported (name = %s)\n", loadmodel->name); + + loadmodel->type = mod_alias; + loadmodel->DrawSky = NULL; + loadmodel->Draw = R_Q1BSP_Draw; + loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume; + loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume; + loadmodel->DrawLight = R_Q1BSP_DrawLight; + loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox; + loadmodel->flags = 0; // there are no flags on zym models + loadmodel->synctype = ST_RAND; + + // byteswap header + pheader->type = BigLong(pheader->type); + pheader->filesize = BigLong(pheader->filesize); + pheader->mins[0] = BigFloat(pheader->mins[0]); + pheader->mins[1] = BigFloat(pheader->mins[1]); + pheader->mins[2] = BigFloat(pheader->mins[2]); + pheader->maxs[0] = BigFloat(pheader->maxs[0]); + pheader->maxs[1] = BigFloat(pheader->maxs[1]); + pheader->maxs[2] = BigFloat(pheader->maxs[2]); + pheader->yawradius = BigFloat(pheader->yawradius); + pheader->allradius = BigFloat(pheader->allradius); + pheader->num_bones = BigLong(pheader->num_bones); + pheader->num_meshs = BigLong(pheader->num_meshs); + pheader->num_frames = BigLong(pheader->num_frames); + pheader->ofs_bones = BigLong(pheader->ofs_bones); + pheader->ofs_meshs = BigLong(pheader->ofs_meshs); + pheader->ofs_frames = BigLong(pheader->ofs_frames); + + // model bbox + for (i = 0;i < 3;i++) + { + loadmodel->normalmins[i] = pheader->mins[i]; + loadmodel->normalmaxs[i] = pheader->maxs[i]; + loadmodel->yawmins[i] = i != 2 ? -pheader->yawradius : pheader->mins[i]; + loadmodel->yawmaxs[i] = i != 2 ? pheader->yawradius : pheader->maxs[i]; + loadmodel->rotatedmins[i] = -pheader->allradius; + loadmodel->rotatedmaxs[i] = pheader->allradius; + } + loadmodel->radius = pheader->allradius; + loadmodel->radius2 = pheader->allradius * pheader->allradius; + + // load external .skin files if present + skinfiles = Mod_LoadSkinFiles(); + if (loadmodel->numskins < 1) + loadmodel->numskins = 1; + + loadmodel->numframes = pheader->num_frames; + loadmodel->num_bones = pheader->num_bones; + loadmodel->num_poses = loadmodel->num_bones * loadmodel->numframes; + loadmodel->num_textures = loadmodel->nummeshes = loadmodel->nummodelsurfaces = loadmodel->num_surfaces = pheader->num_meshs; + + // do most allocations as one merged chunk + data = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t) + loadmodel->num_surfaces * sizeof(int) + loadmodel->nummeshes * sizeof(surfmesh_t *) + loadmodel->nummeshes * sizeof(surfmesh_t) + loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t) + loadmodel->numskins * sizeof(animscene_t) + loadmodel->num_bones * sizeof(aliasbone_t) + loadmodel->num_poses * sizeof(float[12]) + loadmodel->numframes * sizeof(animscene_t)); + loadmodel->data_surfaces = (void *)data;data += loadmodel->num_surfaces * sizeof(msurface_t); + loadmodel->surfacelist = (void *)data;data += loadmodel->num_surfaces * sizeof(int); + loadmodel->meshlist = (void *)data;data += loadmodel->num_surfaces * sizeof(surfmesh_t *); + loadmodel->data_textures = (void *)data;data += loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t); + loadmodel->skinscenes = (void *)data;data += loadmodel->numskins * sizeof(animscene_t); + loadmodel->data_bones = (void *)data;data += loadmodel->num_bones * sizeof(aliasbone_t); + loadmodel->data_poses = (void *)data;data += loadmodel->num_poses * sizeof(float[12]); + loadmodel->animscenes = (void *)data;data += loadmodel->numframes * sizeof(animscene_t); + for (i = 0;i < loadmodel->numskins;i++) { - int i, *bonecount; - // zymlump_t lump_vertbonecounts; // int vertbonecounts[numvertices]; // how many bones influence each vertex (separate mainly to make this compress better) - loadmodel->alias.zymdata_vertbonecounts = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(int)); - bonecount = (void *) (pheader->lump_vertbonecounts.start + pbase); - for (i = 0;i < pheader->numverts;i++) + loadmodel->skinscenes[i].firstframe = i; + loadmodel->skinscenes[i].framecount = 1; + loadmodel->skinscenes[i].loop = true; + loadmodel->skinscenes[i].framerate = 10; + } + for (i = 0;i < loadmodel->num_surfaces;i++) + { + loadmodel->surfacelist[i] = i; + loadmodel->meshlist[i] = (void *)data;data += sizeof(surfmesh_t); + } + + // load the bone info + bone = (void *) (pbase + pheader->ofs_bones); + for (i = 0;i < loadmodel->num_bones;i++) + { + memcpy(loadmodel->data_bones[i].name, bone[i].name, sizeof(bone[i].name)); + loadmodel->data_bones[i].flags = BigLong(bone[i].flags); + loadmodel->data_bones[i].parent = BigLong(bone[i].parent); + if (loadmodel->data_bones[i].parent >= i) + Host_Error("%s bone[%i].parent >= %i\n", loadmodel->name, i, i); + } + + // load the frames + frame = (void *) (pbase + pheader->ofs_frames); + for (i = 0;i < loadmodel->numframes;i++) + { + const float *poses; + memcpy(loadmodel->animscenes[i].name, frame->name, sizeof(frame->name)); + loadmodel->animscenes[i].firstframe = i; + loadmodel->animscenes[i].framecount = 1; + loadmodel->animscenes[i].loop = true; + loadmodel->animscenes[i].framerate = 10; + // load the bone poses for this frame + poses = (void *) (pbase + BigLong(frame->ofs_bonepositions)); + for (j = 0;j < loadmodel->num_bones*12;j++) + loadmodel->data_poses[i * loadmodel->num_bones*12 + j] = BigFloat(poses[j]); + // stuff not processed here: mins, maxs, yawradius, allradius + frame++; + } + + // load the meshes now + dpmmesh = (void *) (pbase + pheader->ofs_meshs); + for (i = 0;i < loadmodel->num_surfaces;i++) + { + const int *inelements; + int *outelements; + const float *intexcoord; + surfmesh_t *mesh; + msurface_t *surface; + + mesh = loadmodel->meshlist[i]; + mesh->num_triangles = BigLong(dpmmesh->num_tris); + mesh->num_vertices = BigLong(dpmmesh->num_verts); + + // to find out how many weights exist we two a two-stage load... + mesh->num_vertexboneweights = 0; + data = (void *) (pbase + BigLong(dpmmesh->ofs_verts)); + for (j = 0;j < mesh->num_vertices;j++) { - loadmodel->alias.zymdata_vertbonecounts[i] = BigLong(bonecount[i]); - if (loadmodel->alias.zymdata_vertbonecounts[i] < 1) - Host_Error("Mod_ZYMOTICMODEL_Load: bone vertex count < 1 in %s\n", loadmodel->name); + int numweights = BigLong(((dpmvertex_t *)data)->numbones); + mesh->num_vertexboneweights += numweights; + data += sizeof(dpmvertex_t); + data += numweights * sizeof(dpmbonevert_t); } + + // allocate things now that we know how many + mesh->data_vertexboneweights = Mem_Alloc(loadmodel->mempool, mesh->num_vertexboneweights * sizeof(surfmeshvertexboneweight_t)); + mesh->data_element3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3])); + mesh->data_neighbor3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3])); + mesh->data_texcoordtexture2f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * sizeof(float[2])); + + inelements = (void *) (pbase + BigLong(dpmmesh->ofs_indices)); + outelements = mesh->data_element3i; + for (j = 0;j < mesh->num_triangles;j++) + { + // swap element order to flip triangles, because Quake uses clockwise (rare) and dpm uses counterclockwise (standard) + outelements[0] = BigLong(inelements[2]); + outelements[1] = BigLong(inelements[1]); + outelements[2] = BigLong(inelements[0]); + inelements += 3; + outelements += 3; + } + + intexcoord = (void *) (pbase + BigLong(dpmmesh->ofs_texcoords)); + for (j = 0;j < mesh->num_vertices*2;j++) + mesh->data_texcoordtexture2f[j] = BigFloat(intexcoord[j]); + + // now load them for real + mesh->num_vertexboneweights = 0; + data = (void *) (pbase + BigLong(dpmmesh->ofs_verts)); + for (j = 0;j < mesh->num_vertices;j++) + { + int numweights = BigLong(((dpmvertex_t *)data)->numbones); + data += sizeof(dpmvertex_t); + for (k = 0;k < numweights;k++) + { + const dpmbonevert_t *vert = (void *) data; + // stuff not processed here: normal + mesh->data_vertexboneweights[mesh->num_vertexboneweights].vertexindex = j; + mesh->data_vertexboneweights[mesh->num_vertexboneweights].boneindex = BigLong(vert->bonenum); + mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[0] = BigFloat(vert->origin[0]); + mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[1] = BigFloat(vert->origin[1]); + mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[2] = BigFloat(vert->origin[2]); + mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin[3] = BigFloat(vert->influence); + mesh->num_vertexboneweights++; + data += sizeof(dpmbonevert_t); + } + } + + // since dpm models do not have named sections, reuse their shader name as the section name + if (dpmmesh->shadername[0]) + Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures + i, skinfiles, dpmmesh->shadername, dpmmesh->shadername); + else + for (j = 0;j < loadmodel->numskins;j++) + Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + i + j * loadmodel->num_surfaces, NULL); + + Mod_ValidateElements(mesh->data_element3i, mesh->num_triangles, mesh->num_vertices, __FILE__, __LINE__); + Mod_BuildTriangleNeighbors(mesh->data_neighbor3i, mesh->data_element3i, mesh->num_triangles); + Mod_Alias_Mesh_CompileFrameZero(mesh); + + surface = loadmodel->data_surfaces + i; + surface->groupmesh = mesh; + surface->texture = loadmodel->data_textures + i; + surface->num_firsttriangle = 0; + surface->num_triangles = mesh->num_triangles; + surface->num_firstvertex = 0; + surface->num_vertices = mesh->num_vertices; + + dpmmesh++; } +} + +static void Mod_PSKMODEL_AnimKeyToMatrix(float *origin, float *quat, matrix4x4_t *m) +{ + float x = quat[0], y = quat[1], z = quat[2], w = quat[3]; + m->m[0][0]=1-2*(y*y+z*z);m->m[0][1]= 2*(x*y-z*w);m->m[0][2]= 2*(x*z+y*w);m->m[0][3]=origin[0]; + m->m[1][0]= 2*(x*y+z*w);m->m[1][1]=1-2*(x*x+z*z);m->m[1][2]= 2*(y*z-x*w);m->m[1][3]=origin[1]; + m->m[2][0]= 2*(x*z-y*w);m->m[2][1]= 2*(y*z+x*w);m->m[2][2]=1-2*(x*x+y*y);m->m[2][3]=origin[2]; + m->m[3][0]= 0 ;m->m[3][1]= 0 ;m->m[3][2]= 0 ;m->m[3][3]=1; +} +// no idea why PSK/PSA files contain weird quaternions but they do... +#define PSKQUATNEGATIONS +void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend) +{ + int i, j, index, version, recordsize, numrecords; + int numpnts, numvtxw, numfaces, nummatts, numbones, numrawweights, numanimbones, numanims, numanimkeys; + pskpnts_t *pnts; + pskvtxw_t *vtxw; + pskface_t *faces; + pskmatt_t *matts; + pskboneinfo_t *bones; + pskrawweights_t *rawweights; + pskboneinfo_t *animbones; + pskaniminfo_t *anims; + pskanimkeys_t *animkeys; + void *animfilebuffer, *animbuffer, *animbufferend; + pskchunk_t *pchunk; + surfmesh_t *mesh; + skinfile_t *skinfiles; + char animname[MAX_QPATH]; + + pchunk = (void *)buffer; + if (strcmp(pchunk->id, "ACTRHEAD")) + Host_Error ("Mod_PSKMODEL_Load: %s is not a ActorX model\n"); + + loadmodel->type = mod_alias; + loadmodel->DrawSky = NULL; + loadmodel->Draw = R_Q1BSP_Draw; + loadmodel->CompileShadowVolume = R_Q1BSP_CompileShadowVolume; + loadmodel->DrawShadowVolume = R_Q1BSP_DrawShadowVolume; + loadmodel->DrawLight = R_Q1BSP_DrawLight; + loadmodel->TraceBox = Mod_MDLMD2MD3_TraceBox; + loadmodel->flags = 0; // there are no flags on zym models + loadmodel->synctype = ST_RAND; + + // load external .skin files if present + skinfiles = Mod_LoadSkinFiles(); + if (loadmodel->numskins < 1) + loadmodel->numskins = 1; + loadmodel->skinscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numskins * sizeof(animscene_t)); + for (i = 0;i < loadmodel->numskins;i++) { - int i; - zymvertex_t *vertdata; - // zymlump_t lump_verts; // zymvertex_t vert[numvertices]; // see vertex struct - loadmodel->alias.zymdata_verts = Mem_Alloc(loadmodel->mempool, pheader->lump_verts.length); - vertdata = (void *) (pheader->lump_verts.start + pbase); - for (i = 0;i < pheader->lump_verts.length / (int) sizeof(zymvertex_t);i++) + loadmodel->skinscenes[i].firstframe = i; + loadmodel->skinscenes[i].framecount = 1; + loadmodel->skinscenes[i].loop = true; + loadmodel->skinscenes[i].framerate = 10; + } + + FS_StripExtension(loadmodel->name, animname, sizeof(animname)); + strlcat(animname, ".psa", sizeof(animname)); + animbuffer = animfilebuffer = FS_LoadFile(animname, loadmodel->mempool, false); + animbufferend = (void *)((unsigned char*)animbuffer + fs_filesize); + if (animbuffer == NULL) + Host_Error("%s: can't find .psa file (%s)\n", loadmodel->name, animname); + + numpnts = 0; + pnts = NULL; + numvtxw = 0; + vtxw = NULL; + numfaces = 0; + faces = NULL; + nummatts = 0; + matts = NULL; + numbones = 0; + bones = NULL; + numrawweights = 0; + rawweights = NULL; + numanims = 0; + anims = NULL; + numanimkeys = 0; + animkeys = NULL; + + while (buffer < bufferend) + { + pchunk = buffer; + buffer = (void *)((unsigned char *)buffer + sizeof(pskchunk_t)); + version = LittleLong(pchunk->version); + recordsize = LittleLong(pchunk->recordsize); + numrecords = LittleLong(pchunk->numrecords); + if (developer.integer) + Con_Printf("%s: %s %x: %i * %i = %i\n", loadmodel->name, pchunk->id, version, recordsize, numrecords, recordsize * numrecords); + if (version != 0x1e83b9 && version != 0x1e9179 && version != 0x2e) + Con_Printf ("%s: chunk %s has unknown version %x (0x1e83b9, 0x1e9179 and 0x2e are currently supported), trying to load anyway!\n", loadmodel->name, pchunk->id, version); + if (!strcmp(pchunk->id, "ACTRHEAD")) + { + // nothing to do + } + else if (!strcmp(pchunk->id, "PNTS0000")) + { + pskpnts_t *p; + if (recordsize != sizeof(*p)) + Host_Error("%s: %s has unsupported recordsize\n", loadmodel->name, pchunk->id); + // byteswap in place and keep the pointer + numpnts = numrecords; + pnts = buffer; + for (index = 0, p = buffer;index < numrecords;index++, p++) + { + p->origin[0] = LittleFloat(p->origin[0]); + p->origin[1] = LittleFloat(p->origin[1]); + p->origin[2] = LittleFloat(p->origin[2]); + } + buffer = p; + } + else if (!strcmp(pchunk->id, "VTXW0000")) + { + pskvtxw_t *p; + if (recordsize != sizeof(*p)) + Host_Error("%s: %s has unsupported recordsize\n", loadmodel->name, pchunk->id); + // byteswap in place and keep the pointer + numvtxw = numrecords; + vtxw = buffer; + for (index = 0, p = buffer;index < numrecords;index++, p++) + { + p->pntsindex = LittleShort(p->pntsindex); + p->texcoord[0] = LittleFloat(p->texcoord[0]); + p->texcoord[1] = LittleFloat(p->texcoord[1]); + if (p->pntsindex >= numpnts) + { + Con_Printf("%s: vtxw->pntsindex %i >= numpnts %i\n", loadmodel->name, p->pntsindex, numpnts); + p->pntsindex = 0; + } + } + buffer = p; + } + else if (!strcmp(pchunk->id, "FACE0000")) + { + pskface_t *p; + if (recordsize != sizeof(*p)) + Host_Error("%s: %s has unsupported recordsize\n", loadmodel->name, pchunk->id); + // byteswap in place and keep the pointer + numfaces = numrecords; + faces = buffer; + for (index = 0, p = buffer;index < numrecords;index++, p++) + { + p->vtxwindex[0] = LittleShort(p->vtxwindex[0]); + p->vtxwindex[1] = LittleShort(p->vtxwindex[1]); + p->vtxwindex[2] = LittleShort(p->vtxwindex[2]); + p->group = LittleLong(p->group); + if (p->vtxwindex[0] >= numvtxw) + { + Con_Printf("%s: face->vtxwindex[0] %i >= numvtxw %i\n", loadmodel->name, p->vtxwindex[0], numvtxw); + p->vtxwindex[0] = 0; + } + if (p->vtxwindex[1] >= numvtxw) + { + Con_Printf("%s: face->vtxwindex[1] %i >= numvtxw %i\n", loadmodel->name, p->vtxwindex[1], numvtxw); + p->vtxwindex[1] = 0; + } + if (p->vtxwindex[2] >= numvtxw) + { + Con_Printf("%s: face->vtxwindex[2] %i >= numvtxw %i\n", loadmodel->name, p->vtxwindex[2], numvtxw); + p->vtxwindex[2] = 0; + } + } + buffer = p; + } + else if (!strcmp(pchunk->id, "MATT0000")) { - loadmodel->alias.zymdata_verts[i].bonenum = BigLong(vertdata[i].bonenum); - loadmodel->alias.zymdata_verts[i].origin[0] = BigFloat(vertdata[i].origin[0]); - loadmodel->alias.zymdata_verts[i].origin[1] = BigFloat(vertdata[i].origin[1]); - loadmodel->alias.zymdata_verts[i].origin[2] = BigFloat(vertdata[i].origin[2]); + pskmatt_t *p; + if (recordsize != sizeof(*p)) + Host_Error("%s: %s has unsupported recordsize\n", loadmodel->name, pchunk->id); + // byteswap in place and keep the pointer + nummatts = numrecords; + matts = buffer; + for (index = 0, p = buffer;index < numrecords;index++, p++) + { + } + buffer = p; + } + else if (!strcmp(pchunk->id, "REFSKELT")) + { + pskboneinfo_t *p; + if (recordsize != sizeof(*p)) + Host_Error("%s: %s has unsupported recordsize\n", loadmodel->name, pchunk->id); + // byteswap in place and keep the pointer + numbones = numrecords; + bones = buffer; + for (index = 0, p = buffer;index < numrecords;index++, p++) + { + p->numchildren = LittleLong(p->numchildren); + p->parent = LittleLong(p->parent); + p->basepose.quat[0] = LittleFloat(p->basepose.quat[0]); + p->basepose.quat[1] = LittleFloat(p->basepose.quat[1]); + p->basepose.quat[2] = LittleFloat(p->basepose.quat[2]); + p->basepose.quat[3] = LittleFloat(p->basepose.quat[3]); + p->basepose.origin[0] = LittleFloat(p->basepose.origin[0]); + p->basepose.origin[1] = LittleFloat(p->basepose.origin[1]); + p->basepose.origin[2] = LittleFloat(p->basepose.origin[2]); + p->basepose.unknown = LittleFloat(p->basepose.unknown); + p->basepose.size[0] = LittleFloat(p->basepose.size[0]); + p->basepose.size[1] = LittleFloat(p->basepose.size[1]); + p->basepose.size[2] = LittleFloat(p->basepose.size[2]); +#ifdef PSKQUATNEGATIONS + if (index) + { + p->basepose.quat[0] *= -1; + p->basepose.quat[1] *= -1; + p->basepose.quat[2] *= -1; + } + else + { + p->basepose.quat[0] *= 1; + p->basepose.quat[1] *= -1; + p->basepose.quat[2] *= 1; + } +#endif + if (p->parent < 0 || p->parent >= numbones) + { + Con_Printf("%s: bone->parent %i >= numbones %i\n", loadmodel->name, p->parent, numbones); + p->parent = 0; + } + } + buffer = p; + } + else if (!strcmp(pchunk->id, "RAWWEIGHTS")) + { + pskrawweights_t *p; + if (recordsize != sizeof(*p)) + Host_Error("%s: %s has unsupported recordsize\n", loadmodel->name, pchunk->id); + // byteswap in place and keep the pointer + numrawweights = numrecords; + rawweights = buffer; + for (index = 0, p = buffer;index < numrecords;index++, p++) + { + p->weight = LittleFloat(p->weight); + p->pntsindex = LittleLong(p->pntsindex); + p->boneindex = LittleLong(p->boneindex); + if (p->pntsindex < 0 || p->pntsindex >= numpnts) + { + Con_Printf("%s: weight->pntsindex %i >= numpnts %i\n", loadmodel->name, p->pntsindex, numpnts); + p->pntsindex = 0; + } + if (p->boneindex < 0 || p->boneindex >= numbones) + { + Con_Printf("%s: weight->boneindex %i >= numbones %i\n", loadmodel->name, p->boneindex, numbones); + p->boneindex = 0; + } + } + buffer = p; } } + while (animbuffer < animbufferend) { - int i; - float *intexcoord2f, *outtexcoord2f; - // zymlump_t lump_texcoords; // float texcoords[numvertices][2]; - loadmodel->alias.zymdata_texcoords = outtexcoord2f = Mem_Alloc(loadmodel->mempool, pheader->numverts * sizeof(float[2])); - intexcoord2f = (void *) (pheader->lump_texcoords.start + pbase); - for (i = 0;i < pheader->numverts;i++) + pchunk = animbuffer; + animbuffer = (void *)((unsigned char *)animbuffer + sizeof(pskchunk_t)); + version = LittleLong(pchunk->version); + recordsize = LittleLong(pchunk->recordsize); + numrecords = LittleLong(pchunk->numrecords); + if (developer.integer) + Con_Printf("%s: %s %x: %i * %i = %i\n", animname, pchunk->id, version, recordsize, numrecords, recordsize * numrecords); + if (version != 0x1e83b9 && version != 0x1e9179 && version != 0x2e) + Con_Printf ("%s: chunk %s has unknown version %x (0x1e83b9, 0x1e9179 and 0x2e are currently supported), trying to load anyway!\n", animname, pchunk->id, version); + if (!strcmp(pchunk->id, "ANIMHEAD")) + { + // nothing to do + } + else if (!strcmp(pchunk->id, "BONENAMES")) + { + pskboneinfo_t *p; + if (recordsize != sizeof(*p)) + Host_Error("%s: %s has unsupported recordsize\n", animname, pchunk->id); + // byteswap in place and keep the pointer + numanimbones = numrecords; + animbones = animbuffer; + // NOTE: supposedly psa does not need to match the psk model, the + // bones missing from the psa would simply use their base + // positions from the psk, but this is hard for me to implement + // and people can easily make animations that match. + if (numanimbones != numbones) + Host_Error("%s: this loader only supports animations with the same bones as the mesh\n"); + for (index = 0, p = animbuffer;index < numrecords;index++, p++) + { + p->numchildren = LittleLong(p->numchildren); + p->parent = LittleLong(p->parent); + p->basepose.quat[0] = LittleFloat(p->basepose.quat[0]); + p->basepose.quat[1] = LittleFloat(p->basepose.quat[1]); + p->basepose.quat[2] = LittleFloat(p->basepose.quat[2]); + p->basepose.quat[3] = LittleFloat(p->basepose.quat[3]); + p->basepose.origin[0] = LittleFloat(p->basepose.origin[0]); + p->basepose.origin[1] = LittleFloat(p->basepose.origin[1]); + p->basepose.origin[2] = LittleFloat(p->basepose.origin[2]); + p->basepose.unknown = LittleFloat(p->basepose.unknown); + p->basepose.size[0] = LittleFloat(p->basepose.size[0]); + p->basepose.size[1] = LittleFloat(p->basepose.size[1]); + p->basepose.size[2] = LittleFloat(p->basepose.size[2]); +#ifdef PSKQUATNEGATIONS + if (index) + { + p->basepose.quat[0] *= -1; + p->basepose.quat[1] *= -1; + p->basepose.quat[2] *= -1; + } + else + { + p->basepose.quat[0] *= 1; + p->basepose.quat[1] *= -1; + p->basepose.quat[2] *= 1; + } +#endif + if (p->parent < 0 || p->parent >= numanimbones) + { + Con_Printf("%s: bone->parent %i >= numanimbones %i\n", animname, p->parent, numanimbones); + p->parent = 0; + } + // check that bones are the same as in the base + if (strcmp(p->name, bones[index].name) || p->parent != bones[index].parent) + Host_Error("%s: this loader only supports animations with the same bones as the mesh\n", animname); + } + animbuffer = p; + } + else if (!strcmp(pchunk->id, "ANIMINFO")) + { + pskaniminfo_t *p; + if (recordsize != sizeof(*p)) + Host_Error("%s: %s has unsupported recordsize\n", animname, pchunk->id); + // byteswap in place and keep the pointer + numanims = numrecords; + anims = animbuffer; + for (index = 0, p = animbuffer;index < numrecords;index++, p++) + { + p->numbones = LittleLong(p->numbones); + p->playtime = LittleFloat(p->playtime); + p->fps = LittleFloat(p->fps); + p->firstframe = LittleLong(p->firstframe); + p->numframes = LittleLong(p->numframes); + if (p->numbones != numbones) + { + Con_Printf("%s: animinfo->numbones != numbones, trying to load anyway!\n", animname); + } + } + animbuffer = p; + } + else if (!strcmp(pchunk->id, "ANIMKEYS")) { - outtexcoord2f[i*2+0] = BigFloat(intexcoord2f[i*2+0]); - // flip T coordinate for OpenGL - outtexcoord2f[i*2+1] = 1 - BigFloat(intexcoord2f[i*2+1]); + pskanimkeys_t *p; + if (recordsize != sizeof(*p)) + Host_Error("%s: %s has unsupported recordsize\n", animname, pchunk->id); + numanimkeys = numrecords; + animkeys = animbuffer; + for (index = 0, p = animbuffer;index < numrecords;index++, p++) + { + p->origin[0] = LittleFloat(p->origin[0]); + p->origin[1] = LittleFloat(p->origin[1]); + p->origin[2] = LittleFloat(p->origin[2]); + p->quat[0] = LittleFloat(p->quat[0]); + p->quat[1] = LittleFloat(p->quat[1]); + p->quat[2] = LittleFloat(p->quat[2]); + p->quat[3] = LittleFloat(p->quat[3]); + p->frametime = LittleFloat(p->frametime); +#ifdef PSKQUATNEGATIONS + if (index % numbones) + { + p->quat[0] *= -1; + p->quat[1] *= -1; + p->quat[2] *= -1; + } + else + { + p->quat[0] *= 1; + p->quat[1] *= -1; + p->quat[2] *= 1; + } +#endif + } + animbuffer = p; + // TODO: allocate bonepose stuff } + else + Con_Printf("%s: unknown chunk ID \"%s\"\n", animname, pchunk->id); } + if (!numpnts || !pnts || !numvtxw || !vtxw || !numfaces || !faces || !nummatts || !matts || !numbones || !bones || !numrawweights || !rawweights || !numanims || !anims || !numanimkeys || !animkeys) + Host_Error("%s: missing required chunks\n", loadmodel->name); + + // FIXME: model bbox + // model bbox + for (i = 0;i < 3;i++) + { + loadmodel->normalmins[i] = -128; + loadmodel->normalmaxs[i] = 128; + loadmodel->yawmins[i] = -128; + loadmodel->yawmaxs[i] = 128; + loadmodel->rotatedmins[i] = -128; + loadmodel->rotatedmaxs[i] = 128; + } + loadmodel->radius = 128; + loadmodel->radius2 = loadmodel->radius * loadmodel->radius; + + loadmodel->numframes = 0; + for (index = 0;index < numanims;index++) + loadmodel->numframes += anims[index].numframes; + + loadmodel->num_bones = numbones; + loadmodel->num_poses = loadmodel->num_bones * loadmodel->numframes; + loadmodel->num_textures = loadmodel->nummeshes = loadmodel->nummodelsurfaces = loadmodel->num_surfaces = nummatts; + + if (numanimkeys != loadmodel->num_bones * loadmodel->numframes) + Host_Error("%s: %s has incorrect number of animation keys\n", animname, pchunk->id); + + loadmodel->data_poses = Mem_Alloc(loadmodel->mempool, loadmodel->num_poses * sizeof(float[12])); + loadmodel->animscenes = Mem_Alloc(loadmodel->mempool, loadmodel->numframes * sizeof(animscene_t)); + loadmodel->data_textures = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * loadmodel->numskins * sizeof(texture_t)); + loadmodel->data_surfaces = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(msurface_t)); + loadmodel->surfacelist = Mem_Alloc(loadmodel->mempool, loadmodel->num_surfaces * sizeof(int)); + loadmodel->data_bones = Mem_Alloc(loadmodel->mempool, loadmodel->num_bones * sizeof(aliasbone_t)); + + loadmodel->meshlist = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t *)); + mesh = loadmodel->meshlist[0] = Mem_Alloc(loadmodel->mempool, sizeof(surfmesh_t)); + mesh->num_vertices = numvtxw; + mesh->num_triangles = numfaces; + mesh->data_element3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3])); + mesh->data_neighbor3i = Mem_Alloc(loadmodel->mempool, mesh->num_triangles * sizeof(int[3])); + mesh->data_texcoordtexture2f = Mem_Alloc(loadmodel->mempool, mesh->num_vertices * sizeof(float[2])); + + // create surfaces + for (index = 0, i = 0;index < nummatts;index++) { - int i, count, *renderlist, *renderlistend, *outrenderlist; - // zymlump_t lump_render; // int renderlist[rendersize]; // sorted by shader with run lengths (int count), shaders are sequentially used, each run can be used with glDrawElements (each triangle is 3 int indices) - loadmodel->alias.zymdata_renderlist = Mem_Alloc(loadmodel->mempool, pheader->lump_render.length); - // byteswap, validate, and swap winding order of tris - count = pheader->numshaders * sizeof(int) + pheader->numtris * sizeof(int[3]); - if (pheader->lump_render.length != count) - Host_Error("Mod_ZYMOTICMODEL_Load: renderlist is wrong size in %s (is %i bytes, should be %i bytes)\n", loadmodel->name, pheader->lump_render.length, count); - outrenderlist = loadmodel->alias.zymdata_renderlist = Mem_Alloc(loadmodel->mempool, count); - renderlist = (void *) (pheader->lump_render.start + pbase); - renderlistend = (void *) ((qbyte *) renderlist + pheader->lump_render.length); - for (i = 0;i < pheader->numshaders;i++) + // since psk models do not have named sections, reuse their shader name as the section name + if (matts[index].name[0]) + Mod_BuildAliasSkinsFromSkinFiles(loadmodel->data_textures + index, skinfiles, matts[index].name, matts[index].name); + else + for (j = 0;j < loadmodel->numskins;j++) + Mod_BuildAliasSkinFromSkinFrame(loadmodel->data_textures + index + j * loadmodel->num_surfaces, NULL); + loadmodel->surfacelist[index] = index; + loadmodel->data_surfaces[index].groupmesh = loadmodel->meshlist[0]; + loadmodel->data_surfaces[index].texture = loadmodel->data_textures + index; + loadmodel->data_surfaces[index].num_firstvertex = 0; + loadmodel->data_surfaces[index].num_vertices = loadmodel->meshlist[0]->num_vertices; + } + + // copy over the texcoords + for (index = 0;index < numvtxw;index++) + { + mesh->data_texcoordtexture2f[index*2+0] = vtxw[index].texcoord[0]; + mesh->data_texcoordtexture2f[index*2+1] = vtxw[index].texcoord[1]; + } + + // loading the faces is complicated because we need to sort them into surfaces by mattindex + for (index = 0;index < numfaces;index++) + loadmodel->data_surfaces[faces[index].mattindex].num_triangles++; + for (index = 0, i = 0;index < nummatts;index++) + { + loadmodel->data_surfaces[index].num_firsttriangle = i; + i += loadmodel->data_surfaces[index].num_triangles; + loadmodel->data_surfaces[index].num_triangles = 0; + } + for (index = 0;index < numfaces;index++) + { + i = (loadmodel->data_surfaces[faces[index].mattindex].num_firsttriangle + loadmodel->data_surfaces[faces[index].mattindex].num_triangles++)*3; + mesh->data_element3i[i+0] = faces[index].vtxwindex[0]; + mesh->data_element3i[i+1] = faces[index].vtxwindex[1]; + mesh->data_element3i[i+2] = faces[index].vtxwindex[2]; + } + + // copy over the bones + for (index = 0;index < numbones;index++) + { + strlcpy(loadmodel->data_bones[index].name, bones[index].name, sizeof(loadmodel->data_bones[index].name)); + loadmodel->data_bones[index].parent = (index || bones[index].parent > 0) ? bones[index].parent : -1; + if (loadmodel->data_bones[index].parent >= index) + Host_Error("%s bone[%i].parent >= %i\n", loadmodel->name, index, index); + } + + // build bone-relative vertex weights from the psk point weights + mesh->num_vertexboneweights = 0; + for (index = 0;index < numvtxw;index++) + for (j = 0;j < numrawweights;j++) + if (rawweights[j].pntsindex == vtxw[index].pntsindex) + mesh->num_vertexboneweights++; + mesh->data_vertexboneweights = Mem_Alloc(loadmodel->mempool, mesh->num_vertexboneweights * sizeof(surfmeshvertexboneweight_t)); + mesh->num_vertexboneweights = 0; + for (index = 0;index < numvtxw;index++) + { + for (j = 0;j < numrawweights;j++) { - if (renderlist >= renderlistend) - Host_Error("Mod_ZYMOTICMODEL_Load: corrupt renderlist in %s (wrong size)\n", loadmodel->name); - count = BigLong(*renderlist);renderlist++; - if (renderlist + count * 3 > renderlistend) - Host_Error("Mod_ZYMOTICMODEL_Load: corrupt renderlist in %s (wrong size)\n", loadmodel->name); - *outrenderlist++ = count; - while (count--) + if (rawweights[j].pntsindex == vtxw[index].pntsindex) { - outrenderlist[2] = BigLong(renderlist[0]); - outrenderlist[1] = BigLong(renderlist[1]); - outrenderlist[0] = BigLong(renderlist[2]); - if ((unsigned int)outrenderlist[0] >= (unsigned int)pheader->numverts - || (unsigned int)outrenderlist[1] >= (unsigned int)pheader->numverts - || (unsigned int)outrenderlist[2] >= (unsigned int)pheader->numverts) - Host_Error("Mod_ZYMOTICMODEL_Load: corrupt renderlist in %s (out of bounds index)\n", loadmodel->name); - renderlist += 3; - outrenderlist += 3; + matrix4x4_t matrix, inversematrix; + mesh->data_vertexboneweights[mesh->num_vertexboneweights].vertexindex = index; + mesh->data_vertexboneweights[mesh->num_vertexboneweights].boneindex = rawweights[j].boneindex; + mesh->data_vertexboneweights[mesh->num_vertexboneweights].weight = rawweights[j].weight; + Matrix4x4_CreateIdentity(&matrix); + for (i = rawweights[j].boneindex;i >= 0;i = loadmodel->data_bones[i].parent) + { + matrix4x4_t childmatrix, tempmatrix; + Mod_PSKMODEL_AnimKeyToMatrix(bones[i].basepose.origin, bones[i].basepose.quat, &tempmatrix); + childmatrix = matrix; + Matrix4x4_Concat(&matrix, &tempmatrix, &childmatrix); + } + Matrix4x4_Invert_Simple(&inversematrix, &matrix); + Matrix4x4_Transform(&inversematrix, pnts[rawweights[j].pntsindex].origin, mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin); + VectorScale(mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin, mesh->data_vertexboneweights[mesh->num_vertexboneweights].weight, mesh->data_vertexboneweights[mesh->num_vertexboneweights].origin); + mesh->num_vertexboneweights++; } } } + // set up the animscenes based on the anims + for (index = 0, i = 0;index < numanims;index++) { - int i; - char *shadername; - // zymlump_t lump_shaders; // char shadername[numshaders][32]; // shaders used on this model - loadmodel->alias.zymdata_textures = Mem_Alloc(loadmodel->mempool, pheader->numshaders * sizeof(rtexture_t *)); - shadername = (void *) (pheader->lump_shaders.start + pbase); - for (i = 0;i < pheader->numshaders;i++) - loadmodel->alias.zymdata_textures[i] = loadtextureimage(loadmodel->texturepool, shadername + i * 32, 0, 0, true, TEXF_ALPHA | TEXF_PRECACHE | (r_mipskins.integer ? TEXF_MIPMAP : 0)); + for (j = 0;j < anims[index].numframes;j++, i++) + { + dpsnprintf(loadmodel->animscenes[i].name, sizeof(loadmodel->animscenes[i].name), "%s_%d", anims[index].name, j); + loadmodel->animscenes[i].firstframe = i; + loadmodel->animscenes[i].framecount = 1; + loadmodel->animscenes[i].loop = true; + loadmodel->animscenes[i].framerate = 10; + } } + // load the poses from the animkeys + for (index = 0;index < numanimkeys;index++) { - // zymlump_t lump_trizone; // byte trizone[numtris]; // see trizone explanation - loadmodel->alias.zymdata_trizone = Mem_Alloc(loadmodel->mempool, pheader->numtris); - memcpy(loadmodel->alias.zymdata_trizone, (void *) (pheader->lump_trizone.start + pbase), pheader->numtris); + matrix4x4_t matrix; + Mod_PSKMODEL_AnimKeyToMatrix(animkeys[index].origin, animkeys[index].quat, &matrix); + loadmodel->data_poses[index*12+0] = matrix.m[0][0]; + loadmodel->data_poses[index*12+1] = matrix.m[0][1]; + loadmodel->data_poses[index*12+2] = matrix.m[0][2]; + loadmodel->data_poses[index*12+3] = matrix.m[0][3]; + loadmodel->data_poses[index*12+4] = matrix.m[1][0]; + loadmodel->data_poses[index*12+5] = matrix.m[1][1]; + loadmodel->data_poses[index*12+6] = matrix.m[1][2]; + loadmodel->data_poses[index*12+7] = matrix.m[1][3]; + loadmodel->data_poses[index*12+8] = matrix.m[2][0]; + loadmodel->data_poses[index*12+9] = matrix.m[2][1]; + loadmodel->data_poses[index*12+10] = matrix.m[2][2]; + loadmodel->data_poses[index*12+11] = matrix.m[2][3]; } + + // compile extra data we want + Mod_ValidateElements(mesh->data_element3i, mesh->num_triangles, mesh->num_vertices, __FILE__, __LINE__); + Mod_BuildTriangleNeighbors(mesh->data_neighbor3i, mesh->data_element3i, mesh->num_triangles); + Mod_Alias_Mesh_CompileFrameZero(mesh); + + Mem_Free(animfilebuffer); }