The-Homebrew-Cloud/re3-wiiu
2
0
Fork 0
mirror of https://gitlab.com/GaryOderNichts/re3-wiiu.git synced 2024-11-24 01:59:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #889 from aap/miami

Browse Source 
CMBlur FX
This commit is contained in:
aap 2020-12-18 13:31:24 +01:00 committed by GitHub
commit db752d141b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 411 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

363
src/render/MBlur.cpp
View File

@ -7,10 +7,15 @@
#include <d3d8caps.h> #include <d3d8caps.h>
#endif #endif
#include "General.h"
#include "RwHelper.h" #include "RwHelper.h"
#include "Camera.h" #include "Camera.h"
#include "MBlur.h" #include "Timecycle.h"
#include "Particle.h"
#include "Timer.h" #include "Timer.h"
#include "Hud.h"
#include "Frontend.h"
#include "MBlur.h"
#include "postfx.h" #include "postfx.h"
// Originally taken from RW example 'mblur' // Originally taken from RW example 'mblur'
@ -21,6 +26,8 @@ bool CMBlur::ms_bScaledBlur;
bool CMBlur::BlurOn; bool CMBlur::BlurOn;
float CMBlur::Drunkness; float CMBlur::Drunkness;
int32 CMBlur::pBufVertCount;
static RwIm2DVertex Vertex[4]; static RwIm2DVertex Vertex[4];
static RwIm2DVertex Vertex2[4]; static RwIm2DVertex Vertex2[4];
static RwImVertexIndex Index[6] = { 0, 1, 2, 0, 2, 3 }; static RwImVertexIndex Index[6] = { 0, 1, 2, 0, 2, 3 };
@ -243,6 +250,84 @@ CMBlur::CreateImmediateModeData(RwCamera *cam, RwRect *rect)
RwIm2DVertexSetIntRGBA(&Vertex2[3], 255, 255, 255, 255); RwIm2DVertexSetIntRGBA(&Vertex2[3], 255, 255, 255, 255);
} }
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 void
CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 bluralpha) CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 bluralpha)
{ {
@ -415,7 +500,8 @@ CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type,
RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, Vertex, 4, Index, 6); RwIm2DRenderIndexedPrimitive(rwPRIMTYPETRILIST, Vertex, 4, Index, 6);
} }
// TODO(MIAMI): OverlayRenderFx if(type != MOTION_BLUR_SNIPER)
OverlayRenderFx(cam, pFrontBuffer);
RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE); RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE); RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
@ -438,3 +524,276 @@ CMBlur::ClearDrunkBlur()
Drunkness = 0.0f; Drunkness = 0.0f;
CTimer::SetTimeScale(1.0f); CTimer::SetTimeScale(1.0f);
} }
#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;
}

23
src/render/MBlur.h
View File

@ -2,12 +2,14 @@
enum FxType enum FxType
{ {
FXTYPE_0 = 0, FXTYPE_WATER1,
FXTYPE_1, FXTYPE_WATER2,
FXTYPE_2, FXTYPE_BLOOD1,
FXTYPE_3, FXTYPE_BLOOD2,
FXTYPE_4, FXTYPE_HEATHAZE,
FXTYPE_5, FXTYPE_SPLASH1,
FXTYPE_SPLASH2,
FXTYPE_SPLASH3
}; };
class CMBlur class CMBlur
@ -19,16 +21,19 @@ public:
static bool BlurOn; static bool BlurOn;
static float Drunkness; static float Drunkness;
static int32 pBufVertCount;
public: public:
static RwBool MotionBlurOpen(RwCamera *cam); static RwBool MotionBlurOpen(RwCamera *cam);
static RwBool MotionBlurClose(void); static RwBool MotionBlurClose(void);
static void CreateImmediateModeData(RwCamera *cam, RwRect *rect); 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 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 OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, int32 bluralpha);
static void SetDrunkBlur(float drunkness); static void SetDrunkBlur(float drunkness);
static void ClearDrunkBlur(); static void ClearDrunkBlur();
//TODO static bool PosInside(RwRect *rect, float x1, float y1, float x2, float y2);
static void AddRenderFx(RwCamera *,RwRect *,float,FxType) static bool AddRenderFx(RwCamera *cam, RwRect *rect, float z, FxType type);
{} static void OverlayRenderFx(RwCamera *cam, RwRaster *frontBuf);
}; };

