From: divverent Date: Sat, 22 Oct 2011 14:19:37 +0000 (+0000) Subject: a harmless sRGB simplification, more to be done later X-Git-Tag: xonotic-v0.6.0~226 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c8594bcd2b7cd9105da61a5effcb6e6b68b2c434;p=xonotic%2Fdarkplaces.git a harmless sRGB simplification, more to be done later git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11458 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=154145cdd4e53712d7c69f1def94df479d4b7e34 --- diff --git a/gl_rmain.c b/gl_rmain.c index b61ea3f1..20aff5a2 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -192,6 +192,7 @@ cvar_t r_waterscroll = {CVAR_SAVE, "r_waterscroll", "1", "makes water scroll aro cvar_t r_bloom = {CVAR_SAVE, "r_bloom", "0", "enables bloom effect (makes bright pixels affect neighboring pixels)"}; cvar_t r_bloom_colorscale = {CVAR_SAVE, "r_bloom_colorscale", "1", "how bright the glow is"}; + cvar_t r_bloom_brighten = {CVAR_SAVE, "r_bloom_brighten", "2", "how bright the glow is, after subtract/power"}; cvar_t r_bloom_blur = {CVAR_SAVE, "r_bloom_blur", "4", "how large the glow is"}; cvar_t r_bloom_resolution = {CVAR_SAVE, "r_bloom_resolution", "320", "what resolution to perform the bloom effect at (independent of screen resolution)"}; diff --git a/image.h b/image.h index 66b679df..442b5dc7 100644 --- a/image.h +++ b/image.h @@ -49,8 +49,12 @@ void Image_HeightmapToNormalmap_BGRA(const unsigned char *inpixels, unsigned cha void Image_FixTransparentPixels_f(void); extern cvar_t r_fixtrans_auto; -#define Image_LinearFloatFromsRGB(c) (((c) <= 10.3552f) ? (c) * 0.000302341331f : (float)pow(((c)*(1.0f/256.0f) + 0.055f)*(1.0f/1.055f), 2.4f)) -#define Image_sRGBFloatFromLinear(c) (((c) < 0.8014848f) ? (c) * 0.05046875f : 1.055f * (float)pow((c)*(1.0f/256.0f), 1.0f/2.4f) - 0.055f) +#define Image_LinearFloatFromsRGBFloat(c) (((c) <= 0.04045f) ? (c) * (1.0f / 12.92f) : (float)pow(((c) + 0.055f)*(1.0f/1.055f), 2.4f)) +#define Image_sRGBFloatFromLinearFloat(c) (((c) < 0.0031308f) ? (c) * 12.92f : 1.055f * (float)pow((c), 1.0f/2.4f) - 0.055f) + +#define Image_LinearFloatFromsRGB(c) Image_LinearFloatFromsRGBFloat((c) * (1.0f / 255.0f)) +#define Image_sRGBFloatFromLinear(c) Image_sRGBFloatFromLinearFloat((c) * (1.0f / 255.0f)) + #define Image_sRGBFloatFromLinear_Lightmap(c) (Image_sRGBFloatFromLinear(c*2.0f)*0.5f) void Image_MakeLinearColorsFromsRGB(unsigned char *pout, const unsigned char *pin, int numpixels);