X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_backend.h;h=1752635f6303a408d653855bc48a18efeed1d171;hb=051cbfa162b00e0820b50114e2b3366c9912018e;hp=9476312b9a32feda9221ff0bec01e9b7116ee840;hpb=0256e57e16a302ad45090618b8d6eb5930788809;p=xonotic%2Fdarkplaces.git

diff --git a/gl_backend.h b/gl_backend.h
index 9476312b..1752635f 100644
--- a/gl_backend.h
+++ b/gl_backend.h
@@ -4,57 +4,35 @@
 
 #define MAX_TEXTUREUNITS 8
 
-extern int c_meshtris, c_meshs, c_transtris, c_transmeshs;
-
-typedef struct
-{
-	int transparent;
-	int depthwrite; // force depth writing enabled even if polygon is not opaque
-	int depthdisable; // disable depth read/write entirely
-	int blendfunc1;
-	int blendfunc2;
-	int numtriangles;
-	int *index;
-	int numverts;
-	float *vertex;
-	int vertexstep;
-	float *color;
-	int colorstep;
-	float cr, cg, cb, ca; // if color is NULL, these are used for all vertices
-	int tex[MAX_TEXTUREUNITS];
-	float *texcoords[MAX_TEXTUREUNITS];
-	int texcoordstep[MAX_TEXTUREUNITS];
-	int texrgbscale[MAX_TEXTUREUNITS]; // used only if COMBINE is present
-}
-rmeshinfo_t;
+extern int c_meshtris, c_meshs;
 
 typedef struct
 {
 	//input to R_Mesh_Draw_GetBuffer
-	int transparent;
 	int depthwrite; // force depth writing enabled even if polygon is not opaque
 	int depthdisable; // disable depth read/write entirely
 	int blendfunc1;
 	int blendfunc2;
-	int numtriangles;
-	int numverts;
+	int wantoverbright;
 	int tex[MAX_TEXTUREUNITS];
 	int texrgbscale[MAX_TEXTUREUNITS]; // used only if COMBINE is present
-
-	// output
-	int *index;
-	float *vertex;
-	float *color;
-	float colorscale;
-	float *texcoords[MAX_TEXTUREUNITS];
 }
-rmeshbufferinfo_t;
+rmeshstate_t;
+
+// overbright rendering scale for the current state
+extern float mesh_colorscale;
+extern int *varray_element;
+extern float *varray_vertex;
+extern float *varray_color;
+extern float *varray_texcoord[MAX_TEXTUREUNITS];
+extern int mesh_maxverts;
+extern int mesh_maxtris;
 
 // adds console variables and registers the render module (only call from GL_Init)
 void gl_backend_init(void);
 
 // starts mesh rendering for the frame
-void R_Mesh_Start(void);
+void R_Mesh_Start(float farclip);
 
 // ends mesh rendering for the frame
 // (only valid after R_Mesh_Start)
@@ -64,30 +42,18 @@ void R_Mesh_Finish(void);
 // (only valid between R_Mesh_Start and R_Mesh_Finish)
 void R_Mesh_ClearDepth(void);
 
-// renders current batch of meshs
-// (only valid between R_Mesh_Start and R_Mesh_Finish)
-void R_Mesh_Render(void);
-
-// queues a mesh to be rendered (invokes Render if queue is full)
-// (only valid between R_Mesh_Start and R_Mesh_Finish)
-void R_Mesh_Draw(const rmeshinfo_t *m);
-
-// renders the queued transparent meshs
-// (only valid between R_Mesh_Start and R_Mesh_Finish)
-void R_Mesh_AddTransparent(void);
+// sets up the requested transform matrix
+void R_Mesh_Matrix(const matrix4x4_t *matrix);
 
-// ease-of-use frontend to R_Mesh_Draw, set up meshinfo, except for index and numtriangles and numverts, then call this
-// (only valid between R_Mesh_Start and R_Mesh_Finish)
-void R_Mesh_DrawPolygon(rmeshinfo_t *m, int numverts);
+// sets up the requested state
+void R_Mesh_State(const rmeshstate_t *m);
 
-// same as normal, except for harsh format restrictions (vertex must be 4 float, color must be 4 float, texcoord must be 2 float, flat color not supported)
-// (only valid between R_Mesh_Start and R_Mesh_Finish)
-void R_Mesh_Draw_NativeOnly(const rmeshinfo_t *m);
+// enlarges geometry buffers if they are too small
+#define R_Mesh_ResizeCheck(numverts, numtriangles) if ((numverts) > mesh_maxverts || (numtriangles) > mesh_maxtris) _R_Mesh_ResizeCheck(numverts, numtriangles);
+void _R_Mesh_ResizeCheck(int numverts, int numtriangles);
 
-// allocates space in geometry buffers, and fills in pointers to the buffers in passsed struct
-// (this is used for very high speed rendering, no copying)
-// (only valid between R_Mesh_Start and R_Mesh_Finish)
-int R_Mesh_Draw_GetBuffer(rmeshbufferinfo_t *m);
+// renders the mesh in the varray_* buffers
+void R_Mesh_Draw(int numverts, int numtriangles);
 
 // saves a section of the rendered frame to a .tga file
 qboolean SCR_ScreenShot(char *filename, int x, int y, int width, int height);