60
src/render/Particle.cpp
View File

@ -213,19 +213,19 @@ RwTexture *gpSparkTex;
RwTexture *gpNewspaperTex; RwTexture *gpNewspaperTex;
RwTexture *gpGunSmokeTex; RwTexture *gpGunSmokeTex;
RwTexture *gpDotTex; RwTexture *gpDotTex;
RwTexture *gpHeathazeTex; RwTexture *gpHeatHazeTex;
RwTexture *gpBeastieTex; RwTexture *gpBeastieTex;
RwTexture *gpRaindripTex1[MAX_RAINDRIP_FILES]; RwTexture *gpRainDripTex[MAX_RAINDRIP_FILES];
RwTexture *gpRaindripTex2[MAX_RAINDRIP_FILES]; RwTexture *gpRainDripDarkTex[MAX_RAINDRIP_FILES];
RwRaster *gpSparkRaster; RwRaster *gpSparkRaster;
RwRaster *gpNewspaperRaster; RwRaster *gpNewspaperRaster;
RwRaster *gpGunSmokeRaster; RwRaster *gpGunSmokeRaster;
RwRaster *gpDotRaster; RwRaster *gpDotRaster;
RwRaster *gpHeathazeRaster; RwRaster *gpHeatHazeRaster;
RwRaster *gpBeastieRaster; RwRaster *gpBeastieRaster;
RwRaster *gpRaindripRaster1[MAX_RAINDRIP_FILES]; RwRaster *gpRainDripRaster[MAX_RAINDRIP_FILES];
RwRaster *gpRaindripRaster2[MAX_RAINDRIP_FILES]; RwRaster *gpRainDripDarkRaster[MAX_RAINDRIP_FILES];
float CParticle::ms_afRandTable[CParticle::RAND_TABLE_SIZE]; float CParticle::ms_afRandTable[CParticle::RAND_TABLE_SIZE];
CParticle *CParticle::m_pUnusedListHead; CParticle *CParticle::m_pUnusedListHead;
@ -465,23 +465,23 @@ void CParticle::Initialise()
gpDotTex = RwTextureRead("dot", nil); gpDotTex = RwTextureRead("dot", nil);
gpDotRaster = RwTextureGetRaster(gpDotTex); gpDotRaster = RwTextureGetRaster(gpDotTex);
gpHeathazeTex = RwTextureRead("heathaze", nil); gpHeatHazeTex = RwTextureRead("heathaze", nil);
gpHeathazeRaster = RwTextureGetRaster(gpHeathazeTex); gpHeatHazeRaster = RwTextureGetRaster(gpHeatHazeTex);
gpBeastieTex = RwTextureRead("beastie", nil); gpBeastieTex = RwTextureRead("beastie", nil);
gpBeastieRaster = RwTextureGetRaster(gpBeastieTex); gpBeastieRaster = RwTextureGetRaster(gpBeastieTex);
gpRaindripTex1[0] = RwTextureRead("raindrip64", nil); gpRainDripTex[0] = RwTextureRead("raindrip64", nil);
gpRaindripRaster1[0] = RwTextureGetRaster(gpRaindripTex1[0]); gpRainDripRaster[0] = RwTextureGetRaster(gpRainDripTex[0]);
gpRaindripTex1[1] = RwTextureRead("raindripb64", nil); gpRainDripTex[1] = RwTextureRead("raindripb64", nil);
gpRaindripRaster1[1] = RwTextureGetRaster(gpRaindripTex1[1]); gpRainDripRaster[1] = RwTextureGetRaster(gpRainDripTex[1]);
gpRaindripTex2[0] = RwTextureRead("raindrip64_d", nil); gpRainDripDarkTex[0] = RwTextureRead("raindrip64_d", nil);
gpRaindripRaster2[0] = RwTextureGetRaster(gpRaindripTex2[0]); gpRainDripDarkRaster[0] = RwTextureGetRaster(gpRainDripDarkTex[0]);
gpRaindripTex2[1] = RwTextureRead("raindripb64_d", nil); gpRainDripDarkTex[1] = RwTextureRead("raindripb64_d", nil);
gpRaindripRaster2[1] = RwTextureGetRaster(gpRaindripTex2[1]); gpRainDripDarkRaster[1] = RwTextureGetRaster(gpRainDripDarkTex[1]);
CTxdStore::PopCurrentTxd(); CTxdStore::PopCurrentTxd();
@ -586,7 +586,7 @@ void CParticle::Initialise()
break; break;
case PARTICLE_TEARGAS: case PARTICLE_TEARGAS:
entry->m_ppRaster = &gpHeathazeRaster; entry->m_ppRaster = &gpHeatHazeRaster;
break; break;
case PARTICLE_SHARD: case PARTICLE_SHARD:
@ -749,11 +749,11 @@ void CParticle::Shutdown()
for ( int32 i = 0; i < MAX_RAINDRIP_FILES; i++ ) for ( int32 i = 0; i < MAX_RAINDRIP_FILES; i++ )
{ {
RwTextureDestroy(gpRaindripTex1[i]); RwTextureDestroy(gpRainDripTex[i]);
gpRaindripTex1[i] = nil; gpRainDripTex[i] = nil;
RwTextureDestroy(gpRaindripTex2[i]); RwTextureDestroy(gpRainDripDarkTex[i]);
gpRaindripTex2[i] = nil; gpRainDripDarkTex[i] = nil;
} }
RwTextureDestroy(gpBoatWakeTex); RwTextureDestroy(gpBoatWakeTex);
@ -812,8 +812,8 @@ void CParticle::Shutdown()
RwTextureDestroy(gpDotTex); RwTextureDestroy(gpDotTex);
gpDotTex = nil; gpDotTex = nil;
RwTextureDestroy(gpHeathazeTex); RwTextureDestroy(gpHeatHazeTex);
gpHeathazeTex = nil; gpHeatHazeTex = nil;
RwTextureDestroy(gpBeastieTex); RwTextureDestroy(gpBeastieTex);
gpBeastieTex = nil; gpBeastieTex = nil;
@ -1913,9 +1913,9 @@ void CParticle::Render()
FxType fxtype; FxType fxtype;
if ( particle->m_nCurrentFrame != 0 ) if ( particle->m_nCurrentFrame != 0 )
fxtype = FXTYPE_1; fxtype = FXTYPE_WATER2;
else else
fxtype = FXTYPE_0; fxtype = FXTYPE_WATER1;
CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, fxtype); CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, fxtype);
@ -1939,9 +1939,9 @@ void CParticle::Render()
FxType fxtype; FxType fxtype;
if ( particle->m_nCurrentFrame ) if ( particle->m_nCurrentFrame )
fxtype = FXTYPE_3; fxtype = FXTYPE_BLOOD2;
else else
fxtype = FXTYPE_2; fxtype = FXTYPE_BLOOD1;
CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, fxtype); 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.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)); 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; canDraw = false;
} }
@ -1993,7 +1993,7 @@ void CParticle::Render()
break; break;
} }
CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, FXTYPE_4); CMBlur::AddRenderFx(Scene.camera, &rect, screenZ, FXTYPE_HEATHAZE);
canDraw = false; canDraw = false;
} }
@ -2115,7 +2115,7 @@ void CParticle::Render()
* (CSprite::GetFarScreenZ() - CSprite::GetNearScreenZ()) * CDraw::GetFarClipZ() * (CSprite::GetFarScreenZ() - CSprite::GetNearScreenZ()) * CDraw::GetFarClipZ()
/ ( (CDraw::GetFarClipZ() - CDraw::GetNearClipZ()) * coors.z ) + CSprite::GetNearScreenZ(); / ( (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 else
{ {

5
src/render/Particle.h
View File

@ -99,5 +99,10 @@ public:
extern bool clearWaterDrop; extern bool clearWaterDrop;
extern int32 numWaterDropOnScreen; extern int32 numWaterDropOnScreen;
extern RwRaster *gpCarSplashRaster[];
extern RwRaster *gpHeatHazeRaster;
extern RwRaster *gpDotRaster;
extern RwRaster *gpRainDripRaster[];
extern RwRaster *gpRainDripDarkRaster[];
VALIDATE_SIZE(CParticle, 0x58); VALIDATE_SIZE(CParticle, 0x58);