4 files changed, 411 insertions, 42 deletions

diff --git a/src/render/MBlur.cpp b/src/render/MBlur.cpp
index 08298a1f..57817422 100644
--- a/src/render/MBlur.cpp
+++ b/src/render/MBlur.cpp
@@ -7,10 +7,15 @@
 #include <d3d8caps.h>
 #endif
 
+#include "General.h"
 #include "RwHelper.h"
 #include "Camera.h"
-#include "MBlur.h"
+#include "Timecycle.h"
+#include "Particle.h"
 #include "Timer.h"
+#include "Hud.h"
+#include "Frontend.h"
+#include "MBlur.h"
 #include "postfx.h"
 
 // Originally taken from RW example 'mblur'
@@ -21,6 +26,8 @@ bool CMBlur::ms_bScaledBlur;
 bool CMBlur::BlurOn;
 float CMBlur::Drunkness;
 
+int32 CMBlur::pBufVertCount;
+
 static RwIm2DVertex Vertex[4];
 static RwIm2DVertex Vertex2[4];
 static RwImVertexIndex Index[6] = { 0, 1, 2, 0, 2, 3 };
@@ -244,6 +251,84 @@ CMBlur::CreateImmediateModeData(RwCamera *cam, RwRect *rect)
 }
 
 void
