mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-11-05 02:39:41 +01:00
Code Issues Releases Wiki Activity
VVVVVV/desktop_version/src/preloader.cpp

127 lines
3.7 KiB
C++
Raw Normal View History

Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
#include "Enums.h"
Remove unnecessary includes from header files Including a header file inside another header file means a bunch of files are going to be unnecessarily recompiled whenever that inner header file is changed. So I minimized the amount of header files included in a header file, and only included the ones that were necessary (system includes don't count, I'm only talking about includes from within this project). Then the includes are only in the .cpp files themselves. This also minimizes problems such as a NO_CUSTOM_LEVELS build failing because some file depended on an include that got included in editor.h, which is another benefit of removing unnecessary includes from header files.
2020-07-19 21:05:41 +02:00
#include "Game.h"
#include "Graphics.h"
Allow pressing ACTION to skip fake loading screen While there already exists an option to skip the fake loading screen entirely (without requiring an ACTION press), there are several reasons for including this option as well: * So people upgrading from 2.2 won't have to sit through the fake loading screen the first time they open 2.3. * So if people are too lazy to use the existing option, they can use this one instead. * So tool-assisted speedruns (TASes) of this game can skip the fake loading screen without requiring an existing settings.vvv beforehand. This last one is the biggest reason for me, since I'm not sure what TASVideos.org rules are regarding existing save files, but with this change nobody has to worry about their rules and can safely just press ACTION to skip the fake loading screen automatically.
2020-12-21 00:19:22 +01:00
#include "KeyPoll.h"
Remove unnecessary includes from header files Including a header file inside another header file means a bunch of files are going to be unnecessarily recompiled whenever that inner header file is changed. So I minimized the amount of header files included in a header file, and only included the ones that were necessary (system includes don't count, I'm only talking about includes from within this project). Then the includes are only in the .cpp files themselves. This also minimizes problems such as a NO_CUSTOM_LEVELS build failing because some file depended on an include that got included in editor.h, which is another benefit of removing unnecessary includes from header files.
2020-07-19 21:05:41 +02:00
#include "UtilityClass.h"
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Clean up unnecessary exports and add static keywords This patch cleans up unnecessary exports from header files (there were only a few), as well as adds the static keyword to all symbols that aren't exported and are specific to a file. This helps the linker out in not doing any unnecessary work, speeding it up and avoiding silent symbol conflicts (otherwise two symbols with the same name (and type/signature in C++) would quietly resolve as okay by the linker).
2021-01-10 18:14:37 +01:00
static int pre_fakepercent=0, pre_transition=30;
static bool pre_startgame=false;
static int pre_darkcol=0, pre_lightcol=0, pre_curcol=0, pre_coltimer=0, pre_offset=0;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Clean up unnecessary exports and add static keywords This patch cleans up unnecessary exports from header files (there were only a few), as well as adds the static keyword to all symbols that aren't exported and are specific to a file. This helps the linker out in not doing any unnecessary work, speeding it up and avoiding silent symbol conflicts (otherwise two symbols with the same name (and type/signature in C++) would quietly resolve as okay by the linker).
2021-01-10 18:14:37 +01:00
static int pre_frontrectx=30, pre_frontrecty=20, pre_frontrectw=260, pre_frontrecth=200;
static int pre_temprectx=0, pre_temprecty=0, pre_temprectw=320, pre_temprecth=240;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void preloaderinput(void)
Allow pressing ACTION to skip fake loading screen While there already exists an option to skip the fake loading screen entirely (without requiring an ACTION press), there are several reasons for including this option as well: * So people upgrading from 2.2 won't have to sit through the fake loading screen the first time they open 2.3. * So if people are too lazy to use the existing option, they can use this one instead. * So tool-assisted speedruns (TASes) of this game can skip the fake loading screen without requiring an existing settings.vvv beforehand. This last one is the biggest reason for me, since I'm not sure what TASVideos.org rules are regarding existing save files, but with this change nobody has to worry about their rules and can safely just press ACTION to skip the fake loading screen automatically.
2020-12-21 00:19:22 +01:00
{
game.press_action = false;
if (key.isDown(KEYBOARD_z) || key.isDown(KEYBOARD_SPACE) || key.isDown(KEYBOARD_v) || key.isDown(game.controllerButton_flip)) {
game.press_action = true;
}
if (game.press_action) {
//Skip to TITLEMODE immediately
game.gamestate = TITLEMODE;
game.jumpheld = true;
}
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void preloaderrenderfixed(void)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
{
if (pre_transition < 30) pre_transition--;
if(pre_transition>=30){
pre_fakepercent++;
if (pre_fakepercent >= 100) {
pre_fakepercent = 100;
pre_startgame = true;
}
pre_offset = (pre_offset + 4 + int(fRandom() * 5.0f))%32;
pre_coltimer--;
if (pre_coltimer <= 0) {
pre_curcol = (pre_curcol + int(fRandom() * 5.0f)) % 6;
pre_coltimer = 8;
}
Move preloader update code to new function preloaderlogic() Otherwise the preloader will go by way too quickly.
2020-05-04 19:06:07 +02:00
}
Move all fixed-timestep render updates to new file RenderFixed.cpp As part of fixing #464, I'll need to move these pieces of code around easily. In #220 I just kind of shoved them awkwardly in whatever fixed function would be last called in the gamestate loop, which I shouldn't have done as I've now had to make formal fixed-render functions anyway. Because these fixed functions need to be called directly before a render function, and I'm fixing the order to put render functions in their proper place, so I need to be able to move these around easily, and making them function calls instead of inlined makes them easier to manipulate.
2020-11-08 00:47:49 +01:00
if (pre_transition <= -10) {
game.gamestate = TITLEMODE;
}
Move preloader update code to new function preloaderlogic() Otherwise the preloader will go by way too quickly.
2020-05-04 19:06:07 +02:00
}
Explicitly declare void for all void parameter functions (#628) Apparently in C, if you have `void test();`, it's completely okay to do `test(2);`. The function will take in the argument, but just discard it and throw it away. It's like a trash can, and a rude one at that. If you declare it like `void test(void);`, this is prevented. This is not a problem in C++ - doing `void test();` and `test(2);` is guaranteed to result in a compile error (this also means that right now, at least in all `.cpp` files, nobody is ever calling a void parameter function with arguments and having their arguments be thrown away). However, we may not be using C++ in the future, so I just want to lay down the precedent that if a function takes in no arguments, you must explicitly declare it as such. I would've added `-Wstrict-prototypes`, but it produces an annoying warning message saying it doesn't work in C++ mode if you're compiling in C++ mode. So it can be added later.
2021-02-25 23:23:59 +01:00
void preloaderrender(void)
Move preloader update code to new function preloaderlogic() Otherwise the preloader will go by way too quickly.
2020-05-04 19:06:07 +02:00
{
if(pre_transition>=30){
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
switch(pre_curcol) {
Fix mixed indentation in preloader.cpp Not that much, but only because it's not a big file to begin with.
2020-04-02 23:22:45 +02:00
case 0:
pre_lightcol = graphics.RGBflip(0xBF,0x59,0x6F);
pre_darkcol = graphics.RGBflip(0x88,0x3E,0x53);
break;
case 1:
pre_lightcol = graphics.RGBflip(0x6C,0xBC,0x5C);
pre_darkcol = graphics.RGBflip(0x50,0x86,0x40);
break;
case 2:
pre_lightcol = graphics.RGBflip(0x5D,0x57,0xAA);
pre_darkcol = graphics.RGBflip(0x2F,0x2F,0x6C);
break;
case 3:
pre_lightcol = graphics.RGBflip(0xB7,0xBA,0x5E);
pre_darkcol = graphics.RGBflip(0x84,0x83,0x42);
break;
case 4:
pre_lightcol = graphics.RGBflip(0x57,0x90,0xAA);
pre_darkcol = graphics.RGBflip(0x2F,0x5B,0x6C);
break;
case 5:
pre_lightcol = graphics.RGBflip(0x90,0x61,0xB1);
pre_darkcol = graphics.RGBflip(0x58,0x3D,0x71);
break;
default:
pre_lightcol = graphics.RGBflip(0x00,0x00,0x00);
pre_darkcol = graphics.RGBflip(0x08,0x00,0x00);
break;
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
for (int i = 0; i < 18; i++) {
pre_temprecty = (i * 16)- pre_offset;
Remove one trailing whitespace in preloader.cpp Only one.
2020-04-02 23:20:52 +02:00
if (i % 2 == 0)
Fix mixed indentation in preloader.cpp Not that much, but only because it's not a big file to begin with.
2020-04-02 23:22:45 +02:00
{
Remove global args from preloader.cpp This removes all global args from preloader.cpp, and changes all 'dwgfx' to 'graphics'.
2020-04-02 00:01:08 +02:00
FillRect(graphics.backBuffer, pre_temprectx, pre_temprecty, pre_temprectw,pre_temprecth, pre_lightcol);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Fix mixed indentation in preloader.cpp Not that much, but only because it's not a big file to begin with.
2020-04-02 23:22:45 +02:00
else
{
Remove global args from preloader.cpp This removes all global args from preloader.cpp, and changes all 'dwgfx' to 'graphics'.
2020-04-02 00:01:08 +02:00
FillRect(graphics.backBuffer, pre_temprectx, pre_temprecty, pre_temprectw,pre_temprecth, pre_darkcol);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
}
Remove global args from preloader.cpp This removes all global args from preloader.cpp, and changes all 'dwgfx' to 'graphics'.
2020-04-02 00:01:08 +02:00
FillRect(graphics.backBuffer, pre_frontrectx, pre_frontrecty, pre_frontrectw,pre_frontrecth, graphics.getBGR(0x3E,0x31,0xA2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
if(pre_fakepercent==100){
Remove global args from preloader.cpp This removes all global args from preloader.cpp, and changes all 'dwgfx' to 'graphics'.
2020-04-02 00:01:08 +02:00
graphics.Print(282-(15*8), 204, "LOADING... " + help.String(int(pre_fakepercent))+"%", 124, 112, 218, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}else{
Remove global args from preloader.cpp This removes all global args from preloader.cpp, and changes all 'dwgfx' to 'graphics'.
2020-04-02 00:01:08 +02:00
graphics.Print(282-(14*8), 204, "LOADING... " + help.String(int(pre_fakepercent))+"%", 124, 112, 218, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
//Render
if (pre_startgame) {
pre_transition = 29;
}
}else if (pre_transition <= -10) {
Move all fixed-timestep render updates to new file RenderFixed.cpp As part of fixing #464, I'll need to move these pieces of code around easily. In #220 I just kind of shoved them awkwardly in whatever fixed function would be last called in the gamestate loop, which I shouldn't have done as I've now had to make formal fixed-render functions anyway. Because these fixed functions need to be called directly before a render function, and I'm fixing the order to put render functions in their proper place, so I need to be able to move these around easily, and making them function calls instead of inlined makes them easier to manipulate.
2020-11-08 00:47:49 +01:00
//Switch to TITLEMODE (handled by preloaderrenderfixed)
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}else if (pre_transition < 5) {
Change all surface-clearing FillRect()s to use ClearSurface() ClearSurface() is less verbose than doing it the old way, and also conveys intent clearer. Plus, some of these FillRect()s had hardcoded width and height values, whereas ClearSurface() doesn't - meaning this change also has better future-proofing, in case the widths and heights of the surfaces involved change in the future.
2021-02-26 00:37:03 +01:00
ClearSurface(graphics.backBuffer);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}else if (pre_transition < 20) {
pre_temprecty = 0;
pre_temprecth = 240;
Remove global args from preloader.cpp This removes all global args from preloader.cpp, and changes all 'dwgfx' to 'graphics'.
2020-04-02 00:01:08 +02:00
FillRect(graphics.backBuffer, pre_temprectx, pre_temprecty, pre_temprectw,pre_temprecth, 0x000000);
FillRect(graphics.backBuffer, pre_frontrectx, pre_frontrecty, pre_frontrectw,pre_frontrecth, graphics.getBGR(0x3E,0x31,0xA2));
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
Remove global args from preloader.cpp This removes all global args from preloader.cpp, and changes all 'dwgfx' to 'graphics'.
2020-04-02 00:01:08 +02:00
graphics.Print(282-(15*8), 204, "LOADING... 100%", 124, 112, 218, false);
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Fix mixed indentation in preloader.cpp Not that much, but only because it's not a big file to begin with.
2020-04-02 23:22:45 +02:00
graphics.drawfade();
Only render screen effects on the title screen and in-game In-game because that's where screen effects are used the most. But on the title screen, screen effects are used when you press ACTION to start the game, and when you enable screen effects, too. Otherwise, we don't need screen effects for any other game-gamestate.
2020-04-27 04:29:40 +02:00
graphics.render();
Hello WWWWWWorld!
2020-01-01 21:29:24 +01:00
}
Reference in a new issue Copy permalink