#include "csprogs.h"
#include "image.h"
-cvar_t r_ambient = {0, "r_ambient", "0", "brightens map, value is 0-128"};
-cvar_t r_lockpvs = {0, "r_lockpvs", "0", "disables pvs switching, allows you to walk around and inspect what is visible from a given location in the map (anything not visible from your current location will not be drawn)"};
-cvar_t r_lockvisibility = {0, "r_lockvisibility", "0", "disables visibility updates, allows you to walk around and inspect what is visible from a given viewpoint in the map (anything offscreen at the moment this is enabled will not be drawn)"};
-cvar_t r_useportalculling = {0, "r_useportalculling", "2", "improve framerate with r_novis 1 by using portal culling - still not as good as compiled visibility data in the map, but it helps (a value of 2 forces use of this even with vis data, which improves framerates in maps without too much complexity, but hurts in extremely complex maps, which is why 2 is not the default mode)"};
-cvar_t r_usesurfaceculling = {0, "r_usesurfaceculling", "1", "skip off-screen surfaces (1 = cull surfaces if the map is likely to benefit, 2 = always cull surfaces)"};
-cvar_t r_vis_trace = {0, "r_vis_trace", "0", "test if each portal or leaf is visible using tracelines"};
-cvar_t r_vis_trace_samples = {0, "r_vis_trace_samples", "1", "use this many randomly positioned tracelines each frame to refresh the visible timer"};
-cvar_t r_vis_trace_delay = {0, "r_vis_trace_delay", "1", "keep a portal visible for this many seconds"};
-cvar_t r_vis_trace_eyejitter = {0, "r_vis_trace_eyejitter", "8", "use a random offset of this much on the start of each traceline"};
-cvar_t r_vis_trace_enlarge = {0, "r_vis_trace_enlarge", "0", "make portal bounds bigger for tests by (1+this)*size"};
-cvar_t r_vis_trace_expand = {0, "r_vis_trace_expand", "0", "make portal bounds bigger for tests by this many units"};
-cvar_t r_vis_trace_pad = {0, "r_vis_trace_pad", "8", "accept traces that hit within this many units of the portal"};
-cvar_t r_vis_trace_surfaces = {0, "r_vis_trace_surfaces", "0", "also use tracelines to cull surfaces"};
-cvar_t r_q3bsp_renderskydepth = {0, "r_q3bsp_renderskydepth", "0", "draws sky depth masking in q3 maps (as in q1 maps), this means for example that sky polygons can hide other things"};
+cvar_t r_ambient = {CF_CLIENT, "r_ambient", "0", "brightens map, value is 0-128"};
+cvar_t r_lockpvs = {CF_CLIENT, "r_lockpvs", "0", "disables pvs switching, allows you to walk around and inspect what is visible from a given location in the map (anything not visible from your current location will not be drawn)"};
+cvar_t r_lockvisibility = {CF_CLIENT, "r_lockvisibility", "0", "disables visibility updates, allows you to walk around and inspect what is visible from a given viewpoint in the map (anything offscreen at the moment this is enabled will not be drawn)"};
+cvar_t r_useportalculling = {CF_CLIENT, "r_useportalculling", "1", "improve framerate with r_novis 1 by using portal culling - still not as good as compiled visibility data in the map, but it helps (a value of 2 forces use of this even with vis data, which improves framerates in maps without too much complexity, but hurts in extremely complex maps, which is why 2 is not the default mode)"};
+cvar_t r_usesurfaceculling = {CF_CLIENT, "r_usesurfaceculling", "1", "skip off-screen surfaces (1 = cull surfaces if the map is likely to benefit, 2 = always cull surfaces)"};
+cvar_t r_vis_trace = {CF_CLIENT, "r_vis_trace", "0", "test if each portal or leaf is visible using tracelines"};
+cvar_t r_vis_trace_samples = {CF_CLIENT, "r_vis_trace_samples", "1", "use this many randomly positioned tracelines each frame to refresh the visible timer"};
+cvar_t r_vis_trace_delay = {CF_CLIENT, "r_vis_trace_delay", "1", "keep a portal visible for this many seconds"};
+cvar_t r_vis_trace_eyejitter = {CF_CLIENT, "r_vis_trace_eyejitter", "8", "use a random offset of this much on the start of each traceline"};
+cvar_t r_vis_trace_enlarge = {CF_CLIENT, "r_vis_trace_enlarge", "0", "make portal bounds bigger for tests by (1+this)*size"};
+cvar_t r_vis_trace_expand = {CF_CLIENT, "r_vis_trace_expand", "0", "make portal bounds bigger for tests by this many units"};
+cvar_t r_vis_trace_pad = {CF_CLIENT, "r_vis_trace_pad", "8", "accept traces that hit within this many units of the portal"};
+cvar_t r_vis_trace_surfaces = {CF_CLIENT, "r_vis_trace_surfaces", "0", "also use tracelines to cull surfaces"};
+cvar_t r_q3bsp_renderskydepth = {CF_CLIENT, "r_q3bsp_renderskydepth", "0", "draws sky depth masking in q3 maps (as in q1 maps), this means for example that sky polygons can hide other things"};
/*
===============
int smax, tmax, i, size, size3, maps, l;
int *bl, scale;
unsigned char *lightmap, *out, *stain;
- dp_model_t *model = ent->model;
+ model_t *model = ent->model;
int *intblocklights;
unsigned char *templight;
}
}
-static void R_StainNode (mnode_t *node, dp_model_t *model, const vec3_t origin, float radius, const float fcolor[8])
+static void R_StainNode (mnode_t *node, model_t *model, const vec3_t origin, float radius, const float fcolor[8])
{
float ndist, a, ratio, maxdist, maxdist2, maxdist3, invradius, sdtable[256], td, dist2;
msurface_t *surface, *endsurface;
int n;
float fcolor[8];
entity_render_t *ent;
- dp_model_t *model;
+ model_t *model;
vec3_t org;
if (r_refdef.scene.worldmodel == NULL || !r_refdef.scene.worldmodel->brush.data_nodes || !r_refdef.scene.worldmodel->brushq1.lightdata)
return;
// called with a batch, so numsurfaces is always 1, and the surfacelist
// contains only a leaf number for coloring purposes
const mportal_t *portal = (mportal_t *)ent;
- qboolean isvis;
+ qbool isvis;
int i, numpoints;
float *v;
float vertex3f[POLYGONELEMENTS_MAXPOINTS*3];
R_Mesh_Draw(0, numpoints, 0, numpoints - 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
}
-// LordHavoc: this is just a nice debugging tool, very slow
+// LadyHavoc: this is just a nice debugging tool, very slow
void R_DrawPortals(void)
{
int i, leafnum;
mportal_t *portal;
float center[3], f;
- dp_model_t *model = r_refdef.scene.worldmodel;
+ model_t *model = r_refdef.scene.worldmodel;
if (model == NULL)
return;
- for (leafnum = 0;leafnum < r_refdef.scene.worldmodel->brush.num_leafs;leafnum++)
+ for (leafnum = 0;leafnum < model->brush.num_leafs;leafnum++)
{
if (r_refdef.viewcache.world_leafvisible[leafnum])
{
//for (portalnum = 0, portal = model->brush.data_portals;portalnum < model->brush.num_portals;portalnum++, portal++)
- for (portal = r_refdef.scene.worldmodel->brush.data_leafs[leafnum].portals;portal;portal = portal->next)
+ for (portal = model->brush.data_leafs[leafnum].portals;portal;portal = portal->next)
{
if (portal->numpoints <= POLYGONELEMENTS_MAXPOINTS)
if (!R_CullBox(portal->mins, portal->maxs))
int surfaceindexend;
unsigned char *surfacevisible;
msurface_t *surfaces;
- dp_model_t *model = r_refdef.scene.worldmodel;
+ model_t *model = r_refdef.scene.worldmodel;
if (!model)
return;
if (r_trippy.integer)
}
}
-void R_View_WorldVisibility(qboolean forcenovis)
+void R_View_WorldVisibility(qbool forcenovis)
{
int i, j, *mark;
mleaf_t *leaf;
mleaf_t *viewleaf;
- dp_model_t *model = r_refdef.scene.worldmodel;
+ model_t *model = r_refdef.scene.worldmodel;
if (!model)
return;
continue;
if (r_vis_trace.integer)
{
- if (p->tracetime != realtime && R_CanSeeBox(r_vis_trace_samples.value, r_vis_trace_eyejitter.value, r_vis_trace_enlarge.value, r_vis_trace_expand.value, r_vis_trace_pad.value, r_refdef.view.origin, cullmins, cullmaxs))
- p->tracetime = realtime;
- if (realtime - p->tracetime > r_vis_trace_delay.value)
+ if (p->tracetime != host.realtime && R_CanSeeBox(r_vis_trace_samples.value, r_vis_trace_eyejitter.value, r_vis_trace_enlarge.value, r_vis_trace_expand.value, r_vis_trace_pad.value, r_refdef.view.origin, cullmins, cullmaxs))
+ p->tracetime = host.realtime;
+ if (host.realtime - p->tracetime > r_vis_trace_delay.value)
continue;
}
if (leafstackpos >= (int)(sizeof(leafstack) / sizeof(leafstack[0])))
}
}
}
+ R_View_WorldVisibility_CullSurfaces();
}
-
- R_View_WorldVisibility_CullSurfaces();
}
-void R_Q1BSP_DrawSky(entity_render_t *ent)
+void R_Mod_DrawSky(entity_render_t *ent)
{
if (ent->model == NULL)
return;
- R_DrawModelSurfaces(ent, true, true, false, false, false);
+ R_DrawModelSurfaces(ent, true, true, false, false, false, false);
}
-void R_Q1BSP_DrawAddWaterPlanes(entity_render_t *ent)
+void R_Mod_DrawAddWaterPlanes(entity_render_t *ent)
{
int i, j, n, flagsmask;
- dp_model_t *model = ent->model;
+ model_t *model = ent->model;
msurface_t *surfaces;
if (model == NULL)
return;
rsurface.entity = NULL; // used only by R_GetCurrentTexture and RSurf_ActiveModelEntity
}
-void R_Q1BSP_Draw(entity_render_t *ent)
+void R_Mod_Draw(entity_render_t *ent)
{
- dp_model_t *model = ent->model;
+ model_t *model = ent->model;
if (model == NULL)
return;
- R_DrawModelSurfaces(ent, false, true, false, false, false);
+ R_DrawModelSurfaces(ent, false, true, false, false, false, false);
}
-void R_Q1BSP_DrawDepth(entity_render_t *ent)
+void R_Mod_DrawDepth(entity_render_t *ent)
{
- dp_model_t *model = ent->model;
+ model_t *model = ent->model;
if (model == NULL || model->surfmesh.isanimated)
return;
GL_ColorMask(0,0,0,0);
GL_BlendFunc(GL_ONE, GL_ZERO);
GL_DepthMask(true);
// R_Mesh_ResetTextureState();
- R_DrawModelSurfaces(ent, false, false, true, false, false);
+ R_DrawModelSurfaces(ent, false, false, true, false, false, false);
GL_ColorMask(r_refdef.view.colormask[0], r_refdef.view.colormask[1], r_refdef.view.colormask[2], 1);
}
-void R_Q1BSP_DrawDebug(entity_render_t *ent)
+void R_Mod_DrawDebug(entity_render_t *ent)
{
if (ent->model == NULL)
return;
- R_DrawModelSurfaces(ent, false, false, false, true, false);
+ R_DrawModelSurfaces(ent, false, false, false, true, false, false);
}
-void R_Q1BSP_DrawPrepass(entity_render_t *ent)
+void R_Mod_DrawPrepass(entity_render_t *ent)
{
- dp_model_t *model = ent->model;
+ model_t *model = ent->model;
if (model == NULL)
return;
- R_DrawModelSurfaces(ent, false, true, false, false, true);
+ R_DrawModelSurfaces(ent, false, true, false, false, true, false);
}
typedef struct r_q1bsp_getlightinfo_s
{
- dp_model_t *model;
+ model_t *model;
vec3_t relativelightorigin;
float lightradius;
int *outleaflist;
vec3_t lightmins;
vec3_t lightmaxs;
const unsigned char *pvs;
- qboolean svbsp_active;
- qboolean svbsp_insertoccluder;
- qboolean noocclusion; // avoids PVS culling
- qboolean frontsidecasting; // casts shadows from surfaces facing the light (otherwise ones facing away)
+ qbool svbsp_active;
+ qbool svbsp_insertoccluder;
+ qbool noocclusion; // avoids PVS culling
+ qbool frontsidecasting; // casts shadows from surfaces facing the light (otherwise ones facing away)
int numfrustumplanes;
const mplane_t *frustumplanes;
}
#define GETLIGHTINFO_MAXNODESTACK 4096
-static void R_Q1BSP_RecursiveGetLightInfo_BSP(r_q1bsp_getlightinfo_t *info, qboolean skipsurfaces)
+static void R_Q1BSP_RecursiveGetLightInfo_BSP(r_q1bsp_getlightinfo_t *info, qbool skipsurfaces)
{
// nodestack
mnode_t *nodestack[GETLIGHTINFO_MAXNODESTACK];
int surfaceindex;
int triangleindex, t;
int currentmaterialflags;
- qboolean castshadow;
+ qbool castshadow;
const int *e;
const vec_t *v[3];
float v2[3][3];
- qboolean insidebox;
- qboolean noocclusion = info->noocclusion;
- qboolean frontsidecasting = info->frontsidecasting;
- qboolean svbspactive = info->svbsp_active;
- qboolean svbspinsertoccluder = info->svbsp_insertoccluder;
+ qbool insidebox;
+ qbool noocclusion = info->noocclusion;
+ qbool frontsidecasting = info->frontsidecasting;
+ qbool svbspactive = info->svbsp_active;
+ qbool svbspinsertoccluder = info->svbsp_insertoccluder;
const int *leafsurfaceindices;
- qboolean addedtris;
+ qbool addedtris;
int i;
mportal_t *portal;
static float points[128][3];
for (leafsurfaceindex = 0;leafsurfaceindex < numleafsurfaces;leafsurfaceindex++)
{
surfaceindex = leafsurfaceindices[leafsurfaceindex];
+ surface = surfaces + surfaceindex;
+ if(!surface->texture)
+ continue;
if (CHECKPVSBIT(info->outsurfacepvs, surfaceindex))
continue;
SETPVSBIT(info->outsurfacepvs, surfaceindex);
- surface = surfaces + surfaceindex;
if (!BoxesOverlap(info->lightmins, info->lightmaxs, surface->mins, surface->maxs))
continue;
addedtris = false;
int t;
int nodeleafindex;
int currentmaterialflags;
- qboolean castshadow;
- qboolean noocclusion = info->noocclusion;
- qboolean frontsidecasting = info->frontsidecasting;
+ qbool castshadow;
+ qbool noocclusion = info->noocclusion;
+ qbool frontsidecasting = info->frontsidecasting;
msurface_t *surface;
const int *e;
const vec_t *v[3];
}
}
-static void R_Q1BSP_CallRecursiveGetLightInfo(r_q1bsp_getlightinfo_t *info, qboolean use_svbsp)
+static void R_Q1BSP_CallRecursiveGetLightInfo(r_q1bsp_getlightinfo_t *info, qbool use_svbsp)
{
extern cvar_t r_shadow_usebihculling;
if (use_svbsp)
extern cvar_t r_shadow_sortsurfaces;
-void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, unsigned char *outleafpvs, int *outnumleafspointer, int *outsurfacelist, unsigned char *outsurfacepvs, int *outnumsurfacespointer, unsigned char *outshadowtrispvs, unsigned char *outlighttrispvs, unsigned char *visitingleafpvs, int numfrustumplanes, const mplane_t *frustumplanes, qboolean noocclusion)
+void R_Mod_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, unsigned char *outleafpvs, int *outnumleafspointer, int *outsurfacelist, unsigned char *outsurfacepvs, int *outnumsurfacespointer, unsigned char *outshadowtrispvs, unsigned char *outlighttrispvs, unsigned char *visitingleafpvs, int numfrustumplanes, const mplane_t *frustumplanes, qbool noocclusion)
{
r_q1bsp_getlightinfo_t info;
info.frontsidecasting = r_shadow_frontsidecasting.integer != 0;
qsort(info.outsurfacelist, info.outnumsurfaces, sizeof(*info.outsurfacelist), R_Q1BSP_GetLightInfo_comparefunc);
}
-void R_Q1BSP_CompileShadowMap(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist)
+void R_Mod_CompileShadowMap(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist)
{
- dp_model_t *model = ent->model;
+ model_t *model = ent->model;
msurface_t *surface;
int surfacelistindex;
int sidetotals[6] = { 0, 0, 0, 0, 0, 0 }, sidemasks = 0;
// exceeding the number of triangles in a single mesh) we have to make sure
// that we make only a single mesh - so over-estimate the size of the mesh
// to match the model.
- r_shadow_compilingrtlight->static_meshchain_shadow_shadowmap = Mod_ShadowMesh_Begin(r_main_mempool, model->surfmesh.num_vertices, model->surfmesh.num_triangles, NULL, NULL, NULL, false, true);
+ r_shadow_compilingrtlight->static_meshchain_shadow_shadowmap = Mod_ShadowMesh_Begin(r_main_mempool, model->surfmesh.num_vertices, model->surfmesh.num_triangles);
R_Shadow_PrepareShadowSides(model->surfmesh.num_triangles);
for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++)
{
sidemasks |= R_Shadow_ChooseSidesFromBox(surface->num_firsttriangle, surface->num_triangles, model->surfmesh.data_vertex3f, model->surfmesh.data_element3i, &r_shadow_compilingrtlight->matrix_worldtolight, relativelightorigin, relativelightdirection, r_shadow_compilingrtlight->cullmins, r_shadow_compilingrtlight->cullmaxs, surface->mins, surface->maxs, surface->texture->basematerialflags & MATERIALFLAG_NOSHADOW ? NULL : sidetotals);
}
R_Shadow_ShadowMapFromList(model->surfmesh.num_vertices, model->surfmesh.num_triangles, model->surfmesh.data_vertex3f, model->surfmesh.data_element3i, numshadowsides, sidetotals, shadowsides, shadowsideslist);
- r_shadow_compilingrtlight->static_meshchain_shadow_shadowmap = Mod_ShadowMesh_Finish(r_main_mempool, r_shadow_compilingrtlight->static_meshchain_shadow_shadowmap, false, true);
+ r_shadow_compilingrtlight->static_meshchain_shadow_shadowmap = Mod_ShadowMesh_Finish(r_shadow_compilingrtlight->static_meshchain_shadow_shadowmap, true);
r_shadow_compilingrtlight->static_shadowmap_receivers &= sidemasks;
for(i = 0;i<6;i++)
if(!sidetotals[i])
static const msurface_t *batchsurfacelist[RSURF_MAX_BATCHSURFACES];
-void R_Q1BSP_DrawShadowMap(int side, entity_render_t *ent, const vec3_t relativelightorigin, const vec3_t relativelightdirection, float lightradius, int modelnumsurfaces, const int *modelsurfacelist, const unsigned char *surfacesides, const vec3_t lightmins, const vec3_t lightmaxs)
+void R_Mod_DrawShadowMap(int side, entity_render_t *ent, const vec3_t relativelightorigin, const vec3_t relativelightdirection, float lightradius, int modelnumsurfaces, const int *modelsurfacelist, const unsigned char *surfacesides, const vec3_t lightmins, const vec3_t lightmaxs)
{
- dp_model_t *model = ent->model;
+ model_t *model = ent->model;
const msurface_t *surface;
int modelsurfacelistindex, batchnumsurfaces;
// check the box in modelspace, it was already checked in worldspace
for (modelsurfacelistindex = 0;modelsurfacelistindex < modelnumsurfaces;modelsurfacelistindex++)
{
surface = model->data_surfaces + modelsurfacelist[modelsurfacelistindex];
- if (surfacesides && !(surfacesides[modelsurfacelistindex] && (1 << side)))
+ if (surfacesides && !(surfacesides[modelsurfacelistindex] & (1 << side)))
continue;
rsurface.texture = R_GetCurrentTexture(surface->texture);
if (rsurface.texture->currentmaterialflags & MATERIALFLAG_NOSHADOW)
R_FrameData_ReturnToMark();
}
-extern qboolean r_shadow_usingdeferredprepass;
-void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surfacelist, const unsigned char *lighttrispvs)
+extern qbool r_shadow_usingdeferredprepass;
+void R_Mod_DrawLight(entity_render_t *ent, int numsurfaces, const int *surfacelist, const unsigned char *lighttrispvs)
{
- dp_model_t *model = ent->model;
+ model_t *model = ent->model;
const msurface_t *surface;
int i, k, kend, l, endsurface, batchnumsurfaces, texturenumsurfaces;
const msurface_t **texturesurfacelist;
}
//Made by [515]
-static void R_ReplaceWorldTexture (void)
+static void R_ReplaceWorldTexture_f(cmd_state_t *cmd)
{
- dp_model_t *m;
+ model_t *m;
texture_t *t;
int i;
const char *r, *newt;
}
m = r_refdef.scene.worldmodel;
- if(Cmd_Argc() < 2)
+ if(Cmd_Argc(cmd) < 2)
{
Con_Print("r_replacemaptexture <texname> <newtexname> - replaces texture\n");
Con_Print("r_replacemaptexture <texname> - switch back to default texture\n");
Con_Print("This command works only in singleplayer\n");
return;
}
- r = Cmd_Argv(1);
- newt = Cmd_Argv(2);
+ r = Cmd_Argv(cmd, 1);
+ newt = Cmd_Argv(cmd, 2);
if(!newt[0])
newt = r;
for(i=0,t=m->data_textures;i<m->num_textures;i++,t++)
}
//Made by [515]
-static void R_ListWorldTextures (void)
+static void R_ListWorldTextures_f(cmd_state_t *cmd)
{
- dp_model_t *m;
+ model_t *m;
texture_t *t;
int i;
if (!r_refdef.scene.worldmodel)
Cvar_RegisterVariable(&r_vis_trace_surfaces);
Cvar_RegisterVariable(&r_q3bsp_renderskydepth);
- Cmd_AddCommand ("r_replacemaptexture", R_ReplaceWorldTexture, "override a map texture for testing purposes");
- Cmd_AddCommand ("r_listmaptextures", R_ListWorldTextures, "list all textures used by the current map");
+ Cmd_AddCommand(CF_CLIENT, "r_replacemaptexture", R_ReplaceWorldTexture_f, "override a map texture for testing purposes");
+ Cmd_AddCommand(CF_CLIENT, "r_listmaptextures", R_ListWorldTextures_f, "list all textures used by the current map");
//R_RegisterModule("GL_Surf", gl_surf_start, gl_surf_shutdown, gl_surf_newmap);
}
projects / xonotic / darkplaces.git / blobdiff