+CMBlur::CreateImmediateModeData(RwCamera *cam, RwRect *rect, RwIm2DVertex *verts, RwRGBA color, float u1Off, float v1Off, float u2Off, float v2Off, float z, int fullTexture)
+{
+	float x1 = rect->x;
+	float y1 = rect->y;
+	float x2 = rect->w;
+	float y2 = rect->h;
+
+	float u1, v1, u2, v2;
+	if(fullTexture){
+		u1 = 0.0f;
+		v1 = 0.0f;
+		u2 = 1.0f;
+		v2 = 1.0f;
+	}else{
+		if(RwRasterGetDepth(RwCameraGetRaster(cam)) == 16){
+			x1 += HALFPX;
+			y1 += HALFPX;
+			x2 += HALFPX;
+			y2 += HALFPX;
+		}else{
+			x1 -= HALFPX;
+			y1 -= HALFPX;
+			x2 -= HALFPX;
+			y2 -= HALFPX;
+		}
+
+		int32 width  = Pow(2.0f, int32(log2(RwRasterGetWidth (RwCameraGetRaster(cam))))+1);
+		int32 height = Pow(2.0f, int32(log2(RwRasterGetHeight(RwCameraGetRaster(cam))))+1);
+		u1 = x1/width + u1Off;
+		v1 = y1/height + v1Off;
+		u2 = x2/width + u2Off;
+		v2 = y2/height + v2Off;
+		u1 = clamp(u1, 0.0f, 1.0f);
+		v1 = clamp(v1, 0.0f, 1.0f);
+		u2 = clamp(u2, 0.0f, 1.0f);
+		v2 = clamp(v2, 0.0f, 1.0f);
+	}
+
+	float recipz = 1.0f/z;
+	// TODO: CameraZ is wrong, what should we do?
+	RwIm2DVertexSetScreenX(&verts[0], x1);
+	RwIm2DVertexSetScreenY(&verts[0], y1);
+	RwIm2DVertexSetScreenZ(&verts[0], z);
+	RwIm2DVertexSetCameraZ(&verts[0], RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetRecipCameraZ(&verts[0], recipz);
+	RwIm2DVertexSetU(&verts[0], u1, recipz);
+	RwIm2DVertexSetV(&verts[0], v1, recipz);
+	RwIm2DVertexSetIntRGBA(&verts[0], color.red, color.green, color.blue, color.alpha);
+
+	RwIm2DVertexSetScreenX(&verts[1], x1);
+	RwIm2DVertexSetScreenY(&verts[1], y2);
+	RwIm2DVertexSetScreenZ(&verts[1], z);
+	RwIm2DVertexSetCameraZ(&verts[1], RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetRecipCameraZ(&verts[1], recipz);
+	RwIm2DVertexSetU(&verts[1], u1, recipz);
+	RwIm2DVertexSetV(&verts[1], v2, recipz);
+	RwIm2DVertexSetIntRGBA(&verts[1], color.red, color.green, color.blue, color.alpha);
+
+	RwIm2DVertexSetScreenX(&verts[2], x2);
+	RwIm2DVertexSetScreenY(&verts[2], y2);
+	RwIm2DVertexSetScreenZ(&verts[2], z);
+	RwIm2DVertexSetCameraZ(&verts[2], RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetRecipCameraZ(&verts[2], recipz);
+	RwIm2DVertexSetU(&verts[2], u2, recipz);
+	RwIm2DVertexSetV(&verts[2], v2, recipz);
+	RwIm2DVertexSetIntRGBA(&verts[2], color.red, color.green, color.blue, color.alpha);
+
+	RwIm2DVertexSetScreenX(&verts[3], x2);
+	RwIm2DVertexSetScreenY(&verts[3], y1);
+	RwIm2DVertexSetScreenZ(&verts[3], z);
+	RwIm2DVertexSetCameraZ(&verts[3], RwCameraGetNearClipPlane(cam));
+	RwIm2DVertexSetRecipCameraZ(&verts[3], recipz);
+	RwIm2DVertexSetU(&verts[3], u2, recipz);
+	RwIm2DVertexSetV(&verts[3], v1, recipz);
+	RwIm2DVertexSetIntRGBA(&verts[3], color.red, color.green, color.blue, color.alpha);
+}
+
+void
 CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 bluralpha)
 {
 #ifdef EXTENDED_COLOURFILTER
@@ -415,7 +500,8 @@ CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type,
 		RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, Vertex, 4, Index, 6);
 	}
 
-	// TODO(MIAMI): OverlayRenderFx
+	if(type != MOTION_BLUR_SNIPER)
+		OverlayRenderFx(cam, pFrontBuffer);
 
 	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
 	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
@@ -437,4 +523,277 @@ CMBlur::ClearDrunkBlur()
 {
 	Drunkness = 0.0f;
 	CTimer::SetTimeScale(1.0f);
-}
\ No newline at end of file
+}
+
+#define NUM_RENDER_FX 64
+
+static RwRect fxRect[NUM_RENDER_FX];
+static FxType fxType[NUM_RENDER_FX];
+static float fxZ[NUM_RENDER_FX];
+
+bool
+CMBlur::PosInside(RwRect *rect, float x1, float y1, float x2, float y2)
+{
+	if((rect->x < x1 - 10.0f || rect->x > x2 + 10.0f || rect->y < y1 - 10.0f || rect->y > y2 + 10.0f) &&
+	   (rect->w < x1 - 10.0f || rect->w > x2 + 10.0f || rect->h < y1 - 10.0f || rect->h > y2 + 10.0f) &&
+	   (rect->x < x1 - 10.0f || rect->x > x2 + 10.0f || rect->h < y1 - 10.0f || rect->h > y2 + 10.0f) &&
+	   (rect->w < x1 - 10.0f || rect->w > x2 + 10.0f || rect->y < y1 - 10.0f || rect->y > y2 + 10.0f))
+		return false;
+	return true;
+}
+
+bool
+CMBlur::AddRenderFx(RwCamera *cam, RwRect *rect, float z, FxType type)
+{
+	if(pBufVertCount >= NUM_RENDER_FX)
+		return false;
+
+	rect->x = Max(rect->x, 0);
+	rect->y = Max(rect->y, 0);
+	rect->w = Min(rect->w, SCREEN_WIDTH);
+	rect->h = Min(rect->h, SCREEN_HEIGHT);
+	if(rect->x >= rect->w || rect->y >= rect->h)
+		return false;
+
+	switch(type){
+	case FXTYPE_WATER1:
+	case FXTYPE_WATER2:
+	case FXTYPE_BLOOD1:
+	case FXTYPE_BLOOD2:
+	case FXTYPE_HEATHAZE:	// code seems to be duplicated for this case
+		for(int i = 0; i < pBufVertCount; i++)
+			if(fxType[i] == type && PosInside(rect, fxRect[i].x-10.0f, fxRect[i].y-10.0f, fxRect[i].w+10.0f, fxRect[i].h+10.0f))
+				return false;
+		// TODO: fix aspect ratio scaling
+		// radar
+		if(PosInside(rect, 40.0f, SCREEN_SCALE_FROM_BOTTOM(116.0f), 40.0f + SCREEN_SCALE_X(94.0f), SCREEN_SCALE_FROM_BOTTOM(116.0f - 76.0f)))
+			return false;
+		// HUD
+		if(PosInside(rect, 400.0f, 0.0f, SCREEN_WIDTH, 90.0f))
+			return false;
+		// vehicle name
+		if(CHud::m_VehicleState != 0 && PosInside(rect, SCREEN_WIDTH/2, 350.0f, SCREEN_WIDTH, SCREEN_HEIGHT))
+			return false;
+		// zone name
+		if(CHud::m_ZoneState != 0 && PosInside(rect, SCREEN_WIDTH/2, 350.0f, SCREEN_WIDTH, SCREEN_HEIGHT))
+			return false;
+		break;
+	}
+
+	fxRect[pBufVertCount] = *rect;
+	fxZ[pBufVertCount] = z;
+	fxType[pBufVertCount] = type;
+	pBufVertCount++;
+
+	return true;
+}
+
+void
+CMBlur::OverlayRenderFx(RwCamera *cam, RwRaster *frontBuf)
+{
+	bool drawWaterDrops = false;
+	RwIm2DVertex verts[4];
+	int red = (0.75f*CTimeCycle::GetDirectionalRed() + CTimeCycle::GetAmbientRed())*0.55f * 255;
+	int green = (0.75f*CTimeCycle::GetDirectionalGreen() + CTimeCycle::GetAmbientGreen())*0.55f * 255;
+	int blue = (0.75f*CTimeCycle::GetDirectionalBlue() + CTimeCycle::GetAmbientBlue())*0.55f * 255;
+	red = clamp(red, 0, 255);
+	green = clamp(green, 0, 255);
+	blue = clamp(blue, 0, 255);
+
+	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
+
+#ifdef LIBRW
+	rw::SetRenderState(rw::STENCILENABLE, TRUE);
+#else
+	RwD3D8SetRenderState(D3DRS_STENCILENABLE, TRUE);
+#endif
+
+	for(int i = 0; i < pBufVertCount; i++)
+		switch(fxType[i]){
+		case FXTYPE_WATER1:
+		case FXTYPE_WATER2:
+		case FXTYPE_BLOOD1:
+		case FXTYPE_BLOOD2: {
+			drawWaterDrops = true;
+			int32 width  = Pow(2.0f, int32(log2(RwRasterGetWidth (RwCameraGetRaster(cam))))+1);
+			int32 height = Pow(2.0f, int32(log2(RwRasterGetHeight(RwCameraGetRaster(cam))))+1);
+
+			float u1Off = (fxRect[i].w - fxRect[i].x)/width;
+			float u2Off = u1Off - (fxRect[i].w - fxRect[i].x + 0.5f)*0.66f/width;
+			float halfHeight = (fxRect[i].h - fxRect[i].y + 0.5f)*0.25f/height;
+
+			if(RwRasterGetDepth(RwCameraGetRaster(cam)) == 16){
+				if(fxType[i] == FXTYPE_BLOOD1 || fxType[i] == FXTYPE_BLOOD2)
+					CreateImmediateModeData(cam, &fxRect[i], verts, CRGBA(255, 0, 0, 128), 0.0f, 0.0f, 0.0f, 0.0f, fxZ[i], true);
+				else
+					CreateImmediateModeData(cam, &fxRect[i], verts, CRGBA(32, 32, 32, 225), 0.0f, 0.0f, 0.0f, 0.0f, fxZ[i], true);
+			}else{
+				CreateImmediateModeData(cam, &fxRect[i], verts, CRGBA(32, 32, 32, 225), 0.0f, 0.0f, 0.0f, 0.0f, fxZ[i], true);
+			}
+
+			RwRenderStateSet(rwRENDERSTATETEXTURERASTER, gpDotRaster);
+#ifdef LIBRW
+			rw::SetRenderState(rw::STENCILFUNCTION, rw::STENCILALWAYS);
+			rw::SetRenderState(rw::STENCILFUNCTIONREF, 1);
+			rw::SetRenderState(rw::STENCILFUNCTIONMASK, 0xFFFFFFFF);
+			rw::SetRenderState(rw::STENCILFUNCTIONWRITEMASK, 0xFFFFFFFF);
+			rw::SetRenderState(rw::STENCILZFAIL, rw::STENCILKEEP);
+			rw::SetRenderState(rw::STENCILFAIL, rw::STENCILKEEP);
+			rw::SetRenderState(rw::STENCILPASS, rw::STENCILREPLACE);
+#else
+			RwD3D8SetRenderState(D3DRS_STENCILFUNC, D3DCMP_ALWAYS);
+			RwD3D8SetRenderState(D3DRS_STENCILREF, 1);
+			RwD3D8SetRenderState(D3DRS_STENCILMASK, 0xFFFFFFFF);
+			RwD3D8SetRenderState(D3DRS_STENCILWRITEMASK, 0xFFFFFFFF);
+			RwD3D8SetRenderState(D3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP);
+			RwD3D8SetRenderState(D3DRS_STENCILFAIL, D3DSTENCILOP_KEEP);
+			RwD3D8SetRenderState(D3DRS_STENCILPASS, D3DSTENCILOP_REPLACE);
+#endif
+			RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+			RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+			RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, verts, 4, Index, 6);
+
+			if(RwRasterGetDepth(RwCameraGetRaster(cam)) != 16){
+				RwRenderStateSet(rwRENDERSTATETEXTURERASTER, frontBuf);
+#ifdef LIBRW
+				rw::SetRenderState(rw::STENCILFUNCTION, rw::STENCILEQUAL);
+				rw::SetRenderState(rw::STENCILPASS, rw::STENCILKEEP);
+#else
+				RwD3D8SetRenderState(D3DRS_STENCILFUNC, D3DCMP_EQUAL);
+				RwD3D8SetRenderState(D3DRS_STENCILPASS, D3DSTENCILOP_KEEP);
+#endif
+				if(BlurOn){
+					if(fxType[i] == FXTYPE_BLOOD1 || fxType[i] == FXTYPE_BLOOD2)
+						CreateImmediateModeData(cam, &fxRect[i], verts, CRGBA(255, 0, 0, 255), u1Off, 0.0f+halfHeight, u2Off, 0.0f-halfHeight, fxZ[i], false);
+					else
+						CreateImmediateModeData(cam, &fxRect[i], verts, CRGBA(225, 225, 225, 160), u1Off, 0.0f+halfHeight, u2Off, 0.0f-halfHeight, fxZ[i], false);
+					RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDDESTALPHA);
+					RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVDESTALPHA);
+				}else{
+					if(fxType[i] == FXTYPE_BLOOD1 || fxType[i] == FXTYPE_BLOOD2)
+						CreateImmediateModeData(cam, &fxRect[i], verts, CRGBA(255, 0, 0, 128), u1Off, 0.0f+halfHeight, u2Off, 0.0f-halfHeight, fxZ[i], false);
+					else
+						CreateImmediateModeData(cam, &fxRect[i], verts, CRGBA(128, 128, 128, 32), u1Off, 0.0f+halfHeight, u2Off, 0.0f-halfHeight, fxZ[i], false);
+					RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+					RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+				}
+				RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, verts, 4, Index, 6);
+			}
+			break;
+		}
+		case FXTYPE_SPLASH1:
+		case FXTYPE_SPLASH2:
+		case FXTYPE_SPLASH3:
+			drawWaterDrops = true;
+			break;
+
+		case FXTYPE_HEATHAZE:
+			if(TheCamera.GetScreenFadeStatus() == FADE_0 && frontBuf){
+				int alpha = FrontEndMenuManager.m_PrefsBrightness > 255 ?
+					FrontEndMenuManager.m_PrefsBrightness - 90 :
+					FrontEndMenuManager.m_PrefsBrightness - 130;
+				alpha = clamp(alpha, 16, 200)/2;
+
+				CreateImmediateModeData(cam, &fxRect[i], verts, CRGBA(0, 0, 0, alpha), 0.0f, 0.0f, 0.0f, 0.0f, fxZ[i], true);
+				RwRenderStateSet(rwRENDERSTATETEXTURERASTER, gpHeatHazeRaster);
+#ifdef LIBRW
+				rw::SetRenderState(rw::STENCILFUNCTION, rw::STENCILALWAYS);
+				rw::SetRenderState(rw::STENCILFUNCTIONREF, 1);
+				rw::SetRenderState(rw::STENCILFUNCTIONMASK, 0xFFFFFFFF);
+				rw::SetRenderState(rw::STENCILFUNCTIONWRITEMASK, 0xFFFFFFFF);
+				rw::SetRenderState(rw::STENCILZFAIL, rw::STENCILKEEP);
+				rw::SetRenderState(rw::STENCILFAIL, rw::STENCILKEEP);
+				rw::SetRenderState(rw::STENCILPASS, rw::STENCILREPLACE);
+#else
+				RwD3D8SetRenderState(D3DRS_STENCILFUNC, D3DCMP_ALWAYS);
+				RwD3D8SetRenderState(D3DRS_STENCILREF, 1);
+				RwD3D8SetRenderState(D3DRS_STENCILMASK, 0xFFFFFFFF);
+				RwD3D8SetRenderState(D3DRS_STENCILWRITEMASK, 0xFFFFFFFF);
+				RwD3D8SetRenderState(D3DRS_STENCILZFAIL, D3DSTENCILOP_KEEP);
+				RwD3D8SetRenderState(D3DRS_STENCILFAIL, D3DSTENCILOP_KEEP);
+				RwD3D8SetRenderState(D3DRS_STENCILPASS, D3DSTENCILOP_REPLACE);
+#endif
+				RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+				RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
+				RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, verts, 4, Index, 6);
+
+				CreateImmediateModeData(cam, &fxRect[i], verts, CRGBA(255, 255, 255, alpha),
+					CGeneral::GetRandomNumberInRange(-0.002f, 0.002f),
+					CGeneral::GetRandomNumberInRange(-0.002f, 0.002f),
+					CGeneral::GetRandomNumberInRange(-0.002f, 0.002f),
+					CGeneral::GetRandomNumberInRange(-0.002f, 0.002f),
+					fxZ[i], false);
+				RwRenderStateSet(rwRENDERSTATETEXTURERASTER, frontBuf);
+#ifdef LIBRW
+				rw::SetRenderState(rw::STENCILFUNCTION, rw::STENCILEQUAL);
+				rw::SetRenderState(rw::STENCILPASS, rw::STENCILKEEP);
+#else
+				RwD3D8SetRenderState(D3DRS_STENCILFUNC, D3DCMP_EQUAL);
+				RwD3D8SetRenderState(D3DRS_STENCILPASS, D3DSTENCILOP_KEEP);
+#endif
+				RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+				RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+				RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, verts, 4, Index, 6);
+			}
+			break;
+		}
+#ifdef LIBRW
+	rw::SetRenderState(rw::STENCILENABLE, FALSE);
+#else
+	RwD3D8SetRenderState(D3DRS_STENCILENABLE, FALSE);
+#endif
+
+	if(drawWaterDrops){
+		RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
+
+		// Draw drops
+		RwRenderStateSet(rwRENDERSTATETEXTURERASTER, gpRainDripRaster[0]);
+		for(int i = 0; i < pBufVertCount; i++)
+			if(fxType[i] == FXTYPE_WATER1 || fxType[i] == FXTYPE_BLOOD1){
+				CreateImmediateModeData(cam, &fxRect[i], verts, CRGBA(red, green, blue, fxType[i] == FXTYPE_BLOOD1 ? 255 : 192),
+					0.0f, 0.0f, 0.0f, 0.0f, fxZ[i], true);
+				RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, verts, 4, Index, 6);
+			}
+		RwRenderStateSet(rwRENDERSTATETEXTURERASTER, gpRainDripRaster[1]);
+		for(int i = 0; i < pBufVertCount; i++)
+			if(fxType[i] == FXTYPE_WATER2 || fxType[i] == FXTYPE_BLOOD2){
+				CreateImmediateModeData(cam, &fxRect[i], verts, CRGBA(red, green, blue, fxType[i] == FXTYPE_BLOOD2 ? 255 : 192),
+					0.0f, 0.0f, 0.0f, 0.0f, fxZ[i], true);
+				RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, verts, 4, Index, 6);
+			}
+
+		RwRenderStateSet(rwRENDERSTATETEXTURERASTER, gpCarSplashRaster[0]);
+		for(int i = 0; i < pBufVertCount; i++)
+			if(fxType[i] == FXTYPE_SPLASH1 || fxType[i] == FXTYPE_SPLASH2 || fxType[i] == FXTYPE_SPLASH3){
+				CreateImmediateModeData(cam, &fxRect[i], verts, CRGBA(200, 200, 200, 255),
+					0.0f, 0.0f, 0.0f, 0.0f, fxZ[i], true);
+				RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, verts, 4, Index, 6);
+			}
+
+		// Darken the water drops
+		int alpha = 192*0.5f;
+		RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
+		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
+
+		RwRenderStateSet(rwRENDERSTATETEXTURERASTER, gpRainDripDarkRaster[0]);
+		for(int i = 0; i < pBufVertCount; i++)
+			if(fxType[i] == FXTYPE_WATER1){
+				CreateImmediateModeData(cam, &fxRect[i], verts, CRGBA(red, green, blue, alpha),
+					0.0f, 0.0f, 0.0f, 0.0f, fxZ[i], true);
+				RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, verts, 4, Index, 6);
+			}
+		RwRenderStateSet(rwRENDERSTATETEXTURERASTER, gpRainDripDarkRaster[1]);
+		for(int i = 0; i < pBufVertCount; i++)
+			if(fxType[i] == FXTYPE_WATER2){
+				CreateImmediateModeData(cam, &fxRect[i], verts, CRGBA(red, green, blue, alpha),
+					0.0f, 0.0f, 0.0f, 0.0f, fxZ[i], true);
+				RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, verts, 4, Index, 6);
+			}
+	}
+
+	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
+	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
+	pBufVertCount = 0;
+}
diff --git a/src/render/MBlur.h b/src/render/MBlur.h
index c2572256..3dc53082 100644
--- a/src/render/MBlur.h
+++ b/src/render/MBlur.h
@@ -2,12 +2,14 @@
 
 enum FxType
 {
-	FXTYPE_0 = 0,
-	FXTYPE_1,
-	FXTYPE_2,
-	FXTYPE_3,
-	FXTYPE_4,
-	FXTYPE_5,
+	FXTYPE_WATER1,
+	FXTYPE_WATER2,
+	FXTYPE_BLOOD1,
+	FXTYPE_BLOOD2,
+	FXTYPE_HEATHAZE,
+	FXTYPE_SPLASH1,
+	FXTYPE_SPLASH2,
+	FXTYPE_SPLASH3
 };
 
 class CMBlur
