added trace.realfraction field which is now used for comparisons instead of fraction...

[xonotic/darkplaces.git] / image.h

diff --git a/image.h b/image.h
index 5ff67384fa8350a3960ff052a85c1478e01d694d..71a5535b16c24c919c27bd9533241a380ba4e254 100644 (file)
--- a/image.h
+++ b/image.h
@@ -28,6 +28,7 @@ rtexture_t *image_masktex;
 rtexture_t *image_nmaptex;
 rtexture_t *loadtextureimagewithmask (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags);
 rtexture_t *loadtextureimagewithmaskandnmap (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags, float bumpscale);
+rtexture_t *loadtextureimagebumpasnmap (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags, float bumpscale);
 
 // writes a RGB TGA that is already upside down (which TGA wants)
 qboolean Image_WriteTGARGB_preflipped (const char *filename, int width, int height, const qbyte *data);
@@ -48,9 +49,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