diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-03-11 00:30:55 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-03-11 00:35:07 +1300 |
| commit | 31cfc73a09a8685cbab20502b4bc132e98e2feb5 (patch) | |
| tree | c7eb3a0906bab0eb711bd7c79166c96fe97ec488 /Source/Core/VideoBackends/Software/Rasterizer.cpp | |
| parent | 4591464486d696a300cc914f6c2a3cce8af2d666 (diff) | |
Fixes spacing for "for", "while", "switch" and "if"
Also moved && and || to ends of lines instead of start.
Fixed misc vertical alignments and some { needed newlining.
Diffstat (limited to 'Source/Core/VideoBackends/Software/Rasterizer.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Software/Rasterizer.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/Source/Core/VideoBackends/Software/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Rasterizer.cpp index 80be2adada..7054fab304 100644 --- a/Source/Core/VideoBackends/Software/Rasterizer.cpp +++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp @@ -87,7 +87,7 @@ inline int iround(float x) int t; t = (int)x; - if((x - t) >= 0.5) + if ((x - t) >= 0.5) return t + 1; return t; @@ -149,7 +149,7 @@ inline void Draw(s32 x, s32 y, s32 xi, s32 yi) // colors for (unsigned int i = 0; i < bpmem.genMode.numcolchans; i++) { - for(int comp = 0; comp < 4; comp++) + for (int comp = 0; comp < 4; comp++) { u16 color = (u16)ColorSlopes[i][comp].GetValue(dx, dy); @@ -299,7 +299,7 @@ void BuildBlock(s32 blockX, s32 blockY) { int stageOdd = i&1; TwoTevStageOrders &order = bpmem.tevorders[i >> 1]; - if(order.getEnable(stageOdd)) + if (order.getEnable(stageOdd)) { u32 texmap = order.getTexMap(stageOdd); u32 texcoord = order.getTexCoord(stageOdd); @@ -384,15 +384,15 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer if (!bpmem.genMode.zfreeze || !g_SWVideoConfig.bZFreeze) InitSlope(&ZSlope, v0->screenPosition[2], v1->screenPosition[2], v2->screenPosition[2], fltdx31, fltdx12, fltdy12, fltdy31); - for(unsigned int i = 0; i < bpmem.genMode.numcolchans; i++) + for (unsigned int i = 0; i < bpmem.genMode.numcolchans; i++) { - for(int comp = 0; comp < 4; comp++) + for (int comp = 0; comp < 4; comp++) InitSlope(&ColorSlopes[i][comp], v0->color[i][comp], v1->color[i][comp], v2->color[i][comp], fltdx31, fltdx12, fltdy12, fltdy31); } - for(unsigned int i = 0; i < bpmem.genMode.numtexgens; i++) + for (unsigned int i = 0; i < bpmem.genMode.numtexgens; i++) { - for(int comp = 0; comp < 3; comp++) + for (int comp = 0; comp < 3; comp++) InitSlope(&TexSlopes[i][comp], v0->texCoords[i][comp] * w[0], v1->texCoords[i][comp] * w[1], v2->texCoords[i][comp] * w[2], fltdx31, fltdx12, fltdy12, fltdy31); } @@ -406,14 +406,14 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer s32 C3 = DY31 * X3 - DX31 * Y3; // Correct for fill convention - if(DY12 < 0 || (DY12 == 0 && DX12 > 0)) C1++; - if(DY23 < 0 || (DY23 == 0 && DX23 > 0)) C2++; - if(DY31 < 0 || (DY31 == 0 && DX31 > 0)) C3++; + if (DY12 < 0 || (DY12 == 0 && DX12 > 0)) C1++; + if (DY23 < 0 || (DY23 == 0 && DX23 > 0)) C2++; + if (DY31 < 0 || (DY31 == 0 && DX31 > 0)) C3++; // Loop through blocks - for(s32 y = miny; y < maxy; y += BLOCK_SIZE) + for (s32 y = miny; y < maxy; y += BLOCK_SIZE) { - for(s32 x = minx; x < maxx; x += BLOCK_SIZE) + for (s32 x = minx; x < maxx; x += BLOCK_SIZE) { // Corners of block s32 x0 = x << 4; @@ -441,17 +441,17 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer int c = (c00 << 0) | (c10 << 1) | (c01 << 2) | (c11 << 3); // Skip block when outside an edge - if(a == 0x0 || b == 0x0 || c == 0x0) + if (a == 0x0 || b == 0x0 || c == 0x0) continue; BuildBlock(x, y); // Accept whole block when totally covered - if(a == 0xF && b == 0xF && c == 0xF) + if (a == 0xF && b == 0xF && c == 0xF) { - for(s32 iy = 0; iy < BLOCK_SIZE; iy++) + for (s32 iy = 0; iy < BLOCK_SIZE; iy++) { - for(s32 ix = 0; ix < BLOCK_SIZE; ix++) + for (s32 ix = 0; ix < BLOCK_SIZE; ix++) { Draw(x + ix, y + iy, ix, iy); } @@ -463,15 +463,15 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer s32 CY2 = C2 + DX23 * y0 - DY23 * x0; s32 CY3 = C3 + DX31 * y0 - DY31 * x0; - for(s32 iy = 0; iy < BLOCK_SIZE; iy++) + for (s32 iy = 0; iy < BLOCK_SIZE; iy++) { s32 CX1 = CY1; s32 CX2 = CY2; s32 CX3 = CY3; - for(s32 ix = 0; ix < BLOCK_SIZE; ix++) + for (s32 ix = 0; ix < BLOCK_SIZE; ix++) { - if(CX1 > 0 && CX2 > 0 && CX3 > 0) + if (CX1 > 0 && CX2 > 0 && CX3 > 0) { Draw(x + ix, y + iy, ix, iy); } |
