[iortcw] 294/497: MP: Remove duplicate tr_bloom.c file

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 8696b2684aa059a7a9871ae98cd4df2777af4460
Author: m4n4t4...@gmail.com 

Date:   Sun Feb 15 13:12:10 2015 +

MP: Remove duplicate tr_bloom.c file
---
 MP/code/rend2/tr_bloom.c | 446 ---
 1 file changed, 446 deletions(-)

diff --git a/MP/code/rend2/tr_bloom.c b/MP/code/rend2/tr_bloom.c
deleted file mode 100644
index ff3deb1..000
--- a/MP/code/rend2/tr_bloom.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
-Copyright (C) 1997-2001 Id Software, Inc.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-// tr_bloom.c: 2D lighting post process effect
-
-#include "tr_local.h"
-
-
-static cvar_t *r_bloom;
-static cvar_t *r_bloom_sample_size;
-static cvar_t *r_bloom_fast_sample;
-static cvar_t *r_bloom_alpha;
-static cvar_t *r_bloom_darken;
-static cvar_t *r_bloom_intensity;
-static cvar_t *r_bloom_diamond_size;
-
-/* 
-== 
- 
-   LIGHT BLOOMS
- 
-== 
-*/ 
-
-static float Diamond8x[8][8] =
-{ 
-   { 0.0f, 0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f, 0.0f, },
-   { 0.0f, 0.0f, 0.2f, 0.3f, 0.3f, 0.2f, 0.0f, 0.0f, },
-   { 0.0f, 0.2f, 0.4f, 0.6f, 0.6f, 0.4f, 0.2f, 0.0f, },
-   { 0.1f, 0.3f, 0.6f, 0.9f, 0.9f, 0.6f, 0.3f, 0.1f, },
-   { 0.1f, 0.3f, 0.6f, 0.9f, 0.9f, 0.6f, 0.3f, 0.1f, },
-   { 0.0f, 0.2f, 0.4f, 0.6f, 0.6f, 0.4f, 0.2f, 0.0f, },
-   { 0.0f, 0.0f, 0.2f, 0.3f, 0.3f, 0.2f, 0.0f, 0.0f, },
-   { 0.0f, 0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f, 0.0f  }
-};
-
-static float Diamond6x[6][6] =
-{ 
-   { 0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f, },
-   { 0.0f, 0.3f, 0.5f, 0.5f, 0.3f, 0.0f, }, 
-   { 0.1f, 0.5f, 0.9f, 0.9f, 0.5f, 0.1f, },
-   { 0.1f, 0.5f, 0.9f, 0.9f, 0.5f, 0.1f, },
-   { 0.0f, 0.3f, 0.5f, 0.5f, 0.3f, 0.0f, },
-   { 0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f  }
-};
-
-static float Diamond4x[4][4] =
-{  
-   { 0.3f, 0.4f, 0.4f, 0.3f, },
-   { 0.4f, 0.9f, 0.9f, 0.4f, },
-   { 0.4f, 0.9f, 0.9f, 0.4f, },
-   { 0.3f, 0.4f, 0.4f, 0.3f  }
-};
-
-static struct {
-   struct {
-   image_t *texture;
-   int width, height;
-   float   readW, readH;
-   } effect;
-   struct {
-   image_t *texture;
-   int width, height;
-   float   readW, readH;
-   } screen;
-   struct {
-   int width, height;
-   } work;
-   qboolean started;
-} bloom;
-
-
-static void ID_INLINE R_Bloom_Quad( int width, int height, float texX, float 
texY, float texWidth, float texHeight ) {
-   int x = 0;
-   int y = 0;
-   x = 0;
-   y += glConfig.vidHeight - height;
-   width += x;
-   height += y;
-   
-   texWidth += texX;
-   texHeight += texY;
-
-   qglBegin( GL_QUADS );   
-   qglTexCoord2f(  texX,   
texHeight   );  
-   qglVertex2f(x,  
y   );
-
-   qglTexCoord2f(  texX,   texY
);  
-   qglVertex2f(x,  
height  );  
-
-   qglTexCoord2f(  texWidth,   texY
);  
-   qglVertex2f(width,  height  
);  
-
-   qglTexCoord2f(  texWidth,   
texHeight   );  
-   qglVertex2f(width,  y   
);  
-   qglEnd ();
-}
-
-
-/*
-=
-R_Bloom_InitTextures
-=
-*/
-static void R_Bloom_InitTextures( void )
-{
-   byte*data;
-
-   // find closer power of 2 to screen size 
-   for (bloom.screen.width = 1;bloom.screen.width< 
glConfig.vidWidth;bloom.screen.width *= 2);
-  

[iortcw] 294/497: MP: Remove duplicate tr_bloom.c file

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 8696b2684aa059a7a9871ae98cd4df2777af4460
Author: m4n4t4...@gmail.com 

Date:   Sun Feb 15 13:12:10 2015 +

MP: Remove duplicate tr_bloom.c file
---
 MP/code/rend2/tr_bloom.c | 446 ---
 1 file changed, 446 deletions(-)

diff --git a/MP/code/rend2/tr_bloom.c b/MP/code/rend2/tr_bloom.c
deleted file mode 100644
index ff3deb1..000
--- a/MP/code/rend2/tr_bloom.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
-Copyright (C) 1997-2001 Id Software, Inc.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-// tr_bloom.c: 2D lighting post process effect
-
-#include "tr_local.h"
-
-
-static cvar_t *r_bloom;
-static cvar_t *r_bloom_sample_size;
-static cvar_t *r_bloom_fast_sample;
-static cvar_t *r_bloom_alpha;
-static cvar_t *r_bloom_darken;
-static cvar_t *r_bloom_intensity;
-static cvar_t *r_bloom_diamond_size;
-
-/* 
-== 
- 
-   LIGHT BLOOMS
- 
-== 
-*/ 
-
-static float Diamond8x[8][8] =
-{ 
-   { 0.0f, 0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f, 0.0f, },
-   { 0.0f, 0.0f, 0.2f, 0.3f, 0.3f, 0.2f, 0.0f, 0.0f, },
-   { 0.0f, 0.2f, 0.4f, 0.6f, 0.6f, 0.4f, 0.2f, 0.0f, },
-   { 0.1f, 0.3f, 0.6f, 0.9f, 0.9f, 0.6f, 0.3f, 0.1f, },
-   { 0.1f, 0.3f, 0.6f, 0.9f, 0.9f, 0.6f, 0.3f, 0.1f, },
-   { 0.0f, 0.2f, 0.4f, 0.6f, 0.6f, 0.4f, 0.2f, 0.0f, },
-   { 0.0f, 0.0f, 0.2f, 0.3f, 0.3f, 0.2f, 0.0f, 0.0f, },
-   { 0.0f, 0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f, 0.0f  }
-};
-
-static float Diamond6x[6][6] =
-{ 
-   { 0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f, },
-   { 0.0f, 0.3f, 0.5f, 0.5f, 0.3f, 0.0f, }, 
-   { 0.1f, 0.5f, 0.9f, 0.9f, 0.5f, 0.1f, },
-   { 0.1f, 0.5f, 0.9f, 0.9f, 0.5f, 0.1f, },
-   { 0.0f, 0.3f, 0.5f, 0.5f, 0.3f, 0.0f, },
-   { 0.0f, 0.0f, 0.1f, 0.1f, 0.0f, 0.0f  }
-};
-
-static float Diamond4x[4][4] =
-{  
-   { 0.3f, 0.4f, 0.4f, 0.3f, },
-   { 0.4f, 0.9f, 0.9f, 0.4f, },
-   { 0.4f, 0.9f, 0.9f, 0.4f, },
-   { 0.3f, 0.4f, 0.4f, 0.3f  }
-};
-
-static struct {
-   struct {
-   image_t *texture;
-   int width, height;
-   float   readW, readH;
-   } effect;
-   struct {
-   image_t *texture;
-   int width, height;
-   float   readW, readH;
-   } screen;
-   struct {
-   int width, height;
-   } work;
-   qboolean started;
-} bloom;
-
-
-static void ID_INLINE R_Bloom_Quad( int width, int height, float texX, float 
texY, float texWidth, float texHeight ) {
-   int x = 0;
-   int y = 0;
-   x = 0;
-   y += glConfig.vidHeight - height;
-   width += x;
-   height += y;
-   
-   texWidth += texX;
-   texHeight += texY;
-
-   qglBegin( GL_QUADS );   
-   qglTexCoord2f(  texX,   
texHeight   );  
-   qglVertex2f(x,  
y   );
-
-   qglTexCoord2f(  texX,   texY
);  
-   qglVertex2f(x,  
height  );  
-
-   qglTexCoord2f(  texWidth,   texY
);  
-   qglVertex2f(width,  height  
);  
-
-   qglTexCoord2f(  texWidth,   
texHeight   );  
-   qglVertex2f(width,  y   
);  
-   qglEnd ();
-}
-
-
-/*
-=
-R_Bloom_InitTextures
-=
-*/
-static void R_Bloom_InitTextures( void )
-{
-   byte*data;
-
-   // find closer power of 2 to screen size 
-   for (bloom.screen.width = 1;bloom.screen.width< 
glConfig.vidWidth;bloom.screen.width *= 2);
-