X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=render.h;h=8f387103fffa9af158a5acdda5bbf277c748c3f6;hb=refs%2Fheads%2FColdSpirit%2Fcvar_onchange_stable;hp=82761cb64a9e8f926895f1b99ed1a1dfbf521ac8;hpb=fc64981df559aafe9ebe54d08ddf0da4ee94f293;p=xonotic%2Fdarkplaces.git

diff --git a/render.h b/render.h
index 82761cb6..8f387103 100644
--- a/render.h
+++ b/render.h
@@ -33,7 +33,10 @@ void FOG_clear(void);
 extern cvar_t r_sky;
 extern cvar_t r_skyscroll1;
 extern cvar_t r_skyscroll2;
+extern cvar_t r_sky_scissor;
+extern cvar_t r_q3bsp_renderskydepth;
 extern int skyrenderlater, skyrendermasked;
+extern int skyscissor[4];
 int R_SetSkyBox(const char *sky);
 void R_SkyStartFrame(void);
 void R_Sky(void);
@@ -123,9 +126,8 @@ extern cvar_t r_fullbright;
 extern cvar_t r_wateralpha;
 extern cvar_t r_dynamic;
 
-void R_Init(void);
 void R_UpdateVariables(void); // must call after setting up most of r_refdef, but before calling R_RenderView
-void R_RenderView(void); // must set r_refdef and call R_UpdateVariables first
+void R_RenderView(void); // must set r_refdef and call R_UpdateVariables and CL_UpdateEntityShading first
 void R_RenderView_UpdateViewVectors(void); // just updates r_refdef.view.{forward,left,up,origin,right,inverse_matrix}
 
 typedef enum r_refdef_scene_type_s {
@@ -139,6 +141,7 @@ r_refdef_scene_t * R_GetScenePointer( r_refdef_scene_type_t scenetype );
 
 void R_SkinFrame_PrepareForPurge(void);
 void R_SkinFrame_MarkUsed(skinframe_t *skinframe);
+void R_SkinFrame_PurgeSkinFrame(skinframe_t *skinframe);
 void R_SkinFrame_Purge(void);
 // set last to NULL to start from the beginning
 skinframe_t *R_SkinFrame_FindNextByName( skinframe_t *last, const char *name );
@@ -401,18 +404,6 @@ typedef struct rsurfacestate_s
 	// animation blending state from entity
 	frameblend_t frameblend[MAX_FRAMEBLENDS];
 	skeleton_t *skeleton;
-	// directional model shading state from entity
-	vec3_t modellight_ambient;
-	vec3_t modellight_diffuse;
-	vec3_t modellight_lightdir;
-	// colormapping state from entity (these are black if colormapping is off)
-	vec3_t colormap_pantscolor;
-	vec3_t colormap_shirtcolor;
-	// special coloring of ambient/diffuse textures (gloss not affected)
-	// colormod[3] is the alpha of the entity
-	float colormod[4];
-	// special coloring of glow textures
-	float glowmod[3];
 	// view location in model space
 	vec3_t localvieworigin;
 	// polygon offset data for submodels
@@ -451,8 +442,8 @@ typedef struct rsurfacestate_s
 	float userwavefunc_param[Q3WAVEFUNC_USER_COUNT];
 
 	// pointer to an entity_render_t used only by R_GetCurrentTexture and
-	// RSurf_ActiveWorldEntity/RSurf_ActiveModelEntity as a unique id within
-	// each frame (see r_frame also)
+	// RSurf_ActiveModelEntity as a unique id within each frame (see r_frame
+	// also)
 	entity_render_t *entity;
 }
 rsurfacestate_t;
@@ -461,7 +452,6 @@ extern rsurfacestate_t rsurface;
 
 void R_HDR_UpdateIrisAdaptation(const vec3_t point);
 
-void RSurf_ActiveWorldEntity(void);
 void RSurf_ActiveModelEntity(const entity_render_t *ent, qboolean wantnormals, qboolean wanttangents, qboolean prepass);
 void RSurf_ActiveCustomEntity(const matrix4x4_t *matrix, const matrix4x4_t *inversematrix, int entflags, double shadertime, float r, float g, float b, float a, int numvertices, const float *vertex3f, const float *texcoord2f, const float *normal3f, const float *svector3f, const float *tvector3f, const float *color4f, int numtriangles, const int *element3i, const unsigned short *element3s, qboolean wantnormals, qboolean wanttangents);
 void RSurf_SetupDepthAndCulling(void);
@@ -508,7 +498,7 @@ rsurfacepass_t;
 void R_SetupShader_Generic(rtexture_t *first, rtexture_t *second, int texturemode, int rgbscale, qboolean usegamma, qboolean notrippy, qboolean suppresstexalpha);
 void R_SetupShader_Generic_NoTexture(qboolean usegamma, qboolean notrippy);
 void R_SetupShader_DepthOrShadow(qboolean notrippy, qboolean depthrgb, qboolean skeletal);
-void R_SetupShader_Surface(const vec3_t lightcolorbase, qboolean modellighting, float ambientscale, float diffusescale, float specularscale, rsurfacepass_t rsurfacepass, int texturenumsurfaces, const msurface_t **texturesurfacelist, void *waterplane, qboolean notrippy);
+void R_SetupShader_Surface(const float ambientcolor[3], const float diffusecolor[3], const float specularcolor[3], rsurfacepass_t rsurfacepass, int texturenumsurfaces, const msurface_t **texturesurfacelist, void *waterplane, qboolean notrippy);
 void R_SetupShader_DeferredLight(const rtlight_t *rtlight);
 
 typedef struct r_waterstate_waterplane_s
@@ -613,7 +603,6 @@ void SCR_DrawConsole(void);
 void R_Shadow_EditLights_DrawSelectedLightProperties(void);
 void R_DecalSystem_Reset(decalsystem_t *decalsystem);
 void R_Shadow_UpdateBounceGridTexture(void);
-void R_DrawLightningBeams(void);
 void VM_CL_AddPolygonsToMeshQueue(struct prvm_prog_s *prog);
 void R_DrawPortals(void);
 void R_BuildLightMap(const entity_render_t *ent, msurface_t *surface);