X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_models.c;h=7edf394ecb7e80c20d99d5ad6ed945503ab2de78;hp=815ddb480a1edf7c7b402788b454e2b4ef7c57a7;hb=af8286fa99958a1ac89a091f09bc48e1ee225e65;hpb=63e01393ed618f8561aee961acfc8a25bb30eb7f diff --git a/gl_models.c b/gl_models.c index 815ddb48..7edf394e 100644 --- a/gl_models.c +++ b/gl_models.c @@ -1,7 +1,6 @@ #include "quakedef.h" -//cvar_t gl_transform = {0, "gl_transform", "1"}; cvar_t r_quickmodels = {0, "r_quickmodels", "1"}; typedef struct @@ -21,48 +20,6 @@ float *aliasvertnorm; int *aliasvertusage; zymbonematrix *zymbonepose; -rmeshinfo_t aliasmeshinfo; - -/* -void GL_SetupModelTransform (vec3_t origin, vec3_t angles, vec_t scale) -{ - glTranslatef (origin[0], origin[1], origin[2]); - - if (scale != 1) - glScalef (scale, scale, scale); - if (angles[1]) - glRotatef (angles[1], 0, 0, 1); - if (angles[0]) - glRotatef (-angles[0], 0, 1, 0); - if (angles[2]) - glRotatef (angles[2], 1, 0, 0); -} -*/ - -/* -rtexturepool_t *chrometexturepool; -rtexture_t *chrometexture; - -// currently unused reflection effect texture -void makechrometexture(void) -{ - int i; - qbyte noise[64*64]; - qbyte data[64*64][4]; - - fractalnoise(noise, 64, 8); - - // convert to RGBA data - for (i = 0;i < 64*64;i++) - { - data[i][0] = data[i][1] = data[i][2] = noise[i]; - data[i][3] = 255; - } - - chrometexture = R_LoadTexture (chrometexturepool, "chrometexture", 64, 64, &data[0][0], TEXTYPE_RGBA, TEXF_MIPMAP | TEXF_PRECACHE); -} -*/ - mempool_t *gl_models_mempool; void gl_models_start(void) @@ -75,13 +32,10 @@ void gl_models_start(void) aliasvertcolor2 = Mem_Alloc(gl_models_mempool, sizeof(float[MD2MAX_VERTS][4])); // used temporarily for tinted coloring zymbonepose = Mem_Alloc(gl_models_mempool, sizeof(zymbonematrix[256])); aliasvertusage = Mem_Alloc(gl_models_mempool, sizeof(int[MD2MAX_VERTS])); - //chrometexturepool = R_AllocTexturePool(); - //makechrometexture(); } void gl_models_shutdown(void) { - //R_FreeTexturePool(&chrometexturepool); Mem_FreePool(&gl_models_mempool); } @@ -91,48 +45,42 @@ void gl_models_newmap(void) void GL_Models_Init(void) { -// Cvar_RegisterVariable(&gl_transform); Cvar_RegisterVariable(&r_quickmodels); R_RegisterModule("GL_Models", gl_models_start, gl_models_shutdown, gl_models_newmap); } +/* void R_AliasTransformVerts(int vertcount) { vec3_t point; float *av; -// float *avn; av = aliasvert; -// avn = aliasvertnorm; while (vertcount >= 4) { VectorCopy(av, point);softwaretransform(point, av);av += 4; VectorCopy(av, point);softwaretransform(point, av);av += 4; VectorCopy(av, point);softwaretransform(point, av);av += 4; VectorCopy(av, point);softwaretransform(point, av);av += 4; -// VectorCopy(avn, point);softwaretransformdirection(point, avn);avn += 3; -// VectorCopy(avn, point);softwaretransformdirection(point, avn);avn += 3; -// VectorCopy(avn, point);softwaretransformdirection(point, avn);avn += 3; -// VectorCopy(avn, point);softwaretransformdirection(point, avn);avn += 3; vertcount -= 4; } while(vertcount > 0) { VectorCopy(av, point);softwaretransform(point, av);av += 4; -// VectorCopy(avn, point);softwaretransformdirection(point, avn);avn += 3; vertcount--; } } +*/ void R_AliasLerpVerts(int vertcount, - float lerp1, trivertx_t *verts1, vec3_t fscale1, vec3_t translate1, - float lerp2, trivertx_t *verts2, vec3_t fscale2, vec3_t translate2, - float lerp3, trivertx_t *verts3, vec3_t fscale3, vec3_t translate3, - float lerp4, trivertx_t *verts4, vec3_t fscale4, vec3_t translate4) + float lerp1, const trivertx_t *verts1, const vec3_t fscale1, const vec3_t translate1, + float lerp2, const trivertx_t *verts2, const vec3_t fscale2, const vec3_t translate2, + float lerp3, const trivertx_t *verts3, const vec3_t fscale3, const vec3_t translate3, + float lerp4, const trivertx_t *verts4, const vec3_t fscale4, const vec3_t translate4) { int i; vec3_t scale1, scale2, scale3, scale4, translate; - float *n1, *n2, *n3, *n4; + const float *n1, *n2, *n3, *n4; float *av, *avn; av = aliasvert; avn = aliasvertnorm; @@ -252,325 +200,294 @@ void R_AliasLerpVerts(int vertcount, } } -void R_DrawModelMesh(rtexture_t *skin, float *colors, float cred, float cgreen, float cblue) -{ - aliasmeshinfo.tex[0] = R_GetTexture(skin); - aliasmeshinfo.color = colors; - if (colors == NULL) - { - aliasmeshinfo.cr = cred; - aliasmeshinfo.cg = cgreen; - aliasmeshinfo.cb = cblue; - aliasmeshinfo.ca = currentrenderentity->alpha; - } - - c_alias_polys += aliasmeshinfo.numtriangles; - R_Mesh_Draw(&aliasmeshinfo); - - // leave it in a state for additional passes - aliasmeshinfo.blendfunc1 = GL_SRC_ALPHA; - aliasmeshinfo.blendfunc2 = GL_ONE; -} - -void R_TintModel(float *in, float *out, int verts, float r, float g, float b) +skinframe_t *R_FetchSkinFrame(const entity_render_t *ent) { - int i; - for (i = 0;i < verts;i++) - { - out[0] = in[0] * r; - out[1] = in[1] * g; - out[2] = in[2] * b; - out[3] = in[3]; - in += 4; - out += 4; - } -} - -skinframe_t *R_FetchSkinFrame(void) -{ - model_t *model = currentrenderentity->model; - if (model->skinscenes[currentrenderentity->skinnum].framecount > 1) - return &model->skinframes[model->skinscenes[currentrenderentity->skinnum].firstframe + (int) (cl.time * 10) % model->skinscenes[currentrenderentity->skinnum].framecount]; + model_t *model = ent->model; + unsigned int s = (unsigned int) ent->skinnum; + if (s >= model->numskins) + s = 0; + if (model->skinscenes[s].framecount > 1) + return &model->skinframes[model->skinscenes[s].firstframe + (int) (cl.time * 10) % model->skinscenes[s].framecount]; else - return &model->skinframes[model->skinscenes[currentrenderentity->skinnum].firstframe]; + return &model->skinframes[model->skinscenes[s].firstframe]; } -void R_SetupMDLMD2Frames(float colorr, float colorg, float colorb) +void R_SetupMDLMD2Frames(const entity_render_t *ent, float colorr, float colorg, float colorb) { - md2frame_t *frame1, *frame2, *frame3, *frame4; - trivertx_t *frame1verts, *frame2verts, *frame3verts, *frame4verts; - model_t *model; - model = currentrenderentity->model; - - frame1 = &model->mdlmd2data_frames[currentrenderentity->frameblend[0].frame]; - frame2 = &model->mdlmd2data_frames[currentrenderentity->frameblend[1].frame]; - frame3 = &model->mdlmd2data_frames[currentrenderentity->frameblend[2].frame]; - frame4 = &model->mdlmd2data_frames[currentrenderentity->frameblend[3].frame]; - frame1verts = &model->mdlmd2data_pose[currentrenderentity->frameblend[0].frame * model->numverts]; - frame2verts = &model->mdlmd2data_pose[currentrenderentity->frameblend[1].frame * model->numverts]; - frame3verts = &model->mdlmd2data_pose[currentrenderentity->frameblend[2].frame * model->numverts]; - frame4verts = &model->mdlmd2data_pose[currentrenderentity->frameblend[3].frame * model->numverts]; + const md2frame_t *frame1, *frame2, *frame3, *frame4; + const trivertx_t *frame1verts, *frame2verts, *frame3verts, *frame4verts; + const model_t *model = ent->model; + + frame1 = &model->mdlmd2data_frames[ent->frameblend[0].frame]; + frame2 = &model->mdlmd2data_frames[ent->frameblend[1].frame]; + frame3 = &model->mdlmd2data_frames[ent->frameblend[2].frame]; + frame4 = &model->mdlmd2data_frames[ent->frameblend[3].frame]; + frame1verts = &model->mdlmd2data_pose[ent->frameblend[0].frame * model->numverts]; + frame2verts = &model->mdlmd2data_pose[ent->frameblend[1].frame * model->numverts]; + frame3verts = &model->mdlmd2data_pose[ent->frameblend[2].frame * model->numverts]; + frame4verts = &model->mdlmd2data_pose[ent->frameblend[3].frame * model->numverts]; R_AliasLerpVerts(model->numverts, - currentrenderentity->frameblend[0].lerp, frame1verts, frame1->scale, frame1->translate, - currentrenderentity->frameblend[1].lerp, frame2verts, frame2->scale, frame2->translate, - currentrenderentity->frameblend[2].lerp, frame3verts, frame3->scale, frame3->translate, - currentrenderentity->frameblend[3].lerp, frame4verts, frame4->scale, frame4->translate); + ent->frameblend[0].lerp, frame1verts, frame1->scale, frame1->translate, + ent->frameblend[1].lerp, frame2verts, frame2->scale, frame2->translate, + ent->frameblend[2].lerp, frame3verts, frame3->scale, frame3->translate, + ent->frameblend[3].lerp, frame4verts, frame4->scale, frame4->translate); - R_LightModel(model->numverts, colorr, colorg, colorb, false); + R_LightModel(ent, model->numverts, colorr, colorg, colorb, false); - R_AliasTransformVerts(model->numverts); + //R_AliasTransformVerts(model->numverts); } -void R_DrawQ1Q2AliasModel (float fog) +void R_DrawQ1Q2AliasModelCallback (const void *calldata1, int calldata2) { + int i, c, pantsfullbright, shirtfullbright, colormapped; + float pantscolor[3], shirtcolor[3]; + float fog; + vec3_t diff; + qbyte *bcolor; + rmeshbufferinfo_t m; model_t *model; skinframe_t *skinframe; + const entity_render_t *ent = calldata1; + int blendfunc1, blendfunc2; - model = currentrenderentity->model; +// softwaretransformforentity(ent); - skinframe = R_FetchSkinFrame(); - if (fog && !(currentrenderentity->effects & EF_ADDITIVE)) + fog = 0; + if (fogenabled) { - R_SetupMDLMD2Frames(1 - fog, 1 - fog, 1 - fog); + VectorSubtract(ent->origin, r_origin, diff); + fog = DotProduct(diff,diff); + if (fog < 0.01f) + fog = 0.01f; + fog = exp(fogdensity/fog); + if (fog > 1) + fog = 1; + if (fog < 0.01f) + fog = 0; + // fog method: darken, additive fog + // 1. render model as normal, scaled by inverse of fog alpha (darkens it) + // 2. render fog as additive + } - memset(&aliasmeshinfo, 0, sizeof(aliasmeshinfo)); + model = ent->model; - aliasmeshinfo.vertex = aliasvert; - aliasmeshinfo.vertexstep = sizeof(float[4]); - aliasmeshinfo.numverts = model->numverts; - aliasmeshinfo.numtriangles = model->numtris; - aliasmeshinfo.index = model->mdlmd2data_indices; - aliasmeshinfo.colorstep = sizeof(float[4]); - aliasmeshinfo.texcoords[0] = model->mdlmd2data_texcoords; - aliasmeshinfo.texcoordstep[0] = sizeof(float[2]); + skinframe = R_FetchSkinFrame(ent); - if (currentrenderentity->effects & EF_ADDITIVE) - { - aliasmeshinfo.transparent = true; - aliasmeshinfo.blendfunc1 = GL_SRC_ALPHA; - aliasmeshinfo.blendfunc2 = GL_ONE; - } - else if (currentrenderentity->alpha != 1.0 || skinframe->fog != NULL) - { - aliasmeshinfo.transparent = true; - aliasmeshinfo.blendfunc1 = GL_SRC_ALPHA; - aliasmeshinfo.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; - } - else - { - aliasmeshinfo.transparent = false; - aliasmeshinfo.blendfunc1 = GL_ONE; - aliasmeshinfo.blendfunc2 = GL_ZERO; - } + if (ent->effects & EF_ADDITIVE) + { + blendfunc1 = GL_SRC_ALPHA; + blendfunc2 = GL_ONE; + } + else if (ent->alpha != 1.0 || skinframe->fog != NULL) + { + blendfunc1 = GL_SRC_ALPHA; + blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + } + else + { + blendfunc1 = GL_ONE; + blendfunc2 = GL_ZERO; + } - if (skinframe->base || skinframe->pants || skinframe->shirt || skinframe->glow || skinframe->merged) + if (!skinframe->base && !skinframe->pants && !skinframe->shirt && !skinframe->glow) + { + // untextured + memset(&m, 0, sizeof(m)); + m.blendfunc1 = blendfunc1; + m.blendfunc2 = blendfunc2; + m.numtriangles = model->numtris; + m.numverts = model->numverts; + m.tex[0] = R_GetTexture(r_notexture); + m.matrix = ent->matrix; + + c_alias_polys += m.numtriangles; + if (R_Mesh_Draw_GetBuffer(&m, true)) { - if (currentrenderentity->colormap >= 0 && (skinframe->base || skinframe->pants || skinframe->shirt)) - { - int c; - qbyte *color; - if (skinframe->base) - R_DrawModelMesh(skinframe->base, aliasvertcolor, 0, 0, 0); - if (skinframe->pants) - { - c = (currentrenderentity->colormap & 0xF) << 4;c += (c >= 128 && c < 224) ? 4 : 12; // 128-224 are backwards ranges - color = (qbyte *) (&d_8to24table[c]); - if (c >= 224) // fullbright ranges - R_DrawModelMesh(skinframe->pants, NULL, color[0] * (1.0f / 255.0f), color[1] * (1.0f / 255.0f), color[2] * (1.0f / 255.0f)); - else - { - R_TintModel(aliasvertcolor, aliasvertcolor2, model->numverts, color[0] * (1.0f / 255.0f), color[1] * (1.0f / 255.0f), color[2] * (1.0f / 255.0f)); - R_DrawModelMesh(skinframe->pants, aliasvertcolor2, 0, 0, 0); - } - } - if (skinframe->shirt) - { - c = currentrenderentity->colormap & 0xF0 ;c += (c >= 128 && c < 224) ? 4 : 12; // 128-224 are backwards ranges - color = (qbyte *) (&d_8to24table[c]); - if (c >= 224) // fullbright ranges - R_DrawModelMesh(skinframe->shirt, NULL, color[0] * (1.0f / 255.0f), color[1] * (1.0f / 255.0f), color[2] * (1.0f / 255.0f)); - else - { - R_TintModel(aliasvertcolor, aliasvertcolor2, model->numverts, color[0] * (1.0f / 255.0f), color[1] * (1.0f / 255.0f), color[2] * (1.0f / 255.0f)); - R_DrawModelMesh(skinframe->shirt, aliasvertcolor2, 0, 0, 0); - } - } - } - else - { - if (skinframe->merged) - R_DrawModelMesh(skinframe->merged, aliasvertcolor, 0, 0, 0); - else - { - if (skinframe->base) R_DrawModelMesh(skinframe->base, aliasvertcolor, 0, 0, 0); - if (skinframe->pants) R_DrawModelMesh(skinframe->pants, aliasvertcolor, 0, 0, 0); - if (skinframe->shirt) R_DrawModelMesh(skinframe->shirt, aliasvertcolor, 0, 0, 0); - } - } - if (skinframe->glow) R_DrawModelMesh(skinframe->glow, NULL, 1 - fog, 1 - fog, 1 - fog); + memcpy(m.index, model->mdlmd2data_indices, m.numtriangles * sizeof(int[3])); + for (i = 0;i < m.numverts * 2;i++) + m.texcoords[0][i] = model->mdlmd2data_texcoords[i] * 8.0f; + + aliasvert = m.vertex; + aliasvertcolor = m.color; + R_SetupMDLMD2Frames(ent, m.colorscale, m.colorscale, m.colorscale); + aliasvert = aliasvertbuf; + aliasvertcolor = aliasvertcolorbuf; + + R_Mesh_Render(); } - else - R_DrawModelMesh(0, NULL, 1 - fog, 1 - fog, 1 - fog); + return; + } - aliasmeshinfo.tex[0] = R_GetTexture(skinframe->fog); - aliasmeshinfo.blendfunc1 = GL_SRC_ALPHA; - aliasmeshinfo.blendfunc2 = GL_ONE; - aliasmeshinfo.color = NULL; - aliasmeshinfo.cr = fogcolor[0]; - aliasmeshinfo.cg = fogcolor[1]; - aliasmeshinfo.cb = fogcolor[2]; - aliasmeshinfo.ca = currentrenderentity->alpha * fog; + colormapped = !skinframe->merged || (ent->colormap >= 0 && skinframe->base && (skinframe->pants || skinframe->shirt)); + if (!colormapped && !fog && !skinframe->glow && !skinframe->fog) + { + // fastpath for the normal situation (one texture) + memset(&m, 0, sizeof(m)); + m.blendfunc1 = blendfunc1; + m.blendfunc2 = blendfunc2; + m.numtriangles = model->numtris; + m.numverts = model->numverts; + m.tex[0] = R_GetTexture(skinframe->merged); + m.matrix = ent->matrix; + + c_alias_polys += m.numtriangles; + if (R_Mesh_Draw_GetBuffer(&m, true)) + { + memcpy(m.index, model->mdlmd2data_indices, m.numtriangles * sizeof(int[3])); + memcpy(m.texcoords[0], model->mdlmd2data_texcoords, m.numverts * sizeof(float[2])); - c_alias_polys += aliasmeshinfo.numtriangles; - R_Mesh_Draw(&aliasmeshinfo); + aliasvert = m.vertex; + aliasvertcolor = m.color; + R_SetupMDLMD2Frames(ent, m.colorscale, m.colorscale, m.colorscale); + aliasvert = aliasvertbuf; + aliasvertcolor = aliasvertcolorbuf; + + R_Mesh_Render(); + } + return; } - else if (currentrenderentity->colormap >= 0 || !skinframe->merged || skinframe->glow || !r_quickmodels.integer) - { - R_SetupMDLMD2Frames(1 - fog, 1 - fog, 1 - fog); - memset(&aliasmeshinfo, 0, sizeof(aliasmeshinfo)); + R_SetupMDLMD2Frames(ent, 1 - fog, 1 - fog, 1 - fog); - aliasmeshinfo.vertex = aliasvert; - aliasmeshinfo.vertexstep = sizeof(float[4]); - aliasmeshinfo.numverts = model->numverts; - aliasmeshinfo.numtriangles = model->numtris; - aliasmeshinfo.index = model->mdlmd2data_indices; - aliasmeshinfo.colorstep = sizeof(float[4]); - aliasmeshinfo.texcoords[0] = model->mdlmd2data_texcoords; - aliasmeshinfo.texcoordstep[0] = sizeof(float[2]); + if (colormapped) + { + // 128-224 are backwards ranges + c = (ent->colormap & 0xF) << 4;c += (c >= 128 && c < 224) ? 4 : 12; + bcolor = (qbyte *) (&d_8to24table[c]); + pantsfullbright = c >= 224; + VectorScale(bcolor, (1.0f / 255.0f), pantscolor); + c = (ent->colormap & 0xF0);c += (c >= 128 && c < 224) ? 4 : 12; + bcolor = (qbyte *) (&d_8to24table[c]); + shirtfullbright = c >= 224; + VectorScale(bcolor, (1.0f / 255.0f), shirtcolor); + } + else + { + pantscolor[0] = pantscolor[1] = pantscolor[2] = shirtcolor[0] = shirtcolor[1] = shirtcolor[2] = 1; + pantsfullbright = shirtfullbright = false; + } - if (currentrenderentity->effects & EF_ADDITIVE) - { - aliasmeshinfo.transparent = true; - aliasmeshinfo.blendfunc1 = GL_SRC_ALPHA; - aliasmeshinfo.blendfunc2 = GL_ONE; - } - else if (currentrenderentity->alpha != 1.0 || skinframe->fog != NULL) - { - aliasmeshinfo.transparent = true; - aliasmeshinfo.blendfunc1 = GL_SRC_ALPHA; - aliasmeshinfo.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; - } - else - { - aliasmeshinfo.transparent = false; - aliasmeshinfo.blendfunc1 = GL_ONE; - aliasmeshinfo.blendfunc2 = GL_ZERO; - } + memset(&m, 0, sizeof(m)); + m.blendfunc1 = blendfunc1; + m.blendfunc2 = blendfunc2; + m.numtriangles = model->numtris; + m.numverts = model->numverts; + m.matrix = ent->matrix; + m.tex[0] = colormapped ? R_GetTexture(skinframe->base) : R_GetTexture(skinframe->merged); + if (m.tex[0] && R_Mesh_Draw_GetBuffer(&m, true)) + { + blendfunc1 = GL_SRC_ALPHA; + blendfunc2 = GL_ONE; + c_alias_polys += m.numtriangles; + R_ModulateColors(aliasvertcolor, m.color, m.numverts, m.colorscale, m.colorscale, m.colorscale); + memcpy(m.index, model->mdlmd2data_indices, m.numtriangles * sizeof(int[3])); + memcpy(m.vertex, aliasvert, m.numverts * sizeof(float[4])); + memcpy(m.texcoords[0], model->mdlmd2data_texcoords, m.numverts * sizeof(float[2])); + R_Mesh_Render(); + } - if (skinframe->base || skinframe->pants || skinframe->shirt || skinframe->glow || skinframe->merged) + if (colormapped) + { + if (skinframe->pants) { - if (currentrenderentity->colormap >= 0 && (skinframe->base || skinframe->pants || skinframe->shirt)) + memset(&m, 0, sizeof(m)); + m.blendfunc1 = blendfunc1; + m.blendfunc2 = blendfunc2; + m.numtriangles = model->numtris; + m.numverts = model->numverts; + m.matrix = ent->matrix; + m.tex[0] = R_GetTexture(skinframe->pants); + if (m.tex[0] && R_Mesh_Draw_GetBuffer(&m, true)) { - int c; - qbyte *color; - if (skinframe->base) - R_DrawModelMesh(skinframe->base, aliasvertcolor, 0, 0, 0); - if (skinframe->pants) - { - c = (currentrenderentity->colormap & 0xF) << 4;c += (c >= 128 && c < 224) ? 4 : 12; // 128-224 are backwards ranges - color = (qbyte *) (&d_8to24table[c]); - if (c >= 224) // fullbright ranges - R_DrawModelMesh(skinframe->pants, NULL, color[0] * (1.0f / 255.0f), color[1] * (1.0f / 255.0f), color[2] * (1.0f / 255.0f)); - else - { - R_TintModel(aliasvertcolor, aliasvertcolor2, model->numverts, color[0] * (1.0f / 255.0f), color[1] * (1.0f / 255.0f), color[2] * (1.0f / 255.0f)); - R_DrawModelMesh(skinframe->pants, aliasvertcolor2, 0, 0, 0); - } - } - if (skinframe->shirt) - { - c = currentrenderentity->colormap & 0xF0 ;c += (c >= 128 && c < 224) ? 4 : 12; // 128-224 are backwards ranges - color = (qbyte *) (&d_8to24table[c]); - if (c >= 224) // fullbright ranges - R_DrawModelMesh(skinframe->shirt, NULL, color[0] * (1.0f / 255.0f), color[1] * (1.0f / 255.0f), color[2] * (1.0f / 255.0f)); - else - { - R_TintModel(aliasvertcolor, aliasvertcolor2, model->numverts, color[0] * (1.0f / 255.0f), color[1] * (1.0f / 255.0f), color[2] * (1.0f / 255.0f)); - R_DrawModelMesh(skinframe->shirt, aliasvertcolor2, 0, 0, 0); - } - } + blendfunc1 = GL_SRC_ALPHA; + blendfunc2 = GL_ONE; + c_alias_polys += m.numtriangles; + if (pantsfullbright) + R_FillColors(m.color, m.numverts, pantscolor[0] * m.colorscale, pantscolor[1] * m.colorscale, pantscolor[2] * m.colorscale, ent->alpha); + else + R_ModulateColors(aliasvertcolor, m.color, m.numverts, pantscolor[0] * m.colorscale, pantscolor[1] * m.colorscale, pantscolor[2] * m.colorscale); + memcpy(m.index, model->mdlmd2data_indices, m.numtriangles * sizeof(int[3])); + memcpy(m.vertex, aliasvert, m.numverts * sizeof(float[4])); + memcpy(m.texcoords[0], model->mdlmd2data_texcoords, m.numverts * sizeof(float[2])); + R_Mesh_Render(); } - else + } + if (skinframe->shirt) + { + memset(&m, 0, sizeof(m)); + m.blendfunc1 = blendfunc1; + m.blendfunc2 = blendfunc2; + m.numtriangles = model->numtris; + m.numverts = model->numverts; + m.matrix = ent->matrix; + m.tex[0] = R_GetTexture(skinframe->shirt); + if (m.tex[0] && R_Mesh_Draw_GetBuffer(&m, true)) { - if (skinframe->merged) - R_DrawModelMesh(skinframe->merged, aliasvertcolor, 0, 0, 0); + blendfunc1 = GL_SRC_ALPHA; + blendfunc2 = GL_ONE; + c_alias_polys += m.numtriangles; + if (shirtfullbright) + R_FillColors(m.color, m.numverts, shirtcolor[0] * m.colorscale, shirtcolor[1] * m.colorscale, shirtcolor[2] * m.colorscale, ent->alpha); else - { - if (skinframe->base) R_DrawModelMesh(skinframe->base, aliasvertcolor, 0, 0, 0); - if (skinframe->pants) R_DrawModelMesh(skinframe->pants, aliasvertcolor, 0, 0, 0); - if (skinframe->shirt) R_DrawModelMesh(skinframe->shirt, aliasvertcolor, 0, 0, 0); - } + R_ModulateColors(aliasvertcolor, m.color, m.numverts, shirtcolor[0] * m.colorscale, shirtcolor[1] * m.colorscale, shirtcolor[2] * m.colorscale); + memcpy(m.index, model->mdlmd2data_indices, m.numtriangles * sizeof(int[3])); + memcpy(m.vertex, aliasvert, m.numverts * sizeof(float[4])); + memcpy(m.texcoords[0], model->mdlmd2data_texcoords, m.numverts * sizeof(float[2])); + R_Mesh_Render(); } - if (skinframe->glow) R_DrawModelMesh(skinframe->glow, NULL, 1 - fog, 1 - fog, 1 - fog); } - else - R_DrawModelMesh(0, NULL, 1 - fog, 1 - fog, 1 - fog); } - else + if (skinframe->glow) { - rmeshbufferinfo_t bufmesh; - memset(&bufmesh, 0, sizeof(bufmesh)); - if (currentrenderentity->effects & EF_ADDITIVE) + memset(&m, 0, sizeof(m)); + m.blendfunc1 = blendfunc1; + m.blendfunc2 = blendfunc2; + m.numtriangles = model->numtris; + m.numverts = model->numverts; + m.matrix = ent->matrix; + m.tex[0] = R_GetTexture(skinframe->glow); + if (m.tex[0] && R_Mesh_Draw_GetBuffer(&m, true)) { - bufmesh.transparent = true; - bufmesh.blendfunc1 = GL_SRC_ALPHA; - bufmesh.blendfunc2 = GL_ONE; + blendfunc1 = GL_SRC_ALPHA; + blendfunc2 = GL_ONE; + c_alias_polys += m.numtriangles; + R_FillColors(m.color, m.numverts, (1 - fog) * m.colorscale, (1 - fog) * m.colorscale, (1 - fog) * m.colorscale, ent->alpha); + memcpy(m.index, model->mdlmd2data_indices, m.numtriangles * sizeof(int[3])); + memcpy(m.vertex, aliasvert, m.numverts * sizeof(float[4])); + memcpy(m.texcoords[0], model->mdlmd2data_texcoords, m.numverts * sizeof(float[2])); + R_Mesh_Render(); } - else if (currentrenderentity->alpha != 1.0 || skinframe->fog != NULL) - { - bufmesh.transparent = true; - bufmesh.blendfunc1 = GL_SRC_ALPHA; - bufmesh.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; - } - else + } + if (fog) + { + memset(&m, 0, sizeof(m)); + m.blendfunc1 = GL_SRC_ALPHA; + m.blendfunc2 = GL_ONE; + m.numtriangles = model->numtris; + m.numverts = model->numverts; + m.matrix = ent->matrix; + m.tex[0] = R_GetTexture(skinframe->fog); + if (R_Mesh_Draw_GetBuffer(&m, true)) { - bufmesh.transparent = false; - bufmesh.blendfunc1 = GL_ONE; - bufmesh.blendfunc2 = GL_ZERO; + c_alias_polys += m.numtriangles; + R_FillColors(m.color, m.numverts, fogcolor[0] * fog * m.colorscale, fogcolor[1] * fog * m.colorscale, fogcolor[2] * fog * m.colorscale, ent->alpha); + memcpy(m.index, model->mdlmd2data_indices, m.numtriangles * sizeof(int[3])); + memcpy(m.vertex, aliasvert, m.numverts * sizeof(float[4])); + memcpy(m.texcoords[0], model->mdlmd2data_texcoords, m.numverts * sizeof(float[2])); + R_Mesh_Render(); } - bufmesh.numtriangles = model->numtris; - bufmesh.numverts = model->numverts; - bufmesh.tex[0] = R_GetTexture(skinframe->merged); - - R_Mesh_Draw_GetBuffer(&bufmesh); - - aliasvert = bufmesh.vertex; - aliasvertcolor = bufmesh.color; - memcpy(bufmesh.index, model->mdlmd2data_indices, bufmesh.numtriangles * sizeof(int[3])); - memcpy(bufmesh.texcoords[0], model->mdlmd2data_texcoords, bufmesh.numverts * sizeof(float[2])); - - fog = bufmesh.colorscale * (1 - fog); - R_SetupMDLMD2Frames(fog, fog, fog); - - aliasvert = aliasvertbuf; - aliasvertcolor = aliasvertcolorbuf; } } -int ZymoticLerpBones(int count, zymbonematrix *bonebase, frameblend_t *blend, zymbone_t *bone) +int ZymoticLerpBones(int count, const zymbonematrix *bonebase, const frameblend_t *blend, const zymbone_t *bone) { int i; float lerp1, lerp2, lerp3, lerp4; - zymbonematrix *out, rootmatrix, m, *bone1, *bone2, *bone3, *bone4; + zymbonematrix *out, rootmatrix, m; + const zymbonematrix *bone1, *bone2, *bone3, *bone4; /* - m.m[0][0] = 0; - m.m[0][1] = -1; - m.m[0][2] = 0; - m.m[0][3] = 0; - m.m[1][0] = 1; - m.m[1][1] = 0; - m.m[1][2] = 0; - m.m[1][3] = 0; - m.m[2][0] = 0; - m.m[2][1] = 0; - m.m[2][2] = 1; - m.m[2][3] = 0; - R_ConcatTransforms(&softwaretransform_matrix[0], &m.m[0], &rootmatrix.m[0]); - */ - // LordHavoc: combine transform from zym coordinate space to quake coordinate space with model to world transform matrix rootmatrix.m[0][0] = softwaretransform_matrix[0][1]; rootmatrix.m[0][1] = -softwaretransform_matrix[0][0]; @@ -584,6 +501,19 @@ int ZymoticLerpBones(int count, zymbonematrix *bonebase, frameblend_t *blend, zy rootmatrix.m[2][1] = -softwaretransform_matrix[2][0]; rootmatrix.m[2][2] = softwaretransform_matrix[2][2]; rootmatrix.m[2][3] = softwaretransform_matrix[2][3]; + */ + rootmatrix.m[0][0] = 1; + rootmatrix.m[0][1] = 0; + rootmatrix.m[0][2] = 0; + rootmatrix.m[0][3] = 0; + rootmatrix.m[1][0] = 0; + rootmatrix.m[1][1] = 1; + rootmatrix.m[1][2] = 0; + rootmatrix.m[1][3] = 0; + rootmatrix.m[2][0] = 0; + rootmatrix.m[2][1] = 0; + rootmatrix.m[2][2] = 1; + rootmatrix.m[2][3] = 0; bone1 = bonebase + blend[0].frame * count; lerp1 = blend[0].lerp; @@ -616,9 +546,9 @@ int ZymoticLerpBones(int count, zymbonematrix *bonebase, frameblend_t *blend, zy m.m[2][2] = bone1->m[2][2] * lerp1 + bone2->m[2][2] * lerp2 + bone3->m[2][2] * lerp3 + bone4->m[2][2] * lerp4; m.m[2][3] = bone1->m[2][3] * lerp1 + bone2->m[2][3] * lerp2 + bone3->m[2][3] * lerp3 + bone4->m[2][3] * lerp4; if (bone->parent >= 0) - R_ConcatTransforms(&zymbonepose[bone->parent].m[0], &m.m[0], &out->m[0]); + R_ConcatTransforms(&zymbonepose[bone->parent].m[0][0], &m.m[0][0], &out->m[0][0]); else - R_ConcatTransforms(&rootmatrix.m[0], &m.m[0], &out->m[0]); + R_ConcatTransforms(&rootmatrix.m[0][0], &m.m[0][0], &out->m[0][0]); bone1++; bone2++; bone3++; @@ -645,9 +575,9 @@ int ZymoticLerpBones(int count, zymbonematrix *bonebase, frameblend_t *blend, zy m.m[2][2] = bone1->m[2][2] * lerp1 + bone2->m[2][2] * lerp2 + bone3->m[2][2] * lerp3; m.m[2][3] = bone1->m[2][3] * lerp1 + bone2->m[2][3] * lerp2 + bone3->m[2][3] * lerp3; if (bone->parent >= 0) - R_ConcatTransforms(&zymbonepose[bone->parent].m[0], &m.m[0], &out->m[0]); + R_ConcatTransforms(&zymbonepose[bone->parent].m[0][0], &m.m[0][0], &out->m[0][0]); else - R_ConcatTransforms(&rootmatrix.m[0], &m.m[0], &out->m[0]); + R_ConcatTransforms(&rootmatrix.m[0][0], &m.m[0][0], &out->m[0][0]); bone1++; bone2++; bone3++; @@ -674,9 +604,9 @@ int ZymoticLerpBones(int count, zymbonematrix *bonebase, frameblend_t *blend, zy m.m[2][2] = bone1->m[2][2] * lerp1 + bone2->m[2][2] * lerp2; m.m[2][3] = bone1->m[2][3] * lerp1 + bone2->m[2][3] * lerp2; if (bone->parent >= 0) - R_ConcatTransforms(&zymbonepose[bone->parent].m[0], &m.m[0], &out->m[0]); + R_ConcatTransforms(&zymbonepose[bone->parent].m[0][0], &m.m[0][0], &out->m[0][0]); else - R_ConcatTransforms(&rootmatrix.m[0], &m.m[0], &out->m[0]); + R_ConcatTransforms(&rootmatrix.m[0][0], &m.m[0][0], &out->m[0][0]); bone1++; bone2++; bone++; @@ -705,9 +635,9 @@ int ZymoticLerpBones(int count, zymbonematrix *bonebase, frameblend_t *blend, zy m.m[2][2] = bone1->m[2][2] * lerp1; m.m[2][3] = bone1->m[2][3] * lerp1; if (bone->parent >= 0) - R_ConcatTransforms(&zymbonepose[bone->parent].m[0], &m.m[0], &out->m[0]); + R_ConcatTransforms(&zymbonepose[bone->parent].m[0][0], &m.m[0][0], &out->m[0][0]); else - R_ConcatTransforms(&rootmatrix.m[0], &m.m[0], &out->m[0]); + R_ConcatTransforms(&rootmatrix.m[0][0], &m.m[0][0], &out->m[0][0]); bone1++; bone++; } @@ -718,9 +648,9 @@ int ZymoticLerpBones(int count, zymbonematrix *bonebase, frameblend_t *blend, zy for (i = 0, out = zymbonepose;i < count;i++, out++) { if (bone->parent >= 0) - R_ConcatTransforms(&zymbonepose[bone->parent].m[0], &bone1->m[0], &out->m[0]); + R_ConcatTransforms(&zymbonepose[bone->parent].m[0][0], &bone1->m[0][0], &out->m[0][0]); else - R_ConcatTransforms(&rootmatrix.m[0], &bone1->m[0], &out->m[0]); + R_ConcatTransforms(&rootmatrix.m[0][0], &bone1->m[0][0], &out->m[0][0]); bone1++; bone++; } @@ -825,129 +755,132 @@ void ZymoticCalcNormals(int vertcount, int shadercount, int *renderlist) } } -void R_DrawZymoticModelMesh(zymtype1header_t *m) +void R_DrawZymoticModelMeshCallback (const void *calldata1, int calldata2) { + float fog; + vec3_t diff; int i, *renderlist; - rtexture_t **texture; + zymtype1header_t *m; + rtexture_t *texture; + rmeshbufferinfo_t mbuf; + const entity_render_t *ent = calldata1; + int shadernum = calldata2; - // FIXME: do better fog + // find the vertex index list and texture + m = ent->model->zymdata_header; renderlist = (int *)(m->lump_render.start + (int) m); - texture = (rtexture_t **)(m->lump_shaders.start + (int) m); - - aliasmeshinfo.vertex = aliasvert; - aliasmeshinfo.vertexstep = sizeof(float[4]); - aliasmeshinfo.color = aliasvertcolor; - aliasmeshinfo.colorstep = sizeof(float[4]); - aliasmeshinfo.texcoords[0] = (float *)(m->lump_texcoords.start + (int) m); - aliasmeshinfo.texcoordstep[0] = sizeof(float[2]); + for (i = 0;i < shadernum;i++) + renderlist += renderlist[0] * 3 + 1; + texture = ((rtexture_t **)(m->lump_shaders.start + (int) m))[shadernum]; - for (i = 0;i < m->numshaders;i++) + fog = 0; + if (fogenabled) { - aliasmeshinfo.tex[0] = R_GetTexture(texture[i]); - if (currentrenderentity->effects & EF_ADDITIVE) - { - aliasmeshinfo.transparent = true; - aliasmeshinfo.blendfunc1 = GL_SRC_ALPHA; - aliasmeshinfo.blendfunc2 = GL_ONE; - } - else if (currentrenderentity->alpha != 1.0 || R_TextureHasAlpha(texture[i])) - { - aliasmeshinfo.transparent = true; - aliasmeshinfo.blendfunc1 = GL_SRC_ALPHA; - aliasmeshinfo.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; - } - else - { - aliasmeshinfo.transparent = false; - aliasmeshinfo.blendfunc1 = GL_ONE; - aliasmeshinfo.blendfunc2 = GL_ZERO; - } - aliasmeshinfo.numtriangles = *renderlist++; - aliasmeshinfo.index = renderlist; - c_alias_polys += aliasmeshinfo.numtriangles; - R_Mesh_Draw(&aliasmeshinfo); - renderlist += aliasmeshinfo.numtriangles * 3; + VectorSubtract(ent->origin, r_origin, diff); + fog = DotProduct(diff,diff); + if (fog < 0.01f) + fog = 0.01f; + fog = exp(fogdensity/fog); + if (fog > 1) + fog = 1; + if (fog < 0.01f) + fog = 0; + // fog method: darken, additive fog + // 1. render model as normal, scaled by inverse of fog alpha (darkens it) + // 2. render fog as additive } -} -void R_DrawZymoticModelMeshFog(vec3_t org, zymtype1header_t *m, float fog) -{ - int i, *renderlist; - - // FIXME: do better fog - renderlist = (int *)(m->lump_render.start + (int) m); + ZymoticLerpBones(m->numbones, (zymbonematrix *)(m->lump_poses.start + (int) m), ent->frameblend, (zymbone_t *)(m->lump_bones.start + (int) m)); + ZymoticTransformVerts(m->numverts, (int *)(m->lump_vertbonecounts.start + (int) m), (zymvertex_t *)(m->lump_verts.start + (int) m)); + ZymoticCalcNormals(m->numverts, m->numshaders, (int *)(m->lump_render.start + (int) m)); - aliasmeshinfo.tex[0] = 0; - aliasmeshinfo.blendfunc1 = GL_SRC_ALPHA; - aliasmeshinfo.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + R_LightModel(ent, m->numverts, 1 - fog, 1 - fog, 1 - fog, false); - aliasmeshinfo.cr = fogcolor[0]; - aliasmeshinfo.cg = fogcolor[1]; - aliasmeshinfo.cb = fogcolor[2]; - aliasmeshinfo.ca = currentrenderentity->alpha * fog; + memset(&mbuf, 0, sizeof(mbuf)); + mbuf.numverts = m->numverts; + mbuf.numtriangles = renderlist[0]; + if (ent->effects & EF_ADDITIVE) + { + mbuf.blendfunc1 = GL_SRC_ALPHA; + mbuf.blendfunc2 = GL_ONE; + } + else if (ent->alpha != 1.0 || R_TextureHasAlpha(texture)) + { + mbuf.blendfunc1 = GL_SRC_ALPHA; + mbuf.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + } + else + { + mbuf.blendfunc1 = GL_ONE; + mbuf.blendfunc2 = GL_ZERO; + } + mbuf.tex[0] = R_GetTexture(texture); + mbuf.matrix = ent->matrix; + if (R_Mesh_Draw_GetBuffer(&mbuf, true)) + { + c_alias_polys += mbuf.numtriangles; + memcpy(mbuf.index, renderlist + 1, mbuf.numtriangles * sizeof(int[3])); + memcpy(mbuf.vertex, aliasvert, mbuf.numverts * sizeof(float[4])); + R_ModulateColors(aliasvertcolor, mbuf.color, mbuf.numverts, mbuf.colorscale, mbuf.colorscale, mbuf.colorscale); + //memcpy(mbuf.color, aliasvertcolor, mbuf.numverts * sizeof(float[4])); + memcpy(mbuf.texcoords[0], (float *)(m->lump_texcoords.start + (int) m), mbuf.numverts * sizeof(float[2])); + R_Mesh_Render(); + } - for (i = 0;i < m->numshaders;i++) + if (fog) { - aliasmeshinfo.numtriangles = *renderlist++; - aliasmeshinfo.index = renderlist; - c_alias_polys += aliasmeshinfo.numtriangles; - R_Mesh_Draw(&aliasmeshinfo); - renderlist += aliasmeshinfo.numtriangles * 3; + memset(&mbuf, 0, sizeof(mbuf)); + mbuf.numverts = m->numverts; + mbuf.numtriangles = renderlist[0]; + mbuf.blendfunc1 = GL_SRC_ALPHA; + mbuf.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + // FIXME: need alpha mask for fogging... + //mbuf.tex[0] = R_GetTexture(texture); + mbuf.matrix = ent->matrix; + if (R_Mesh_Draw_GetBuffer(&mbuf, false)) + { + c_alias_polys += mbuf.numtriangles; + memcpy(mbuf.index, renderlist + 1, mbuf.numtriangles * sizeof(int[3])); + memcpy(mbuf.vertex, aliasvert, mbuf.numverts * sizeof(float[4])); + R_FillColors(mbuf.color, mbuf.numverts, fogcolor[0] * mbuf.colorscale, fogcolor[1] * mbuf.colorscale, fogcolor[2] * mbuf.colorscale, ent->alpha * fog); + //memcpy(mbuf.texcoords[0], (float *)(m->lump_texcoords.start + (int) m), mbuf.numverts * sizeof(float[2])); + R_Mesh_Render(); + } } } -void R_DrawZymoticModel (float fog) +void R_DrawZymoticModel (entity_render_t *ent) { + int i; zymtype1header_t *m; + rtexture_t *texture; - // FIXME: do better fog - m = currentrenderentity->model->zymdata_header; - ZymoticLerpBones(m->numbones, (zymbonematrix *)(m->lump_poses.start + (int) m), currentrenderentity->frameblend, (zymbone_t *)(m->lump_bones.start + (int) m)); - ZymoticTransformVerts(m->numverts, (int *)(m->lump_vertbonecounts.start + (int) m), (zymvertex_t *)(m->lump_verts.start + (int) m)); - ZymoticCalcNormals(m->numverts, m->numshaders, (int *)(m->lump_render.start + (int) m)); - - R_LightModel(m->numverts, 1 - fog, 1 - fog, 1 - fog, true); - - memset(&aliasmeshinfo, 0, sizeof(aliasmeshinfo)); - aliasmeshinfo.numverts = m->numverts; + if (ent->alpha < (1.0f / 64.0f)) + return; // basically completely transparent - R_DrawZymoticModelMesh(m); + c_models++; - if (fog) - R_DrawZymoticModelMeshFog(currentrenderentity->origin, m, fog); + m = ent->model->zymdata_header; + for (i = 0;i < m->numshaders;i++) + { + texture = ((rtexture_t **)(m->lump_shaders.start + (int) m))[i]; + if (ent->effects & EF_ADDITIVE || ent->alpha != 1.0 || R_TextureHasAlpha(texture)) + R_MeshQueue_AddTransparent(ent->origin, R_DrawZymoticModelMeshCallback, ent, i); + else + R_MeshQueue_Add(R_DrawZymoticModelMeshCallback, ent, i); + } } -void R_DrawAliasModel (void) +void R_DrawQ1Q2AliasModel(entity_render_t *ent) { - float fog; - vec3_t diff; - - if (currentrenderentity->alpha < (1.0f / 64.0f)) + if (ent->alpha < (1.0f / 64.0f)) return; // basically completely transparent c_models++; - softwaretransformforentity(currentrenderentity); - - fog = 0; - if (fogenabled) - { - VectorSubtract(currentrenderentity->origin, r_origin, diff); - fog = DotProduct(diff,diff); - if (fog < 0.01f) - fog = 0.01f; - fog = exp(fogdensity/fog); - if (fog > 1) - fog = 1; - if (fog < 0.01f) - fog = 0; - // fog method: darken, additive fog - // 1. render model as normal, scaled by inverse of fog alpha (darkens it) - // 2. render fog as additive - } - - if (currentrenderentity->model->aliastype == ALIASTYPE_ZYM) - R_DrawZymoticModel(fog); + if (ent->effects & EF_ADDITIVE || ent->alpha != 1.0 || R_FetchSkinFrame(ent)->fog != NULL) + R_MeshQueue_AddTransparent(ent->origin, R_DrawQ1Q2AliasModelCallback, ent, 0); else - R_DrawQ1Q2AliasModel(fog); + R_MeshQueue_Add(R_DrawQ1Q2AliasModelCallback, ent, 0); } +