@@ -19,16 +21,19 @@ public:
 	static bool BlurOn;
 	static float Drunkness;
 
+	static int32 pBufVertCount;
+
 public:
 	static RwBool MotionBlurOpen(RwCamera *cam);
 	static RwBool MotionBlurClose(void);
 	static void CreateImmediateModeData(RwCamera *cam, RwRect *rect);
+	static void CreateImmediateModeData(RwCamera *cam, RwRect *rect, RwIm2DVertex *verts, RwRGBA color, float u1Off, float v1Off, float u2Off, float v2Off, float z, int fullTexture);
 	static void MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 bluralpha);
 	static void OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, int32 bluralpha);
 	static void SetDrunkBlur(float drunkness);
 	static void ClearDrunkBlur();
 	
-	//TODO
-	static void AddRenderFx(RwCamera *,RwRect *,float,FxType)
-	{}
+	static bool PosInside(RwRect *rect, float x1, float y1, float x2, float y2);
+	static bool AddRenderFx(RwCamera *cam, RwRect *rect, float z, FxType type);
+	static void OverlayRenderFx(RwCamera *cam, RwRaster *frontBuf);
 };
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp
index 5ea4f610..7012f956 100644
--- a/src/render/Particle.cpp
+++ b/src/render/Particle.cpp
@@ -213,19 +213,19 @@ RwTexture *gpSparkTex;
 RwTexture *gpNewspaperTex;
 RwTexture *gpGunSmokeTex;
 RwTexture *gpDotTex;
