From 0f691683efa8b10aee9f854c8969c81683d14aba Mon Sep 17 00:00:00 2001 From: havoc Date: Sat, 15 May 2004 20:43:17 +0000 Subject: [PATCH] Tomaz renamed all R_Model_Brush functions to R_Q1BSP git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4171 d7cf8633-e32d-0410-b094-e92efae38249 --- gl_rsurf.c | 10 +++++----- model_brush.c | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gl_rsurf.c b/gl_rsurf.c index 44ce6a1d..3aa5f59d 100644 --- a/gl_rsurf.c +++ b/gl_rsurf.c @@ -1743,7 +1743,7 @@ void R_WorldVisibility(entity_render_t *ent) R_DrawPortals(ent); } -void R_Model_Brush_DrawSky(entity_render_t *ent) +void R_Q1BSP_DrawSky(entity_render_t *ent) { if (ent->model == NULL) return; @@ -1753,7 +1753,7 @@ void R_Model_Brush_DrawSky(entity_render_t *ent) R_DrawSurfaces(ent, SURF_DRAWSKY); } -void R_Model_Brush_Draw(entity_render_t *ent) +void R_Q1BSP_Draw(entity_render_t *ent) { if (ent->model == NULL) return; @@ -1766,7 +1766,7 @@ void R_Model_Brush_Draw(entity_render_t *ent) R_DrawSurfaces(ent, SURF_DRAWTURB | SURF_LIGHTMAP); } -void R_Model_Brush_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outclusterlist, qbyte *outclusterpvs, int *outnumclusterspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer) +void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outclusterlist, qbyte *outclusterpvs, int *outnumclusterspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer) { model_t *model = ent->model; vec3_t lightmins, lightmaxs; @@ -1852,7 +1852,7 @@ void R_Model_Brush_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin *outnumsurfacespointer = outnumsurfaces; } -void R_Model_Brush_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist) +void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist) { model_t *model = ent->model; vec3_t lightmins, lightmaxs; @@ -1886,7 +1886,7 @@ void R_Model_Brush_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightor } } -void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, int numsurfaces, const int *surfacelist) +void R_Q1BSP_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, int numsurfaces, const int *surfacelist) { model_t *model = ent->model; vec3_t lightmins, lightmaxs, modelorg; diff --git a/model_brush.c b/model_brush.c index 13ba7884..fa74b70e 100644 --- a/model_brush.c +++ b/model_brush.c @@ -2860,11 +2860,11 @@ void Mod_Q1BSP_GetVisible(model_t *model, const vec3_t point, const vec3_t mins, } */ -extern void R_Model_Brush_DrawSky(entity_render_t *ent); -extern void R_Model_Brush_Draw(entity_render_t *ent); -extern void R_Model_Brush_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outclusterlist, qbyte *outclusterpvs, int *outnumclusterspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer); -extern void R_Model_Brush_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist); -extern void R_Model_Brush_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, int numsurfaces, const int *surfacelist); +extern void R_Q1BSP_DrawSky(entity_render_t *ent); +extern void R_Q1BSP_Draw(entity_render_t *ent); +extern void R_Q1BSP_GetLightInfo(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outclusterlist, qbyte *outclusterpvs, int *outnumclusterspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer); +extern void R_Q1BSP_DrawShadowVolume(entity_render_t *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist); +extern void R_Q1BSP_DrawLight(entity_render_t *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, int numsurfaces, const int *surfacelist); void Mod_Q1BSP_Load(model_t *mod, void *buffer) { int i, j, k; @@ -3017,10 +3017,10 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer) // this gets altered below if sky is used mod->DrawSky = NULL; - mod->Draw = R_Model_Brush_Draw; - mod->GetLightInfo = R_Model_Brush_GetLightInfo; - mod->DrawShadowVolume = R_Model_Brush_DrawShadowVolume; - mod->DrawLight = R_Model_Brush_DrawLight; + mod->Draw = R_Q1BSP_Draw; + mod->GetLightInfo = R_Q1BSP_GetLightInfo; + mod->DrawShadowVolume = R_Q1BSP_DrawShadowVolume; + mod->DrawLight = R_Q1BSP_DrawLight; if (i != 0) { mod->brush.GetPVS = NULL; @@ -3045,7 +3045,7 @@ void Mod_Q1BSP_Load(model_t *mod, void *buffer) { // we only need to have a drawsky function if it is used(usually only on world model) if (surf->texinfo->texture->flags & SURF_DRAWSKY) - mod->DrawSky = R_Model_Brush_DrawSky; + mod->DrawSky = R_Q1BSP_DrawSky; // LordHavoc: submodels always clip, even if water if (mod->brush.numsubmodels - 1) surf->flags |= SURF_SOLIDCLIP; -- 2.39.2