X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_models.c;h=223be1b81b87af20c877d54b988831638ee23e9e;hp=b382588fa4f444934900e106c489f903aca4cd93;hb=e2d030eaf3d5c507bce6dd15619973d02f4b9d00;hpb=4b03014f14b7275c799bcf7727c7339727180459;ds=sidebyside diff --git a/gl_models.c b/gl_models.c index b382588f..223be1b8 100644 --- a/gl_models.c +++ b/gl_models.c @@ -9,34 +9,66 @@ typedef struct } zymbonematrix; // LordHavoc: vertex arrays - -float *aliasvertcolorbuf; -float *aliasvertcolor; // this may point at aliasvertcolorbuf or at vertex arrays in the mesh backend -float *aliasvert_svectors; -float *aliasvert_tvectors; -float *aliasvert_normals; - -float *aliasvertcolor2; +int aliasvertmax = 0; +void *aliasvertarrays = NULL; +float *aliasvertcolor4fbuf = NULL; +float *aliasvertcolor4f = NULL; // this may point at aliasvertcolorbuf or at vertex arrays in the mesh backend +float *aliasvert_vertex3f = NULL; +float *aliasvert_svector3f = NULL; +float *aliasvert_tvector3f = NULL; +float *aliasvert_normal3f = NULL; + +float *aliasvertcolor2_4f = NULL; int *aliasvertusage; zymbonematrix *zymbonepose; mempool_t *gl_models_mempool; +#define expandaliasvert(newmax) if ((newmax) > aliasvertmax) gl_models_allocarrays(newmax) + +void gl_models_allocarrays(int newmax) +{ + qbyte *data; + aliasvertmax = newmax; + if (aliasvertarrays != NULL) + Mem_Free(aliasvertarrays); + aliasvertarrays = Mem_Alloc(gl_models_mempool, aliasvertmax * (sizeof(float[4+4+3+3+3+3]) + sizeof(int[3]))); + data = aliasvertarrays; + aliasvertcolor4f = aliasvertcolor4fbuf = (void *)data;data += aliasvertmax * sizeof(float[4]); + aliasvertcolor2_4f = (void *)data;data += aliasvertmax * sizeof(float[4]); // used temporarily for tinted coloring + aliasvert_vertex3f = (void *)data;data += aliasvertmax * sizeof(float[3]); + aliasvert_svector3f = (void *)data;data += aliasvertmax * sizeof(float[3]); + aliasvert_tvector3f = (void *)data;data += aliasvertmax * sizeof(float[3]); + aliasvert_normal3f = (void *)data;data += aliasvertmax * sizeof(float[3]); + aliasvertusage = (void *)data;data += aliasvertmax * sizeof(int[3]); +} + +void gl_models_freearrays(void) +{ + aliasvertmax = 0; + if (aliasvertarrays != NULL) + Mem_Free(aliasvertarrays); + aliasvertarrays = NULL; + aliasvertcolor4f = aliasvertcolor4fbuf = NULL; + aliasvertcolor2_4f = NULL; + aliasvert_vertex3f = NULL; + aliasvert_svector3f = NULL; + aliasvert_tvector3f = NULL; + aliasvert_normal3f = NULL; + aliasvertusage = NULL; +} + void gl_models_start(void) { // allocate vertex processing arrays gl_models_mempool = Mem_AllocPool("GL_Models"); - aliasvertcolor = aliasvertcolorbuf = Mem_Alloc(gl_models_mempool, sizeof(float[MD2MAX_VERTS][4])); - aliasvert_svectors = Mem_Alloc(gl_models_mempool, sizeof(float[MD2MAX_VERTS][4])); - aliasvert_tvectors = Mem_Alloc(gl_models_mempool, sizeof(float[MD2MAX_VERTS][4])); - aliasvert_normals = Mem_Alloc(gl_models_mempool, sizeof(float[MD2MAX_VERTS][4])); - 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])); + gl_models_allocarrays(4096); } void gl_models_shutdown(void) { + gl_models_freearrays(); Mem_FreePool(&gl_models_mempool); } @@ -49,174 +81,101 @@ void GL_Models_Init(void) R_RegisterModule("GL_Models", gl_models_start, gl_models_shutdown, gl_models_newmap); } -void R_Model_Alias_GetVerts(const entity_render_t *ent, float *vertices, float *normals, float *svectors, float *tvectors) +#define MODELARRAY_VERTEX 0 +#define MODELARRAY_SVECTOR 1 +#define MODELARRAY_TVECTOR 2 +#define MODELARRAY_NORMAL 3 + +void R_Model_Alias_GetMesh_Array3f(const entity_render_t *ent, const aliasmesh_t *mesh, int whicharray, float *out3f) { int i, vertcount; float lerp1, lerp2, lerp3, lerp4; - const aliasvertex_t *verts1, *verts2, *verts3, *verts4; + const float *vertsbase, *verts1, *verts2, *verts3, *verts4; - if (vertices == NULL) - Host_Error("R_Model_Alias_GetVerts: vertices == NULL.\n"); - if (svectors != NULL && (tvectors == NULL || normals == NULL)) - Host_Error("R_Model_Alias_GetVerts: svectors requires tvectors and normals.\n"); - if (tvectors != NULL && (svectors == NULL || normals == NULL)) - Host_Error("R_Model_Alias_GetVerts: tvectors requires svectors and normals.\n"); + switch(whicharray) + { + case MODELARRAY_VERTEX:vertsbase = mesh->data_aliasvertex3f;break; + case MODELARRAY_SVECTOR:vertsbase = mesh->data_aliassvector3f;break; + case MODELARRAY_TVECTOR:vertsbase = mesh->data_aliastvector3f;break; + case MODELARRAY_NORMAL:vertsbase = mesh->data_aliasnormal3f;break; + default: + Host_Error("R_Model_Alias_GetBlendedArray: unknown whicharray %i\n", whicharray); + return; + } - vertcount = ent->model->numverts; - verts1 = ent->model->mdlmd2data_pose + ent->frameblend[0].frame * vertcount; + vertcount = mesh->num_vertices; + verts1 = vertsbase + ent->frameblend[0].frame * vertcount * 3; lerp1 = ent->frameblend[0].lerp; if (ent->frameblend[1].lerp) { - verts2 = ent->model->mdlmd2data_pose + ent->frameblend[1].frame * vertcount; + verts2 = vertsbase + ent->frameblend[1].frame * vertcount * 3; lerp2 = ent->frameblend[1].lerp; if (ent->frameblend[2].lerp) { - verts3 = ent->model->mdlmd2data_pose + ent->frameblend[2].frame * vertcount; + verts3 = vertsbase + ent->frameblend[2].frame * vertcount * 3; lerp3 = ent->frameblend[2].lerp; if (ent->frameblend[3].lerp) { - verts4 = ent->model->mdlmd2data_pose + ent->frameblend[3].frame * vertcount; + verts4 = vertsbase + ent->frameblend[3].frame * vertcount * 3; lerp4 = ent->frameblend[3].lerp; - // generate vertices - if (svectors != NULL) - { - for (i = 0;i < vertcount;i++, vertices += 4, normals += 4, svectors += 4, tvectors += 4, verts1++, verts2++, verts3++, verts4++) - { - VectorMAMAMAM(lerp1, verts1->origin, lerp2, verts2->origin, lerp3, verts3->origin, lerp4, verts4->origin, vertices); - VectorMAMAMAM(lerp1, verts1->normal, lerp2, verts2->normal, lerp3, verts3->normal, lerp4, verts4->normal, normals); - VectorMAMAMAM(lerp1, verts1->svector, lerp2, verts2->svector, lerp3, verts3->svector, lerp4, verts4->svector, svectors); - CrossProduct(svectors, normals, tvectors); - } - } - else if (normals != NULL) - { - for (i = 0;i < vertcount;i++, vertices += 4, normals += 4, verts1++, verts2++, verts3++, verts4++) - { - VectorMAMAMAM(lerp1, verts1->origin, lerp2, verts2->origin, lerp3, verts3->origin, lerp4, verts4->origin, vertices); - VectorMAMAMAM(lerp1, verts1->normal, lerp2, verts2->normal, lerp3, verts3->normal, lerp4, verts4->normal, normals); - } - } - else - for (i = 0;i < vertcount;i++, vertices += 4, verts1++, verts2++, verts3++, verts4++) - VectorMAMAMAM(lerp1, verts1->origin, lerp2, verts2->origin, lerp3, verts3->origin, lerp4, verts4->origin, vertices); + for (i = 0;i < vertcount * 3;i++) + VectorMAMAMAM(lerp1, verts1 + i, lerp2, verts2 + i, lerp3, verts3 + i, lerp4, verts4 + i, out3f + i); } else - { - // generate vertices - if (svectors != NULL) - { - for (i = 0;i < vertcount;i++, vertices += 4, normals += 4, svectors += 4, tvectors += 4, verts1++, verts2++, verts3++) - { - VectorMAMAM(lerp1, verts1->origin, lerp2, verts2->origin, lerp3, verts3->origin, vertices); - VectorMAMAM(lerp1, verts1->normal, lerp2, verts2->normal, lerp3, verts3->normal, normals); - VectorMAMAM(lerp1, verts1->svector, lerp2, verts2->svector, lerp3, verts3->svector, svectors); - CrossProduct(svectors, normals, tvectors); - } - } - else if (normals != NULL) - { - for (i = 0;i < vertcount;i++, vertices += 4, normals += 4, verts1++, verts2++, verts3++) - { - VectorMAMAM(lerp1, verts1->origin, lerp2, verts2->origin, lerp3, verts3->origin, vertices); - VectorMAMAM(lerp1, verts1->normal, lerp2, verts2->normal, lerp3, verts3->normal, normals); - } - } - else - for (i = 0;i < vertcount;i++, vertices += 4, verts1++, verts2++, verts3++) - VectorMAMAM(lerp1, verts1->origin, lerp2, verts2->origin, lerp3, verts3->origin, vertices); - } + for (i = 0;i < vertcount * 3;i++) + VectorMAMAM(lerp1, verts1 + i, lerp2, verts2 + i, lerp3, verts3 + i, out3f + i); } else - { - // generate vertices - if (svectors != NULL) - { - for (i = 0;i < vertcount;i++, vertices += 4, normals += 4, svectors += 4, tvectors += 4, verts1++, verts2++) - { - VectorMAM(lerp1, verts1->origin, lerp2, verts2->origin, vertices); - VectorMAM(lerp1, verts1->normal, lerp2, verts2->normal, normals); - VectorMAM(lerp1, verts1->svector, lerp2, verts2->svector, svectors); - CrossProduct(svectors, normals, tvectors); - } - } - else if (normals != NULL) - { - for (i = 0;i < vertcount;i++, vertices += 4, normals += 4, verts1++, verts2++) - { - VectorMAM(lerp1, verts1->origin, lerp2, verts2->origin, vertices); - VectorMAM(lerp1, verts1->normal, lerp2, verts2->normal, normals); - } - } - else - for (i = 0;i < vertcount;i++, vertices += 4, verts1++, verts2++) - VectorMAM(lerp1, verts1->origin, lerp2, verts2->origin, vertices); - } + for (i = 0;i < vertcount * 3;i++) + VectorMAM(lerp1, verts1 + i, lerp2, verts2 + i, out3f + i); } else - { - // generate vertices - if (svectors != NULL) - { - for (i = 0;i < vertcount;i++, vertices += 4, normals += 4, svectors += 4, tvectors += 4, verts1++) - { - VectorM(lerp1, verts1->origin, vertices); - VectorM(lerp1, verts1->normal, normals); - VectorM(lerp1, verts1->svector, svectors); - CrossProduct(svectors, normals, tvectors); - } - } - else if (normals != NULL) - { - for (i = 0;i < vertcount;i++, vertices += 4, normals += 4, verts1++) - { - VectorM(lerp1, verts1->origin, vertices); - VectorM(lerp1, verts1->normal, normals); - } - } - else - for (i = 0;i < vertcount;i++, vertices += 4, verts1++) - VectorM(lerp1, verts1->origin, vertices); - } + memcpy(out3f, verts1, vertcount * sizeof(float[3])); } -skinframe_t *R_FetchSkinFrame(const entity_render_t *ent) +aliaslayer_t r_aliasnoskinlayers[2] = {{ALIASLAYER_DIFFUSE, NULL, NULL}, {ALIASLAYER_FOG | ALIASLAYER_FORCEDRAW_IF_FIRSTPASS, NULL, NULL}}; +aliasskin_t r_aliasnoskin = {0, 2, r_aliasnoskinlayers}; +aliasskin_t *R_FetchAliasSkin(const entity_render_t *ent, const aliasmesh_t *mesh) { model_t *model = ent->model; - int s = ent->skinnum; - if ((unsigned int)s >= (unsigned int)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]; + if (model->numskins) + { + int s = ent->skinnum; + if ((unsigned int)s >= (unsigned int)model->numskins) + s = 0; + if (model->skinscenes[s].framecount > 1) + s = model->skinscenes[s].firstframe + (int) (cl.time * model->skinscenes[s].framerate) % model->skinscenes[s].framecount; + else + s = model->skinscenes[s].firstframe; + if (s >= mesh->num_skins) + s = 0; + return mesh->data_skins + s; + } else - return &model->skinframes[model->skinscenes[s].firstframe]; + { + r_aliasnoskinlayers[0].texture = r_notexture; + return &r_aliasnoskin; + } } void R_DrawAliasModelCallback (const void *calldata1, int calldata2) { - int i, c, fullbright, pantsfullbright, shirtfullbright, colormapped, tex; - float pantscolor[3], shirtcolor[3]; - float fog, ifog, colorscale; + int c, fullbright, layernum, firstpass; + float tint[3], fog, ifog, colorscale, ambientcolor4f[4], diffusecolor[3], diffusenormal[3]; vec3_t diff; qbyte *bcolor; rmeshstate_t m; - model_t *model; - skinframe_t *skinframe; const entity_render_t *ent = calldata1; - int blendfunc1, blendfunc2; + aliasmesh_t *mesh = ent->model->alias.aliasdata_meshes + calldata2; + aliaslayer_t *layer; + aliasskin_t *skin; R_Mesh_Matrix(&ent->matrix); - model = ent->model; - R_Mesh_ResizeCheck(model->numverts); - - skinframe = R_FetchSkinFrame(ent); - - fullbright = (ent->effects & EF_FULLBRIGHT) != 0; - fog = 0; if (fogenabled) { - VectorSubtract(ent->origin, r_origin, diff); + VectorSubtract(ent->origin, r_vieworigin, diff); fog = DotProduct(diff,diff); if (fog < 0.01f) fog = 0.01f; @@ -231,311 +190,229 @@ void R_DrawAliasModelCallback (const void *calldata1, int calldata2) } ifog = 1 - fog; - 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 + firstpass = true; + skin = R_FetchAliasSkin(ent, mesh); + for (layernum = 0, layer = skin->data_layers;layernum < skin->num_layers;layernum++, layer++) { - blendfunc1 = GL_ONE; - blendfunc2 = GL_ZERO; - } - - R_Model_Alias_GetVerts(ent, varray_vertex, aliasvert_normals, NULL, NULL); - memcpy(varray_texcoord[0], model->mdlmd2data_texcoords, model->numverts * sizeof(float[4])); - if (!skinframe->base && !skinframe->pants && !skinframe->shirt && !skinframe->glow) - { - // untextured - memset(&m, 0, sizeof(m)); - m.blendfunc1 = blendfunc1; - m.blendfunc2 = blendfunc2; - colorscale = r_colorscale; - if (gl_combine.integer) + if (!(layer->flags & ALIASLAYER_FORCEDRAW_IF_FIRSTPASS) || !firstpass) { - colorscale *= 0.25f; - m.texrgbscale[0] = 4; + if (((layer->flags & ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED) && ent->colormap < 0) + || ((layer->flags & ALIASLAYER_NODRAW_IF_COLORMAPPED) && ent->colormap >= 0) + || ((layer->flags & ALIASLAYER_FOG) && !fogenabled) + || (layer->flags & ALIASLAYER_SPECULAR) + || ((layer->flags & ALIASLAYER_DIFFUSE) && (r_shadow_realtime_world.integer && r_shadow_realtime_world_lightmaps.value <= 0 && r_ambient.integer <= 0 && r_fullbright.integer == 0 && !(ent->effects & EF_FULLBRIGHT)))) + continue; } - m.tex[0] = R_GetTexture(r_notexture); - R_Mesh_State(&m); - c_alias_polys += model->numtris; - for (i = 0;i < model->numverts * 4;i += 4) + if (!firstpass || (ent->effects & EF_ADDITIVE)) { - varray_texcoord[0][i + 0] *= 8.0f; - varray_texcoord[0][i + 1] *= 8.0f; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + GL_DepthMask(false); } - R_LightModel(ent, model->numverts, varray_vertex, aliasvert_normals, varray_color, colorscale, colorscale, colorscale, false); - R_Mesh_Draw(model->numverts, model->numtris, model->mdlmd2data_indices); - return; - } - - colormapped = !skinframe->merged || (ent->colormap >= 0 && skinframe->base && (skinframe->pants || skinframe->shirt)); - if (colormapped) - { - // 128-224 are backwards ranges - c = (ent->colormap & 0xF) << 4;c += (c >= 128 && c < 224) ? 4 : 12; - bcolor = (qbyte *) (&palette_complete[c]); - pantsfullbright = c >= 224; - VectorScale(bcolor, (1.0f / 255.0f), pantscolor); - c = (ent->colormap & 0xF0);c += (c >= 128 && c < 224) ? 4 : 12; - bcolor = (qbyte *) (&palette_complete[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; - } - - tex = colormapped ? R_GetTexture(skinframe->base) : R_GetTexture(skinframe->merged); - if (tex) - { - memset(&m, 0, sizeof(m)); - m.blendfunc1 = blendfunc1; - m.blendfunc2 = blendfunc2; - colorscale = r_colorscale; - if (gl_combine.integer) + else if ((skin->flags & ALIASSKIN_TRANSPARENT) || ent->alpha != 1.0) { - colorscale *= 0.25f; - m.texrgbscale[0] = 4; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + GL_DepthMask(false); } - m.tex[0] = tex; - R_Mesh_State(&m); - if (fullbright) - GL_Color(colorscale * ifog, colorscale * ifog, colorscale * ifog, ent->alpha); else - R_LightModel(ent, model->numverts, varray_vertex, aliasvert_normals, varray_color, colorscale * ifog, colorscale * ifog, colorscale * ifog, false); - R_Mesh_Draw(model->numverts, model->numtris, model->mdlmd2data_indices); - c_alias_polys += model->numtris; - blendfunc1 = GL_SRC_ALPHA; - blendfunc2 = GL_ONE; - } + { + GL_BlendFunc(GL_ONE, GL_ZERO); + GL_DepthMask(true); + } + GL_DepthTest(true); + firstpass = false; + expandaliasvert(mesh->num_vertices); + colorscale = 1.0f; - if (colormapped) - { - if (skinframe->pants) + memset(&m, 0, sizeof(m)); + if (layer->texture != NULL) { - tex = R_GetTexture(skinframe->pants); - if (tex) + m.tex[0] = R_GetTexture(layer->texture); + m.pointer_texcoord[0] = mesh->data_texcoord2f; + if (gl_combine.integer && layer->flags & (ALIASLAYER_DIFFUSE | ALIASLAYER_SPECULAR)) { - memset(&m, 0, sizeof(m)); - m.blendfunc1 = blendfunc1; - m.blendfunc2 = blendfunc2; - colorscale = r_colorscale; - if (gl_combine.integer) - { - colorscale *= 0.25f; - m.texrgbscale[0] = 4; - } - m.tex[0] = tex; - R_Mesh_State(&m); - if (pantsfullbright) - GL_Color(pantscolor[0] * colorscale * ifog, pantscolor[1] * colorscale * ifog, pantscolor[2] * colorscale * ifog, ent->alpha); - else - R_LightModel(ent, model->numverts, varray_vertex, aliasvert_normals, varray_color, pantscolor[0] * colorscale * ifog, pantscolor[1] * colorscale * ifog, pantscolor[2] * colorscale * ifog, false); - R_Mesh_Draw(model->numverts, model->numtris, model->mdlmd2data_indices); - c_alias_polys += model->numtris; - blendfunc1 = GL_SRC_ALPHA; - blendfunc2 = GL_ONE; + colorscale *= 0.25f; + m.texrgbscale[0] = 4; } } - if (skinframe->shirt) + m.pointer_vertex = varray_vertex3f; + + c_alias_polys += mesh->num_triangles; + R_Model_Alias_GetMesh_Array3f(ent, mesh, MODELARRAY_VERTEX, varray_vertex3f); + if (layer->flags & ALIASLAYER_FOG) + { + colorscale *= fog; + GL_Color(fogcolor[0] * colorscale, fogcolor[1] * colorscale, fogcolor[2] * colorscale, ent->alpha); + } + else { - tex = R_GetTexture(skinframe->shirt); - if (tex) + fullbright = !(layer->flags & ALIASLAYER_DIFFUSE) || r_fullbright.integer || (ent->effects & EF_FULLBRIGHT); + if (layer->flags & (ALIASLAYER_COLORMAP_PANTS | ALIASLAYER_COLORMAP_SHIRT)) { - memset(&m, 0, sizeof(m)); - m.blendfunc1 = blendfunc1; - m.blendfunc2 = blendfunc2; - colorscale = r_colorscale; - if (gl_combine.integer) + // 128-224 are backwards ranges + if (layer->flags & ALIASLAYER_COLORMAP_PANTS) + c = (ent->colormap & 0xF) << 4; + else //if (layer->flags & ALIASLAYER_COLORMAP_SHIRT) + c = (ent->colormap & 0xF0); + c += (c >= 128 && c < 224) ? 4 : 12; + bcolor = (qbyte *) (&palette_complete[c]); + fullbright = fullbright || c >= 224; + VectorScale(bcolor, (1.0f / 255.0f), tint); + } + else + tint[0] = tint[1] = tint[2] = 1; + if (r_shadow_realtime_world.integer && !fullbright) + VectorScale(tint, r_shadow_realtime_world_lightmaps.value, tint); + colorscale *= ifog; + if (fullbright) + GL_Color(tint[0] * colorscale, tint[1] * colorscale, tint[2] * colorscale, ent->alpha); + else + { + if (R_LightModel(ambientcolor4f, diffusecolor, diffusenormal, ent, tint[0] * colorscale, tint[1] * colorscale, tint[2] * colorscale, ent->alpha, false)) { - colorscale *= 0.25f; - m.texrgbscale[0] = 4; + m.pointer_color = varray_color4f; + R_Model_Alias_GetMesh_Array3f(ent, mesh, MODELARRAY_NORMAL, varray_normal3f); + R_LightModel_CalcVertexColors(ambientcolor4f, diffusecolor, diffusenormal, mesh->num_vertices, varray_vertex3f, varray_normal3f, varray_color4f); } - m.tex[0] = tex; - R_Mesh_State(&m); - if (shirtfullbright) - GL_Color(shirtcolor[0] * colorscale * ifog, shirtcolor[1] * colorscale * ifog, shirtcolor[2] * colorscale * ifog, ent->alpha); else - R_LightModel(ent, model->numverts, varray_vertex, aliasvert_normals, varray_color, shirtcolor[0] * colorscale * ifog, shirtcolor[1] * colorscale * ifog, shirtcolor[2] * colorscale * ifog, false); - R_Mesh_Draw(model->numverts, model->numtris, model->mdlmd2data_indices); - c_alias_polys += model->numtris; - blendfunc1 = GL_SRC_ALPHA; - blendfunc2 = GL_ONE; + GL_Color(ambientcolor4f[0], ambientcolor4f[1], ambientcolor4f[2], ambientcolor4f[3]); } } - } - if (skinframe->glow) - { - tex = R_GetTexture(skinframe->glow); - if (tex) - { - memset(&m, 0, sizeof(m)); - m.blendfunc1 = blendfunc1; - m.blendfunc2 = blendfunc2; - m.tex[0] = tex; - R_Mesh_State(&m); - - blendfunc1 = GL_SRC_ALPHA; - blendfunc2 = GL_ONE; - c_alias_polys += model->numtris; - GL_Color(ifog * r_colorscale, ifog * r_colorscale, ifog * r_colorscale, ent->alpha); - R_Mesh_Draw(model->numverts, model->numtris, model->mdlmd2data_indices); - } - } - if (fog) - { - memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE; - m.tex[0] = R_GetTexture(skinframe->fog); R_Mesh_State(&m); - - c_alias_polys += model->numtris; - GL_Color(fogcolor[0] * fog * r_colorscale, fogcolor[1] * fog * r_colorscale, fogcolor[2] * fog * r_colorscale, ent->alpha); - R_Mesh_Draw(model->numverts, model->numtris, model->mdlmd2data_indices); + GL_LockArrays(0, mesh->num_vertices); + R_Mesh_Draw(mesh->num_vertices, mesh->num_triangles, mesh->data_element3i); + GL_LockArrays(0, 0); } } void R_Model_Alias_Draw(entity_render_t *ent) { + int meshnum; + aliasmesh_t *mesh; if (ent->alpha < (1.0f / 64.0f)) return; // basically completely transparent c_models++; - if (ent->effects & EF_ADDITIVE || ent->alpha != 1.0 || R_FetchSkinFrame(ent)->fog != NULL) - R_MeshQueue_AddTransparent(ent->origin, R_DrawAliasModelCallback, ent, 0); - else - R_DrawAliasModelCallback(ent, 0); -} - -void R_Model_Alias_DrawFakeShadow (entity_render_t *ent) -{ - int i; - rmeshstate_t m; - model_t *model; - float *v, planenormal[3], planedist, dist, projection[3], floororigin[3], surfnormal[3], lightdirection[3], v2[3]; - - lightdirection[0] = 0.5; - lightdirection[1] = 0.2; - lightdirection[2] = -1; - VectorNormalizeFast(lightdirection); - - VectorMA(ent->origin, 65536.0f, lightdirection, v2); - if (CL_TraceLine(ent->origin, v2, floororigin, surfnormal, 0, false, NULL) == 1) - return; - - R_Mesh_Matrix(&ent->matrix); - - model = ent->model; - R_Mesh_ResizeCheck(model->numverts); - - memset(&m, 0, sizeof(m)); - m.blendfunc1 = GL_SRC_ALPHA; - m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; - R_Mesh_State(&m); - - c_alias_polys += model->numtris; - R_Model_Alias_GetVerts(ent, varray_vertex, NULL, NULL, NULL); - - // put a light direction in the entity's coordinate space - Matrix4x4_Transform3x3(&ent->inversematrix, lightdirection, projection); - VectorNormalizeFast(projection); - - // put the plane's normal in the entity's coordinate space - Matrix4x4_Transform3x3(&ent->inversematrix, surfnormal, planenormal); - VectorNormalizeFast(planenormal); - - // put the plane's distance in the entity's coordinate space - VectorSubtract(floororigin, ent->origin, floororigin); - planedist = DotProduct(floororigin, surfnormal) + 2; - - dist = -1.0f / DotProduct(projection, planenormal); - VectorScale(projection, dist, projection); - for (i = 0, v = varray_vertex;i < model->numverts;i++, v += 4) + for (meshnum = 0, mesh = ent->model->alias.aliasdata_meshes;meshnum < ent->model->alias.aliasnum_meshes;meshnum++, mesh++) { - dist = DotProduct(v, planenormal) - planedist; - if (dist > 0) - //if (i & 1) - VectorMA(v, dist, projection, v); + if (ent->effects & EF_ADDITIVE || ent->alpha != 1.0 || R_FetchAliasSkin(ent, mesh)->flags & ALIASSKIN_TRANSPARENT) + R_MeshQueue_AddTransparent(ent->origin, R_DrawAliasModelCallback, ent, meshnum); + else + R_DrawAliasModelCallback(ent, meshnum); } - GL_Color(0, 0, 0, 0.5); - R_Mesh_Draw(model->numverts, model->numtris, model->mdlmd2data_indices); } void R_Model_Alias_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius) { + int meshnum; + aliasmesh_t *mesh; + aliasskin_t *skin; float projectdistance; - projectdistance = lightradius + ent->model->radius - sqrt(DotProduct(relativelightorigin, relativelightorigin)); + if (ent->effects & EF_ADDITIVE || ent->alpha < 1) + return; + projectdistance = lightradius + ent->model->radius;// - sqrt(DotProduct(relativelightorigin, relativelightorigin)); if (projectdistance > 0.1) { R_Mesh_Matrix(&ent->matrix); - R_Mesh_ResizeCheck(ent->model->numverts * 2); - R_Model_Alias_GetVerts(ent, varray_vertex, NULL, NULL, NULL); - R_Shadow_Volume(ent->model->numverts, ent->model->numtris, ent->model->mdlmd2data_indices, ent->model->mdlmd2data_triangleneighbors, relativelightorigin, lightradius, projectdistance); + for (meshnum = 0, mesh = ent->model->alias.aliasdata_meshes;meshnum < ent->model->alias.aliasnum_meshes;meshnum++, mesh++) + { + skin = R_FetchAliasSkin(ent, mesh); + if (skin->flags & ALIASSKIN_TRANSPARENT) + continue; + R_Model_Alias_GetMesh_Array3f(ent, mesh, MODELARRAY_VERTEX, varray_vertex3f); + R_Shadow_VolumeFromSphere(mesh->num_vertices, mesh->num_triangles, varray_vertex3f, mesh->data_element3i, mesh->data_neighbor3i, relativelightorigin, projectdistance, lightradius); + } } } -void R_Model_Alias_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor) +void R_Model_Alias_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap) { - int c; - float lightcolor2[3]; + int c, meshnum, layernum; + float fog, ifog, lightcolor2[3]; + vec3_t diff; qbyte *bcolor; - skinframe_t *skinframe; - R_Mesh_Matrix(&ent->matrix); - R_Mesh_ResizeCheck(ent->model->numverts); - R_Model_Alias_GetVerts(ent, varray_vertex, aliasvert_normals, aliasvert_svectors, aliasvert_tvectors); - skinframe = R_FetchSkinFrame(ent); + aliasmesh_t *mesh; + aliaslayer_t *layer; + aliasskin_t *skin; - // note: to properly handle fog this should scale the lightcolor into lightcolor2 according to 1-fog scaling + if (ent->effects & (EF_ADDITIVE | EF_FULLBRIGHT) || ent->alpha < 1) + return; - R_Shadow_SpecularLighting(ent->model->numverts, ent->model->numtris, ent->model->mdlmd2data_indices, aliasvert_svectors, aliasvert_tvectors, aliasvert_normals, ent->model->mdlmd2data_texcoords, relativelightorigin, relativeeyeorigin, lightradius, lightcolor, NULL, NULL, NULL); + R_Mesh_Matrix(&ent->matrix); - if (!skinframe->base && !skinframe->pants && !skinframe->shirt && !skinframe->glow) + fog = 0; + if (fogenabled) { - R_Shadow_DiffuseLighting(ent->model->numverts, ent->model->numtris, ent->model->mdlmd2data_indices, aliasvert_svectors, aliasvert_tvectors, aliasvert_normals, ent->model->mdlmd2data_texcoords, relativelightorigin, lightradius, lightcolor, r_notexture, NULL, NULL); - return; + VectorSubtract(ent->origin, r_vieworigin, 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 } + ifog = 1 - fog; - if (!skinframe->merged || (ent->colormap >= 0 && skinframe->base && (skinframe->pants || skinframe->shirt))) + for (meshnum = 0, mesh = ent->model->alias.aliasdata_meshes;meshnum < ent->model->alias.aliasnum_meshes;meshnum++, mesh++) { - // 128-224 are backwards ranges - // we only render non-fullbright ranges here - if (skinframe->pants && (ent->colormap & 0xF) < 0xE) - { - c = (ent->colormap & 0xF) << 4;c += (c >= 128 && c < 224) ? 4 : 12; - bcolor = (qbyte *) (&palette_complete[c]); - lightcolor2[0] = lightcolor[0] * bcolor[0] * (1.0f / 255.0f); - lightcolor2[1] = lightcolor[1] * bcolor[1] * (1.0f / 255.0f); - lightcolor2[2] = lightcolor[2] * bcolor[2] * (1.0f / 255.0f); - R_Shadow_DiffuseLighting(ent->model->numverts, ent->model->numtris, ent->model->mdlmd2data_indices, aliasvert_svectors, aliasvert_tvectors, aliasvert_normals, ent->model->mdlmd2data_texcoords, relativelightorigin, lightradius, lightcolor2, skinframe->pants, skinframe->nmap, NULL); - } - - // we only render non-fullbright ranges here - if (skinframe->shirt && (ent->colormap & 0xF0) < 0xE0) + skin = R_FetchAliasSkin(ent, mesh); + if (skin->flags & ALIASSKIN_TRANSPARENT) + continue; + expandaliasvert(mesh->num_vertices); + R_Model_Alias_GetMesh_Array3f(ent, mesh, MODELARRAY_VERTEX, aliasvert_vertex3f); + R_Model_Alias_GetMesh_Array3f(ent, mesh, MODELARRAY_SVECTOR, aliasvert_svector3f); + R_Model_Alias_GetMesh_Array3f(ent, mesh, MODELARRAY_TVECTOR, aliasvert_tvector3f); + R_Model_Alias_GetMesh_Array3f(ent, mesh, MODELARRAY_NORMAL, aliasvert_normal3f); + for (layernum = 0, layer = skin->data_layers;layernum < skin->num_layers;layernum++, layer++) { - c = (ent->colormap & 0xF0);c += (c >= 128 && c < 224) ? 4 : 12; - bcolor = (qbyte *) (&palette_complete[c]); - lightcolor2[0] = lightcolor[0] * bcolor[0] * (1.0f / 255.0f); - lightcolor2[1] = lightcolor[1] * bcolor[1] * (1.0f / 255.0f); - lightcolor2[2] = lightcolor[2] * bcolor[2] * (1.0f / 255.0f); - R_Shadow_DiffuseLighting(ent->model->numverts, ent->model->numtris, ent->model->mdlmd2data_indices, aliasvert_svectors, aliasvert_tvectors, aliasvert_normals, ent->model->mdlmd2data_texcoords, relativelightorigin, lightradius, lightcolor2, skinframe->shirt, skinframe->nmap, NULL); + if (!(layer->flags & (ALIASLAYER_DIFFUSE | ALIASLAYER_SPECULAR)) + || ((layer->flags & ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED) && ent->colormap < 0) + || ((layer->flags & ALIASLAYER_NODRAW_IF_COLORMAPPED) && ent->colormap >= 0)) + continue; + lightcolor2[0] = lightcolor[0] * ifog; + lightcolor2[1] = lightcolor[1] * ifog; + lightcolor2[2] = lightcolor[2] * ifog; + if (layer->flags & ALIASLAYER_SPECULAR) + { + c_alias_polys += mesh->num_triangles; + R_Shadow_RenderLighting(mesh->num_vertices, mesh->num_triangles, mesh->data_element3i, aliasvert_vertex3f, aliasvert_svector3f, aliasvert_tvector3f, aliasvert_normal3f, mesh->data_texcoord2f, relativelightorigin, relativeeyeorigin, lightcolor2, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, layer->texture, layer->nmap, layer->texture, lightcubemap, LIGHTING_SPECULAR); + } + else if (layer->flags & ALIASLAYER_DIFFUSE) + { + if (layer->flags & ALIASLAYER_COLORMAP_PANTS) + { + // 128-224 are backwards ranges + c = (ent->colormap & 0xF) << 4;c += (c >= 128 && c < 224) ? 4 : 12; + // fullbright passes were already taken care of, so skip them in realtime lighting passes + if (c >= 224) + continue; + bcolor = (qbyte *) (&palette_complete[c]); + lightcolor2[0] *= bcolor[0] * (1.0f / 255.0f); + lightcolor2[1] *= bcolor[1] * (1.0f / 255.0f); + lightcolor2[2] *= bcolor[2] * (1.0f / 255.0f); + } + else if (layer->flags & ALIASLAYER_COLORMAP_SHIRT) + { + // 128-224 are backwards ranges + c = (ent->colormap & 0xF0);c += (c >= 128 && c < 224) ? 4 : 12; + // fullbright passes were already taken care of, so skip them in realtime lighting passes + if (c >= 224) + continue; + bcolor = (qbyte *) (&palette_complete[c]); + lightcolor2[0] *= bcolor[0] * (1.0f / 255.0f); + lightcolor2[1] *= bcolor[1] * (1.0f / 255.0f); + lightcolor2[2] *= bcolor[2] * (1.0f / 255.0f); + } + c_alias_polys += mesh->num_triangles; + R_Shadow_RenderLighting(mesh->num_vertices, mesh->num_triangles, mesh->data_element3i, aliasvert_vertex3f, aliasvert_svector3f, aliasvert_tvector3f, aliasvert_normal3f, mesh->data_texcoord2f, relativelightorigin, relativeeyeorigin, lightcolor2, matrix_modeltolight, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz, layer->texture, layer->nmap, layer->texture, lightcubemap, LIGHTING_DIFFUSE); + } } - - if (skinframe->base) - R_Shadow_DiffuseLighting(ent->model->numverts, ent->model->numtris, ent->model->mdlmd2data_indices, aliasvert_svectors, aliasvert_tvectors, aliasvert_normals, ent->model->mdlmd2data_texcoords, relativelightorigin, lightradius, lightcolor, skinframe->base, skinframe->nmap, NULL); } - else - if (skinframe->merged) - R_Shadow_DiffuseLighting(ent->model->numverts, ent->model->numtris, ent->model->mdlmd2data_indices, aliasvert_svectors, aliasvert_tvectors, aliasvert_normals, ent->model->mdlmd2data_texcoords, relativelightorigin, lightradius, lightcolor, skinframe->merged, skinframe->nmap, NULL); } int ZymoticLerpBones(int count, const zymbonematrix *bonebase, const frameblend_t *blend, const zymbone_t *bone) @@ -732,17 +609,17 @@ void ZymoticTransformVerts(int vertcount, float *vertex, int *bonecounts, zymver vert++; } } - out += 4; + out += 3; } } -void ZymoticCalcNormals(int vertcount, float *vertex, float *normals, int shadercount, int *renderlist) +void ZymoticCalcNormal3f(int vertcount, float *vertex3f, float *normal3f, int shadercount, int *renderlist) { int a, b, c, d; float *out, v1[3], v2[3], normal[3], s; int *u; // clear normals - memset(normals, 0, sizeof(float) * vertcount * 3); + memset(normal3f, 0, sizeof(float) * vertcount * 3); memset(aliasvertusage, 0, sizeof(int) * vertcount); // parse render list and accumulate surface normals while(shadercount--) @@ -753,36 +630,36 @@ void ZymoticCalcNormals(int vertcount, float *vertex, float *normals, int shader a = renderlist[0]*4; b = renderlist[1]*4; c = renderlist[2]*4; - v1[0] = vertex[a+0] - vertex[b+0]; - v1[1] = vertex[a+1] - vertex[b+1]; - v1[2] = vertex[a+2] - vertex[b+2]; - v2[0] = vertex[c+0] - vertex[b+0]; - v2[1] = vertex[c+1] - vertex[b+1]; - v2[2] = vertex[c+2] - vertex[b+2]; + v1[0] = vertex3f[a+0] - vertex3f[b+0]; + v1[1] = vertex3f[a+1] - vertex3f[b+1]; + v1[2] = vertex3f[a+2] - vertex3f[b+2]; + v2[0] = vertex3f[c+0] - vertex3f[b+0]; + v2[1] = vertex3f[c+1] - vertex3f[b+1]; + v2[2] = vertex3f[c+2] - vertex3f[b+2]; CrossProduct(v1, v2, normal); VectorNormalizeFast(normal); // add surface normal to vertices a = renderlist[0] * 3; - normals[a+0] += normal[0]; - normals[a+1] += normal[1]; - normals[a+2] += normal[2]; + normal3f[a+0] += normal[0]; + normal3f[a+1] += normal[1]; + normal3f[a+2] += normal[2]; aliasvertusage[renderlist[0]]++; a = renderlist[1] * 3; - normals[a+0] += normal[0]; - normals[a+1] += normal[1]; - normals[a+2] += normal[2]; + normal3f[a+0] += normal[0]; + normal3f[a+1] += normal[1]; + normal3f[a+2] += normal[2]; aliasvertusage[renderlist[1]]++; a = renderlist[2] * 3; - normals[a+0] += normal[0]; - normals[a+1] += normal[1]; - normals[a+2] += normal[2]; + normal3f[a+0] += normal[0]; + normal3f[a+1] += normal[1]; + normal3f[a+2] += normal[2]; aliasvertusage[renderlist[2]]++; renderlist += 3; } } // FIXME: precalc this // average surface normals - out = normals; + out = normal3f; u = aliasvertusage; while(vertcount--) { @@ -800,7 +677,7 @@ void ZymoticCalcNormals(int vertcount, float *vertex, float *normals, int shader void R_DrawZymoticModelMeshCallback (const void *calldata1, int calldata2) { - float fog, ifog, colorscale; + float fog, ifog, colorscale, ambientcolor4f[4], diffusecolor[3], diffusenormal[3]; vec3_t diff; int i, *renderlist, *elements; rtexture_t *texture; @@ -812,20 +689,21 @@ void R_DrawZymoticModelMeshCallback (const void *calldata1, int calldata2) R_Mesh_Matrix(&ent->matrix); // find the vertex index list and texture - renderlist = ent->model->zymdata_renderlist; + renderlist = ent->model->alias.zymdata_renderlist; for (i = 0;i < shadernum;i++) renderlist += renderlist[0] * 3 + 1; - texture = ent->model->zymdata_textures[shadernum]; + texture = ent->model->alias.zymdata_textures[shadernum]; - numverts = ent->model->zymnum_verts; + numverts = ent->model->alias.zymnum_verts; numtriangles = *renderlist++; elements = renderlist; - R_Mesh_ResizeCheck(numverts); + + expandaliasvert(numverts); fog = 0; if (fogenabled) { - VectorSubtract(ent->origin, r_origin, diff); + VectorSubtract(ent->origin, r_vieworigin, diff); fog = DotProduct(diff,diff); if (fog < 0.01f) fog = 0.01f; @@ -840,49 +718,70 @@ void R_DrawZymoticModelMeshCallback (const void *calldata1, int calldata2) } ifog = 1 - fog; - memset(&mstate, 0, sizeof(mstate)); if (ent->effects & EF_ADDITIVE) { - mstate.blendfunc1 = GL_SRC_ALPHA; - mstate.blendfunc2 = GL_ONE; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + GL_DepthMask(false); } else if (ent->alpha != 1.0 || R_TextureHasAlpha(texture)) { - mstate.blendfunc1 = GL_SRC_ALPHA; - mstate.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + GL_DepthMask(false); } else { - mstate.blendfunc1 = GL_ONE; - mstate.blendfunc2 = GL_ZERO; + GL_BlendFunc(GL_ONE, GL_ZERO); + GL_DepthMask(true); } - colorscale = r_colorscale; + GL_DepthTest(true); + + memset(&mstate, 0, sizeof(mstate)); + colorscale = 1.0f; if (gl_combine.integer) { mstate.texrgbscale[0] = 4; colorscale *= 0.25f; } mstate.tex[0] = R_GetTexture(texture); + mstate.pointer_texcoord[0] = ent->model->alias.zymdata_texcoords; + mstate.pointer_vertex = varray_vertex3f; + + ZymoticLerpBones(ent->model->alias.zymnum_bones, (zymbonematrix *) ent->model->alias.zymdata_poses, ent->frameblend, ent->model->alias.zymdata_bones); + + ZymoticTransformVerts(numverts, varray_vertex3f, ent->model->alias.zymdata_vertbonecounts, ent->model->alias.zymdata_verts); + ZymoticCalcNormal3f(numverts, varray_vertex3f, aliasvert_normal3f, ent->model->alias.zymnum_shaders, ent->model->alias.zymdata_renderlist); + if (R_LightModel(ambientcolor4f, diffusecolor, diffusenormal, ent, ifog * colorscale, ifog * colorscale, ifog * colorscale, ent->alpha, false)) + { + mstate.pointer_color = varray_color4f; + R_LightModel_CalcVertexColors(ambientcolor4f, diffusecolor, diffusenormal, numverts, varray_vertex3f, aliasvert_normal3f, varray_color4f); + } + else + GL_Color(ambientcolor4f[0], ambientcolor4f[1], ambientcolor4f[2], ambientcolor4f[3]); R_Mesh_State(&mstate); - ZymoticLerpBones(ent->model->zymnum_bones, (zymbonematrix *) ent->model->zymdata_poses, ent->frameblend, ent->model->zymdata_bones); - ZymoticTransformVerts(numverts, varray_vertex, ent->model->zymdata_vertbonecounts, ent->model->zymdata_verts); - ZymoticCalcNormals(numverts, varray_vertex, aliasvert_normals, ent->model->zymnum_shaders, ent->model->zymdata_renderlist); - memcpy(varray_texcoord[0], ent->model->zymdata_texcoords, ent->model->zymnum_verts * sizeof(float[4])); - GL_UseColorArray(); - R_LightModel(ent, numverts, varray_vertex, aliasvert_normals, varray_color, ifog * colorscale, ifog * colorscale, ifog * colorscale, false); + GL_LockArrays(0, numverts); R_Mesh_Draw(numverts, numtriangles, elements); + GL_LockArrays(0, 0); c_alias_polys += numtriangles; if (fog) { + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + GL_DepthMask(false); + GL_DepthTest(true); + memset(&mstate, 0, sizeof(mstate)); - mstate.blendfunc1 = GL_SRC_ALPHA; - mstate.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA; // FIXME: need alpha mask for fogging... //mstate.tex[0] = R_GetTexture(texture); + //mstate.pointer_texcoord = ent->model->alias.zymdata_texcoords; + mstate.pointer_vertex = varray_vertex3f; R_Mesh_State(&mstate); - GL_Color(fogcolor[0] * r_colorscale, fogcolor[1] * r_colorscale, fogcolor[2] * r_colorscale, ent->alpha * fog); + + GL_Color(fogcolor[0], fogcolor[1], fogcolor[2], ent->alpha * fog); + ZymoticTransformVerts(numverts, varray_vertex3f, ent->model->alias.zymdata_vertbonecounts, ent->model->alias.zymdata_verts); + R_Mesh_State(&mstate); + GL_LockArrays(0, numverts); R_Mesh_Draw(numverts, numtriangles, elements); + GL_LockArrays(0, 0); c_alias_polys += numtriangles; } } @@ -896,26 +795,22 @@ void R_Model_Zymotic_Draw(entity_render_t *ent) c_models++; - for (i = 0;i < ent->model->zymnum_shaders;i++) + for (i = 0;i < ent->model->alias.zymnum_shaders;i++) { - if (ent->effects & EF_ADDITIVE || ent->alpha != 1.0 || R_TextureHasAlpha(ent->model->zymdata_textures[i])) + if (ent->effects & EF_ADDITIVE || ent->alpha != 1.0 || R_TextureHasAlpha(ent->model->alias.zymdata_textures[i])) R_MeshQueue_AddTransparent(ent->origin, R_DrawZymoticModelMeshCallback, ent, i); else R_DrawZymoticModelMeshCallback(ent, i); } } -void R_Model_Zymotic_DrawFakeShadow(entity_render_t *ent) +void R_Model_Zymotic_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius) { // FIXME } -void R_Model_Zymotic_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, float lightradius2, float lightdistbias, float lightsubtract, float *lightcolor) +void R_Model_Zymotic_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap) { // FIXME } -void R_Model_Zymotic_DrawOntoLight(entity_render_t *ent) -{ - // FIXME -}