-RwTexture *gpHeathazeTex;
+RwTexture *gpHeatHazeTex;
 RwTexture *gpBeastieTex;
-RwTexture *gpRaindripTex1[MAX_RAINDRIP_FILES];
-RwTexture *gpRaindripTex2[MAX_RAINDRIP_FILES];
+RwTexture *gpRainDripTex[MAX_RAINDRIP_FILES];
+RwTexture *gpRainDripDarkTex[MAX_RAINDRIP_FILES];
 
 RwRaster *gpSparkRaster;
 RwRaster *gpNewspaperRaster;
 RwRaster *gpGunSmokeRaster;
 RwRaster *gpDotRaster;
-RwRaster *gpHeathazeRaster;
+RwRaster *gpHeatHazeRaster;
 RwRaster *gpBeastieRaster;
-RwRaster *gpRaindripRaster1[MAX_RAINDRIP_FILES];
-RwRaster *gpRaindripRaster2[MAX_RAINDRIP_FILES];
+RwRaster *gpRainDripRaster[MAX_RAINDRIP_FILES];
+RwRaster *gpRainDripDarkRaster[MAX_RAINDRIP_FILES];
 
 float      CParticle::ms_afRandTable[CParticle::RAND_TABLE_SIZE];
 CParticle *CParticle::m_pUnusedListHead;
