Skip to content

Fixed fps hud scaling with the world #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrChuse wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed fps hud scaling with the world #301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions gameSource/LivingLifePage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7200,13 +7200,13 @@ static void drawFixedShadowString( const char *inString, doublePair inPos ) {
FloatColor faceColor = getDrawColor();

setDrawColor( 0, 0, 0, 1 );
numbersFontFixed->drawString( inString, inPos, alignLeft );
numbersFontFixed->drawString( inString, inPos, alignLeft, gui_fov_scale_hud );

setDrawColor( faceColor );

inPos.x += 2;
inPos.y -= 2;
numbersFontFixed->drawString( inString, inPos, alignLeft );
inPos.x += 2 * gui_fov_scale_hud;
inPos.y -= 2 * gui_fov_scale_hud;
numbersFontFixed->drawString( inString, inPos, alignLeft, gui_fov_scale_hud );
}


Expand Down Expand Up @@ -7260,10 +7260,10 @@ static void drawGraph( SimpleVector<double> *inHistory, doublePair inPos,

double graphHeight = 40;

drawRect( inPos.x - 2,
inPos.y - 2,
inPos.x + historyGraphLength + 2,
inPos.y + graphHeight + 2 );
drawRect( inPos.x - 2 * gui_fov_scale_hud,
inPos.y - 2 * gui_fov_scale_hud,
inPos.x + (historyGraphLength + 2) * gui_fov_scale_hud,
inPos.y + (graphHeight + 2) * gui_fov_scale_hud );



Expand All @@ -7273,10 +7273,10 @@ static void drawGraph( SimpleVector<double> *inHistory, doublePair inPos,

double scaledVal = val / max;

drawRect( inPos.x + i,
drawRect( inPos.x + i * gui_fov_scale_hud,
inPos.y,
inPos.x + i + 1,
inPos.y + scaledVal * graphHeight );
inPos.x + (i + 1) * gui_fov_scale_hud,
inPos.y + (scaledVal * graphHeight) * gui_fov_scale_hud );
}
}

Expand All @@ -7298,10 +7298,10 @@ static void drawGraph( SimpleVector<TimeMeasureRecord> *inHistory,

double graphHeight = 40;

drawRect( inPos.x - 2,
inPos.y - 2,
inPos.x + historyGraphLength + 2,
inPos.y + graphHeight + 2 );
drawRect( inPos.x - 2 * gui_fov_scale_hud,
inPos.y - 2 * gui_fov_scale_hud,
inPos.x + (historyGraphLength + 2) * gui_fov_scale_hud,
inPos.y + (graphHeight + 2) * gui_fov_scale_hud );



Expand All @@ -7322,10 +7322,10 @@ static void drawGraph( SimpleVector<TimeMeasureRecord> *inHistory,

double scaledVal = sum / max;

drawRect( inPos.x + i,
drawRect( inPos.x + i * gui_fov_scale_hud,
inPos.y,
inPos.x + i + 1,
inPos.y + scaledVal * graphHeight );
inPos.x + (i + 1) * gui_fov_scale_hud,
inPos.y + (scaledVal * graphHeight) * gui_fov_scale_hud );
}
}
}
Expand Down Expand Up @@ -10937,11 +10937,11 @@ void LivingLifePage::draw( doublePair inViewCenter,
if( showFPS ) {

doublePair pos = lastScreenViewCenter;
pos.x -= 600;
pos.y += 300;
pos.x -= 600 * gui_fov_scale_hud;
pos.y += 250 * gui_fov_scale_hud;

if( mTutorialNumber > 0 || mGlobalMessageShowing ) {
pos.y -= 50;
pos.y -= 50 * gui_fov_scale_hud;
}

if( frameBatchMeasureStartTime == -1 ) {
Expand Down Expand Up @@ -11005,16 +11005,16 @@ void LivingLifePage::draw( doublePair inViewCenter,

drawFixedShadowStringWhite( fpsString, pos );

pos.x += 20 + numbersFontFixed->measureString( fpsString );
pos.y -= 20;
pos.x += (20 + numbersFontFixed->measureString( fpsString )) * gui_fov_scale_hud;
pos.y -= 20 * gui_fov_scale_hud;

FloatColor yellow = { 1, 1, 0, 1 };
drawGraph( &fpsHistoryGraph, pos, yellow );

delete [] fpsString;

pos.x += 120;
pos.y += 60;
pos.x += 120 * gui_fov_scale_hud;
pos.y += 60 * gui_fov_scale_hud;

double maxStringW = 0;

Expand All @@ -11026,7 +11026,7 @@ void LivingLifePage::draw( doublePair inViewCenter,
timeMeasureToDraw[i] * 1000,
timeMeasureNames[i],
translate( "ms/f" ) );
pos.y -= 20;
pos.y -= 20 * gui_fov_scale_hud;

setDrawColor( timeMeasureGraphColors[i] );
drawFixedShadowString( timeString, pos );
Expand All @@ -11041,18 +11041,18 @@ void LivingLifePage::draw( doublePair inViewCenter,

pos.y += 0;

pos.x += 20 + maxStringW;
pos.x += (20 + maxStringW) * gui_fov_scale_hud;

drawGraph( &timeMeasureHistoryGraph, pos, timeMeasureGraphColors );


pos.x += 120;
pos.x += 120 * gui_fov_scale_hud;

drawGraph( &spriteCountHistoryGraph, pos, yellow );


pos.x -= 60;
pos.y += 60;
pos.x -= 60 * gui_fov_scale_hud;
pos.y += 60 * gui_fov_scale_hud;
char *spriteString =
autoSprintf( "%6.0f %s", spriteCountToDraw,
translate( "spritesDrawn" ) );
Expand All @@ -11061,15 +11061,15 @@ void LivingLifePage::draw( doublePair inViewCenter,

delete [] spriteString;

pos.x += 60;
pos.y -= 60;
pos.x += 60 * gui_fov_scale_hud;
pos.y -= 60 * gui_fov_scale_hud;


pos.x += 120;
pos.x += 120 * gui_fov_scale_hud;
drawGraph( &uniqueSpriteHistoryGraph, pos, yellow );

pos.x -= 60;
pos.y -= 20;
pos.x -= 60 * gui_fov_scale_hud;
pos.y -= 20 * gui_fov_scale_hud;

char *unqString =
autoSprintf( "%6.0f %s", uniqueSpriteCountToDraw,
Expand All @@ -11080,11 +11080,11 @@ void LivingLifePage::draw( doublePair inViewCenter,
delete [] unqString;


pos.y -= 80;
pos.y -= 80 * gui_fov_scale_hud;
drawGraph( &pixelCountHistoryGraph, pos, yellow );

pos.x -= 60;
pos.y -= 20;
pos.x -= 60 * gui_fov_scale_hud;
pos.y -= 20 * gui_fov_scale_hud;

char pixBuffer[16];

Expand Down