X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=render.h;h=a6bc20793a6cca7ca0bd6ec15f60b5c070cd71d4;hb=b2d45dd172990008ff2fefa83cc24243b39cafae;hp=785ece43295d5e1999c4e82c2980fd75356b770a;hpb=28450d0ddd2790b82c48a07239fd3cddbef4d63c;p=xonotic%2Fdarkplaces.git diff --git a/render.h b/render.h index 785ece43..a6bc2079 100644 --- a/render.h +++ b/render.h @@ -140,12 +140,13 @@ 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_LoadInternal8bit(const char *name, int textureflags, const unsigned char *skindata, int width, int height, const unsigned int *palette, const unsigned int *alphapalette); skinframe_t *R_SkinFrame_LoadMissing(void); +rtexture_t *R_GetCubemap(const char *basename); + void R_View_WorldVisibility(qboolean forcenovis); void R_DrawDecals(void); void R_DrawParticles(void); @@ -161,6 +162,17 @@ int R_CullBoxCustomPlanes(const vec3_t mins, const vec3_t maxs, int numplanes, c #include "meshqueue.h" +extern qboolean r_framedata_failed; +void R_FrameData_Reset(void); +void R_FrameData_NewFrame(void); +void *R_FrameData_Alloc(size_t size); +void *R_FrameData_Store(size_t size, void *data); + +void R_AnimCache_Free(void); +void R_AnimCache_ClearCache(void); +qboolean R_AnimCache_GetEntity(entity_render_t *ent, qboolean wantnormals, qboolean wanttangents); +void R_AnimCache_CacheVisibleEntities(void); + #include "r_lerpanim.h" extern cvar_t r_render; @@ -168,7 +180,7 @@ extern cvar_t r_renderview; extern cvar_t r_waterwarp; extern cvar_t r_textureunits; -extern cvar_t r_glsl; + extern cvar_t r_glsl_offsetmapping; extern cvar_t r_glsl_offsetmapping_reliefmapping; extern cvar_t r_glsl_offsetmapping_scale; @@ -183,6 +195,12 @@ extern cvar_t r_smoothnormals_areaweighting; extern cvar_t r_test; +extern cvar_t r_texture_convertsRGB_2d; +extern cvar_t r_texture_convertsRGB_skin; +extern cvar_t r_texture_convertsRGB_cubemap; +extern cvar_t r_texture_convertsRGB_skybox; +extern cvar_t r_texture_convertsRGB_particles; + #include "gl_backend.h" extern rtexture_t *r_texture_blanknormalmap; @@ -193,10 +211,9 @@ extern rtexture_t *r_texture_notexture; extern rtexture_t *r_texture_whitecube; extern rtexture_t *r_texture_normalizationcube; extern rtexture_t *r_texture_fogattenuation; -//extern rtexture_t *r_texture_fogintensity; +extern rtexture_t *r_texture_fogheighttexture; -#define R_MAX_OCCLUSION_QUERIES 4096 -extern unsigned int r_queries[R_MAX_OCCLUSION_QUERIES]; +extern unsigned int r_queries[MAX_OCCLUSION_QUERIES]; extern unsigned int r_numqueries; extern unsigned int r_maxqueries; @@ -206,7 +223,7 @@ void R_TimeReport(char *name); void R_Stain(const vec3_t origin, float radius, int cr1, int cg1, int cb1, int ca1, int cr2, int cg2, int cb2, int ca2); void R_CalcBeam_Vertex3f(float *vert, const vec3_t org1, const vec3_t org2, float width); -void R_DrawSprite(int blendfunc1, int blendfunc2, rtexture_t *texture, rtexture_t *fogtexture, qboolean depthdisable, qboolean depthshort, 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); +void R_CalcSprite_Vertex3f(float *vertex3f, const vec3_t origin, const vec3_t left, const vec3_t up, float scalex1, float scalex2, float scaley1, float scaley2); extern mempool_t *r_main_mempool; @@ -241,35 +258,35 @@ typedef struct rsurfacestate_s // this indicates the model* arrays are pointed at array_model* buffers // (in other words, the model has been animated in software) qboolean generatedvertex; - float *modelvertex3f; + const float *modelvertex3f; int modelvertex3f_bufferobject; size_t modelvertex3f_bufferoffset; - float *modelsvector3f; + const float *modelsvector3f; int modelsvector3f_bufferobject; size_t modelsvector3f_bufferoffset; - float *modeltvector3f; + const float *modeltvector3f; int modeltvector3f_bufferobject; size_t modeltvector3f_bufferoffset; - float *modelnormal3f; + const float *modelnormal3f; int modelnormal3f_bufferobject; size_t modelnormal3f_bufferoffset; - float *modellightmapcolor4f; + const float *modellightmapcolor4f; int modellightmapcolor4f_bufferobject; size_t modellightmapcolor4f_bufferoffset; - float *modeltexcoordtexture2f; + const float *modeltexcoordtexture2f; int modeltexcoordtexture2f_bufferobject; size_t modeltexcoordtexture2f_bufferoffset; - float *modeltexcoordlightmap2f; + const float *modeltexcoordlightmap2f; int modeltexcoordlightmap2f_bufferobject; size_t modeltexcoordlightmap2f_bufferoffset; - int *modelelement3i; - unsigned short *modelelement3s; + const int *modelelement3i; + const unsigned short *modelelement3s; int modelelement3i_bufferobject; int modelelement3s_bufferobject; - int *modellightmapoffsets; + const int *modellightmapoffsets; int modelnum_vertices; int modelnum_triangles; - msurface_t *modelsurfaces; + const msurface_t *modelsurfaces; // current rendering array pointers // these may point to any of several different buffers depending on how // much processing was needed to prepare this model for rendering @@ -280,25 +297,25 @@ typedef struct rsurfacestate_s // the exception is the color array which is often generated based on // colormod, alpha fading, and fogging, it may also come from q3bsp vertex // lighting of certain surfaces - float *vertex3f; + const float *vertex3f; int vertex3f_bufferobject; size_t vertex3f_bufferoffset; - float *svector3f; + const float *svector3f; int svector3f_bufferobject; size_t svector3f_bufferoffset; - float *tvector3f; + const float *tvector3f; int tvector3f_bufferobject; size_t tvector3f_bufferoffset; - float *normal3f; + const float *normal3f; int normal3f_bufferobject; size_t normal3f_bufferoffset; - float *lightmapcolor4f; + const float *lightmapcolor4f; int lightmapcolor4f_bufferobject; size_t lightmapcolor4f_bufferoffset; - float *texcoordtexture2f; + const float *texcoordtexture2f; int texcoordtexture2f_bufferobject; size_t texcoordtexture2f_bufferoffset; - float *texcoordlightmap2f; + const float *texcoordlightmap2f; int texcoordlightmap2f_bufferobject; size_t texcoordlightmap2f_bufferoffset; // some important fields from the entity @@ -306,7 +323,7 @@ typedef struct rsurfacestate_s int ent_qwskin; int ent_flags; float ent_shadertime; - float ent_color[4]; + int ent_alttextures; // used by q1bsp animated textures (pressed buttons) // transform matrices to render this entity and effects on this entity matrix4x4_t matrix; matrix4x4_t inversematrix; @@ -315,6 +332,7 @@ typedef struct rsurfacestate_s float inversematrixscale; // 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; @@ -322,8 +340,11 @@ typedef struct rsurfacestate_s // 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 - vec3_t glowmod; + float glowmod[3]; // view location in model space vec3_t localvieworigin; // polygon offset data for submodels @@ -337,16 +358,13 @@ typedef struct rsurfacestate_s // fog plane in model space for direct application to vertices float fograngerecip; float fogmasktabledistmultiplier; + float fogplane[4]; + float fogheightfade; + float fogplaneviewdist; // rtlight rendering // light currently being rendered 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; - // current light's culling planes - int rtlight_numfrustumplanes; - mplane_t rtlight_frustumplanes[12+6+6]; // see R_Shadow_ComputeShadowCasterCullingPlanes // this is the location of the light in entity space vec3_t entitylightorigin; @@ -369,24 +387,30 @@ rsurfacestate_t; extern rsurfacestate_t rsurface; void RSurf_ActiveWorldEntity(void); -void RSurf_ActiveModelEntity(const entity_render_t *ent, qboolean wantnormals, qboolean wanttangents); +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); void R_Mesh_ResizeArrays(int newvertices); 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_DrawWorldSurfaces(qboolean skysurfaces, qboolean writedepth, qboolean depthonly, qboolean debug, qboolean prepass); +void R_DrawModelSurfaces(entity_render_t *ent, qboolean skysurfaces, qboolean writedepth, qboolean depthonly, qboolean debug, qboolean prepass); void R_AddWaterPlanes(entity_render_t *ent); +void R_DrawCustomSurface(skinframe_t *skinframe, const matrix4x4_t *texmatrix, int materialflags, int firstvertex, int numvertices, int firsttriangle, int numtriangles, qboolean writedepth, qboolean prepass); +void R_DrawCustomSurface_Texture(texture_t *texture, const matrix4x4_t *texmatrix, int materialflags, int firstvertex, int numvertices, int firsttriangle, int numtriangles, qboolean writedepth, qboolean prepass); + +void RSurf_PrepareVerticesForBatch(qboolean generatenormals, qboolean generatetangents, int texturenumsurfaces, const msurface_t **texturesurfacelist); +void RSurf_DrawBatch_Simple(int texturenumsurfaces, const msurface_t **texturesurfacelist); -void RSurf_PrepareVerticesForBatch(qboolean generatenormals, qboolean generatetangents, int texturenumsurfaces, msurface_t **texturesurfacelist); -void RSurf_DrawBatch_Simple(int texturenumsurfaces, msurface_t **texturesurfacelist); +void R_DecalSystem_SplatEntities(const vec3_t org, const vec3_t normal, float r, float g, float b, float a, float s1, float t1, float s2, float t2, float size); typedef enum rsurfacepass_e { RSURFPASS_BASE, RSURFPASS_BACKGROUND, - RSURFPASS_RTLIGHT + RSURFPASS_RTLIGHT, + RSURFPASS_DEFERREDGEOMETRY, } rsurfacepass_t; @@ -409,7 +433,7 @@ typedef enum gl20_texunit_e // material properties for a colormapped material // conflicts with secondary material GL20TU_PANTS = 4, - GL20TU_SHIRT = 5, + GL20TU_SHIRT = 7, // fog fade in the distance GL20TU_FOGMASK = 8, // compiled ambient lightmap and deluxemap @@ -427,37 +451,52 @@ typedef enum gl20_texunit_e GL20TU_SHADOWMAPRECT = 11, GL20TU_SHADOWMAPCUBE = 11, GL20TU_SHADOWMAP2D = 11, - GL20TU_CUBEPROJECTION = 12 + GL20TU_CUBEPROJECTION = 12, + // orthographic-projection shadowmapping + GL20TU_SHADOWMAPORTHORECT = 15, + GL20TU_SHADOWMAPORTHO2D = 15, + // rtlight prepass data (screenspace depth and normalmap) + GL20TU_SCREENDEPTH = 13, + GL20TU_SCREENNORMALMAP = 14, + // lightmap prepass data (screenspace diffuse and specular from lights) + GL20TU_SCREENDIFFUSE = 11, + GL20TU_SCREENSPECULAR = 12, + // fake reflections + GL20TU_REFLECTMASK = 5, + GL20TU_REFLECTCUBE = 6, + GL20TU_FOGHEIGHTTEXTURE = 14 } 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); +void R_SetupShader_Generic(rtexture_t *first, rtexture_t *second, int texturemode, int rgbscale); +void R_SetupShader_DepthOrShadow(void); +void R_SetupShader_ShowDepth(void); +void R_SetupShader_Surface(const vec3_t lightcolorbase, qboolean modellighting, float ambientscale, float diffusescale, float specularscale, rsurfacepass_t rsurfacepass); +void R_SetupShader_DeferredLight(const rtlight_t *rtlight); typedef struct r_waterstate_waterplane_s { rtexture_t *texture_refraction; rtexture_t *texture_reflection; + rtexture_t *texture_camera; 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 + unsigned char pvsbits[(MAX_MAP_LEAFS+7)>>3]; // FIXME: buffer overflow on huge maps qboolean pvsvalid; + int camera_entity; } 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 + qboolean renderingrefraction; int waterwidth, waterheight; int texturewidth, textureheight; + int camerawidth, cameraheight; int maxwaterplanes; // same as MAX_WATERPLANES int numwaterplanes;