@@ -465,23 +465,23 @@ void CParticle::Initialise()
 	gpDotTex = RwTextureRead("dot", nil);
 	gpDotRaster = RwTextureGetRaster(gpDotTex);
 	
-	gpHeathazeTex = RwTextureRead("heathaze", nil);
-	gpHeathazeRaster = RwTextureGetRaster(gpHeathazeTex);
+	gpHeatHazeTex = RwTextureRead("heathaze", nil);
+	gpHeatHazeRaster = RwTextureGetRaster(gpHeatHazeTex);
 	
 	gpBeastieTex = RwTextureRead("beastie", nil);
 	gpBeastieRaster = RwTextureGetRaster(gpBeastieTex);
 	
-	gpRaindripTex1[0] = RwTextureRead("raindrip64", nil);
-	gpRaindripRaster1[0] = RwTextureGetRaster(gpRaindripTex1[0]);
+	gpRainDripTex[0] = RwTextureRead("raindrip64", nil);
+	gpRainDripRaster[0] = RwTextureGetRaster(gpRainDripTex[0]);
 	
-	gpRaindripTex1[1] = RwTextureRead("raindripb64", nil);
-	gpRaindripRaster1[1] = RwTextureGetRaster(gpRaindripTex1[1]);
+	gpRainDripTex[1] = RwTextureRead("raindripb64", nil);
+	gpRainDripRaster[1] = RwTextureGetRaster(gpRainDripTex[1]);
 	
