X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=image.h;h=983581243042e538cf02aa83f3a20a084cd08757;hp=f85a806085f8be2d3361e60e150ef19ddcf12ef1;hb=8bcbd476c86b2c26e77b76b57039f840904a89a5;hpb=61f6f92291491fe35ecd38747e37e6d569fec28d diff --git a/image.h b/image.h index f85a8060..98358124 100644 --- a/image.h +++ b/image.h @@ -2,75 +2,50 @@ #ifndef IMAGE_H #define IMAGE_H + +extern int image_width, image_height; + + // swizzle components (even converting number of components) and flip images // (warning: input must be different than output due to non-linear read/write) -void Image_CopyMux(qbyte *outpixels, const qbyte *inpixels, int width, int height, int flipx, int flipy, int flipdiagonal, int numincomponents, int numoutcomponents, int *inputcomponentindices); +// (tip: component indices can contain values | 0x80000000 to tell it to +// store them directly into output, so 255 | 0x80000000 would write 255) +void Image_CopyMux(unsigned char *outpixels, const unsigned char *inpixels, int inputwidth, int inputheight, qboolean inputflipx, qboolean inputflipy, qboolean inputflipdiagonal, int numoutputcomponents, int numinputcomponents, int *outputinputcomponentindices); // 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); +void Image_GammaRemapRGB(const unsigned char *in, unsigned char *out, int pixels, const unsigned char *gammar, const unsigned char *gammag, const unsigned char *gammab); -// converts 8bit image data to RGBA, in can not be the same as out -void Image_Copy8bitRGBA(const qbyte *in, qbyte *out, int pixels, const unsigned int *pal); +// converts 8bit image data to BGRA, in can not be the same as out +void Image_Copy8bitBGRA(const unsigned char *in, unsigned char *out, int pixels, const unsigned int *pal); -// makes a RGBA mask from RGBA input, in can be the same as out -int image_makemask (const qbyte *in, qbyte *out, int size); +void Image_StripImageExtension (const char *in, char *out, size_t size_out); + +// called by conchars.tga loader in gl_draw.c, otherwise private +unsigned char *LoadTGA_BGRA (const unsigned char *f, int filesize); // loads a texture, as pixel data -qbyte *loadimagepixels (const char *filename, qboolean complain, int matchwidth, int matchheight); +unsigned char *loadimagepixelsbgra (const char *filename, qboolean complain, qboolean allowFixtrans); // loads a texture, as a texture -rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags); - -// loads a texture's alpha mask, as pixel data -qbyte *loadimagepixelsmask (const char *filename, qboolean complain, int matchwidth, int matchheight); - -// loads a texture's alpha mask, as a texture -rtexture_t *loadtextureimagemask (rtexturepool_t *pool, const char *filename, int matchwidth, int matchheight, qboolean complain, int flags); +rtexture_t *loadtextureimage (rtexturepool_t *pool, const char *filename, qboolean complain, int flags, qboolean allowFixtrans); -// loads a texture and it's alpha mask at once (NULL if it has no translucent pixels) -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 an upside down BGR image into a TGA +qboolean Image_WriteTGABGR_preflipped (const char *filename, int width, int height, const unsigned char *data, unsigned char *buffer); -// 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); - -// writes a RGB TGA -void Image_WriteTGARGB (const char *filename, int width, int height, const qbyte *data); - -// writes a RGBA TGA -void Image_WriteTGARGBA (const char *filename, int width, int height, const qbyte *data); - -// returns true if the image has some translucent pixels -qboolean Image_CheckAlpha(const qbyte *data, int size, qboolean rgba); +// writes a BGRA image into a TGA file +void Image_WriteTGABGRA (const char *filename, int width, int height, const unsigned char *data); // resizes the image (in can not be the same as out) -void Image_Resample (const void *indata, int inwidth, int inheight, int indepth, void *outdata, int outwidth, int outheight, int outdepth, int bytesperpixel, int quality); +void Image_Resample32(const void *indata, int inwidth, int inheight, int indepth, void *outdata, int outwidth, int outheight, int outdepth, int quality); // scales the image down by a power of 2 (in can be the same as out) -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 (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); +void Image_MipReduce32(const unsigned char *in, unsigned char *out, int *width, int *height, int *depth, int destwidth, int destheight, int destdepth); + +void Image_HeightmapToNormalmap_BGRA(const unsigned char *inpixels, unsigned char *outpixels, int width, int height, int clamp, float bumpscale); + +// console command to fix the colors of transparent pixels (to prevent weird borders) +void Image_FixTransparentPixels_f(void); +extern cvar_t r_fixtrans_auto; #endif