ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix code to comply with coding style

This commit is contained in:
unknown 2015-07-29 19:48:08 -06:00 committed by mirrorbender
parent 0faba3b018
commit 739ede2242
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/HW/VideoInterface.cpp
View File

@ -477,11 +477,11 @@ float GetAspectRatio(bool wide)
{
if (wide)
{
return 16.0f/9.0f;
return 16.0f / 9.0f;
}
else
{
return 4.0f/3.0f;
return 4.0f / 3.0f;
}
}
return ((float)width / (float)height) * pixelAR;

4
Source/Core/VideoBackends/D3D/FramebufferManager.cpp
View File

@ -56,11 +56,11 @@ FramebufferManager::FramebufferManager()
{
m_target_width = Renderer::GetTargetWidth();
m_target_height = Renderer::GetTargetHeight();
if(m_target_height < 1)
if (m_target_height < 1)
{
m_target_height = 1;
}
if(m_target_width < 1)
if (m_target_width < 1)
{
m_target_width = 1;
}

22
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -46,7 +46,6 @@
#include "VideoCommon/VideoConfig.h"
#include "VideoCommon/XFMemory.h"
// TODO: Move these out of here.
int frameCount;
int OSDChoice;
@ -478,17 +477,18 @@ void Renderer::UpdateDrawRectangle(int backbuffer_width, int backbuffer_height)
// The rendering window aspect ratio as a proportion of the 4:3 or 16:9 ratio
float Ratio;
switch (g_ActiveConfig.iAspectRatio)
{
case ASPECT_ANALOG_WIDE:
Ratio = (WinWidth / WinHeight) / VideoInterface::GetAspectRatio(true);
break;
case ASPECT_ANALOG:
Ratio = (WinWidth / WinHeight) / VideoInterface::GetAspectRatio(false);
break;
default:
Ratio = (WinWidth / WinHeight) / VideoInterface::GetAspectRatio(g_aspect_wide);
break;
{
case ASPECT_ANALOG_WIDE:
Ratio = (WinWidth / WinHeight) / VideoInterface::GetAspectRatio(true);
break;
case ASPECT_ANALOG:
Ratio = (WinWidth / WinHeight) / VideoInterface::GetAspectRatio(false);
break;
default:
Ratio = (WinWidth / WinHeight) / VideoInterface::GetAspectRatio(g_aspect_wide);
break;
}
if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH)
{
if (Ratio > 1.0f)

2
Source/Core/VideoCommon/RenderBase.h
View File

@ -40,7 +40,6 @@ extern int OSDChoice;
extern bool bLastFrameDumped;
// Renderer really isn't a very good name for this class - it's more like "Misc".
// The long term goal is to get rid of this class and replace it with others that make
// more sense.
@ -137,7 +136,6 @@ public:
static Common::Event s_screenshotCompleted;
protected:
static void CalculateTargetScale(int x, int y, int* scaledX, int* scaledY);