actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I sense a double merge.

Browse Source
This commit is contained in:
Jason Felds
2011-07-09 02:28:42 -04:00
parent 08d5f8f722 3572e9c7c7
commit 9d413ce75a
5 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenDebugOverlay.cpp
+18 -1
View File
@@ -569,6 +569,7 @@ static LocalizedString WRITE_PREFERENCES ( "ScreenDebugOverlay", "Write Preferen
static LocalizedString MENU_TIMER ( "ScreenDebugOverlay", "Menu Timer" );
static LocalizedString FLUSH_LOG ( "ScreenDebugOverlay", "Flush Log" );
static LocalizedString PULL_BACK_CAMERA ( "ScreenDebugOverlay", "Pull Back Camera" );
static LocalizedString ZOOM_IN_CAMERA ( "ScreenDebugOverlay", "Zoom In Camera" );
static LocalizedString VISUAL_DELAY_UP ( "ScreenDebugOverlay", "Visual Delay Up" );
static LocalizedString VISUAL_DELAY_DOWN ( "ScreenDebugOverlay", "Visual Delay Down" );
static LocalizedString VOLUME_UP ( "ScreenDebugOverlay", "Volume Up" );
@@ -1101,7 +1102,7 @@ class DebugLinePullBackCamera : public IDebugLine
{
virtual RString GetDisplayTitle() { return PULL_BACK_CAMERA.GetValue(); }
virtual RString GetDisplayValue() { return RString(); }
virtual bool IsEnabled() { return g_fImageScaleDestination != 1; }
virtual bool IsEnabled() { return g_fImageScaleDestination < 1.0f; }
virtual void DoAndLog( RString &sMessageOut )
{
if( g_fImageScaleDestination == 1 )
@@ -1112,6 +1113,21 @@ class DebugLinePullBackCamera : public IDebugLine
}
};
class DebugLineZoomInCamera : public IDebugLine
{
virtual RString GetDisplayTitle() { return ZOOM_IN_CAMERA.GetValue(); }
virtual RString GetDisplayValue() { return RString(); }
virtual bool IsEnabled() { return g_fImageScaleDestination > 1.0f; }
virtual void DoAndLog( RString &sMessageOut )
{
if( g_fImageScaleDestination == 1 )
g_fImageScaleDestination = 2.0f;
else
g_fImageScaleDestination = 1;
IDebugLine::DoAndLog( sMessageOut );
}
};
class DebugLineVolumeUp : public IDebugLine
{
virtual RString GetDisplayTitle() { return VOLUME_UP.GetValue(); }
@@ -1226,6 +1242,7 @@ DECLARE_ONE( DebugLineWritePreferences );
DECLARE_ONE( DebugLineMenuTimer );
DECLARE_ONE( DebugLineFlushLog );
DECLARE_ONE( DebugLinePullBackCamera );
DECLARE_ONE( DebugLineZoomInCamera );
DECLARE_ONE( DebugLineVolumeUp );
DECLARE_ONE( DebugLineVolumeDown );
DECLARE_ONE( DebugLineVisualDelayUp );