diff options
| author | XTra.KrazzY <XTra.KrazzY@gmail.com> | 2008-09-20 14:29:30 +0000 |
|---|---|---|
| committer | XTra.KrazzY <XTra.KrazzY@gmail.com> | 2008-09-20 14:29:30 +0000 |
| commit | a5488ccf5899f953afe6d616bb71dc35b447596b (patch) | |
| tree | ffa00701c8718ca7f8ad159f927ef42c458d06f1 | |
| parent | 558f453dde626d56097c1c32b73734a93e9be6ff (diff) | |
Initial steps towards fog emulation in DX9
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@585 8ced0084-cf51-0410-be5f-012b33b47a6e
| -rw-r--r-- | Source/Plugins/Plugin_VideoDX9/Src/BPStructs.cpp | 58 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp | 1 |
2 files changed, 52 insertions, 7 deletions
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/BPStructs.cpp b/Source/Plugins/Plugin_VideoDX9/Src/BPStructs.cpp index ccab72098e..87a7cbb6c6 100644 --- a/Source/Plugins/Plugin_VideoDX9/Src/BPStructs.cpp +++ b/Source/Plugins/Plugin_VideoDX9/Src/BPStructs.cpp @@ -31,6 +31,8 @@ bool textureChanged[8];
+const bool renderFog = false;
+
// State translation lookup tables
const D3DBLEND d3dSrcFactors[8] =
{
@@ -328,22 +330,64 @@ void BPWritten(int addr, int changes, int newval) case BPMEM_FOGPARAM3:
//fog settings
- {
+ if(changes) {
+ static bool bFog = false;
+ CVertexHandler::Flush();
+ ((u32*)&bpmem)[addr] = newval;
+
+ if(!renderFog)
+ break;
+
/// u32 fogCTemp = bpmem.fog.c_proj_fsel.cShifted12 << 12;
// float fogC = *(float*)(&fogCTemp);
- CVertexHandler::Flush();
- ((u32*)&bpmem)[addr] = newval;
+
+ if(bpmem.fog.c_proj_fsel.fsel > 0 && !bFog) {
+ Renderer::SetRenderState(D3DRS_FOGENABLE, true);
+ bFog = true;
+ }
+
+ //printf("%f %f magnitude: %x\n", bpmem.fog.a.GetA(),bpmem.fog.c_proj_fsel.GetC(), bpmem.fog.b_magnitude);
+ switch(bpmem.fog.c_proj_fsel.fsel)
+ {
+ case 0: // Off
+ if(bFog) {
+ Renderer::SetRenderState(D3DRS_FOGENABLE, false);
+ bFog = false;
+ }
+ break;
+ case 2: // Linear
+ Renderer::SetRenderState(D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR);
+ break;
+ case 4: // exp
+ Renderer::SetRenderState(D3DRS_FOGVERTEXMODE, D3DFOG_EXP);
+ break;
+ case 5: // exp2
+ Renderer::SetRenderState(D3DRS_FOGVERTEXMODE, D3DFOG_EXP2);
+ break;
+ case 6: // Backward exp
+ case 7: // Backward exp2
+ PanicAlert("Backward Exponential Fog Detected");
+ // TODO: Figure out how to do these in any rendering API
+ //TEV_FSEL_BX, TEV_FSEL_BX2?
+ default:
+ PanicAlert("Non-Emulated Fog selection %d\n", bpmem.fog.c_proj_fsel.fsel);
+ break;
+ }
}
break;
case BPMEM_FOGCOLOR:
- if (changes)
- {
+ if(changes) {
CVertexHandler::Flush();
((u32*)&bpmem)[addr] = newval;
-
+
+ if(!renderFog)
+ break;
+
// dev->SetRenderState(D3DRS_FOGCOLOR,bpmem.fog.color);
- Renderer::SetRenderState( D3DRS_FOGCOLOR, bpmem.fog.color );
+ int fogcolor[3] = { ((bpmem.fog.color>>16)&0xff), ((bpmem.fog.color>>8)&0xff), (bpmem.fog.color&0xff)};
+ //D3DCOLOR_RGBA(fogcolor[0], fogcolor[1], fogcolor[2], 0)
+ Renderer::SetRenderState(D3DRS_FOGCOLOR, bpmem.fog.color);
}
break;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp b/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp index 36611074ea..eb8c3978a2 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp @@ -291,6 +291,7 @@ void BPWritten(int addr, int changes, int newval) case 6: // Backward exp
case 7: // Backward exp2
// TODO: Figure out how to do these in GL
+ //TEV_FSEL_BX, TEV_FSEL_BX2?
default:
printf("Non-Emulated Fog selection %d\n", bpmem.fog.c_proj_fsel.fsel);
break;
|