From 51657e10769faa2617d546a06c42e4c62a19bb50 Mon Sep 17 00:00:00 2001 From: Aki Date: Sun, 30 Jan 2022 17:41:24 +0100 Subject: Removed trailing whitespace all over the place --- Magic2/VideoDX9.cpp | 64 ++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'Magic2/VideoDX9.cpp') diff --git a/Magic2/VideoDX9.cpp b/Magic2/VideoDX9.cpp index 0c9e24d..f4c3f7b 100644 --- a/Magic2/VideoDX9.cpp +++ b/Magic2/VideoDX9.cpp @@ -101,7 +101,7 @@ public: model_clients.append(model); } - virtual ~VideoDX9SurfaceData() { + virtual ~VideoDX9SurfaceData() { model_clients.remove(model); delete vertex_buffer; @@ -165,8 +165,8 @@ struct VideoDX9ScreenVertex static DWORD FVF; }; -DWORD VideoDX9ScreenVertex::FVF = D3DFVF_XYZRHW | -D3DFVF_DIFFUSE | +DWORD VideoDX9ScreenVertex::FVF = D3DFVF_XYZRHW | +D3DFVF_DIFFUSE | D3DFVF_TEX1; struct VideoDX9NormalVertex @@ -184,7 +184,7 @@ struct VideoDX9NormalVertex DWORD VideoDX9NormalVertex::FVF = 0; // Global Vertex Declaration shared by shaders -D3DVERTEXELEMENT9 videoDX9NormalVertexElements[] = +D3DVERTEXELEMENT9 videoDX9NormalVertexElements[] = { { 0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0 }, { 0, 12, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0 }, @@ -204,8 +204,8 @@ struct VideoDX9SolidVertex static DWORD FVF; }; -DWORD VideoDX9SolidVertex::FVF = D3DFVF_XYZ | -D3DFVF_NORMAL | +DWORD VideoDX9SolidVertex::FVF = D3DFVF_XYZ | +D3DFVF_NORMAL | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE2(0); @@ -218,8 +218,8 @@ struct VideoDX9LuminousVertex static DWORD FVF; }; -DWORD VideoDX9LuminousVertex::FVF = D3DFVF_XYZ | -D3DFVF_DIFFUSE | +DWORD VideoDX9LuminousVertex::FVF = D3DFVF_XYZ | +D3DFVF_DIFFUSE | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE2(0); @@ -234,7 +234,7 @@ struct VideoDX9DetailVertex static DWORD FVF; }; -DWORD VideoDX9DetailVertex::FVF = D3DFVF_XYZ | +DWORD VideoDX9DetailVertex::FVF = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | D3DFVF_TEX2; @@ -247,7 +247,7 @@ struct VideoDX9LineVertex static DWORD FVF; }; -DWORD VideoDX9LineVertex::FVF = D3DFVF_XYZ | +DWORD VideoDX9LineVertex::FVF = D3DFVF_XYZ | D3DFVF_DIFFUSE; enum { @@ -470,7 +470,7 @@ VideoDX9::~VideoDX9() video_dx9_instance = 0; } -IDirect3DDevice9* +IDirect3DDevice9* VideoDX9::GetD3DDevice9() { if (video_dx9_instance) @@ -617,7 +617,7 @@ VideoDX9::Reset(const VideoSettings* vs) d3ddevice->SetSamplerState(0, D3DSAMP_MIPFILTER, D3DTEXF_NONE); D3DVIEWPORT9 view; - + hr = d3ddevice->GetViewport(&view); if (SUCCEEDED(hr)) { rect.x = view.X; @@ -890,7 +890,7 @@ VideoDX9::SetGammaLevel(int g) // compute 1/gamma float recip_gray = ReciprocalGamma(g); - + // compute i**(1/gamma) for all i and scale to range for (UINT i = 0; i < 256; i++) { int val = RampValue(i, recip_gray, f); @@ -1135,11 +1135,11 @@ VideoDX9::Capture(Bitmap& bmp) desc.Format = D3DFMT_A8R8G8B8; hr = d3ddevice->CreateOffscreenPlainSurface( - desc.Width, - desc.Height, - desc.Format, - D3DPOOL_SYSTEMMEM, - &pTempSurf, + desc.Width, + desc.Height, + desc.Format, + D3DPOOL_SYSTEMMEM, + &pTempSurf, NULL); if (FAILED(hr)) { @@ -1174,10 +1174,10 @@ VideoDX9::Capture(Bitmap& bmp) // and to do so hits performance, so copy to another surface // Must be the same format as the source surface hr = d3ddevice->CreateOffscreenPlainSurface( - desc.Width, - desc.Height, - desc.Format, - D3DPOOL_DEFAULT, + desc.Width, + desc.Height, + desc.Format, + D3DPOOL_DEFAULT, &pSurf, NULL); @@ -1203,14 +1203,14 @@ VideoDX9::Capture(Bitmap& bmp) } D3DLOCKED_RECT lockedRect; - hr = pTempSurf->LockRect(&lockedRect, NULL, + hr = pTempSurf->LockRect(&lockedRect, NULL, D3DLOCK_READONLY | D3DLOCK_NOSYSLOCK); if (FAILED(hr)) { VideoDX9Error("VideoDX9::Capture - can't lock rect", hr); RELEASE(pTempSurf); return false; - } + } // Allocate color buffer DWORD* buffer = new DWORD[desc.Width * desc.Height]; @@ -1248,7 +1248,7 @@ VideoDX9::Capture(Bitmap& bmp) *dst++ = pRow[2]; // B *dst++ = 255; - pRow += 3; + pRow += 3; break; } @@ -1315,8 +1315,8 @@ VideoDX9::SetViewport(int x, int y, int w, int h) view.Y = y; view.Width = w; view.Height = h; - view.MinZ = 0.0f; - view.MaxZ = 1.0f; + view.MinZ = 0.0f; + view.MaxZ = 1.0f; hr = d3ddevice->SetViewport(&view); if (FAILED(hr)) { @@ -1460,7 +1460,7 @@ VideoDX9::SetProjection(float fov, float znear, float zfar, DWORD type) /*** *** PERSPECTIVE PROJECTION: - ***/ + ***/ if (type == PROJECTION_PERSPECTIVE) { double xscale = width / fov; @@ -3374,7 +3374,7 @@ VideoDX9::SetupPass(int pass) d3ddevice->SetTextureStageState(1, D3DTSS_COLORARG2, D3DTA_TEXTURE); d3ddevice->SetTextureStageState(1, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); d3ddevice->SetTextureStageState(1, D3DTSS_ALPHAARG1, D3DTA_CURRENT); - d3ddevice->SetTextureStageState(1, D3DTSS_TEXCOORDINDEX, 0); + d3ddevice->SetTextureStageState(1, D3DTSS_TEXCOORDINDEX, 0); d3ddevice->SetTextureStageState(2, D3DTSS_COLOROP, D3DTOP_MODULATE); d3ddevice->SetTextureStageState(2, D3DTSS_COLORARG1, D3DTA_CURRENT); @@ -3397,21 +3397,21 @@ VideoDX9::SetupPass(int pass) d3ddevice->SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE); d3ddevice->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); d3ddevice->SetTextureStageState(0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); - d3ddevice->SetTextureStageState(0, D3DTSS_TEXCOORDINDEX, 0); + d3ddevice->SetTextureStageState(0, D3DTSS_TEXCOORDINDEX, 0); d3ddevice->SetTextureStageState(1, D3DTSS_COLOROP, D3DTOP_BLENDCURRENTALPHA); d3ddevice->SetTextureStageState(1, D3DTSS_COLORARG1, D3DTA_CURRENT); d3ddevice->SetTextureStageState(1, D3DTSS_COLORARG2, D3DTA_TEXTURE); d3ddevice->SetTextureStageState(1, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); d3ddevice->SetTextureStageState(1, D3DTSS_ALPHAARG1, D3DTA_CURRENT); - d3ddevice->SetTextureStageState(1, D3DTSS_TEXCOORDINDEX, 0); + d3ddevice->SetTextureStageState(1, D3DTSS_TEXCOORDINDEX, 0); d3ddevice->SetTextureStageState(2, D3DTSS_COLOROP, D3DTOP_BLENDTEXTUREALPHA); d3ddevice->SetTextureStageState(2, D3DTSS_COLORARG1, D3DTA_TEXTURE); d3ddevice->SetTextureStageState(2, D3DTSS_COLORARG2, D3DTA_CURRENT); d3ddevice->SetTextureStageState(2, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); d3ddevice->SetTextureStageState(2, D3DTSS_ALPHAARG1, D3DTA_CURRENT); - d3ddevice->SetTextureStageState(2, D3DTSS_TEXCOORDINDEX, 1); + d3ddevice->SetTextureStageState(2, D3DTSS_TEXCOORDINDEX, 1); d3ddevice->SetTextureStageState(3, D3DTSS_COLOROP, D3DTOP_MODULATE); d3ddevice->SetTextureStageState(3, D3DTSS_COLORARG1, D3DTA_CURRENT); -- cgit v1.1