-	gpRaindripTex2[0] = RwTextureRead("raindrip64_d", nil);
-	gpRaindripRaster2[0] = RwTextureGetRaster(gpRaindripTex2[0]);
+	gpRainDripDarkTex[0] = RwTextureRead("raindrip64_d", nil);
+	gpRainDripDarkRaster[0] = RwTextureGetRaster(gpRainDripDarkTex[0]);
 	
-	gpRaindripTex2[1] = RwTextureRead("raindripb64_d", nil);
-	gpRaindripRaster2[1] = RwTextureGetRaster(gpRaindripTex2[1]);
+	gpRainDripDarkTex[1] = RwTextureRead("raindripb64_d", nil);
+	gpRainDripDarkRaster[1] = RwTextureGetRaster(gpRainDripDarkTex[1]);
 	
 	CTxdStore::PopCurrentTxd();
 	
@@ -586,7 +586,7 @@ void CParticle::Initialise()
 				break;
 			
 			case PARTICLE_TEARGAS:
-				entry->m_ppRaster = &gpHeathazeRaster;
+				entry->m_ppRaster = &gpHeatHazeRaster;
 				break;
 			
 			case PARTICLE_SHARD:
@@ -749,11 +749,11 @@ void CParticle::Shutdown()
 	
 	for ( int32 i = 0; i < MAX_RAINDRIP_FILES; i++ )
 	{
-		RwTextureDestroy(gpRaindripTex1[i]);
-		gpRaindripTex1[i] = nil;
+		RwTextureDestroy(gpRainDripTex[i]);
+		gpRainDripTex[i] = nil;
 
-		RwTextureDestroy(gpRaindripTex2[i]);
-		gpRaindripTex2[i] = nil;
+		RwTextureDestroy(gpRainDripDarkTex[i]);
+		gpRainDripDarkTex[i] = nil;
 	}
 	
 	RwTextureDestroy(gpBoatWakeTex);
