qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-31 08:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add my test tetrahedrons.

Browse source
This commit is contained in:
Bill Currie 2012-01-02 23:32:30 +09:00
parent baab15279f
commit ba04cf73d0
1 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

28
libs/video/renderer/glsl/glsl_alias.c
View file

@ -150,6 +150,20 @@ R_InitAlias (void)
void void
R_DrawAlias (void) R_DrawAlias (void)
{ {
#ifdef TETRAHEDRON
static aliasvrt_t debug_verts[] = {
{{0,0,0},{0,0,0}},
{{255,255,0},{0,300,0}},
{{0,255,255},{300,300,0}},
{{255,0,255},{300,0,0}},
};
static GLushort debug_indices[] = {
0, 1, 2,
0, 3, 1,
1, 3, 2,
0, 2, 3,
};
#endif
static quat_t color = { 1, 1, 1, 1}; static quat_t color = { 1, 1, 1, 1};
static vec3_t lightvec = { -1, 0, 0 }; //FIXME static vec3_t lightvec = { -1, 0, 0 }; //FIXME
float ambient = 128; //FIXME float ambient = 128; //FIXME
@ -193,8 +207,10 @@ R_DrawAlias (void)
qfglBindTexture (GL_TEXTURE_2D, skin->texnum); qfglBindTexture (GL_TEXTURE_2D, skin->texnum);
#ifndef TETRAHEDRON
qfglBindBuffer (GL_ARRAY_BUFFER, hdr->posedata); qfglBindBuffer (GL_ARRAY_BUFFER, hdr->posedata);
qfglBindBuffer (GL_ELEMENT_ARRAY_BUFFER, hdr->commands); qfglBindBuffer (GL_ELEMENT_ARRAY_BUFFER, hdr->commands);
#endif
qfglVertexAttrib4fv (quake_mdl.color.location, color); qfglVertexAttrib4fv (quake_mdl.color.location, color);
qfglUniform1f (quake_mdl.ambient.location, ambient); qfglUniform1f (quake_mdl.ambient.location, ambient);
@ -204,6 +220,7 @@ R_DrawAlias (void)
qfglUniformMatrix4fv (quake_mdl.mvp_matrix.location, 1, false, mvp_mat); qfglUniformMatrix4fv (quake_mdl.mvp_matrix.location, 1, false, mvp_mat);
qfglUniformMatrix3fv (quake_mdl.norm_matrix.location, 1, false, norm_mat); qfglUniformMatrix3fv (quake_mdl.norm_matrix.location, 1, false, norm_mat);
#ifndef TETRAHEDRON
qfglVertexAttribPointer (quake_mdl.vertex.location, 3, GL_UNSIGNED_BYTE, qfglVertexAttribPointer (quake_mdl.vertex.location, 3, GL_UNSIGNED_BYTE,
0, sizeof (aliasvrt_t), 0, sizeof (aliasvrt_t),
pose + field_offset (aliasvrt_t, vertex)); pose + field_offset (aliasvrt_t, vertex));
@ -211,6 +228,17 @@ R_DrawAlias (void)
0, sizeof (aliasvrt_t), 0, sizeof (aliasvrt_t),
pose + field_offset (aliasvrt_t, stn)); pose + field_offset (aliasvrt_t, stn));
qfglDrawElements (GL_TRIANGLES, hdr->mdl.numtris, GL_UNSIGNED_SHORT, 0); qfglDrawElements (GL_TRIANGLES, hdr->mdl.numtris, GL_UNSIGNED_SHORT, 0);
#else
qfglVertexAttribPointer (quake_mdl.vertex.location, 3, GL_UNSIGNED_BYTE,
0, sizeof (aliasvrt_t),
&debug_verts[0].vertex);
qfglVertexAttribPointer (quake_mdl.stn.location, 3, GL_SHORT,
0, sizeof (aliasvrt_t),
&debug_verts[0].stn);
qfglDrawElements (GL_TRIANGLES,
sizeof (debug_indices) / sizeof (debug_indices[0]),
GL_UNSIGNED_SHORT, debug_indices);
#endif
} }
// All alias models are drawn in a batch, so avoid thrashing the gl state // All alias models are drawn in a batch, so avoid thrashing the gl state