X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_textures.h;h=a6e323a3ed7011289d7c0d549f2bf36c073b5059;hp=3abbe5839a951e47cb7b6de7cd00056ae394a011;hb=85dc5d62f33392ef3bd67d7e5f7d4fccf13cf1ab;hpb=0256e57e16a302ad45090618b8d6eb5930788809

diff --git a/r_textures.h b/r_textures.h
index 3abbe583..a6e323a3 100644
--- a/r_textures.h
+++ b/r_textures.h
@@ -11,22 +11,29 @@
 // upload immediately, never defer (ignore r_textureprecache)
 #define TEXF_ALWAYSPRECACHE 0x00000008
 // allocated as a fragment in a larger texture, mipmap is not allowed with
-// this, mostly used for lightmaps (which are procedural textures)
+// this, mostly used for lightmaps
 #define TEXF_FRAGMENT 0x00000010
+// indicates texture coordinates should be clamped rather than wrapping
+#define TEXF_CLAMP 0x00000020
+// indicates texture should be uploaded using GL_NEAREST or GL_NEAREST_MIPMAP_NEAREST mode
+#define TEXF_FORCENEAREST 0x00000040
+// indicates texture should be uploaded using GL_LINEAR or GL_LINEAR_MIPMAP_NEAREST or GL_LINEAR_MIPMAP_LINEAR mode
+#define TEXF_FORCELINEAR 0x00000080
 // used for checking if textures mismatch
-#define TEXF_IMPORTANTBITS (TEXF_ALPHA | TEXF_MIPMAP | TEXF_FRAGMENT)
+#define TEXF_IMPORTANTBITS (TEXF_ALPHA | TEXF_MIPMAP | TEXF_FRAGMENT | TEXF_CLAMP | TEXF_FORCENEAREST | TEXF_FORCELINEAR)
 
-// 8bit quake paletted
-#define TEXTYPE_QPALETTE 1
+// 8bit paletted
+#define TEXTYPE_PALETTE 1
 // 24bit RGB
 #define TEXTYPE_RGB 2
 // 32bit RGBA
 #define TEXTYPE_RGBA 3
 
-// contents of this structure are private to gl_textures.c
+// contents of this structure are mostly private to gl_textures.c
 typedef struct
 {
-	int useless;
+	// this is exposed (rather than private) for speed reasons only
+	int texnum;
 }
 rtexture_t;
 
@@ -37,7 +44,7 @@ typedef struct
 }
 rtexturepool_t;
 
-// allocate a texture pool, to be used with R_LoadTexture/R_ProceduralTexture
+// allocate a texture pool, to be used with R_LoadTexture
 rtexturepool_t *R_AllocTexturePool(void);
 // free a texture pool (textures can not be freed individually)
 void R_FreeTexturePool(rtexturepool_t **rtexturepool);
@@ -47,21 +54,30 @@ void R_FreeTexturePool(rtexturepool_t **rtexturepool);
 // update system, to get a compliant size, use R_CompatibleFragmentWidth
 int R_CompatibleFragmentWidth(int width, int textype, int flags);
 
-// these two functions add a texture to a pool, and may precache (upload) it
-// a normal static texture
-rtexture_t *R_LoadTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, qbyte *data, int textype, int flags);
-// a procedurally generated texture, often animated over time, note: generate can be NULL (for odd uses)
-rtexture_t *R_ProceduralTexture (rtexturepool_t *rtexturepool, char *identifier, int width, int height, int textype, int flags, int (*generate)(qbyte *buffer, int width, int height, void *parameterdata, int parameterdatasize), void *parameterdata, int parameterdatasize);
+// add a texture to a pool and optionally precache (upload) it
+// (note: data == NULL is perfectly acceptable)
+// (note: palette must not be NULL if using TEXTYPE_PALETTE)
+rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, const char *identifier, int width, const qbyte *data, int textype, int flags, const unsigned int *palette);
+rtexture_t *R_LoadTexture2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, const qbyte *data, int textype, int flags, const unsigned int *palette);
+rtexture_t *R_LoadTexture3D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, const qbyte *data, int textype, int flags, const unsigned int *palette);
+rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, const char *identifier, int width, const qbyte *data, int textype, int flags, const unsigned int *palette);
 
-// update the image data of a texture, used by lightmap updates and procedural
-// textures.
+// free a texture
+void R_FreeTexture(rtexture_t *rt);
+
+// update the image data of a texture, used by lightmap updates and
+// procedural textures.
 void R_UpdateTexture(rtexture_t *rt, qbyte *data);
 
-// location of the fragment in the texture (note: any parameter except rt can be NULL)
+// location of the fragment in the texture (note: any parameter except rt can
+// be NULL)
 void R_FragmentLocation(rtexture_t *rt, int *x, int *y, float *fx1, float *fy1, float *fx2, float *fy2);
+void R_FragmentLocation3D(rtexture_t *rt, int *x, int *y, int *z, float *fx1, float *fy1, float *fz1, float *fx2, float *fy2, float *fz2);
 
-// returns the renderer dependent texture slot number (call this before each use, as a texture might not have been precached, or it might change over time if it is procedural)
-int R_GetTexture (rtexture_t *rt);
+// returns the renderer dependent texture slot number (call this before each
+// use, as a texture might not have been precached)
+#define R_GetTexture(rt) ((rt) ? ((rt)->texnum >= 0 ? (rt)->texnum : R_RealGetTexture(rt)) : 0)
+int R_RealGetTexture (rtexture_t *rt);
 
 // returns true if the texture is transparent (useful for rendering code)
 int R_TextureHasAlpha(rtexture_t *rt);
@@ -72,5 +88,8 @@ int R_TextureWidth(rtexture_t *rt);
 // returns height of texture, as was specified when it was uploaded
 int R_TextureHeight(rtexture_t *rt);
 
+// frees processing buffers each frame, and may someday animate procedural textures
+void R_Textures_Frame(void);
+
 #endif