@@ -812,8 +812,8 @@ void CParticle::Shutdown()
 	
 	RwTextureDestroy(gpDotTex);
 	gpDotTex = nil;
-	RwTextureDestroy(gpHeathazeTex);
-	gpHeathazeTex = nil;
+	RwTextureDestroy(gpHeatHazeTex);
+	gpHeatHazeTex = nil;
 	
 	RwTextureDestroy(gpBeastieTex);
 	gpBeastieTex = nil;
@@ -1913,9 +1913,9 @@ void CParticle::Render()
 					FxType fxtype;
 
 					if ( particle->m_nCurrentFrame != 0 )
-						fxtype = FXTYPE_1;
+						fxtype = FXTYPE_WATER2;
 					else
-						fxtype = FXTYPE_0;
+						fxtype = FXTYPE_WATER1;
 		
 					CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, fxtype);
 					
@@ -1939,9 +1939,9 @@ void CParticle::Render()
 					FxType fxtype;
 					
 					if ( particle->m_nCurrentFrame )
-						fxtype = FXTYPE_3;
+						fxtype = FXTYPE_BLOOD2;
 					else
-						fxtype = FXTYPE_2;
+						fxtype = FXTYPE_BLOOD1;
 					
 					CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, fxtype);
 					
@@ -1957,7 +1957,7 @@ void CParticle::Render()
 					rect.w = int32(particle->m_vecPosition.x + SCREEN_STRETCH_X(particle->m_fSize * stretchTexW));
 					rect.h = int32(particle->m_vecPosition.y + SCREEN_STRETCH_Y(particle->m_fSize * stretchTexH * 0.15f));
 					
