WildCode's alias model VA prepatory patch

include/QF/model.h

@@ -309,7 +309,7 @@ typedef struct {
 	int			triangles;
 
 	mdl_t		mdl;
-
+	int			tex_coord;
 	int			numposes;
 	int			poseverts;
 	int			posedata;	// numposes * poseverts trivert_t
@@ -462,6 +462,7 @@ void	 Mod_Print (void);
 
 extern struct cvar_s *gl_mesh_cache;
 extern struct cvar_s *gl_subdivide_size;
+extern struct cvar_s *gl_alias_render_tri;
 extern model_t *loadmodel;
 extern char loadname[32];
 extern byte *mod_base;

include/QF/modelgen.h

@@ -71,6 +71,10 @@ typedef struct {
 
 // TODO: could be shorts
 
+typedef struct {
+	float	st[2];
+} tex_coord_t; 
+
 typedef struct {
 	int		onseam;
 	int		s;

libs/models/alias/gl_mesh.c

@@ -345,6 +345,8 @@ Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m, int _s, i
 	aliasmodel = m;
 	paliashdr = hdr;
 
+	if (!gl_alias_render_tri->int_val) {
+
 		if (gl_mesh_cache->int_val
 			&& gl_mesh_cache->int_val <= paliashdr->mdl.numtris) {
 			do_cache = true;
@@ -472,6 +474,34 @@ Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m, int _s, i
 		paliashdr->commands = (byte *) cmds - (byte *) paliashdr;
 		memcpy (cmds, commands, numcommands * sizeof (int));
 
+	} else {
+		tex_coord_t *tex_coord;
+
+		numorder = 0;	
+		for (i=0; i < pheader->mdl.numtris; i++) {
+			add_vertex(triangles[i].vertindex[0]);
+			add_vertex(triangles[i].vertindex[1]);
+			add_vertex(triangles[i].vertindex[2]);
+		}
+		paliashdr->poseverts = numorder;	
+
+		tex_coord = Hunk_Alloc (numorder * sizeof(tex_coord_t));
+		paliashdr->tex_coord = (byte *) tex_coord - (byte *) paliashdr;
+		for (i=0; i < numorder; i++) {
+			float s, t;
+			int k;
+			k = vertexorder[i];
+			s = stverts[k].s;
+			t = stverts[k].t;
+			if (!triangles[i/3].facesfront && stverts[k].onseam)
+				s += pheader->mdl.skinwidth / 2;	// on back side
+			s = (s + 0.5) / pheader->mdl.skinwidth;
+			t = (t + 0.5) / pheader->mdl.skinheight;
+			tex_coord[i].st[0] = s;
+			tex_coord[i].st[1] = t;
+		}
+	}
+
 	if (extra) {
 		trivertx16_t *verts;
 		verts = Hunk_Alloc (paliashdr->numposes * paliashdr->poseverts

libs/models/model.c

@@ -60,6 +60,7 @@ texture_t  *r_notexture_mip;
 
 cvar_t     *gl_mesh_cache;
 cvar_t     *gl_subdivide_size;
+cvar_t     *gl_alias_render_tri;
 
 static void Mod_CallbackLoad (void *object, cache_allocator_t allocator);
 
@@ -102,6 +103,7 @@ Mod_Init_Cvars (void)
 	gl_mesh_cache = Cvar_Get ("gl_mesh_cache", "256", CVAR_ARCHIVE, NULL,
 							  "minimum triangle count in a model for its mesh"
 							  " to be cached. 0 to disable caching");
+	gl_alias_render_tri = Cvar_Get("gl_alias_render_tri", "0", CVAR_ARCHIVE, NULL, "When loading alias models mesh for pure triangle rendering");
 }
 
 void

libs/video/renderer/gl/gl_mod_alias.c

@@ -74,6 +74,8 @@ typedef struct {
 typedef struct {
 	blended_vert_t *verts;
 	int        *order;
+	tex_coord_t *tex_coord;
+	int		count;
 } vert_order_t;
 
 float		r_avertexnormals[NUMVERTEXNORMALS][3] = {
@@ -88,6 +90,84 @@ float   r_avertexnormal_dots[SHADEDOT_QUANT][256] =
 
 vec3_t		shadevector;
 
+
+static void
+GL_DrawAliasFrameTri (vert_order_t *vo)
+{
+	float			color[4];
+	int			count;
+	blended_vert_t	*verts;
+	tex_coord_t		*tex_coord;
+
+	verts = vo->verts;
+	tex_coord = vo->tex_coord;
+	color[3] = modelalpha;
+	count = vo->count;
+	qfglBegin (GL_TRIANGLES);
+	do {
+		qfglTexCoord2fv (tex_coord->st);
+		VectorMA (ambientcolor, verts->lightdot, shadecolor, color);
+		qfglColor4fv (color);
+		qfglVertex3fv (verts->vert);
+
+		tex_coord++;
+		verts++;
+	} while (count--);
+	qfglEnd();
+}
+
+static void
+GL_DrawAliasFrameTri_fb (vert_order_t *vo)
+{
+	int				count;
+	float color[4] = { 1.0, 1.0, 1.0, 0.0};
+	blended_vert_t *verts;
+	tex_coord_t *tex_coord;
+	verts = vo->verts;
+	color[3] = modelalpha * 1.0;
+	count = vo->count;
+	tex_coord = vo->tex_coord;
+	qfglBegin (GL_TRIANGLES);
+	do {
+		qfglTexCoord2fv (tex_coord->st);
+		qfglColor4fv (color);
+		qfglVertex3fv (verts->vert);
+
+		tex_coord++;
+		verts++;
+	} while (--count);
+	qfglEnd();
+}
+
+static void
+GL_DrawAliasFrameTriMulti (vert_order_t *vo)
+{
+	float			color[4];
+	int				count;
+	blended_vert_t *verts;
+	tex_coord_t	*tex_coord;
+
+	verts = vo->verts;
+	tex_coord = vo->tex_coord;	
+	color[3] = modelalpha;
+	count = vo->count;
+	qfglBegin (GL_TRIANGLES);
+	do {
+		// texture coordinates come from the draw list
+		qglMultiTexCoord2fv (gl_mtex_enum + 0, tex_coord->st);
+		qglMultiTexCoord2fv (gl_mtex_enum + 1, tex_coord->st);
+		tex_coord++;
+
+		// normals and vertexes come from the frame list
+		VectorMA (ambientcolor, verts->lightdot, shadecolor, color);
+		qfglColor4fv (color);
+
+		qfglVertex3fv (verts->vert);
+		verts++;
+	} while (--count);
+	qfglEnd ();
+}
+
 static void
 GL_DrawAliasFrame (vert_order_t *vo)
 {
@@ -277,14 +357,18 @@ GL_GetAliasFrameVerts16 (int frame, aliashdr_t *paliashdr, entity_t *e)
 
 	pose = paliashdr->frames[frame].firstpose;
 	numposes = paliashdr->frames[frame].numposes;
-
 	verts = (trivertx16_t *) ((byte *) paliashdr + paliashdr->posedata);
 
 	count = paliashdr->poseverts;
 	vo = Hunk_TempAlloc (sizeof (*vo) + count * sizeof (blended_vert_t));
 	vo->order = (int *) ((byte *) paliashdr + paliashdr->commands);
 	vo->verts = (blended_vert_t *) &vo[1];
-
+	if (paliashdr->tex_coord) {
+		vo->tex_coord = (tex_coord_t *) ((byte *) paliashdr + paliashdr->tex_coord);
+	} else {
+		vo->tex_coord = NULL;
+	}
+	vo->count = count;
 	if (numposes > 1) {
 		interval = paliashdr->frames[frame].interval;
 		pose += (int) (r_realtime / interval) % numposes;
@@ -386,6 +470,12 @@ GL_GetAliasFrameVerts (int frame, aliashdr_t *paliashdr, entity_t *e)
 	vo = Hunk_TempAlloc (sizeof (*vo) + count * sizeof (blended_vert_t));
 	vo->order = (int *) ((byte *) paliashdr + paliashdr->commands);
 	vo->verts = (blended_vert_t *) &vo[1];
+	if (paliashdr->tex_coord) {
+		vo->tex_coord = (tex_coord_t *) ((byte *) paliashdr + paliashdr->tex_coord);
+	} else {
+		vo->tex_coord = NULL;
+	}
+	vo->count = count;
 
 	if (numposes > 1) {
 		interval = paliashdr->frames[frame].interval;
@@ -619,11 +709,18 @@ R_DrawAliasModel (entity_t *e)
 
 	// draw all the triangles
 	if (model->fullbright) {
+
 		qfglBindTexture (GL_TEXTURE_2D, texture);
+		if (vo->tex_coord)
+			GL_DrawAliasFrameTri_fb (vo);
+		else 
 			GL_DrawAliasFrame_fb (vo);
 	} else if (!fb_texture) {
 		// Model has no fullbrights, don't bother with multi
 		qfglBindTexture (GL_TEXTURE_2D, texture);
+		if (vo->tex_coord)
+			GL_DrawAliasFrameTri (vo);
+		else
 			GL_DrawAliasFrame (vo);
 	} else {	// try multitexture
 		if (gl_mtex_active) {	// set up the textures
@@ -635,19 +732,29 @@ R_DrawAliasModel (entity_t *e)
 			qfglTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
 			qfglEnable (GL_TEXTURE_2D);
 
-			GL_DrawAliasFrameMulti (vo);	// do the heavy lifting
+			// do the heavy lifting
+			if (vo->tex_coord)
+				GL_DrawAliasFrameTriMulti (vo);
+			else 
+				GL_DrawAliasFrameMulti (vo);
 
 			// restore the settings
 			qfglDisable (GL_TEXTURE_2D);
 			qglActiveTexture (gl_mtex_enum + 0);
+		} else {
+			if (vo->tex_coord) {
+				qfglBindTexture (GL_TEXTURE_2D, texture);
+				GL_DrawAliasFrameTri (vo);
+				qfglBindTexture (GL_TEXTURE_2D, fb_texture);
+				GL_DrawAliasFrameTri_fb (vo);
 			} else {
 				qfglBindTexture (GL_TEXTURE_2D, texture);
 				GL_DrawAliasFrame (vo);
-
 				qfglBindTexture (GL_TEXTURE_2D, fb_texture);
 				GL_DrawAliasFrame_fb (vo);
 			}
 		}
+	}
 
 	qfglPopMatrix ();