X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=client.h;h=63502b516d6e2ee4c296d4b9a3676a17c2286e1f;hb=d2e8f74d8b64160f6fe231ad0683c7f79465f2ef;hp=14eacf09bb664c2b8305ea2f6103183491e01857;hpb=ff3f978be59a9218a42afbeaf2731947de1eb99f;p=xonotic%2Fdarkplaces.git

diff --git a/client.h b/client.h
index 14eacf09..63502b51 100644
--- a/client.h
+++ b/client.h
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define CLIENT_H
 
 #include "matrixlib.h"
+#include "snd_main.h"
 
 // LordHavoc: 256 dynamic lights
 #define MAX_DLIGHTS 256
@@ -38,7 +39,7 @@ typedef struct effect_s
 {
 	int active;
 	vec3_t origin;
-	float starttime;
+	double starttime;
 	float framerate;
 	int modelindex;
 	int startframe;
@@ -109,6 +110,10 @@ typedef struct rtlight_s
 	// rendering properties, updated each time a light is rendered
 	// this is rtlight->color * d_lightstylevalue
 	vec3_t currentcolor;
+	// used by corona updates, due to occlusion query
+	float corona_visibility;
+	unsigned int corona_queryindex_visiblepixels;
+	unsigned int corona_queryindex_allpixels;
 	// this is R_Shadow_Cubemap(rtlight->cubemapname)
 	rtexture_t *currentcubemap;
 
@@ -118,7 +123,8 @@ typedef struct rtlight_s
 	// true if this is a compiled world light, cleared if the light changes
 	int compiled;
 	// premade shadow volumes to render for world entity
-	shadowmesh_t *static_meshchain_shadow;
+	shadowmesh_t *static_meshchain_shadow_zpass;
+	shadowmesh_t *static_meshchain_shadow_zfail;
 	// used for visibility testing (more exact than bbox)
 	int static_numleafs;
 	int static_numleafpvsbytes;
@@ -277,6 +283,8 @@ typedef struct entity_render_s
 	double frame1time;
 	// time frame2 began playing (for framegroup animations)
 	double frame2time;
+	// time of last model change (for shader animations)
+	double shadertime;
 
 	// calculated by the renderer (but not persistent)
 
@@ -441,50 +449,51 @@ qw_downloadtype_t;
 
 typedef enum capturevideoformat_e
 {
-	CAPTUREVIDEOFORMAT_AVI_I420
+	CAPTUREVIDEOFORMAT_AVI_I420,
+	CAPTUREVIDEOFORMAT_OGG_VORBIS_THEORA,
 }
 capturevideoformat_t;
 
 typedef struct capturevideostate_s
 {
-	double starttime;
+	double startrealtime;
 	double framerate;
-	// for AVI saving some values have to be written after capture ends
-	fs_offset_t videofile_firstchunkframes_offset;
-	fs_offset_t videofile_totalframes_offset1;
-	fs_offset_t videofile_totalframes_offset2;
-	fs_offset_t videofile_totalsampleframes_offset;
-	int videofile_ix_master_audio_inuse;
-	fs_offset_t videofile_ix_master_audio_inuse_offset;
-	fs_offset_t videofile_ix_master_audio_start_offset;
-	int videofile_ix_master_video_inuse;
-	fs_offset_t videofile_ix_master_video_inuse_offset;
-	fs_offset_t videofile_ix_master_video_start_offset;
-	fs_offset_t videofile_ix_movistart;
-	fs_offset_t position;
-	qfile_t *videofile;
 	qboolean active;
 	qboolean realtime;
 	qboolean error;
-	qboolean canseek;
-	capturevideoformat_t format;
 	int soundrate;
+	int soundchannels;
 	int frame;
-	int soundsampleframe; // for AVI saving
+	double starttime;
+	double lastfpstime;
+	int lastfpsframe;
+	int soundsampleframe;
 	unsigned char *screenbuffer;
 	unsigned char *outbuffer;
-	sizebuf_t riffbuffer;
-	unsigned char riffbufferdata[128];
-	// note: riffindex buffer has an allocated ->data member, not static like most!
-	sizebuf_t riffindexbuffer;
-	int riffstacklevel;
-	fs_offset_t riffstackstartoffset[4];
-	fs_offset_t riffstacksizehint[4];
-	const char *riffstackfourcc[4];
+	char basename[MAX_QPATH];
+	int width, height;
+
+	// precomputed RGB to YUV tables
+	// converts the RGB values to YUV (see cap_avi.c for how to use them)
 	short rgbtoyuvscaletable[3][3][256];
 	unsigned char yuvnormalizetable[3][256];
-	char basename[64];
-	int width, height;
+
+	// precomputed gamma ramp (only needed if the capturevideo module uses RGB output)
+	// note: to map from these values to RGB24, you have to multiply by 255.0/65535.0, then add 0.5, then cast to integer
+	unsigned short vidramp[256 * 3];
+
+	// stuff to be filled in by the video format module
+	capturevideoformat_t format;
+	const char *formatextension;
+	qfile_t *videofile;
+		// always use this:
+		//   cls.capturevideo.videofile = FS_OpenRealFile(va("%s.%s", cls.capturevideo.basename, cls.capturevideo.formatextension), "wb", false);
+	void (*endvideo) ();
+	void (*videoframes) (int num);
+	void (*soundframe) (const portable_sampleframe_t *paintbuffer, size_t length);
+
+	// format specific data
+	void *formatspecific;
 }
 capturevideostate_t;
 
@@ -1200,7 +1209,7 @@ void CL_Beam_CalculatePositions (const beam_t *b, vec3_t start, vec3_t end);
 void CL_ClientMovement_Replay(void);
 
 void CL_ClearTempEntities (void);
-entity_render_t *CL_NewTempEntity (void);
+entity_render_t *CL_NewTempEntity (double shadertime);
 
 void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float framerate);
 
@@ -1245,6 +1254,7 @@ void CL_Parse_DumpPacket(void);
 void CL_Parse_ErrorCleanUp(void);
 void QW_CL_StartUpload(unsigned char *data, int size);
 extern cvar_t qport;
+void CL_KeepaliveMessage(qboolean readmessages); // call this during loading of large content
 
 //
 // view
@@ -1488,7 +1498,8 @@ typedef struct r_refdef_scene_s {
 	int maxtempentities;
 
 	// renderable dynamic lights
-	rtlight_t lights[MAX_DLIGHTS];
+	rtlight_t *lights[MAX_DLIGHTS];
+	rtlight_t templights[MAX_DLIGHTS];
 	int numlights;
 
 	// intensities for light styles right now, controls rtlights