// used for dlight push checking and other things
int r_framecount;
+// used for visibility checking
+qbyte r_pvsbits[(MAX_MAP_LEAFS+7)>>3];
+
mplane_t frustum[4];
matrix4x4_t r_identitymatrix;
cvar_t r_textureunits = {0, "r_textureunits", "32"};
+cvar_t r_lerpsprites = {CVAR_SAVE, "r_lerpsprites", "1"};
+cvar_t r_lerpmodels = {CVAR_SAVE, "r_lerpmodels", "1"};
+cvar_t r_waterscroll = {CVAR_SAVE, "r_waterscroll", "1"};
+
+
+
void R_ModulateColors(float *in, float *out, int verts, float r, float g, float b)
{
int i;
extern void CL_ParseEntityLump(char *entitystring);
void gl_main_newmap(void)
{
- if (cl.worldmodel && cl.worldmodel->entities)
- CL_ParseEntityLump(cl.worldmodel->entities);
+ int l;
+ char *entities, entname[MAX_QPATH];
r_framecount = 1;
+ if (cl.worldmodel)
+ {
+ strcpy(entname, cl.worldmodel->name);
+ l = strlen(entname) - 4;
+ if (l >= 0 && !strcmp(entname + l, ".bsp"))
+ {
+ strcpy(entname + l, ".ent");
+ if ((entities = FS_LoadFile(entname, true)))
+ {
+ CL_ParseEntityLump(entities);
+ Mem_Free(entities);
+ return;
+ }
+ }
+ if (cl.worldmodel->brush.entities)
+ CL_ParseEntityLump(cl.worldmodel->brush.entities);
+ }
}
void GL_Main_Init(void)
Cvar_RegisterVariable (&r_fullbright);
Cvar_RegisterVariable (&r_textureunits);
Cvar_RegisterVariable (&r_shadow_cull);
+ Cvar_RegisterVariable (&r_lerpsprites);
+ Cvar_RegisterVariable (&r_lerpmodels);
+ Cvar_RegisterVariable (&r_waterscroll);
if (gamemode == GAME_NEHAHRA || gamemode == GAME_NEXUIZ)
Cvar_SetValue("r_fullbrights", 0);
R_RegisterModule("GL_Main", gl_main_start, gl_main_shutdown, gl_main_newmap);
extern void ui_init(void);
extern void gl_backend_init(void);
extern void Sbar_Init(void);
+extern void R_LightningBeams_Init(void);
void Render_Init(void)
{
R_Explosion_Init();
ui_init();
Sbar_Init();
+ R_LightningBeams_Init();
}
/*
VID_CheckExtensions();
// LordHavoc: report supported extensions
- Con_Printf ("\nengine extensions: %s\n", ENGINE_EXTENSIONS);
+ Con_DPrintf("\nengine extensions: %s\n", ENGINE_EXTENSIONS);
}
int R_CullBox(const vec3_t mins, const vec3_t maxs)
return false;
}
-int PVS_CullBox(const vec3_t mins, const vec3_t maxs)
-{
- int stackpos, sides;
- mnode_t *node, *stack[4096];
- if (cl.worldmodel == NULL)
- return false;
- stackpos = 0;
- stack[stackpos++] = cl.worldmodel->nodes;
- while (stackpos)
- {
- node = stack[--stackpos];
- if (node->contents < 0)
- {
- if (((mleaf_t *)node)->pvsframe == cl.worldmodel->pvsframecount)
- return false;
- }
- else
- {
- sides = BoxOnPlaneSide(mins, maxs, node->plane);
- if (sides & 2 && stackpos < 4096)
- stack[stackpos++] = node->children[1];
- if (sides & 1 && stackpos < 4096)
- stack[stackpos++] = node->children[0];
- }
- }
- return true;
-}
-
-int VIS_CullBox(const vec3_t mins, const vec3_t maxs)
-{
- int stackpos, sides;
- mnode_t *node, *stack[4096];
- if (R_CullBox(mins, maxs))
- return true;
- if (cl.worldmodel == NULL)
- return false;
- stackpos = 0;
- stack[stackpos++] = cl.worldmodel->nodes;
- while (stackpos)
- {
- node = stack[--stackpos];
- if (node->contents < 0)
- {
- if (((mleaf_t *)node)->visframe == r_framecount)
- return false;
- }
- else
- {
- sides = BoxOnPlaneSide(mins, maxs, node->plane);
- if (sides & 2 && stackpos < 4096)
- stack[stackpos++] = node->children[1];
- if (sides & 1 && stackpos < 4096)
- stack[stackpos++] = node->children[0];
- }
- }
- return true;
-}
-
-int R_CullSphere(const vec3_t origin, vec_t radius)
-{
- return (DotProduct(frustum[0].normal, origin) + radius < frustum[0].dist
- || DotProduct(frustum[1].normal, origin) + radius < frustum[1].dist
- || DotProduct(frustum[2].normal, origin) + radius < frustum[2].dist
- || DotProduct(frustum[3].normal, origin) + radius < frustum[3].dist);
-}
-
-int PVS_CullSphere(const vec3_t origin, vec_t radius)
-{
- int stackpos;
- mnode_t *node, *stack[4096];
- float dist;
- if (cl.worldmodel == NULL)
- return false;
- stackpos = 0;
- stack[stackpos++] = cl.worldmodel->nodes;
- while (stackpos)
- {
- node = stack[--stackpos];
- if (node->contents < 0)
- {
- if (((mleaf_t *)node)->pvsframe == cl.worldmodel->pvsframecount)
- return false;
- }
- else
- {
- dist = PlaneDiff(origin, node->plane);
- if (dist <= radius)
- stack[stackpos++] = node->children[1];
- if (dist >= -radius)
- stack[stackpos++] = node->children[0];
- }
- }
- return true;
-}
-
-int VIS_CullSphere(const vec3_t origin, vec_t radius)
-{
- int stackpos;
- mnode_t *node, *stack[4096];
- float dist;
- if (R_CullSphere(origin, radius))
- return true;
- if (cl.worldmodel == NULL)
- return false;
- stackpos = 0;
- stack[stackpos++] = cl.worldmodel->nodes;
- while (stackpos)
- {
- node = stack[--stackpos];
- if (node->contents < 0)
- {
- if (((mleaf_t *)node)->visframe == r_framecount)
- return false;
- }
- else
- {
- dist = PlaneDiff(origin, node->plane);
- if (dist <= radius)
- stack[stackpos++] = node->children[1];
- if (dist >= -radius)
- stack[stackpos++] = node->children[0];
- }
- }
- return true;
-}
-
+#define VIS_CullBox(mins,maxs) (R_CullBox((mins), (maxs)) || (cl.worldmodel && cl.worldmodel->brush.BoxTouchingPVS && !cl.worldmodel->brush.BoxTouchingPVS(cl.worldmodel, r_pvsbits, (mins), (maxs))))
//==================================================================================
R_LerpAnimation(ent);
R_UpdateEntLights(ent);
if ((chase_active.integer || !(ent->flags & RENDER_EXTERIORMODEL))
- && !VIS_CullSphere(ent->origin, (ent->model != NULL ? ent->model->radius : 16) * ent->scale)
&& !VIS_CullBox(ent->mins, ent->maxs))
{
ent->visframe = r_framecount;
int shadowframecount = 0;
-int Light_CullBox(const vec3_t mins, const vec3_t maxs)
-{
- int stackpos, sides;
- mnode_t *node, *stack[4096];
- if (cl.worldmodel == NULL)
- return false;
- stackpos = 0;
- stack[stackpos++] = cl.worldmodel->nodes;
- while (stackpos)
- {
- node = stack[--stackpos];
- if (node->contents < 0)
- {
- if (((mleaf_t *)node)->worldnodeframe == shadowframecount)
- return false;
- }
- else
- {
- sides = BoxOnPlaneSide(mins, maxs, node->plane);
- if (sides & 2 && stackpos < 4096)
- stack[stackpos++] = node->children[1];
- if (sides & 1 && stackpos < 4096)
- stack[stackpos++] = node->children[0];
- }
- }
- return true;
-}
-
-int LightAndVis_CullBox(const vec3_t mins, const vec3_t maxs)
-{
- int stackpos, sides;
- mnode_t *node, *stack[4096];
- if (R_CullBox(mins, maxs))
- return true;
- if (cl.worldmodel == NULL)
- return false;
- stackpos = 0;
- stack[stackpos++] = cl.worldmodel->nodes;
- while (stackpos)
- {
- node = stack[--stackpos];
- if (node->contents < 0)
- {
- if (((mleaf_t *)node)->visframe == r_framecount && ((mleaf_t *)node)->worldnodeframe == shadowframecount)
- return false;
- }
- else
- {
- sides = BoxOnPlaneSide(mins, maxs, node->plane);
- if (sides & 2 && stackpos < 4096)
- stack[stackpos++] = node->children[1];
- if (sides & 1 && stackpos < 4096)
- stack[stackpos++] = node->children[0];
- }
- }
- return true;
-}
-
-int LightAndVis_CullPointCloud(int numpoints, const float *points)
-{
- int i;
- const float *p;
- int stackpos, sides;
- mnode_t *node, *stack[4096];
- //if (R_CullBox(mins, maxs))
- // return true;
- if (cl.worldmodel == NULL)
- return false;
- stackpos = 0;
- stack[stackpos++] = cl.worldmodel->nodes;
- while (stackpos)
- {
- node = stack[--stackpos];
- if (node->contents < 0)
- {
- if (((mleaf_t *)node)->visframe == r_framecount && ((mleaf_t *)node)->worldnodeframe == shadowframecount)
- return false;
- }
- else
- {
- sides = 0;
- for (i = 0, p = points;i < numpoints && sides != 3;i++, p += 3)
- {
- if (DotProduct(p, node->plane->normal) < node->plane->dist)
- sides |= 1;
- else
- sides |= 2;
- }
- if (sides & 2 && stackpos < 4096)
- stack[stackpos++] = node->children[1];
- if (sides & 1 && stackpos < 4096)
- stack[stackpos++] = node->children[0];
- }
- }
- return true;
-}
-
-
void R_TestAndDrawShadowVolume(entity_render_t *ent, vec3_t lightorigin, float cullradius, float lightradius, vec3_t lightmins, vec3_t lightmaxs, vec3_t clipmins, vec3_t clipmaxs, int lightmarked)
{
vec3_t relativelightorigin;
- #if 0
- int i;
- vec3_t temp;
- float dist, projectdistance;
- float points[16][3];
- #endif
// rough checks
- if (!(ent->flags & RENDER_SHADOW) || ent->model == NULL || ent->model->DrawShadowVolume == NULL)
- return;
- if (r_shadow_cull.integer)
- {
- if (ent->maxs[0] < lightmins[0] || ent->mins[0] > lightmaxs[0]
- || ent->maxs[1] < lightmins[1] || ent->mins[1] > lightmaxs[1]
- || ent->maxs[2] < lightmins[2] || ent->mins[2] > lightmaxs[2]
- || (lightmarked && Light_CullBox(ent->mins, ent->maxs)))
- return;
- }
- #if 0
- if (r_shadow_cull.integer)
+ if ((ent->flags & RENDER_SHADOW) && ent->model && ent->model->DrawShadowVolume && !(r_shadow_cull.integer && (ent->maxs[0] < lightmins[0] || ent->mins[0] > lightmaxs[0] || ent->maxs[1] < lightmins[1] || ent->mins[1] > lightmaxs[1] || ent->maxs[2] < lightmins[2] || ent->mins[2] > lightmaxs[2])))
{
- projectdistance = cullradius;
- // calculate projected bounding box and decide if it is on-screen
- for (i = 0;i < 8;i++)
- {
- temp[0] = i & 1 ? ent->model->normalmaxs[0] : ent->model->normalmins[0];
- temp[1] = i & 2 ? ent->model->normalmaxs[1] : ent->model->normalmins[1];
- temp[2] = i & 4 ? ent->model->normalmaxs[2] : ent->model->normalmins[2];
- Matrix4x4_Transform(&ent->matrix, temp, points[i]);
- VectorSubtract(points[i], lightorigin, temp);
- dist = projectdistance / sqrt(DotProduct(temp, temp));
- VectorMA(lightorigin, dist, temp, points[i+8]);
- }
- if (LightAndVis_CullPointCloud(16, points[0]))
- return;
- /*
- for (i = 0;i < 8;i++)
- {
- p2[0] = i & 1 ? ent->model->normalmaxs[0] : ent->model->normalmins[0];
- p2[1] = i & 2 ? ent->model->normalmaxs[1] : ent->model->normalmins[1];
- p2[2] = i & 4 ? ent->model->normalmaxs[2] : ent->model->normalmins[2];
- Matrix4x4_Transform(&ent->matrix, p2, p);
- VectorSubtract(p, lightorigin, temp);
- dist = projectdistance / sqrt(DotProduct(temp, temp));
- VectorMA(p, dist, temp, p2);
- if (i)
- {
- if (mins[0] > p[0]) mins[0] = p[0];if (maxs[0] < p[0]) maxs[0] = p[0];
- if (mins[1] > p[1]) mins[1] = p[1];if (maxs[1] < p[1]) maxs[1] = p[1];
- if (mins[2] > p[2]) mins[2] = p[2];if (maxs[2] < p[2]) maxs[2] = p[2];
- }
- else
- {
- VectorCopy(p, mins);
- VectorCopy(p, maxs);
- }
- if (mins[0] > p2[0]) mins[0] = p2[0];if (maxs[0] < p2[0]) maxs[0] = p2[0];
- if (mins[1] > p2[1]) mins[1] = p2[1];if (maxs[1] < p2[1]) maxs[1] = p2[1];
- if (mins[2] > p2[2]) mins[2] = p2[2];if (maxs[2] < p2[2]) maxs[2] = p2[2];
- }
- if (mins[0] >= clipmaxs[0] || maxs[0] <= clipmins[0]
- || mins[1] >= clipmaxs[1] || maxs[1] <= clipmins[1]
- || mins[2] >= clipmaxs[2] || maxs[2] <= clipmins[2]
- || LightAndVis_CullBox(mins, maxs))
- return;
- */
+ Matrix4x4_Transform(&ent->inversematrix, lightorigin, relativelightorigin);
+ ent->model->DrawShadowVolume (ent, relativelightorigin, lightradius);
}
- #endif
- Matrix4x4_Transform(&ent->inversematrix, lightorigin, relativelightorigin);
- ent->model->DrawShadowVolume (ent, relativelightorigin, lightradius);
}
void R_Shadow_DrawWorldLightShadowVolume(matrix4x4_t *matrix, worldlight_t *light);
extern void R_Model_Brush_DrawLightForSurfaceList(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, msurface_t **surflist, int numsurfaces, const matrix4x4_t *matrix_modeltofilter, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz);
-void R_ShadowVolumeLighting (int visiblevolumes)
+void R_ShadowVolumeLighting(int visiblevolumes)
{
int i;
entity_render_t *ent;
worldlight_t *wl;
rdlight_t *rd;
rmeshstate_t m;
- mleaf_t *leaf;
matrix4x4_t matrix;
matrix4x4_t matrix_worldtofilter, matrix_worldtoattenuationxyz, matrix_worldtoattenuationz;
matrix4x4_t matrix_modeltofilter, matrix_modeltoattenuationxyz, matrix_modeltoattenuationz;
if (visiblevolumes)
{
memset(&m, 0, sizeof(m));
- m.blendfunc1 = GL_ONE;
- m.blendfunc2 = GL_ONE;
- if (r_shadow_visiblevolumes.integer >= 2)
- m.depthdisable = true;
- R_Mesh_State(&m);
+ R_Mesh_State_Texture(&m);
+
+ GL_BlendFunc(GL_ONE, GL_ONE);
+ GL_DepthMask(false);
+ GL_DepthTest(r_shadow_visiblevolumes.integer < 2);
qglDisable(GL_CULL_FACE);
GL_Color(0.0 * r_colorscale, 0.0125 * r_colorscale, 0.1 * r_colorscale, 1);
}
{
if (d_lightstylevalue[wl->style] <= 0)
continue;
- if (R_CullBox(wl->mins, wl->maxs))
- //if (R_CullSphere(wl->origin, cullradius))
+ if (VIS_CullBox(wl->mins, wl->maxs))
continue;
- //if (R_CullBox(wl->mins, wl->maxs) || R_CullSphere(wl->origin, lightradius))
- // continue;
- //if (VIS_CullBox(wl->mins, wl->maxs) || VIS_CullSphere(wl->origin, lightradius))
- // continue;
if (r_shadow_debuglight.integer >= 0 && lnum != r_shadow_debuglight.integer)
continue;
+ if (R_Shadow_ScissorForBBox(wl->mins, wl->maxs))
+ continue;
cullradius = wl->cullradius;
lightradius = wl->lightradius;
-
- if (cl.worldmodel != NULL)
- {
- for (i = 0;i < wl->numleafs;i++)
- if (wl->leafs[i]->visframe == r_framecount)
- break;
- if (i == wl->numleafs)
- continue;
- leaf = wl->leafs[i++];
- VectorCopy(leaf->mins, clipmins);
- VectorCopy(leaf->maxs, clipmaxs);
- for (;i < wl->numleafs;i++)
- {
- leaf = wl->leafs[i];
- if (leaf->visframe == r_framecount)
- {
- if (clipmins[0] > leaf->mins[0]) clipmins[0] = leaf->mins[0];
- if (clipmaxs[0] < leaf->maxs[0]) clipmaxs[0] = leaf->maxs[0];
- if (clipmins[1] > leaf->mins[1]) clipmins[1] = leaf->mins[1];
- if (clipmaxs[1] < leaf->maxs[1]) clipmaxs[1] = leaf->maxs[1];
- if (clipmins[2] > leaf->mins[2]) clipmins[2] = leaf->mins[2];
- if (clipmaxs[2] < leaf->maxs[2]) clipmaxs[2] = leaf->maxs[2];
- }
- }
- if (clipmins[0] < wl->mins[0]) clipmins[0] = wl->mins[0];
- if (clipmaxs[0] > wl->maxs[0]) clipmaxs[0] = wl->maxs[0];
- if (clipmins[1] < wl->mins[1]) clipmins[1] = wl->mins[1];
- if (clipmaxs[1] > wl->maxs[1]) clipmaxs[1] = wl->maxs[1];
- if (clipmins[2] < wl->mins[2]) clipmins[2] = wl->mins[2];
- if (clipmaxs[2] > wl->maxs[2]) clipmaxs[2] = wl->maxs[2];
- }
- else
- {
- VectorCopy(wl->mins, clipmins);
- VectorCopy(wl->maxs, clipmaxs);
- }
-
- //if (R_Shadow_ScissorForBBoxAndSphere(clipmins, clipmaxs, wl->origin, wl->cullradius))
- if (R_CullBox(clipmins, clipmaxs) || R_Shadow_ScissorForBBox(clipmins, clipmaxs))
- continue;
-
- // mark the leafs we care about so only things in those leafs will matter
- if (cl.worldmodel != NULL)
- for (i = 0;i < wl->numleafs;i++)
- wl->leafs[i]->worldnodeframe = shadowframecount;
+ VectorCopy(wl->mins, clipmins);
+ VectorCopy(wl->maxs, clipmaxs);
f = d_lightstylevalue[wl->style] * (1.0f / 256.0f);
VectorScale(wl->light, f, lightcolor);
}
}
- if (!visiblevolumes)
+ if (visiblevolumes)
+ qglEnable(GL_CULL_FACE);
+ else
R_Shadow_Stage_End();
- qglEnable(GL_CULL_FACE);
qglDisable(GL_SCISSOR_TEST);
}
static void R_SetupFrame (void)
{
// don't allow cheats in multiplayer
- if (cl.maxclients > 1)
+ if (!cl.islocalgame)
{
if (r_fullbright.integer != 0)
Cvar_Set ("r_fullbright", "0");
{
rmeshstate_t m;
float r;
+ float vertex3f[3*3];
if (r_refdef.viewblend[3] < 0.01f)
return;
- memset(&m, 0, sizeof(m));
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
- m.depthdisable = true; // magic
R_Mesh_Matrix(&r_identitymatrix);
- R_Mesh_State(&m);
- R_Mesh_GetSpace(3);
- r = 64000;
- varray_vertex3f[0] = r_origin[0] + vpn[0] * 1.5 - vright[0] * r - vup[0] * r;
- varray_vertex3f[1] = r_origin[1] + vpn[1] * 1.5 - vright[1] * r - vup[1] * r;
- varray_vertex3f[2] = r_origin[2] + vpn[2] * 1.5 - vright[2] * r - vup[2] * r;
- varray_vertex3f[3] = r_origin[0] + vpn[0] * 1.5 - vright[0] * r + vup[0] * r * 3;
- varray_vertex3f[4] = r_origin[1] + vpn[1] * 1.5 - vright[1] * r + vup[1] * r * 3;
- varray_vertex3f[5] = r_origin[2] + vpn[2] * 1.5 - vright[2] * r + vup[2] * r * 3;
- varray_vertex3f[6] = r_origin[0] + vpn[0] * 1.5 + vright[0] * r * 3 - vup[0] * r;
- varray_vertex3f[7] = r_origin[1] + vpn[1] * 1.5 + vright[1] * r * 3 - vup[1] * r;
- varray_vertex3f[8] = r_origin[2] + vpn[2] * 1.5 + vright[2] * r * 3 - vup[2] * r;
+ memset(&m, 0, sizeof(m));
+ R_Mesh_State_Texture(&m);
+
+ GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ GL_DepthMask(true);
+ GL_DepthTest(false); // magic
+ GL_VertexPointer(vertex3f);
GL_Color(r_refdef.viewblend[0], r_refdef.viewblend[1], r_refdef.viewblend[2], r_refdef.viewblend[3]);
+ r = 64000;
+ vertex3f[0] = r_origin[0] + vpn[0] * 1.5 - vright[0] * r - vup[0] * r;
+ vertex3f[1] = r_origin[1] + vpn[1] * 1.5 - vright[1] * r - vup[1] * r;
+ vertex3f[2] = r_origin[2] + vpn[2] * 1.5 - vright[2] * r - vup[2] * r;
+ vertex3f[3] = r_origin[0] + vpn[0] * 1.5 - vright[0] * r + vup[0] * r * 3;
+ vertex3f[4] = r_origin[1] + vpn[1] * 1.5 - vright[1] * r + vup[1] * r * 3;
+ vertex3f[5] = r_origin[2] + vpn[2] * 1.5 - vright[2] * r + vup[2] * r * 3;
+ vertex3f[6] = r_origin[0] + vpn[0] * 1.5 + vright[0] * r * 3 - vup[0] * r;
+ vertex3f[7] = r_origin[1] + vpn[1] * 1.5 + vright[1] * r * 3 - vup[1] * r;
+ vertex3f[8] = r_origin[2] + vpn[2] * 1.5 + vright[2] * r * 3 - vup[2] * r;
R_Mesh_Draw(3, 1, polygonelements);
}
R_BuildLightList();
R_TimeReport("setup");
+ if (cl.worldmodel && cl.worldmodel->brush.FatPVS)
+ cl.worldmodel->brush.FatPVS(cl.worldmodel, r_origin, 2, r_pvsbits, sizeof(r_pvsbits));
+
R_WorldVisibility(world);
R_TimeReport("worldvis");
void R_DrawBBoxMesh(vec3_t mins, vec3_t maxs, float cr, float cg, float cb, float ca)
{
int i;
- float *v, *c, f1, f2, diff[3];
+ float *v, *c, f1, f2, diff[3], vertex3f[8*3], color4f[8*4];
rmeshstate_t m;
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+ GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ GL_DepthMask(false);
+ GL_DepthTest(true);
R_Mesh_Matrix(&r_identitymatrix);
- R_Mesh_State(&m);
+
+ memset(&m, 0, sizeof(m));
+ R_Mesh_State_Texture(&m);
R_Mesh_GetSpace(8);
- varray_vertex[ 0] = mins[0];varray_vertex[ 1] = mins[1];varray_vertex[ 2] = mins[2];
- varray_vertex[ 4] = maxs[0];varray_vertex[ 5] = mins[1];varray_vertex[ 6] = mins[2];
- varray_vertex[ 8] = mins[0];varray_vertex[ 9] = maxs[1];varray_vertex[10] = mins[2];
- varray_vertex[12] = maxs[0];varray_vertex[13] = maxs[1];varray_vertex[14] = mins[2];
- varray_vertex[16] = mins[0];varray_vertex[17] = mins[1];varray_vertex[18] = maxs[2];
- varray_vertex[20] = maxs[0];varray_vertex[21] = mins[1];varray_vertex[22] = maxs[2];
- varray_vertex[24] = mins[0];varray_vertex[25] = maxs[1];varray_vertex[26] = maxs[2];
- varray_vertex[28] = maxs[0];varray_vertex[29] = maxs[1];varray_vertex[30] = maxs[2];
- R_FillColors(varray_color, 8, cr * r_colorscale, cg * r_colorscale, cb * r_colorscale, ca);
+ vertex3f[ 0] = mins[0];vertex3f[ 1] = mins[1];vertex3f[ 2] = mins[2];
+ vertex3f[ 3] = maxs[0];vertex3f[ 4] = mins[1];vertex3f[ 5] = mins[2];
+ vertex3f[ 6] = mins[0];vertex3f[ 7] = maxs[1];vertex3f[ 8] = mins[2];
+ vertex3f[ 9] = maxs[0];vertex3f[10] = maxs[1];vertex3f[11] = mins[2];
+ vertex3f[12] = mins[0];vertex3f[13] = mins[1];vertex3f[14] = maxs[2];
+ vertex3f[15] = maxs[0];vertex3f[16] = mins[1];vertex3f[17] = maxs[2];
+ vertex3f[18] = mins[0];vertex3f[19] = maxs[1];vertex3f[20] = maxs[2];
+ vertex3f[21] = maxs[0];vertex3f[22] = maxs[1];vertex3f[23] = maxs[2];
+ GL_ColorPointer(color);
+ R_FillColors(color, 8, cr * r_colorscale, cg * r_colorscale, cb * r_colorscale, ca);
if (fogenabled)
{
- for (i = 0, v = varray_vertex, c = varray_color;i < 8;i++, v += 4, c += 4)
+ for (i = 0, v = vertex, c = color;i < 8;i++, v += 4, c += 4)
{
VectorSubtract(v, r_origin, diff);
f2 = exp(fogdensity/DotProduct(diff, diff));
c[2] = c[2] * f1 + fogcolor[2] * f2;
}
}
- GL_UseColorArray();
R_Mesh_Draw(8, 12);
}
*/
1, 3, 4
};
+float nomodelvertex3f[6*3] =
+{
+ -16, 0, 0,
+ 16, 0, 0,
+ 0, -16, 0,
+ 0, 16, 0,
+ 0, 0, -16,
+ 0, 0, 16
+};
+
+float nomodelcolor4f[6*4] =
+{
+ 0.0f, 0.0f, 0.5f, 1.0f,
+ 0.0f, 0.0f, 0.5f, 1.0f,
+ 0.0f, 0.5f, 0.0f, 1.0f,
+ 0.0f, 0.5f, 0.0f, 1.0f,
+ 0.5f, 0.0f, 0.0f, 1.0f,
+ 0.5f, 0.0f, 0.0f, 1.0f
+};
+
void R_DrawNoModelCallback(const void *calldata1, int calldata2)
{
const entity_render_t *ent = calldata1;
int i;
float f1, f2, *c, diff[3];
+ float color4f[6*4];
rmeshstate_t m;
+ R_Mesh_Matrix(&ent->matrix);
+
memset(&m, 0, sizeof(m));
+ R_Mesh_State_Texture(&m);
+
if (ent->flags & EF_ADDITIVE)
{
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE;
+ GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
+ GL_DepthMask(false);
}
else if (ent->alpha < 1)
{
- m.blendfunc1 = GL_SRC_ALPHA;
- m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
+ GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ GL_DepthMask(false);
}
else
{
- m.blendfunc1 = GL_ONE;
- m.blendfunc2 = GL_ZERO;
+ GL_BlendFunc(GL_ONE, GL_ZERO);
+ GL_DepthMask(true);
}
- R_Mesh_Matrix(&ent->matrix);
- R_Mesh_State(&m);
-
- GL_UseColorArray();
- R_Mesh_GetSpace(6);
- varray_vertex3f[ 0] = -16;varray_vertex3f[ 1] = 0;varray_vertex3f[ 2] = 0;
- varray_vertex3f[ 3] = 16;varray_vertex3f[ 4] = 0;varray_vertex3f[ 5] = 0;
- varray_vertex3f[ 6] = 0;varray_vertex3f[ 7] = -16;varray_vertex3f[ 8] = 0;
- varray_vertex3f[ 9] = 0;varray_vertex3f[10] = 16;varray_vertex3f[11] = 0;
- varray_vertex3f[12] = 0;varray_vertex3f[13] = 0;varray_vertex3f[14] = -16;
- varray_vertex3f[15] = 0;varray_vertex3f[16] = 0;varray_vertex3f[17] = 16;
- varray_color4f[ 0] = 0.00f * r_colorscale;varray_color4f[ 1] = 0.00f * r_colorscale;varray_color4f[ 2] = 0.50f * r_colorscale;varray_color4f[ 3] = ent->alpha;
- varray_color4f[ 4] = 0.00f * r_colorscale;varray_color4f[ 5] = 0.00f * r_colorscale;varray_color4f[ 6] = 0.50f * r_colorscale;varray_color4f[ 7] = ent->alpha;
- varray_color4f[ 8] = 0.00f * r_colorscale;varray_color4f[ 9] = 0.50f * r_colorscale;varray_color4f[10] = 0.00f * r_colorscale;varray_color4f[11] = ent->alpha;
- varray_color4f[12] = 0.00f * r_colorscale;varray_color4f[13] = 0.50f * r_colorscale;varray_color4f[14] = 0.00f * r_colorscale;varray_color4f[15] = ent->alpha;
- varray_color4f[16] = 0.50f * r_colorscale;varray_color4f[17] = 0.00f * r_colorscale;varray_color4f[18] = 0.00f * r_colorscale;varray_color4f[19] = ent->alpha;
- varray_color4f[20] = 0.50f * r_colorscale;varray_color4f[21] = 0.00f * r_colorscale;varray_color4f[22] = 0.00f * r_colorscale;varray_color4f[23] = ent->alpha;
+ GL_DepthTest(true);
+ GL_VertexPointer(nomodelvertex3f);
if (fogenabled)
{
+ memcpy(color4f, nomodelcolor4f, sizeof(float[6*4]));
+ GL_ColorPointer(color4f);
VectorSubtract(ent->origin, r_origin, diff);
f2 = exp(fogdensity/DotProduct(diff, diff));
f1 = 1 - f2;
- for (i = 0, c = varray_color4f;i < 6;i++, c += 4)
+ for (i = 0, c = color4f;i < 6;i++, c += 4)
{
c[0] = (c[0] * f1 + fogcolor[0] * f2) * r_colorscale;
c[1] = (c[1] * f1 + fogcolor[1] * f2) * r_colorscale;
c[2] = (c[2] * f1 + fogcolor[2] * f2) * r_colorscale;
+ c[3] *= ent->alpha;
}
}
- else
+ else if (r_colorscale != 1 || ent->alpha != 1)
{
- for (i = 0, c = varray_color4f;i < 6;i++, c += 4)
+ memcpy(color4f, nomodelcolor4f, sizeof(float[6*4]));
+ GL_ColorPointer(color4f);
+ for (i = 0, c = color4f;i < 6;i++, c += 4)
{
c[0] *= r_colorscale;
c[1] *= r_colorscale;
c[2] *= r_colorscale;
+ c[3] *= ent->alpha;
}
}
+ else
+ GL_ColorPointer(nomodelcolor4f);
R_Mesh_Draw(6, 8, nomodelelements);
}
vert[11] = org2[2] + width * right2[2];
}
-void R_DrawSpriteMesh(const vec3_t origin, const vec3_t left, const vec3_t up, float scalex1, float scalex2, float scaley1, float scaley2)
+float spritetexcoord2f[4*2] = {0, 1, 0, 0, 1, 0, 1, 1};
+
+void R_DrawSprite(int blendfunc1, int blendfunc2, rtexture_t *texture, int depthdisable, const vec3_t origin, const vec3_t left, const vec3_t up, float scalex1, float scalex2, float scaley1, float scaley2, float cr, float cg, float cb, float ca)
{
- R_Mesh_GetSpace(4);
- varray_texcoord2f[0][0] = 0;varray_texcoord2f[0][1] = 1;
- varray_texcoord2f[0][2] = 0;varray_texcoord2f[0][3] = 0;
- varray_texcoord2f[0][4] = 1;varray_texcoord2f[0][5] = 0;
- varray_texcoord2f[0][6] = 1;varray_texcoord2f[0][7] = 1;
+ float diff[3];
+ rmeshstate_t m;
+
+ if (fogenabled)
+ {
+ VectorSubtract(origin, r_origin, diff);
+ ca *= 1 - exp(fogdensity/DotProduct(diff,diff));
+ }
+
+ R_Mesh_Matrix(&r_identitymatrix);
+ GL_Color(cr * r_colorscale, cg * r_colorscale, cb * r_colorscale, ca);
+ GL_VertexPointer(varray_vertex3f);
+ GL_BlendFunc(blendfunc1, blendfunc2);
+ GL_DepthMask(false);
+ GL_DepthTest(!depthdisable);
+
+ memset(&m, 0, sizeof(m));
+ m.tex[0] = R_GetTexture(texture);
+ m.pointer_texcoord[0] = spritetexcoord2f;
+ R_Mesh_State_Texture(&m);
+
varray_vertex3f[ 0] = origin[0] + left[0] * scalex2 + up[0] * scaley1;
varray_vertex3f[ 1] = origin[1] + left[1] * scalex2 + up[1] * scaley1;
varray_vertex3f[ 2] = origin[2] + left[2] * scalex2 + up[2] * scaley1;
projects / xonotic / darkplaces.git / blobdiff