From 837eae31e7ddaa3287b7490e30d6e606ffea5337 Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Sun, 4 May 2008 16:38:18 +0000
Subject: [PATCH] made particles render above water, decals below water

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1869 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/protos.h            | 16 +++++++++++++++-
 source/src/rendergl.cpp        |  7 +++++--
 source/src/renderparticles.cpp | 24 ++++++------------------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/source/src/protos.h b/source/src/protos.h
index 96cda6a8..7d0d6516 100644
--- a/source/src/protos.h
+++ b/source/src/protos.h
@@ -398,6 +398,20 @@ extern void show_out_of_renderloop_progress(float bar1, const char *text1, float
 extern void updatedmgindicator(vec &attack);
 
 // renderparticles
+enum
+{
+    PT_PART = 0,
+    PT_FIREBALL,
+    PT_SHOTLINE,
+    PT_DECAL,
+    PT_BULLETHOLE,
+    PT_BLOOD,
+    PT_STAIN,
+    PT_FLASH
+};
+
+#define PT_DECAL_MASK ((1<<PT_DECAL)|(1<<PT_BULLETHOLE)|(1<<PT_STAIN))
+
 extern void particleinit();
 extern void particlereset();
 extern void particle_flash(int type, float scale, float angle, vec &p);
@@ -409,7 +423,7 @@ extern void addshotline(dynent *d, vec &from, vec &to);
 extern bool addbullethole(vec &from, vec &to, float radius = 1, bool noisy = true);
 extern bool addscorchmark(vec &o, float radius = 7);
 
-extern void render_particles(int time);
+extern void render_particles(int time, int typemask = ~0);
 
 // worldio
 extern void save_world(char *fname);
diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp
index 4b5e19db..de3276b9 100644
--- a/source/src/rendergl.cpp
+++ b/source/src/rendergl.cpp
@@ -839,11 +839,14 @@ void gl_drawframe(int w, int h, float changelod, float curfps)
 
     resettmu(0);
 
-    render_particles(curtime);
-
     glDisable(GL_CULL_FACE);
+
+    render_particles(curtime, PT_DECAL_MASK);
+
     int nquads = renderwater(hf, !waterreflect || underwater ? 0 : reflecttex, !waterreflect || !waterrefract || underwater ? 0 : refracttex);
 
+    render_particles(curtime, ~PT_DECAL_MASK);
+
     glDisable(GL_FOG);
     glDisable(GL_TEXTURE_2D);
 
diff --git a/source/src/renderparticles.cpp b/source/src/renderparticles.cpp
index 81a8e5e9..59f7d62d 100644
--- a/source/src/renderparticles.cpp
+++ b/source/src/renderparticles.cpp
@@ -249,25 +249,13 @@ void newparticle(const vec &o, const vec &d, int fade, int type)
     parlist[type] = p;
 }
 
-enum
-{
-    PT_PART = 0,
-    PT_FIREBALL,
-    PT_SHOTLINE,
-    PT_DECAL,
-    PT_BULLETHOLE,
-    PT_BLOOD,
-    PT_STAIN,
-    PT_FLASH
-};
-
 static struct parttype { int type; float r, g, b; int gr, tex; float sz; } parttypes[] =
 {
-    { 0,             0.4f, 0.4f, 0.4f, 2,  0, 0.06f }, // yellow: sparks 
-    { 0,             1.0f, 1.0f, 1.0f, 20, 1, 0.15f }, // grey:   small smoke
-    { 0,             0.2f, 0.2f, 1.0f, 20, 0, 0.08f }, // blue:   edit mode entities
+    { PT_PART,       0.4f, 0.4f, 0.4f, 2,  0, 0.06f }, // yellow: sparks 
+    { PT_PART,       1.0f, 1.0f, 1.0f, 20, 1, 0.15f }, // grey:   small smoke
+    { PT_PART,       0.2f, 0.2f, 1.0f, 20, 0, 0.08f }, // blue:   edit mode entities
     { PT_BLOOD,      0.5f, 0.0f, 0.0f, 1,  4, 0.3f  }, // red:    blood spats
-    { 0,             1.0f, 0.1f, 0.1f, 0,  1, 0.2f  }, // red:    demotrack
+    { PT_PART,       1.0f, 0.1f, 0.1f, 0,  1, 0.2f  }, // red:    demotrack
     { PT_FIREBALL,   1.0f, 0.5f, 0.5f, 0,  2, 7.0f  }, // explosion fireball
     { PT_SHOTLINE,   1.0f, 1.0f, 0.7f, 0, -1, 0.0f  }, // yellow: shotline
     { PT_BULLETHOLE, 1.0f, 1.0f, 1.0f, 0,  3, 0.3f  }, // hole decal     
@@ -281,10 +269,10 @@ VAR(particlesize, 20, 100, 500);
 VARP(blood, 0, 1, 1);
 VARP(bloodttl, 0, 10000, 30000);
 
-void render_particles(int time)
+void render_particles(int time, int typemask)
 {
     bool rendered = false;
-    for(int i = MAXPARTYPES-1; i>=0; i--) if(parlist[i])
+    for(int i = MAXPARTYPES-1; i>=0; i--) if(typemask&(1<<parttypes[i].type) && parlist[i])
     {
         if(!rendered)
         {