added texmatrix[] to rmeshstate_t and removed R_Mesh_TextureMatrix function

[xonotic/darkplaces.git] / image.h

diff --git a/image.h b/image.h
index 2d26d29ed1368e32fea6620e0c3e820e1695e340..08b21f0fbd25dbbd907c37289d363c0e54d99b32 100644 (file)
--- a/image.h
+++ b/image.h
@@ -2,6 +2,12 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
+// swizzle components (even converting number of components) and flip images
+// (warning: input must be different than output due to non-linear read/write)
+// (tip: inputcomponentindices can contain values | 0x80000000 to tell it to
+// store them directly into output, so 255 | 0x80000000 would write 255)
+void Image_CopyMux(qbyte *outpixels, const qbyte *inpixels, int width, int height, int flipx, int flipy, int flipdiagonal, int numincomponents, int numoutcomponents, int *inputcomponentindices);
+
 // applies gamma correction to RGB pixels, in can be the same as out
 void Image_GammaRemapRGB(const qbyte *in, qbyte *out, int pixels, const qbyte *gammar, const qbyte *gammag, const qbyte *gammab);
 
@@ -49,9 +55,24 @@ void Image_Resample (const void *indata, int inwidth, int inheight, int indepth,
 void Image_MipReduce(const qbyte *in, qbyte *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth, int bytesperpixel);
 
 // only used by menuplyr coloring
-qbyte *LoadLMPAs8Bit (const qbyte *f, int matchwidth, int matchheight);
+qbyte *LoadLMPAs8Bit (qbyte *f, int matchwidth, int matchheight);
 
 void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *outpixels, int width, int height, int clamp, float bumpscale);
 
+typedef struct imageskin_s
+{
+       qbyte *basepixels;int basepixels_width;int basepixels_height;
+       qbyte *nmappixels;int nmappixels_width;int nmappixels_height;
+       qbyte *glowpixels;int glowpixels_width;int glowpixels_height;
+       qbyte *glosspixels;int glosspixels_width;int glosspixels_height;
+       qbyte *pantspixels;int pantspixels_width;int pantspixels_height;
+       qbyte *shirtpixels;int shirtpixels_width;int shirtpixels_height;
+       qbyte *maskpixels;int maskpixels_width;int maskpixels_height;
+}
+imageskin_t;
+
+int image_loadskin(imageskin_t *s, char *name);
+void image_freeskin(imageskin_t *s);
+
 #endif