-					CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, FXTYPE_4);
+					CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, FXTYPE_HEATHAZE);
 					
 					canDraw = false;
 				}
@@ -1993,7 +1993,7 @@ void CParticle::Render()
 							break;
 					}
 														 
-					CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, FXTYPE_4);
+					CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, FXTYPE_HEATHAZE);
 					
 					canDraw = false;
 				}
@@ -2115,7 +2115,7 @@ void CParticle::Render()
 								* (CSprite::GetFarScreenZ() - CSprite::GetNearScreenZ()) * CDraw::GetFarClipZ()
 								/ ( (CDraw::GetFarClipZ() - CDraw::GetNearClipZ()) * coors.z ) + CSprite::GetNearScreenZ();
 
-							CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, FXTYPE_5);
+							CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, FXTYPE_SPLASH1);
 						}
 						else
 						{
diff --git a/src/render/Particle.h b/src/render/Particle.h
index 9c496fe1..5542dc02 100644
--- a/src/render/Particle.h
+++ b/src/render/Particle.h
@@ -99,5 +99,10 @@ public:
 
 extern bool clearWaterDrop;
 extern int32 numWaterDropOnScreen;
+extern RwRaster *gpCarSplashRaster[];
+extern RwRaster *gpHeatHazeRaster;
+extern RwRaster *gpDotRaster;
+extern RwRaster *gpRainDripRaster[];
+extern RwRaster *gpRainDripDarkRaster[];
 
 VALIDATE_SIZE(CParticle, 0x58);