#include "quakedef.h"
-//cvar_t gl_transform = {0, "gl_transform", "1"};
+cvar_t r_quickmodels = {0, "r_quickmodels", "1"};
typedef struct
{
float m[3][4];
} zymbonematrix;
-// LordHavoc: vertex array
-float *aliasvert;
-float *aliasvertnorm;
-float *aliasvertcolor;
-float *aliasvertcolor2;
-zymbonematrix *zymbonepose;
-int *aliasvertusage;
-
-rmeshinfo_t aliasmeshinfo;
-
-rtexture_t *chrometexture;
-
-/*
-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);
-}
-*/
+// LordHavoc: vertex arrays
-rtexturepool_t *chrometexturepool;
+float *aliasvertbuf;
+float *aliasvertcolorbuf;
+float *aliasvert; // this may point at aliasvertbuf or at vertex arrays in the mesh backend
+float *aliasvertcolor; // this may point at aliasvertcolorbuf or at vertex arrays in the mesh backend
-// 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);
-}
+float *aliasvertcolor2;
+float *aliasvertnorm;
+int *aliasvertusage;
+zymbonematrix *zymbonepose;
mempool_t *gl_models_mempool;
{
// allocate vertex processing arrays
gl_models_mempool = Mem_AllocPool("GL_Models");
- aliasvert = Mem_Alloc(gl_models_mempool, sizeof(float[MD2MAX_VERTS][4]));
+ aliasvert = aliasvertbuf = Mem_Alloc(gl_models_mempool, sizeof(float[MD2MAX_VERTS][4]));
+ aliasvertcolor = aliasvertcolorbuf = Mem_Alloc(gl_models_mempool, sizeof(float[MD2MAX_VERTS][4]));
aliasvertnorm = Mem_Alloc(gl_models_mempool, sizeof(float[MD2MAX_VERTS][3]));
- aliasvertcolor = 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]));
- chrometexturepool = R_AllocTexturePool();
- makechrometexture();
}
void gl_models_shutdown(void)
{
- R_FreeTexturePool(&chrometexturepool);
Mem_FreePool(&gl_models_mempool);
}
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, *avn;
+ float *av;
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, 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)
{
int i;
vec3_t scale1, scale2, scale3, scale4, translate;
}
}
-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(void)
{
- 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;
- }
+ 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];
+ else
+ return &model->skinframes[model->skinscenes[currentrenderentity->skinnum].firstframe];
}
-void R_SetupMDLMD2Frames(skinframe_t **skinframe)
+void R_SetupMDLMD2Frames(float colorr, float colorg, float colorb)
{
md2frame_t *frame1, *frame2, *frame3, *frame4;
trivertx_t *frame1verts, *frame2verts, *frame3verts, *frame4verts;
model_t *model;
model = currentrenderentity->model;
- if (model->skinscenes[currentrenderentity->skinnum].framecount > 1)
- *skinframe = &model->skinframes[model->skinscenes[currentrenderentity->skinnum].firstframe + (int) (cl.time * 10) % model->skinscenes[currentrenderentity->skinnum].framecount];
- else
- *skinframe = &model->skinframes[model->skinscenes[currentrenderentity->skinnum].firstframe];
-
frame1 = &model->mdlmd2data_frames[currentrenderentity->frameblend[0].frame];
frame2 = &model->mdlmd2data_frames[currentrenderentity->frameblend[1].frame];
frame3 = &model->mdlmd2data_frames[currentrenderentity->frameblend[2].frame];
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);
- R_AliasTransformVerts(model->numverts);
- R_LightModel(model->numverts);
+ R_LightModel(model->numverts, colorr, colorg, colorb, false);
+
+ R_AliasTransformVerts(model->numverts);
}
-void R_DrawQ1Q2AliasModel (void)
+void R_DrawQ1Q2AliasModel (float fog)
{
- float fog;
- vec3_t diff;
+ int c, pantsfullbright, shirtfullbright, colormapped;
+ float pantscolor[3], shirtcolor[3];
+ qbyte *bcolor;
+ rmeshbufferinfo_t m;
model_t *model;
skinframe_t *skinframe;
model = currentrenderentity->model;
- R_SetupMDLMD2Frames(&skinframe);
+ skinframe = R_FetchSkinFrame();
+
+ colormapped = !skinframe->merged || (currentrenderentity->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));
+ if (currentrenderentity->effects & EF_ADDITIVE)
+ {
+ m.transparent = true;
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE;
+ }
+ else if (currentrenderentity->alpha != 1.0 || skinframe->fog != NULL)
+ {
+ m.transparent = true;
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+ }
+ else
+ {
+ m.transparent = false;
+ m.blendfunc1 = GL_ONE;
+ m.blendfunc2 = GL_ZERO;
+ }
+ m.numtriangles = model->numtris;
+ m.numverts = model->numverts;
+ m.tex[0] = R_GetTexture(skinframe->merged);
+
+ 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]));
- memset(&aliasmeshinfo, 0, sizeof(aliasmeshinfo));
+ aliasvert = m.vertex;
+ aliasvertcolor = m.color;
+ R_SetupMDLMD2Frames(m.colorscale * (1 - fog), m.colorscale * (1 - fog), m.colorscale * (1 - fog));
+ aliasvert = aliasvertbuf;
+ aliasvertcolor = aliasvertcolorbuf;
- 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]);
+ R_Mesh_Render();
+ }
+ return;
+ }
- fog = 0;
- if (fogenabled)
+ R_SetupMDLMD2Frames(1 - fog, 1 - fog, 1 - fog);
+
+ if (colormapped)
{
- 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
+ // 128-224 are backwards ranges
+ c = (currentrenderentity->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 = (currentrenderentity->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;
}
+ memset(&m, 0, sizeof(m));
if (currentrenderentity->effects & EF_ADDITIVE)
{
- aliasmeshinfo.transparent = true;
- aliasmeshinfo.blendfunc1 = GL_SRC_ALPHA;
- aliasmeshinfo.blendfunc2 = GL_ONE;
+ m.transparent = true;
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.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;
+ m.transparent = true;
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
}
else
{
- aliasmeshinfo.transparent = false;
- aliasmeshinfo.blendfunc1 = GL_ONE;
- aliasmeshinfo.blendfunc2 = GL_ZERO;
+ m.transparent = false;
+ m.blendfunc1 = GL_ONE;
+ m.blendfunc2 = GL_ZERO;
+ }
+ m.numtriangles = model->numtris;
+ m.numverts = model->numverts;
+ m.tex[0] = colormapped ? R_GetTexture(skinframe->base) : R_GetTexture(skinframe->merged);
+ if (R_Mesh_Draw_GetBuffer(&m, true))
+ {
+ 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();
}
- // darken source
- if (fog)
- R_TintModel(aliasvertcolor, aliasvertcolor, model->numverts, 1 - fog, 1 - fog, 1 - fog);
-
- if (skinframe->base || skinframe->pants || skinframe->shirt || skinframe->glow || skinframe->merged)
+ if (colormapped)
{
- if (currentrenderentity->colormap >= 0 && (skinframe->base || skinframe->pants || skinframe->shirt))
+ if (skinframe->pants)
{
- int c;
- qbyte *color;
- if (skinframe->base)
- R_DrawModelMesh(skinframe->base, aliasvertcolor, 0, 0, 0);
- if (skinframe->pants)
+ memset(&m, 0, sizeof(m));
+ m.transparent = currentrenderentity->effects & EF_ADDITIVE || currentrenderentity->alpha != 1.0 || skinframe->fog != NULL;
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE;
+ m.numtriangles = model->numtris;
+ m.numverts = model->numverts;
+ m.tex[0] = R_GetTexture(skinframe->pants);
+ if (R_Mesh_Draw_GetBuffer(&m, true))
{
- 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));
+ 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, currentrenderentity->alpha);
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);
- }
+ 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();
}
- if (skinframe->shirt)
+ }
+ if (skinframe->shirt)
+ {
+ memset(&m, 0, sizeof(m));
+ m.transparent = currentrenderentity->effects & EF_ADDITIVE || currentrenderentity->alpha != 1.0 || skinframe->fog != NULL;
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE;
+ m.numtriangles = model->numtris;
+ m.numverts = model->numverts;
+ m.tex[0] = R_GetTexture(skinframe->shirt);
+ if (R_Mesh_Draw_GetBuffer(&m, true))
{
- 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));
+ 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, currentrenderentity->alpha);
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);
- }
+ 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();
}
}
- else
+ }
+ if (skinframe->glow)
+ {
+ memset(&m, 0, sizeof(m));
+ m.transparent = currentrenderentity->effects & EF_ADDITIVE || currentrenderentity->alpha != 1.0 || skinframe->fog != NULL;
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE;
+ m.numtriangles = model->numtris;
+ m.numverts = model->numverts;
+ m.tex[0] = R_GetTexture(skinframe->glow);
+ if (R_Mesh_Draw_GetBuffer(&m, true))
{
- 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);
- }
+ c_alias_polys += m.numtriangles;
+ R_FillColors(m.color, m.numverts, (1 - fog) * m.colorscale, (1 - fog) * m.colorscale, (1 - fog) * m.colorscale, currentrenderentity->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();
}
- 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);
-
- if (fog && !(currentrenderentity->effects & EF_ADDITIVE))
+ if (fog)
{
- 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;
-
- c_alias_polys += aliasmeshinfo.numtriangles;
- R_Mesh_Draw(&aliasmeshinfo);
+ memset(&m, 0, sizeof(m));
+ m.transparent = currentrenderentity->effects & EF_ADDITIVE || currentrenderentity->alpha != 1.0 || skinframe->fog != NULL;
+ m.blendfunc1 = GL_SRC_ALPHA;
+ m.blendfunc2 = GL_ONE;
+ m.numtriangles = model->numtris;
+ m.numverts = model->numverts;
+ m.tex[0] = R_GetTexture(skinframe->fog);
+ if (R_Mesh_Draw_GetBuffer(&m, false))
+ {
+ c_alias_polys += m.numtriangles;
+ R_FillColors(m.color, m.numverts, fog * m.colorscale, fog * m.colorscale, fog * m.colorscale, currentrenderentity->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();
+ }
}
}
float lerp1, lerp2, lerp3, lerp4;
zymbonematrix *out, rootmatrix, m, *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];
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++;
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++;
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++;
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++;
}
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++;
}
}
}
-void R_DrawZymoticModelMesh(zymtype1header_t *m)
+void R_DrawZymoticModelMesh(zymtype1header_t *m, float fog)
{
+ rmeshbufferinfo_t mbuf;
int i, *renderlist;
rtexture_t **texture;
- // FIXME: do better fog
- 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]);
-
+ renderlist = (int *)(m->lump_render.start + (int) m);
for (i = 0;i < m->numshaders;i++)
{
- aliasmeshinfo.tex[0] = R_GetTexture(texture[i]);
+ memset(&mbuf, 0, sizeof(mbuf));
+ mbuf.numverts = m->numverts;
+ mbuf.numtriangles = *renderlist++;
if (currentrenderentity->effects & EF_ADDITIVE)
{
- aliasmeshinfo.transparent = true;
- aliasmeshinfo.blendfunc1 = GL_SRC_ALPHA;
- aliasmeshinfo.blendfunc2 = GL_ONE;
+ mbuf.transparent = true;
+ mbuf.blendfunc1 = GL_SRC_ALPHA;
+ mbuf.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;
+ mbuf.transparent = true;
+ mbuf.blendfunc1 = GL_SRC_ALPHA;
+ mbuf.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
}
else
{
- aliasmeshinfo.transparent = false;
- aliasmeshinfo.blendfunc1 = GL_ONE;
- aliasmeshinfo.blendfunc2 = GL_ZERO;
+ mbuf.transparent = false;
+ mbuf.blendfunc1 = GL_ONE;
+ mbuf.blendfunc2 = GL_ZERO;
+ }
+ mbuf.tex[0] = R_GetTexture(texture[i]);
+ if (R_Mesh_Draw_GetBuffer(&mbuf, true))
+ {
+ c_alias_polys += mbuf.numtriangles;
+ memcpy(mbuf.index, renderlist, 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();
}
- aliasmeshinfo.numtriangles = *renderlist++;
- aliasmeshinfo.index = renderlist;
- c_alias_polys += aliasmeshinfo.numtriangles;
- R_Mesh_Draw(&aliasmeshinfo);
- renderlist += aliasmeshinfo.numtriangles * 3;
+ renderlist += mbuf.numtriangles * 3;
}
-}
-
-void R_DrawZymoticModelMeshFog(vec3_t org, zymtype1header_t *m)
-{
- int i, *renderlist;
- vec3_t diff;
-
- // FIXME: do better fog
- renderlist = (int *)(m->lump_render.start + (int) m);
-
- aliasmeshinfo.tex[0] = 0;
- aliasmeshinfo.blendfunc1 = GL_SRC_ALPHA;
- aliasmeshinfo.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
- VectorSubtract(org, r_origin, diff);
- aliasmeshinfo.cr = fogcolor[0];
- aliasmeshinfo.cg = fogcolor[1];
- aliasmeshinfo.cb = fogcolor[2];
- aliasmeshinfo.ca = currentrenderentity->alpha * exp(fogdensity/DotProduct(diff,diff));
-
- 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;
+ renderlist = (int *)(m->lump_render.start + (int) m);
+ for (i = 0;i < m->numshaders;i++)
+ {
+ memset(&mbuf, 0, sizeof(mbuf));
+ mbuf.numverts = m->numverts;
+ mbuf.numtriangles = *renderlist++;
+ mbuf.transparent = currentrenderentity->effects & EF_ADDITIVE || currentrenderentity->alpha != 1.0 || R_TextureHasAlpha(texture[i]);
+ mbuf.blendfunc1 = GL_SRC_ALPHA;
+ mbuf.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+ // FIXME: need alpha mask for fogging...
+ //mbuf.tex[0] = R_GetTexture(texture[i]);
+ if (R_Mesh_Draw_GetBuffer(&mbuf, false))
+ {
+ c_alias_polys += mbuf.numtriangles;
+ memcpy(mbuf.index, renderlist, 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, currentrenderentity->alpha * fog);
+ //memcpy(mbuf.texcoords[0], (float *)(m->lump_texcoords.start + (int) m), mbuf.numverts * sizeof(float[2]));
+ R_Mesh_Render();
+ }
+ renderlist += mbuf.numtriangles * 3;
+ }
}
}
-void R_DrawZymoticModel (void)
+void R_DrawZymoticModel (float fog)
{
zymtype1header_t *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);
-
- memset(&aliasmeshinfo, 0, sizeof(aliasmeshinfo));
- aliasmeshinfo.numverts = m->numverts;
-
- R_DrawZymoticModelMesh(m);
+ R_LightModel(m->numverts, 1 - fog, 1 - fog, 1 - fog, true);
- if (fogenabled)
- R_DrawZymoticModelMeshFog(currentrenderentity->origin, m);
+ R_DrawZymoticModelMesh(m, fog);
}
void R_DrawAliasModel (void)
{
+ float fog;
+ vec3_t diff;
+
if (currentrenderentity->alpha < (1.0f / 64.0f))
return; // basically completely transparent
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();
+ R_DrawZymoticModel(fog);
else
- R_DrawQ1Q2AliasModel();
+ R_DrawQ1Q2AliasModel(fog);
}
+
projects / xonotic / darkplaces.git / blobdiff