X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=render.h;h=af979e901364f946dc61c35e043b16d1243d2b65;hp=14dd7746f419b35cb4bb6f1950543533839070a2;hb=7005b675fc7c9bc7bddac999caec0f47385c32d9;hpb=f17149584c65550e5a6584354f159456dc81566e diff --git a/render.h b/render.h index 14dd7746..af979e90 100644 --- a/render.h +++ b/render.h @@ -45,7 +45,6 @@ extern void SHOWLMP_decodeshow(void); extern void SHOWLMP_drawall(void); // render profiling stuff -extern char r_speeds_string[1024]; extern int r_timereport_active; // lighting stuff @@ -125,8 +124,14 @@ 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 +typedef enum r_refdef_scene_type_s { + RST_CLIENT, + RST_MENU, + RST_COUNT +} r_refdef_scene_type_t; -void R_InitSky (unsigned char *src, int bytesperpixel); // called at level load +void R_SelectScene( r_refdef_scene_type_t scenetype ); +r_refdef_scene_t * R_GetScenePointer( r_refdef_scene_type_t scenetype ); void R_SkinFrame_PrepareForPurge(void); void R_SkinFrame_MarkUsed(skinframe_t *skinframe); @@ -135,6 +140,7 @@ void R_SkinFrame_Purge(void); skinframe_t *R_SkinFrame_FindNextByName( skinframe_t *last, const char *name ); skinframe_t *R_SkinFrame_Find(const char *name, int textureflags, int comparewidth, int compareheight, int comparecrc, qboolean add); skinframe_t *R_SkinFrame_LoadExternal(const char *name, int textureflags, qboolean complain); +skinframe_t *R_SkinFrame_LoadExternal_CheckAlpha(const char *name, int textureflags, qboolean complain, qboolean *has_alpha); skinframe_t *R_SkinFrame_LoadInternalBGRA(const char *name, int textureflags, const unsigned char *skindata, int width, int height); skinframe_t *R_SkinFrame_LoadInternalQuake(const char *name, int textureflags, int loadpantsandshirt, int loadglowtexture, const unsigned char *skindata, int width, int height); skinframe_t *R_SkinFrame_LoadMissing(void); @@ -169,14 +175,14 @@ extern cvar_t r_glsl_deluxemapping; extern cvar_t gl_polyblend; extern cvar_t gl_dither; +extern cvar_t cl_deathfade; + extern cvar_t r_smoothnormals_areaweighting; extern cvar_t r_test; #include "gl_backend.h" -#include "r_light.h" - extern rtexture_t *r_texture_blanknormalmap; extern rtexture_t *r_texture_white; extern rtexture_t *r_texture_grey128; @@ -187,6 +193,11 @@ extern rtexture_t *r_texture_normalizationcube; extern rtexture_t *r_texture_fogattenuation; //extern rtexture_t *r_texture_fogintensity; +#define R_MAX_OCCLUSION_QUERIES 4096 +extern unsigned int r_queries[R_MAX_OCCLUSION_QUERIES]; +extern unsigned int r_numqueries; +extern unsigned int r_maxqueries; + void R_TimeReport(char *name); // r_stain @@ -197,16 +208,6 @@ void R_DrawSprite(int blendfunc1, int blendfunc2, rtexture_t *texture, rtexture_ extern mempool_t *r_main_mempool; -typedef enum rsurfmode_e -{ - RSURFMODE_NONE, - RSURFMODE_SHOWSURFACES, - RSURFMODE_SKY, - RSURFMODE_MULTIPASS, - RSURFMODE_GLSL -} -rsurfmode_t; - typedef struct rsurfacestate_s { // processing buffers @@ -260,7 +261,9 @@ typedef struct rsurfacestate_s int modeltexcoordlightmap2f_bufferobject; size_t modeltexcoordlightmap2f_bufferoffset; int *modelelement3i; + unsigned short *modelelement3s; int modelelement3i_bufferobject; + int modelelement3s_bufferobject; int *modellightmapoffsets; int modelnum_vertices; int modelnum_triangles; @@ -300,7 +303,7 @@ typedef struct rsurfacestate_s matrix4x4_t matrix; matrix4x4_t inversematrix; // animation blending state from entity - frameblend_t frameblend[4]; + frameblend_t frameblend[MAX_FRAMEBLENDS]; // directional model shading state from entity vec3_t modellight_ambient; vec3_t modellight_diffuse; @@ -310,17 +313,18 @@ typedef struct rsurfacestate_s vec3_t colormap_shirtcolor; // view location in model space vec3_t modelorg; // TODO: rename this + // polygon offset data for submodels + float basepolygonfactor; + float basepolygonoffset; // current texture in batching code texture_t *texture; // whether lightmapping is active on this batch // (otherwise vertex colored) qboolean uselightmaptexture; - // one of the RSURFMODE_ values - rsurfmode_t mode; // rtlight rendering // light currently being rendered - rtlight_t *rtlight; + const rtlight_t *rtlight; // current light's cull box (copied out of an rtlight or calculated by GetLightInfo) vec3_t rtlight_cullmins; vec3_t rtlight_cullmaxs; @@ -338,6 +342,11 @@ typedef struct rsurfacestate_s matrix4x4_t entitytoattenuationxyz; // this transforms only the Z to S, and T is always 0.5 matrix4x4_t entitytoattenuationz; + + // 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) + entity_render_t *entity; } rsurfacestate_t; @@ -345,18 +354,14 @@ extern rsurfacestate_t rsurface; void RSurf_ActiveWorldEntity(void); void RSurf_ActiveModelEntity(const entity_render_t *ent, qboolean wantnormals, qboolean wanttangents); -void RSurf_CleanUp(void); +void RSurf_SetupDepthAndCulling(void); void R_Mesh_ResizeArrays(int newvertices); -struct entity_render_s; -struct texture_s; -struct msurface_s; -void R_UpdateTextureInfo(const entity_render_t *ent, texture_t *t); -void R_UpdateAllTextureInfo(entity_render_t *ent); -void R_QueueTextureSurfaceList(int texturenumsurfaces, msurface_t **texturesurfacelist); -void R_DrawWorldSurfaces(qboolean skysurfaces, qboolean writedepth, qboolean depthonly, qboolean addwaterplanes, qboolean debug); -void R_DrawModelSurfaces(entity_render_t *ent, qboolean skysurfaces, qboolean writedepth, qboolean depthonly, qboolean addwaterplanes, qboolean debug); +texture_t *R_GetCurrentTexture(texture_t *t); +void R_DrawWorldSurfaces(qboolean skysurfaces, qboolean writedepth, qboolean depthonly, qboolean debug); +void R_DrawModelSurfaces(entity_render_t *ent, qboolean skysurfaces, qboolean writedepth, qboolean depthonly, qboolean debug); +void R_AddWaterPlanes(entity_render_t *ent); void RSurf_PrepareVerticesForBatch(qboolean generatenormals, qboolean generatetangents, int texturenumsurfaces, msurface_t **texturesurfacelist); void RSurf_DrawBatch_Simple(int texturenumsurfaces, msurface_t **texturesurfacelist); @@ -369,7 +374,85 @@ typedef enum rsurfacepass_e } rsurfacepass_t; -int R_SetupSurfaceShader(const vec3_t lightcolorbase, qboolean modellighting, float ambientscale, float diffusescale, float specularscale, rsurfacepass_t pass); +typedef enum gl20_texunit_e +{ + // postprocess shaders, and generic shaders: + GL20TU_FIRST = 0, + GL20TU_SECOND = 1, + GL20TU_GAMMARAMPS = 2, + // standard material properties + GL20TU_NORMAL = 0, + GL20TU_COLOR = 1, + GL20TU_GLOSS = 2, + GL20TU_GLOW = 3, + // material properties for a second material + GL20TU_SECONDARY_NORMAL = 4, + GL20TU_SECONDARY_COLOR = 5, + GL20TU_SECONDARY_GLOSS = 6, + GL20TU_SECONDARY_GLOW = 7, + // material properties for a colormapped material + // conflicts with secondary material + GL20TU_PANTS = 4, + GL20TU_SHIRT = 5, + // fog fade in the distance + GL20TU_FOGMASK = 8, + // compiled ambient lightmap and deluxemap + GL20TU_LIGHTMAP = 9, + GL20TU_DELUXEMAP = 10, + // refraction, used by water shaders + GL20TU_REFRACTION = 3, + // reflection, used by water shaders, also with normal material rendering + // conflicts with secondary material + GL20TU_REFLECTION = 7, + // rtlight attenuation (distance fade) and cubemap filter (projection texturing) + // conflicts with lightmap/deluxemap + GL20TU_ATTENUATION = 9, + GL20TU_CUBE = 10, + GL20TU_SHADOWMAPRECT = 11, + GL20TU_SHADOWMAPCUBE = 11, + GL20TU_SHADOWMAP2D = 11, + GL20TU_CUBEPROJECTION = 12 +} +gl20_texunit; + +void R_SetupGenericShader(qboolean usetexture); +void R_SetupGenericTwoTextureShader(int texturemode); +void R_SetupDepthOrShadowShader(void); +void R_SetupShowDepthShader(void); +void R_SetupSurfaceShader(const vec3_t lightcolorbase, qboolean modellighting, float ambientscale, float diffusescale, float specularscale, rsurfacepass_t rsurfacepass); + +typedef struct r_waterstate_waterplane_s +{ + rtexture_t *texture_refraction; + rtexture_t *texture_reflection; + mplane_t plane; + int materialflags; // combined flags of all water surfaces on this plane + unsigned char pvsbits[(32768+7)>>3]; // FIXME: buffer overflow on huge maps + qboolean pvsvalid; +} +r_waterstate_waterplane_t; + +#define MAX_WATERPLANES 16 + +typedef struct r_waterstate_s +{ + qboolean enabled; + + qboolean renderingscene; // true while rendering a refraction or reflection texture, disables water surfaces + + int waterwidth, waterheight; + int texturewidth, textureheight; + + int maxwaterplanes; // same as MAX_WATERPLANES + int numwaterplanes; + r_waterstate_waterplane_t waterplanes[MAX_WATERPLANES]; + + float screenscale[2]; + float screencenter[2]; +} +r_waterstate_t; + +extern r_waterstate_t r_waterstate; #endif