R_RegisterModule("GL_Models", gl_models_start, gl_models_shutdown, gl_models_newmap);
}
+/*
void R_AliasTransformVerts(int vertcount)
{
vec3_t point;
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;
}
}
-skinframe_t *R_FetchSkinFrame(entity_render_t *ent)
+skinframe_t *R_FetchSkinFrame(const entity_render_t *ent)
{
model_t *model = ent->model;
- if (model->skinscenes[ent->skinnum].framecount > 1)
- return &model->skinframes[model->skinscenes[ent->skinnum].firstframe + (int) (cl.time * 10) % model->skinscenes[ent->skinnum].framecount];
+ 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[ent->skinnum].firstframe];
+ return &model->skinframes[model->skinscenes[s].firstframe];
}
-void R_SetupMDLMD2Frames(entity_render_t *ent, 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 = ent->model;
+ 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];
R_LightModel(ent, model->numverts, colorr, colorg, colorb, false);
- R_AliasTransformVerts(model->numverts);
+ //R_AliasTransformVerts(model->numverts);
}
-void R_DrawQ1Q2AliasModelCallback (void *calldata1, int calldata2)
+void R_DrawQ1Q2AliasModelCallback (const void *calldata1, int calldata2)
{
- int c, pantsfullbright, shirtfullbright, colormapped;
+ int i, c, pantsfullbright, shirtfullbright, colormapped;
float pantscolor[3], shirtcolor[3];
float fog;
vec3_t diff;
rmeshbufferinfo_t m;
model_t *model;
skinframe_t *skinframe;
- entity_render_t *ent;
+ const entity_render_t *ent = calldata1;
+ int blendfunc1, blendfunc2;
- ent = calldata1;
- softwaretransformforentity(ent);
+// softwaretransformforentity(ent);
fog = 0;
if (fogenabled)
skinframe = R_FetchSkinFrame(ent);
+ 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)
+ {
+ // 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))
+ {
+ 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();
+ }
+ return;
+ }
+
+
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));
- if (ent->effects & EF_ADDITIVE)
- {
- m.transparent = true;
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE;
- }
- else if (ent->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.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))
aliasvert = m.vertex;
aliasvertcolor = m.color;
- R_SetupMDLMD2Frames(ent, m.colorscale * (1 - fog), m.colorscale * (1 - fog), m.colorscale * (1 - fog));
+ R_SetupMDLMD2Frames(ent, m.colorscale, m.colorscale, m.colorscale);
aliasvert = aliasvertbuf;
aliasvertcolor = aliasvertcolorbuf;
}
memset(&m, 0, sizeof(m));
- if (ent->effects & EF_ADDITIVE)
- {
- m.transparent = true;
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE;
- }
- else if (ent->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.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 (R_Mesh_Draw_GetBuffer(&m, true))
+ 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]));
if (skinframe->pants)
{
memset(&m, 0, sizeof(m));
- m.transparent = ent->effects & EF_ADDITIVE || ent->alpha != 1.0 || skinframe->fog != NULL;
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE;
+ 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 (R_Mesh_Draw_GetBuffer(&m, true))
+ if (m.tex[0] && R_Mesh_Draw_GetBuffer(&m, true))
{
+ 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);
if (skinframe->shirt)
{
memset(&m, 0, sizeof(m));
- m.transparent = ent->effects & EF_ADDITIVE || ent->alpha != 1.0 || skinframe->fog != NULL;
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE;
+ 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 (R_Mesh_Draw_GetBuffer(&m, true))
+ if (m.tex[0] && R_Mesh_Draw_GetBuffer(&m, true))
{
+ 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);
if (skinframe->glow)
{
memset(&m, 0, sizeof(m));
- m.transparent = ent->effects & EF_ADDITIVE || ent->alpha != 1.0 || skinframe->fog != NULL;
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE;
+ 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 (R_Mesh_Draw_GetBuffer(&m, true))
+ if (m.tex[0] && R_Mesh_Draw_GetBuffer(&m, true))
{
+ 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]));
if (fog)
{
memset(&m, 0, sizeof(m));
- m.transparent = ent->effects & EF_ADDITIVE || ent->alpha != 1.0 || skinframe->fog != NULL;
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, false))
+ if (R_Mesh_Draw_GetBuffer(&m, true))
{
c_alias_polys += m.numtriangles;
- R_FillColors(m.color, m.numverts, fog * m.colorscale, fog * m.colorscale, fog * m.colorscale, ent->alpha);
+ 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]));
}
}
-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;
+ /*
// 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];
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;
}
}
-void R_DrawZymoticModelMeshCallback (void *calldata1, int calldata2)
+void R_DrawZymoticModelMeshCallback (const void *calldata1, int calldata2)
{
float fog;
vec3_t diff;
zymtype1header_t *m;
rtexture_t *texture;
rmeshbufferinfo_t mbuf;
- entity_render_t *ent;
- int shadernum;
-
- ent = calldata1;
- shadernum = calldata2;
+ const entity_render_t *ent = calldata1;
+ int shadernum = calldata2;
// find the vertex index list and texture
m = ent->model->zymdata_header;
// 2. render fog as additive
}
- softwaretransformforentity(ent);
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));
- R_LightModel(ent, m->numverts, 1 - fog, 1 - fog, 1 - fog, true);
+ R_LightModel(ent, m->numverts, 1 - fog, 1 - fog, 1 - fog, false);
memset(&mbuf, 0, sizeof(mbuf));
mbuf.numverts = m->numverts;
mbuf.numtriangles = renderlist[0];
- mbuf.transparent = false;
if (ent->effects & EF_ADDITIVE)
{
mbuf.blendfunc1 = GL_SRC_ALPHA;
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;
memset(&mbuf, 0, sizeof(mbuf));
mbuf.numverts = m->numverts;
mbuf.numtriangles = renderlist[0];
- mbuf.transparent = false;
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;
projects / xonotic / darkplaces.git / blobdiff