Skip to content
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

FPS Limit option #22

Closed
wants to merge 2 commits into from
Closed

FPS Limit option #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15ec67d
FPS Limit option
bobermilk Oct 26, 2023
4c1f686
Apply FPSLimit to application frametime
bobermilk Nov 2, 2023
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
2 changes: 2 additions & 0 deletions Headers/LogicalParameter.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,9 +586,11 @@ struct LogicalParameter
KeyPressVisAdvModeWidthScale20,
KeyPressVisAdvModeFixedHeight20,

OtherFPSHint,
OtherSaveStats,
OtherShowOppOnAlt,
OtherMultpl,
OtherFPSLimit,

SaveStatMaxKPS,
SaveStatTotal,
Expand Down
2 changes: 2 additions & 0 deletions Headers/ParameterLine.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,8 @@ class ParameterLine : public sf::Drawable, public sf::Transformable, public std:
OtherSaveStats,
OtherShowOppOnAlt,
OtherMultpl,
OtherFPSHint,
OtherFPSLimit,
OtherMty,

SaveStatColl,
Expand Down
1 change: 1 addition & 0 deletions Headers/Settings.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ namespace Settings
extern bool SaveStats;
extern bool ShowOppOnAlt;
extern unsigned ButtonPressMultiplier;
extern unsigned FPSLimit;

// Default assets
extern unsigned char* KeyCountersDefaultFont;
Expand Down
4 changes: 2 additions & 2 deletions Source/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <SFML/Graphics/Transformable.hpp>


const sf::Time Application::TimePerFrame = sf::seconds(1.f / 60.f);
const sf::Time Application::TimePerFrame = sf::seconds(1.f / static_cast<float>(LogicalParameter::ID::OtherFPSLimit));

Application::Application()
{
Expand Down Expand Up @@ -450,7 +450,7 @@ void Application::openWindow()
mWindow.close();
mWindow.create(sf::VideoMode(getWindowWidth(), getWindowHeight()), "JKPS", style);
mWindow.setKeyRepeatEnabled(false);
mWindow.setFramerateLimit(60);
mWindow.setFramerateLimit(Settings::FPSLimit);
#ifdef linux
if (style == sf::Style::None)
{
Expand Down
5 changes: 5 additions & 0 deletions Source/Menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,7 @@ void Menu::buildParametersMap()
mParameters.emplace(std::make_pair(LogicalParameter::ID::OtherSaveStats, new LogicalParameter(LogicalParameter::Type::Bool, &Settings::SaveStats, "Update statistics on quit", "False")));
mParameters.emplace(std::make_pair(LogicalParameter::ID::OtherShowOppOnAlt, new LogicalParameter(LogicalParameter::Type::Bool, &Settings::ShowOppOnAlt, "Show opposite key values on alt press", "True")));
mParameters.emplace(std::make_pair(LogicalParameter::ID::OtherMultpl, new LogicalParameter(LogicalParameter::Type::Unsigned, &Settings::ButtonPressMultiplier, "Value to multiply on click", "1", 0, 1000000)));
mParameters.emplace(std::make_pair(LogicalParameter::ID::OtherFPSLimit, new LogicalParameter(LogicalParameter::Type::Unsigned, &Settings::FPSLimit, "FPS Limit", "60", 0, 8000)));

mParameters.emplace(std::make_pair(LogicalParameter::ID::SaveStatMaxKPS, new LogicalParameter(LogicalParameter::Type::Float, &Settings::MaxKPS, "Saved max KPS", "0", 0u, UINT_MAX)));
mParameters.emplace(std::make_pair(LogicalParameter::ID::SaveStatTotal, new LogicalParameter(LogicalParameter::Type::Unsigned, &Settings::Total, "Saved total", "0", 0u, UINT_MAX)));
Expand Down Expand Up @@ -807,6 +808,10 @@ void Menu::buildParameterLines()
mParameterLines.emplace(std::make_pair(ParameterLine::ID::KeyPressVisAdvModeSpace, new ParameterLine(emptyP, mFonts, mTextures, mWindow)));
mParameterLines.emplace(std::make_pair(ParameterLine::ID::KeyPressVisAdvModeMty, new ParameterLine(emptyP, mFonts, mTextures, mWindow)));

parP = sPtr(new LogicalParameter(LogicalParameter::Type::Hint, nullptr, "Recommendation: FPS limit = your keyboard's polling rate\nAfter changing FPS Limit, restart the application"));
mParameterLines.emplace(std::make_pair(ParameterLine::ID::OtherFPSHint, new ParameterLine(parP, mFonts, mTextures, mWindow)));
mParameterLines[ParameterLine::ID::OtherFPSHint]->setCharacterSize(16u);

parP = sPtr(new LogicalParameter(LogicalParameter::Type::Collection, nullptr, mCollectionNames.at(collectionNameIdx++)));
mParameterLines.emplace(std::make_pair(ParameterLine::ID::OtherColl, new ParameterLine(parP, mFonts, mTextures, mWindow)));
mParameterLines.emplace(std::make_pair(ParameterLine::ID::OtherMty, new ParameterLine(emptyP, mFonts, mTextures, mWindow)));
Expand Down
2 changes: 1 addition & 1 deletion Source/Palette.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Palette::Palette(int)
, wasButtonPressedOnLine(false)
, wasButtonPressedOnCanvas(false)
{
mWindow.setFramerateLimit(60);
mWindow.setFramerateLimit(Settings::FPSLimit);

auto color = sf::Color::Red;
float colorStep = mLineSize / 2, leftSide = 5.f, rightSide = 25.f;
Expand Down
2 changes: 2 additions & 0 deletions Source/ParameterLine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,9 +1405,11 @@ ParameterLine::ID ParameterLine::parIdToParLineId(LogicalParameter::ID id)
case LogicalParameter::ID::KeyPressVisAdvModeWidthScale20: return ParameterLine::ID::KeyPressVisAdvModeWidthScale20;
case LogicalParameter::ID::KeyPressVisAdvModeFixedHeight20: return ParameterLine::ID::KeyPressVisAdvModeFixedHeight20;

case LogicalParameter::ID::OtherFPSHint: return ParameterLine::ID::OtherFPSHint;
case LogicalParameter::ID::OtherSaveStats: return ParameterLine::ID::OtherSaveStats;
case LogicalParameter::ID::OtherShowOppOnAlt: return ParameterLine::ID::OtherShowOppOnAlt;
case LogicalParameter::ID::OtherMultpl: return ParameterLine::ID::OtherMultpl;
case LogicalParameter::ID::OtherFPSLimit: return ParameterLine::ID::OtherFPSLimit;

case LogicalParameter::ID::SaveStatMaxKPS: return ParameterLine::ID::SaveStatMaxKPS;
case LogicalParameter::ID::SaveStatTotal: return ParameterLine::ID::SaveStatTotal;
Expand Down
1 change: 1 addition & 0 deletions Source/Settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ Container<float> KeyPressAdvFixedHeight;
bool SaveStats;
bool ShowOppOnAlt;
unsigned ButtonPressMultiplier;
unsigned FPSLimit;

// Default assets
unsigned char* StatisticsDefaultFont = MainProgramFont;
Expand Down