Skip to content

Commit

Permalink
Pixel art corregido
Browse files Browse the repository at this point in the history
  • Loading branch information
@agavinm
agavinm committed May 23, 2020
1 parent fefba9e commit 1692452
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 16 deletions.
5 changes: 4 additions & 1 deletion Game.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,10 @@ State Game::pause(Config& c, const Vehicle::Action& a, const Vehicle::Direction
c.effects[2]->play();

if (c.enablePixelArt) {
c.window.setView(View(Vector2f(c.window.getSize().x / 4.0f, c.window.getSize().y / 4.0f), Vector2f(c.window.getSize().x / 2.0f, c.window.getSize().y / 2.0f)));
if (c.isDefaultScreen)
c.window.setView(View(Vector2f(SCREEN_DEFAULT_X / 4.0f, SCREEN_DEFAULT_Y / 4.0f), Vector2f(SCREEN_DEFAULT_X / 2.0f, SCREEN_DEFAULT_Y / 2.0f)));
else
c.window.setView(View(Vector2f(SCREEN_HD_X / 4.0f, SCREEN_HD_Y / 4.0f), Vector2f(SCREEN_HD_X / 2.0f, SCREEN_HD_Y / 2.0f)));
c.w.create(c.window.getView().getSize().x, c.window.getView().getSize().y);
c.screenScale = float(c.w.getSize().x) / float(SCREEN_DEFAULT_X);
}
Expand Down
53 changes: 38 additions & 15 deletions Menu.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// Screen
#define SCREEN_DEFAULT make_pair(SCREEN_DEFAULT_X, SCREEN_DEFAULT_Y)
// HD
#define SCREEN_1 make_pair(1280, 720)
#define SCREEN_1 make_pair(SCREEN_HD_X, SCREEN_HD_Y)
// HD+
#define SCREEN_2 make_pair(1366, 768)
// FULL HD
Expand All @@ -24,16 +24,21 @@
// UHD
#define SCREEN_5 make_pair(3840, 2160)

#define DEFAULT_VIEW

using namespace std;
using namespace sf;

Config::Config() : resolutions({SCREEN_DEFAULT, SCREEN_1, SCREEN_2, SCREEN_3, SCREEN_4, SCREEN_5}), resIndex(0),
camD(0.84), renderLen(300) {
isDefaultScreen(true), camD(0.84), renderLen(300) {
window.create(VideoMode(resolutions[resIndex].first, resolutions[resIndex].second), "Out Run", Style::Titlebar | Style::Close);
window.setFramerateLimit(FPS);
window.setKeyRepeatEnabled(false);

window.setView(View(Vector2f(window.getSize().x / 4.0f, window.getSize().y / 4.0f), Vector2f(window.getSize().x / 2.0f, window.getSize().y / 2.0f)));
if (isDefaultScreen)
window.setView(View(Vector2f(SCREEN_DEFAULT_X / 4.0f, SCREEN_DEFAULT_Y / 4.0f), Vector2f(SCREEN_DEFAULT_X / 2.0f, SCREEN_DEFAULT_Y / 2.0f)));
else
window.setView(View(Vector2f(SCREEN_HD_X / 4.0f, SCREEN_HD_Y / 4.0f), Vector2f(SCREEN_HD_X / 2.0f, SCREEN_HD_Y / 2.0f)));
w.create(window.getView().getSize().x, window.getView().getSize().y);

Image i;
Expand Down Expand Up @@ -395,7 +400,10 @@ State startMenu(Config &c, bool startPressed) {
c.effects[0]->stop();

if (c.enablePixelArt) {
c.window.setView(View(Vector2f(c.window.getSize().x / 4.0f, c.window.getSize().y / 4.0f), Vector2f(c.window.getSize().x / 2.0f, c.window.getSize().y / 2.0f)));
if (c.isDefaultScreen)
c.window.setView(View(Vector2f(SCREEN_DEFAULT_X / 4.0f, SCREEN_DEFAULT_Y / 4.0f), Vector2f(SCREEN_DEFAULT_X / 2.0f, SCREEN_DEFAULT_Y / 2.0f)));
else
c.window.setView(View(Vector2f(SCREEN_HD_X / 4.0f, SCREEN_HD_Y / 4.0f), Vector2f(SCREEN_HD_X / 2.0f, SCREEN_HD_Y / 2.0f)));
c.w.create(c.window.getView().getSize().x, c.window.getView().getSize().y);
c.screenScale = float(c.w.getSize().x) / float(SCREEN_DEFAULT_X);
}
Expand Down Expand Up @@ -897,8 +905,8 @@ State Config::graphicsMenu() {
"Pixel art", Color(0, 255, 0), Color(255, 255, 0), Color(0, 255, 0), 0, screenScale);

// Option configurations
const string res = resIndex < resolutions.size() ? to_string(resolutions[resIndex].first) + "x" +
to_string(resolutions[resIndex].second) : "FULLSCREEN";
const string res = resIndex > -1 ? to_string(resolutions[resIndex].first) + "x" +
to_string(resolutions[resIndex].second) : "FULLSCREEN";
menuButtons.emplace_back(w.getSize().x / 2.f + 80.0f * screenScale, w.getSize().y / 2.f - 70.0f * screenScale,
200.0f * screenScale, 30.0f * screenScale, options,
res, Color(0, 255, 0), Color(255, 255, 0), Color(0, 255, 0), 1, screenScale);
Expand Down Expand Up @@ -969,11 +977,11 @@ State Config::graphicsMenu() {
window.setFramerateLimit(FPS);
window.setKeyRepeatEnabled(false);

if (enablePixelArt)
window.setView(View(Vector2f(window.getSize().x / 4.0f, window.getSize().y / 4.0f), Vector2f(window.getSize().x / 2.0f, window.getSize().y / 2.0f)));
else
window.setView(View(Vector2f(window.getSize().x / 2.0f, window.getSize().y / 2.0f), Vector2f(window.getSize().x, window.getSize().y)));
isDefaultScreen = resIndex == 0;


window.setView(View(Vector2f(window.getSize().x / 2.0f, window.getSize().y / 2.0f),
Vector2f(window.getSize().x, window.getSize().y)));
w.create(window.getView().getSize().x, window.getView().getSize().y);

screenScale = float(w.getSize().x) / float(SCREEN_DEFAULT_X);
Expand All @@ -995,11 +1003,11 @@ State Config::graphicsMenu() {
window.setFramerateLimit(FPS);
window.setKeyRepeatEnabled(false);

if (enablePixelArt)
window.setView(View(Vector2f(window.getSize().x / 4.0f, window.getSize().y / 4.0f), Vector2f(window.getSize().x / 2.0f, window.getSize().y / 2.0f)));
else
window.setView(View(Vector2f(window.getSize().x / 2.0f, window.getSize().y / 2.0f), Vector2f(window.getSize().x, window.getSize().y)));
isDefaultScreen = resIndex == 0;


window.setView(View(Vector2f(window.getSize().x / 2.0f, window.getSize().y / 2.0f),
Vector2f(window.getSize().x, window.getSize().y)));
w.create(window.getView().getSize().x, window.getView().getSize().y);

screenScale = float(w.getSize().x) / float(SCREEN_DEFAULT_X);
Expand Down Expand Up @@ -1410,7 +1418,10 @@ State optionsMenu(Config& c, const bool& inGame) {
c.themes[0]->stop();

if (c.enablePixelArt) {
c.window.setView(View(Vector2f(c.window.getSize().x / 4.0f, c.window.getSize().y / 4.0f), Vector2f(c.window.getSize().x / 2.0f, c.window.getSize().y / 2.0f)));
if (c.isDefaultScreen)
c.window.setView(View(Vector2f(SCREEN_DEFAULT_X / 4.0f, SCREEN_DEFAULT_Y / 4.0f), Vector2f(SCREEN_DEFAULT_X / 2.0f, SCREEN_DEFAULT_Y / 2.0f)));
else
c.window.setView(View(Vector2f(SCREEN_HD_X / 4.0f, SCREEN_HD_Y / 4.0f), Vector2f(SCREEN_HD_X / 2.0f, SCREEN_HD_Y / 2.0f)));
c.w.create(c.window.getView().getSize().x, c.window.getView().getSize().y);
c.screenScale = float(c.w.getSize().x) / float(SCREEN_DEFAULT_X);
}
Expand Down Expand Up @@ -1566,6 +1577,9 @@ State endMenu(Config &c) {


State rankingMenu(Config& c, const unsigned long scorePlayerGame, const int minutes, const int secs, const int cents_Second){
c.window.setView(View(Vector2f(c.window.getSize().x / 2.0f, c.window.getSize().y / 2.0f), Vector2f(c.window.getSize().x, c.window.getSize().y)));
c.w.create(c.window.getView().getSize().x, c.window.getView().getSize().y);
c.screenScale = float(c.w.getSize().x) / float(SCREEN_DEFAULT_X);

c.effects[6]->stop();
// Clean the console window
Expand Down Expand Up @@ -1989,6 +2003,15 @@ State rankingMenu(Config& c, const unsigned long scorePlayerGame, const int minu
c.effects[29]->stop();
c.themes[4]->stop();

if (c.enablePixelArt) {
if (c.isDefaultScreen)
c.window.setView(View(Vector2f(SCREEN_DEFAULT_X / 4.0f, SCREEN_DEFAULT_Y / 4.0f), Vector2f(SCREEN_DEFAULT_X / 2.0f, SCREEN_DEFAULT_Y / 2.0f)));
else
c.window.setView(View(Vector2f(SCREEN_HD_X / 4.0f, SCREEN_HD_Y / 4.0f), Vector2f(SCREEN_HD_X / 2.0f, SCREEN_HD_Y / 2.0f)));
c.w.create(c.window.getView().getSize().x, c.window.getView().getSize().y);
c.screenScale = float(c.w.getSize().x) / float(SCREEN_DEFAULT_X);
}

return START;
}

Expand Down
3 changes: 3 additions & 0 deletions Menu.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

#define SCREEN_DEFAULT_X 921
#define SCREEN_DEFAULT_Y 691
#define SCREEN_HD_X 1280
#define SCREEN_HD_Y 720

sf::Font initializeFontTimePlay();

Expand Down Expand Up @@ -65,6 +67,7 @@ struct Config {
sf::RenderTexture w;
sf::RenderWindow window;
float screenScale;
bool isDefaultScreen;

sf::Keyboard::Key menuKey;
sf::Keyboard::Key menuUpKey;
Expand Down

0 comments on commit 1692452

Please sign in to comment.