matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preprocessor purge round 19: Split and minimize usage of Config.h

Browse Source 
Also mostly banish it from other headers, and shuffle standard header includes to minimize cross-contamination between headers.
This commit is contained in:
Tamás Bálint Misius 2023-01-20 23:28:31 +01:00
parent 6ea66f02de
commit 4f0c365e05
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
167 changed files with 271 additions and 563 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Activity.h
View File

@ -1,6 +1,4 @@
#pragma once
#include "Config.h"
#include "gui/interface/Window.h"
class Activity

56
src/Config.template.h
View File

@ -1,5 +1,4 @@
#pragma once
#include <cstdint>
constexpr bool SET_WINDOW_ICON = @SET_WINDOW_ICON@;
constexpr bool DEBUG = @DEBUG@;
@ -44,58 +43,3 @@ constexpr char STATICSCHEME[] = "https://";
constexpr char LOCAL_SAVE_DIR[] = "Saves";
constexpr char STAMPS_DIR[] = "stamps";
constexpr char BRUSH_DIR[] = "Brushes";
constexpr float M_GRAV = 6.67300e-1f;
constexpr int MENUSIZE = 40;
constexpr int BARSIZE = 17;
//CELL, the size of the pressure, gravity, and wall maps. Larger than 1 to prevent extreme lag
constexpr int CELL = 4;
constexpr int XCELLS = 153;
constexpr int YCELLS = 96;
constexpr int NCELL = XCELLS * YCELLS;
constexpr int XRES = XCELLS * CELL;
constexpr int YRES = YCELLS * CELL;
constexpr int NPART = XRES * YRES;
constexpr int XCNTR = XRES / 2;
constexpr int YCNTR = YRES / 2;
constexpr int WINDOWW = XRES + BARSIZE;
constexpr int WINDOWH = YRES + MENUSIZE;
constexpr int MAXSIGNS = 16;
constexpr int ISTP = CELL / 2;
constexpr float CFDS = 4.0f / CELL;
constexpr float SIM_MAXVELOCITY = 1e4f;
//Air constants
constexpr float AIR_TSTEPP = 0.3f;
constexpr float AIR_TSTEPV = 0.4f;
constexpr float AIR_VADV = 0.3f;
constexpr float AIR_VLOSS = 0.999f;
constexpr float AIR_PLOSS = 0.9999f;
constexpr int NGOL = 24;
constexpr int CIRCLE_BRUSH = 0;
constexpr int SQUARE_BRUSH = 1;
constexpr int TRI_BRUSH = 2;
constexpr int BRUSH_NUM = 3;
//Photon constants
constexpr int SURF_RANGE = 10;
constexpr int NORMAL_MIN_EST = 3;
constexpr int NORMAL_INTERP = 20;
constexpr int NORMAL_FRAC = 16;
constexpr auto REFRACT = UINT32_C(0x80000000);
/* heavy flint glass, for awesome refraction/dispersion
this way you can make roof prisms easily */
constexpr float GLASS_IOR = 1.9f;
constexpr float GLASS_DISP = 0.07f;
constexpr float R_TEMP = 22;

2
src/Format.h
View File

@ -1,6 +1,4 @@
#pragma once
#include "Config.h"
#include "common/String.h"
#include <vector>

8
src/Misc.cpp
View File

@ -1,14 +1,10 @@
#include "Misc.h"
#include "Config.h"
#include "common/tpt-minmax.h"
#include "common/String.h"
#include <cstring>
#include <sys/types.h>
#include <cmath>
#include "common/tpt-minmax.h"
#include "common/String.h"
const static char hex[] = "0123456789ABCDEF";
void strcaturl(char *dst, char *src)
{

1
src/Misc.h
View File

@ -1,5 +1,4 @@
#pragma once
#include "Config.h"
#include <cmath>
#include <cstdio>
#include <cstdlib>

18
src/PowderToyFontEditor.cpp
View File

@ -1,22 +1,10 @@
#include "Config.h"
#include <ctime>
#include <climits>
#include <iostream>
#include <stdexcept>
#include <SDL.h>
#include "Format.h"
#include "Misc.h"
#include "WindowIcon.h"
#include "graphics/Graphics.h"
#include "client/SaveInfo.h"
#include "client/GameSave.h"
#include "client/SaveFile.h"
#include "common/Platform.h"
#include "common/tpt-rand.h"
#include "gui/game/GameController.h"
@ -26,6 +14,12 @@
#include "gui/dialogues/ConfirmPrompt.h"
#include "gui/Style.h"
#include "gui/interface/Engine.h"
#include "Config.h"
#include <ctime>
#include <climits>
#include <iostream>
#include <stdexcept>
#include <SDL.h>
int desktopWidth = 1280, desktopHeight = 1024;

13
src/PowderToyRenderer.cpp
View File

@ -1,20 +1,15 @@
#include "Config.h"
#include "graphics/Graphics.h"
#include "graphics/Renderer.h"
#include <ctime>
#include <iostream>
#include <fstream>
#include <vector>
#include "common/String.h"
#include "common/tpt-rand.h"
#include "Format.h"
#include "gui/interface/Engine.h"
#include "client/GameSave.h"
#include "simulation/Simulation.h"
#include <ctime>
#include <iostream>
#include <fstream>
#include <vector>
void EngineProcess() {}
void ClipboardPush(ByteString) {}

31
src/PowderToySDL.cpp
View File

@ -1,25 +1,9 @@
#include "Config.h"
#include "common/tpt-minmax.h"
#include <map>
#include <optional>
#include <ctime>
#include <climits>
#include <cstdint>
#include <SDL.h>
#include <iostream>
#include <csignal>
#include <stdexcept>
#include <sys/stat.h>
#include <SDL.h>
#include "SimulationConfig.h"
#include "Format.h"
#include "X86KillDenormals.h"
#include "WindowIcon.h"
#include "Misc.h"
#include "prefs/GlobalPrefs.h"
#include "client/Client.h"
#include "client/GameSave.h"
@ -32,12 +16,23 @@
#include "common/tpt-rand.h"
#include "gui/game/Favorite.h"
#include "gui/Style.h"
#include "gui/game/GameController.h"
#include "gui/game/GameView.h"
#include "gui/dialogues/ConfirmPrompt.h"
#include "gui/dialogues/ErrorMessage.h"
#include "gui/interface/Engine.h"
#include "Config.h"
#include <map>
#include <optional>
#include <ctime>
#include <climits>
#include <cstdint>
#include <SDL.h>
#include <iostream>
#include <csignal>
#include <stdexcept>
#include <sys/stat.h>
#include <SDL.h>
int desktopWidth = 1280, desktopHeight = 1024;

3
src/Probability.cpp
View File

@ -14,10 +14,9 @@
*/
#include "Probability.h"
#include "common/tpt-rand.h"
#include <numeric>
#include <cstdlib>
#include "common/tpt-rand.h"
namespace Probability
{

3
src/Probability.h
View File

@ -14,10 +14,7 @@
*/
#pragma once
#include "Config.h"
// This file is used for EMP, to simulate many EMP going off at once at the end of the frame
#include <cmath>
namespace Probability

57
src/SimulationConfig.h Normal file
View File

@ -0,0 +1,57 @@
#pragma once
#include <cstdint>
constexpr int MENUSIZE = 40;
constexpr int BARSIZE = 17;
constexpr float M_GRAV = 6.67300e-1f;
//CELL, the size of the pressure, gravity, and wall maps. Larger than 1 to prevent extreme lag
constexpr int CELL = 4;
constexpr int XCELLS = 153;
constexpr int YCELLS = 96;
constexpr int NCELL = XCELLS * YCELLS;
constexpr int XRES = XCELLS * CELL;
constexpr int YRES = YCELLS * CELL;
constexpr int NPART = XRES * YRES;
constexpr int XCNTR = XRES / 2;
constexpr int YCNTR = YRES / 2;
constexpr int WINDOWW = XRES + BARSIZE;
constexpr int WINDOWH = YRES + MENUSIZE;
constexpr int MAXSIGNS = 16;
constexpr int ISTP = CELL / 2;
constexpr float CFDS = 4.0f / CELL;
constexpr float SIM_MAXVELOCITY = 1e4f;
//Air constants
constexpr float AIR_TSTEPP = 0.3f;
constexpr float AIR_TSTEPV = 0.4f;
constexpr float AIR_VADV = 0.3f;
constexpr float AIR_VLOSS = 0.999f;
constexpr float AIR_PLOSS = 0.9999f;
constexpr int NGOL = 24;
constexpr int CIRCLE_BRUSH = 0;
constexpr int SQUARE_BRUSH = 1;
constexpr int TRI_BRUSH = 2;
constexpr int BRUSH_NUM = 3;
//Photon constants
constexpr int SURF_RANGE = 10;
constexpr int NORMAL_MIN_EST = 3;
constexpr int NORMAL_INTERP = 20;
constexpr int NORMAL_FRAC = 16;
constexpr auto REFRACT = UINT32_C(0x80000000);
/* heavy flint glass, for awesome refraction/dispersion
this way you can make roof prisms easily */
constexpr float GLASS_IOR = 1.9f;
constexpr float GLASS_DISP = 0.07f;
constexpr float R_TEMP = 22;

5
src/bson/BSON.h
View File

@ -19,16 +19,13 @@
*/
#pragma once
#include "Config.h"
#include "common/tpt-inline.h"
#include <ctime>
#include <cstdlib>
#include <cstring>
#include <cstdio>
#include <cstdarg>
#include <climits>
#include "common/tpt-inline.h"
#include <cstdint>
constexpr int BSON_OK = 0;

2
src/bzip2/bz2wrap.cpp
View File

@ -1,7 +1,5 @@
#include "bz2wrap.h"
#include "bzlib.h"
#include <memory>
#include <functional>
#include <vector>

1
src/bzip2/bz2wrap.h
View File

@ -1,5 +1,4 @@
#pragma once
#include <cstddef>
#include <vector>

34
src/client/Client.cpp
View File

@ -1,8 +1,19 @@
#include "Client.h"
#include "prefs/GlobalPrefs.h"
#include "client/http/Request.h" // includes curl.h, needs to come first to silence a warning on windows
#include "client/http/Request.h"
#include "ClientListener.h"
#include "Format.h"
#include "MD5.h"
#include "client/GameSave.h"
#include "client/SaveFile.h"
#include "client/SaveInfo.h"
#include "client/UserInfo.h"
#include "common/Platform.h"
#include "common/String.h"
#include "graphics/Graphics.h"
#include "lua/CommandInterface.h"
#include "gui/preview/Comment.h"
#include "Config.h"
#include <cstring>
#include <cstdlib>
#include <vector>
@ -13,23 +24,6 @@
#include <cstdio>
#include <fstream>
#include "ClientListener.h"
#include "Config.h"
#include "Format.h"
#include "MD5.h"
#include "client/GameSave.h"
#include "client/SaveFile.h"
#include "client/SaveInfo.h"
#include "client/UserInfo.h"
#include "common/Platform.h"
#include "common/String.h"
#include "graphics/Graphics.h"
#include "lua/CommandInterface.h"
#include "gui/preview/Comment.h"
Client::Client():
messageOfTheDay("Fetching the message of the day..."),
versionCheckRequest(nullptr),

10
src/client/Client.h
View File

@ -1,16 +1,12 @@
#pragma once
#include "Config.h"
#include "common/String.h"
#include "common/ExplicitSingleton.h"
#include "User.h"
#include <vector>
#include <list>
#include <memory>
#include "common/String.h"
#include "common/ExplicitSingleton.h"
#include <json/json.h>
#include "User.h"
class SaveInfo;
class SaveFile;
class SaveComment;

22
src/client/GameSave.cpp
View File

@ -1,5 +1,13 @@
#include "GameSave.h"
#include "bzip2/bz2wrap.h"
#include "Format.h"
#include "simulation/Simulation.h"
#include "simulation/ElementClasses.h"
#include "common/tpt-minmax.h"
#include "common/tpt-compat.h"
#include "bson/BSON.h"
#include "graphics/Renderer.h"
#include "Config.h"
#include <iostream>
#include <cmath>
#include <climits>
@ -7,18 +15,6 @@
#include <set>
#include <cmath>
#include "bzip2/bz2wrap.h"
#include "Config.h"
#include "Format.h"
#include "simulation/Simulation.h"
#include "simulation/ElementClasses.h"
#include "common/tpt-minmax.h"
#include "common/tpt-compat.h"
#include "bson/BSON.h"
#include "graphics/Renderer.h"
static void ConvertJsonToBson(bson *b, Json::Value j, int depth = 0);
static void ConvertBsonToJson(bson_iterator *b, Json::Value *j, int depth = 0);
static void CheckBsonFieldUser(bson_iterator iter, const char *field, unsigned char **data, unsigned int *fieldLen);

6
src/client/GameSave.h
View File

@ -1,12 +1,10 @@
#pragma once
#include "Config.h"
#include <vector>
#include "common/String.h"
#include "simulation/Sign.h"
#include "simulation/Particle.h"
#include "Misc.h"
#include "SimulationConfig.h"
#include <vector>
#include <json/json.h>
struct sign;

2
src/client/MD5.cpp
View File

@ -1,6 +1,6 @@
// based on public-domain code from Colin Plumb (1993)
#include <cstring>
#include "MD5.h"
#include <cstring>
static unsigned getu32(const unsigned char *addr)
{

1
src/client/MD5.h
View File

@ -1,5 +1,4 @@
#pragma once
#include "Config.h"
struct md5_context
{

4
src/client/SaveInfo.h
View File

@ -1,8 +1,6 @@
#pragma once
#include "Config.h"
#include <list>
#include "common/String.h"
#include <list>
#ifdef GetUserName
# undef GetUserName // dammit windows

1
src/client/http/APIRequest.h
View File

@ -2,7 +2,6 @@
#include "Request.h"
#include "common/String.h"
#include <json/json.h>
#include <memory>
#include <map>

3
src/client/http/GetUserInfoRequest.cpp
View File

@ -1,7 +1,6 @@
#include "GetUserInfoRequest.h"
#include "Config.h"
#include "client/UserInfo.h"
#include "Config.h"
namespace http
{

3
src/client/http/ImageRequest.cpp
View File

@ -1,8 +1,5 @@
#include "ImageRequest.h"
#include "graphics/Graphics.h"
#include "Config.h"
#include <iostream>
namespace http

1
src/client/http/RequestManager.cpp
View File

@ -1,5 +1,6 @@
#include "RequestManager.h"
#include "Request.h"
#include "Config.h"
#include <iostream>
namespace http

1
src/client/http/RequestManagerHttp.cpp
View File

@ -2,6 +2,7 @@
#include "RequestManager.h"
#include "Request.h"
#include "CurlError.h"
#include "Config.h"
#if defined(CURL_AT_LEAST_VERSION) && CURL_AT_LEAST_VERSION(7, 55, 0)
# define REQUEST_USE_CURL_OFFSET_T

3
src/client/http/SaveUserInfoRequest.cpp
View File

@ -1,7 +1,6 @@
#include "SaveUserInfoRequest.h"
#include "Config.h"
#include "client/UserInfo.h"
#include "Config.h"
namespace http
{

1
src/client/http/ThumbnailRequest.cpp
View File

@ -1,5 +1,4 @@
#include "ThumbnailRequest.h"
#include "Config.h"
namespace http

1
src/common/Platform.cpp
View File

@ -1,6 +1,7 @@
#include "Platform.h"
#include "resource.h"
#include "tpt-rand.h"
#include "Config.h"
#include <memory>
#include <cstring>
#include <fstream>

1
src/common/Platform.h
View File

@ -1,5 +1,4 @@
#pragma once
#include "Config.h"
#include "common/String.h"
#include <string>

5
src/common/PlatformLinux.cpp
View File

@ -1,10 +1,11 @@
#include "Platform.h"
#include <cstring>
#include <ctime>
#include "icon_cps.png.h"
#include "icon_exe.png.h"
#include "save.xml.h"
#include "powder.desktop.h"
#include "Config.h"
#include <cstring>
#include <ctime>
namespace Platform
{

5
src/common/PlatformWindows.cpp
View File

@ -1,10 +1,11 @@
#include "Platform.h"
#include "resource.h"
#include <iostream>
#include <sys/stat.h>
#include "Config.h"
#ifndef NOMINMAX
# define NOMINMAX
#endif
#include <iostream>
#include <sys/stat.h>
#include <io.h>
#include <shlobj.h>
#include <shlwapi.h>

5
src/common/String.h
View File

@ -1,6 +1,5 @@
#pragma once
#include "Config.h"
#include "tpt-minmax.h"
#include <stdexcept>
#include <sstream>
#include <vector>
@ -9,8 +8,6 @@
#include <locale>
#include <ios>
#include "tpt-minmax.h"
/*
There are two "string" classes: ByteString and String. They have nearly
identical interfaces, except that one stores 8-bit octets (bytes) and

4
src/common/tpt-rand.h
View File

@ -1,8 +1,6 @@
#pragma once
#include "Config.h"
#include <stdint.h>
#include "ExplicitSingleton.h"
#include <stdint.h>
class RNGType
{

2
src/common/tpt-thread-local.h
View File

@ -1,6 +1,4 @@
#pragma once
#include "Config.h"
#ifdef __MINGW32__
# include <cstddef>

2
src/debug/DebugInfo.h
View File

@ -1,6 +1,4 @@
#pragma once
#include "Config.h"
#include "gui/interface/Point.h"
class DebugInfo

4
src/debug/DebugLines.cpp
View File

@ -1,10 +1,8 @@
#include "DebugLines.h"
#include "gui/game/GameView.h"
#include "gui/game/GameController.h"
#include "graphics/Graphics.h"
#include "SimulationConfig.h"
DebugLines::DebugLines(unsigned int id, GameView * view, GameController * controller):
DebugInfo(id),

11
src/graphics/Graphics.cpp
View File

@ -1,16 +1,13 @@
#include "Graphics.h"
#include "common/Platform.h"
#include "FontReader.h"
#include "resampler/resampler.h"
#include "SimulationConfig.h"
#include <cmath>
#include <iostream>
#include <cstdlib>
#include <cstring>
#include <bzlib.h>
#include "common/Platform.h"
#include "FontReader.h"
#include "resampler/resampler.h"
#include <png.h>
VideoBuffer::VideoBuffer(int width, int height):

10
src/graphics/Graphics.h
View File

@ -1,6 +1,4 @@
#pragma once
#include "Config.h"
#include "common/String.h"
#include "common/tpt-inline.h"
#include "Pixel.h"
@ -70,10 +68,10 @@ public:
class Graphics
{
int clipx1 = 0;
int clipy1 = 0;
int clipx2 = WINDOWW;
int clipy2 = WINDOWH;
int clipx1;
int clipy1;
int clipx2;
int clipy2;
public:
pixel *vid;

8
src/graphics/RasterGraphics.cpp
View File

@ -1,10 +1,14 @@
#include "Graphics.h"
#include "SimulationConfig.h"
#include <cstdlib>
#include <cstring>
Graphics::Graphics():
sdl_scale(1)
clipx1(0),
clipy1(0),
clipx2(WINDOWW),
clipy2(WINDOWH),
sdl_scale(1)
{
vid = (pixel *)malloc(PIXELSIZE * (WINDOWW * WINDOWH));

2
src/graphics/Renderer.cpp
View File

@ -1,5 +1,4 @@
#include "Renderer.h"
#include <cmath>
#include "Misc.h"
#include "common/tpt-rand.h"
#include "common/tpt-compat.h"
@ -8,6 +7,7 @@
#include "simulation/ElementClasses.h"
#include "simulation/Air.h"
#include "simulation/Gravity.h"
#include <cmath>
constexpr auto VIDXRES = WINDOWW;
constexpr auto VIDYRES = WINDOWH;

8
src/graphics/Renderer.h
View File

@ -1,11 +1,9 @@
#pragma once
#include "Config.h"
#include <vector>
#include <mutex>
#include "Graphics.h"
#include "gui/interface/Point.h"
#include "SimulationConfig.h"
#include <vector>
#include <mutex>
class RenderPreset;
class Simulation;

2
src/graphics/RendererBasic.cpp
View File

@ -1,9 +1,9 @@
#include "Renderer.h"
#include <cmath>
#include "gui/game/RenderPreset.h"
#include "simulation/Simulation.h"
#include "simulation/ElementGraphics.h"
#include "simulation/ElementClasses.h"
#include <cmath>
constexpr auto VIDXRES = WINDOWW;
constexpr auto VIDYRES = WINDOWH;

2
src/gui/Style.h
View File

@ -1,6 +1,4 @@
#pragma once
#include "Config.h"
#include "gui/interface/Colour.h"
namespace style

3
src/gui/console/ConsoleController.h
View File

@ -1,8 +1,5 @@
#pragma once
#include "Config.h"
#include "common/String.h"
#include <functional>
class CommandInterface;

4
src/gui/console/ConsoleModel.h
View File

@ -1,9 +1,7 @@
#pragma once
#include "Config.h"
#include "ConsoleCommand.h"
#include <vector>
#include <deque>
#include "ConsoleCommand.h"
class ConsoleView;
class ConsoleModel

12
src/gui/console/ConsoleView.cpp
View File

@ -1,19 +1,13 @@
#include "ConsoleView.h"
#include "ConsoleController.h"
#include "ConsoleModel.h"
#include <deque>
#include <SDL.h>
#include "graphics/Graphics.h"
#include "Config.h"
#include "ConsoleCommand.h"
#include "gui/interface/Label.h"
#include "gui/interface/Textbox.h"
#include "SimulationConfig.h"
#include <deque>
#include <SDL.h>
ConsoleView::ConsoleView():
ui::Window(ui::Point(0, 0), ui::Point(WINDOWW, 150)),

2
src/gui/console/ConsoleView.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <vector>
#include "gui/interface/Window.h"
#include <vector>
namespace ui
{

5
src/gui/dialogues/SaveIDMessage.cpp
View File

@ -1,14 +1,11 @@
#include "SaveIDMessage.h"
#include "gui/Style.h"
#include "graphics/Graphics.h"
#include "gui/interface/Button.h"
#include "gui/interface/CopyTextButton.h"
#include "gui/interface/Label.h"
#include "Format.h"
#include "SimulationConfig.h"
SaveIDMessage::SaveIDMessage(int id):
ui::Window(ui::Point((XRES-244)/2, (YRES-90)/2), ui::Point(244, 90))

2
src/gui/elementsearch/ElementSearchActivity.h
View File

@ -1,8 +1,8 @@
#pragma once
#include <vector>
#include "Activity.h"
#include "common/String.h"
#include "gui/interface/Point.h"
#include <vector>
class Tool;
class ToolButton;

5
src/gui/filebrowser/FileBrowserActivity.cpp
View File

@ -1,7 +1,5 @@
#include "FileBrowserActivity.h"
#include <algorithm>
#include "client/GameSave.h"
#include "client/SaveFile.h"
#include "common/Platform.h"
@ -18,6 +16,9 @@
#include "gui/interface/ScrollPanel.h"
#include "gui/interface/Textbox.h"
#include "Config.h"
#include <algorithm>
//Currently, reading is done on another thread, we can't render outside the main thread due to some bullshit with OpenGL
class LoadFilesTask: public Task
{

17
src/gui/font/FontEditor.cpp
View File

@ -1,21 +1,18 @@
#include <stdexcept>
#include <cstdint>
#include <fstream>
#include <iterator>
#include <iomanip>
#include <iostream>
#include "FontEditor.h"
#include "bzip2/bz2wrap.h"
#include "Config.h"
#include "gui/interface/Textbox.h"
#include "gui/interface/Engine.h"
#include "gui/interface/Point.h"
#include "gui/interface/Button.h"
#include "gui/interface/ScrollPanel.h"
#include "graphics/Graphics.h"
#include "SimulationConfig.h"
#include <stdexcept>
#include <fstream>
#include <iterator>
#include <iomanip>
#include <iostream>
#include <cstdint>
#include <SDL.h>
extern unsigned char *font_data;

6
src/gui/game/BitmapBrush.cpp
View File

@ -1,9 +1,7 @@
#include "BitmapBrush.h"
#include <cmath>
#include "Misc.h"
#include "common/tpt-minmax.h"
#include "Misc.h"
#include <cmath>
BitmapBrush::BitmapBrush(unsigned char *newBitmap, ui::Point rectSize_):
Brush(ui::Point(0, 0)),

2
src/gui/game/Brush.h
View File

@ -1,6 +1,4 @@
#pragma once
#include "Config.h"
#include "gui/interface/Point.h"
class Renderer;

2
src/gui/game/EllipseBrush.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <cmath>
#include "Brush.h"
#include <cmath>
class EllipseBrush: public Brush
{

4
src/gui/game/Favorite.cpp
View File

@ -1,8 +1,6 @@
#include "Favorite.h"
#include <json/json.h>
#include "prefs/GlobalPrefs.h"
#include <json/json.h>
#include <algorithm>
Favorite::Favorite():

5
src/gui/game/Favorite.h
View File

@ -1,10 +1,7 @@
#pragma once
#include "Config.h"
#include "common/String.h"
#include <vector>
#include "common/ExplicitSingleton.h"
#include <vector>
class Favorite : public ExplicitSingleton<Favorite>
{

2
src/gui/game/GameController.cpp
View File

@ -1,7 +1,6 @@
#include "GameController.h"
#include "Brush.h"
#include "Config.h"
#include "Controller.h"
#include "Format.h"
#include "GameModel.h"
@ -62,6 +61,7 @@
#include "gui/tags/TagsController.h"
#include "gui/tags/TagsView.h"
#include "Config.h"
#include <SDL.h>
#ifdef GetUserName

18
src/gui/game/GameController.h
View File

@ -1,20 +1,14 @@
#pragma once
#include "Config.h"
#include "client/ClientListener.h"
#include "gui/interface/Point.h"
#include "gui/interface/Colour.h"
#include "simulation/Sign.h"
#include "simulation/Particle.h"
#include "Misc.h"
#include <vector>
#include <utility>
#include <memory>
#include "client/ClientListener.h"
#include "gui/interface/Point.h"
#include "gui/interface/Colour.h"
#include "simulation/Sign.h"
#include "simulation/Particle.h"
#include "Misc.h"
class DebugInfo;
class SaveFile;
class Notification;

1
src/gui/game/GameControllerEvents.h
View File

@ -1,5 +1,4 @@
#pragma once
#include "Config.h"
#include "common/String.h"
#include <variant>

8
src/gui/game/GameModel.cpp
View File

@ -1,8 +1,4 @@
#include "GameModel.h"
#include <iostream>
#include <algorithm>
#include "BitmapBrush.h"
#include "EllipseBrush.h"
#include "Favorite.h"
@ -15,7 +11,6 @@
#include "TriangleBrush.h"
#include "QuickOptions.h"
#include "lua/CommandInterface.h"
#include "prefs/GlobalPrefs.h"
#include "client/Client.h"
#include "client/GameSave.h"
@ -32,9 +27,10 @@
#include "simulation/ElementClasses.h"
#include "simulation/ElementGraphics.h"
#include "simulation/ToolClasses.h"
#include "gui/game/DecorationTool.h"
#include "gui/interface/Engine.h"
#include <iostream>
#include <algorithm>
HistoryEntry::~HistoryEntry()
{

9
src/gui/game/GameModel.h
View File

@ -1,13 +1,10 @@
#pragma once
#include "Config.h"
#include <vector>
#include <deque>
#include <memory>
#include "gui/interface/Colour.h"
#include "client/User.h"
#include "gui/interface/Point.h"
#include <vector>
#include <deque>
#include <memory>
class Menu;
class Tool;

2
src/gui/game/GameView.cpp
View File

@ -1,7 +1,6 @@
#include "GameView.h"
#include "Brush.h"
#include "Config.h"
#include "DecorationTool.h"
#include "Favorite.h"
#include "Format.h"
@ -34,6 +33,7 @@
#include "gui/interface/Colour.h"
#include "gui/interface/Engine.h"
#include "Config.h"
#include <cstring>
#include <iostream>
#include <SDL.h>

6
src/gui/game/GameView.h
View File

@ -1,10 +1,10 @@
#pragma once
#include <ctime>
#include <vector>
#include <deque>
#include "common/String.h"
#include "gui/interface/Window.h"
#include "simulation/Sample.h"
#include <ctime>
#include <vector>
#include <deque>
enum DrawMode
{

2
src/gui/game/Menu.h
View File

@ -1,6 +1,4 @@
#pragma once
#include "Config.h"
#include "common/String.h"
class Tool;

1
src/gui/game/PropertyTool.cpp
View File

@ -21,6 +21,7 @@
#include "graphics/Graphics.h"
#include "Config.h"
#include <iostream>
#include <SDL.h>

3
src/gui/game/QuickOption.h
View File

@ -1,8 +1,5 @@
#pragma once
#include "Config.h"
#include "common/String.h"
#include <vector>
class GameModel;

2
src/gui/game/Tool.h
View File

@ -1,6 +1,4 @@
#pragma once
#include "Config.h"
#include "common/String.h"
#include "gui/interface/Point.h"
#include "simulation/StructProperty.h"

5
src/gui/game/ToolButton.cpp
View File

@ -1,10 +1,7 @@
#include "ToolButton.h"
#include "graphics/Graphics.h"
#include <SDL.h>
#include "Favorite.h"
#include <SDL.h>
ToolButton::ToolButton(ui::Point position, ui::Point size, String text, ByteString toolIdentifier, String toolTip):
ui::Button(position, size, text, toolTip),

2
src/gui/game/TriangleBrush.h
View File

@ -6,8 +6,8 @@
*/
#pragma once
#include <cmath>
#include "Brush.h"
#include <cmath>
class TriangleBrush: public Brush
{

2
src/gui/interface/Appearance.cpp
View File

@ -1,6 +1,6 @@
#include <iostream>
#include "Appearance.h"
#include "graphics/Graphics.h"
#include <iostream>
namespace ui
{

2
src/gui/interface/Appearance.h
View File

@ -1,6 +1,4 @@
#pragma once
#include "Config.h"
#include "Border.h"
#include "Colour.h"
#include "graphics/Icons.h"

6
src/gui/interface/AvatarButton.cpp
View File

@ -1,11 +1,11 @@
#include <iostream>
#include <SDL.h>
#include "Button.h"
#include "AvatarButton.h"
#include "Format.h"
#include "graphics/Graphics.h"
#include "ContextMenu.h"
#include "Config.h"
#include <iostream>
#include <SDL.h>
namespace ui {

1
src/gui/interface/Button.h
View File

@ -1,7 +1,6 @@
#pragma once
#include "common/String.h"
#include "Component.h"
#include <functional>
namespace ui

1
src/gui/interface/Checkbox.h
View File

@ -1,7 +1,6 @@
#pragma once
#include "common/String.h"
#include "Component.h"
#include <functional>
namespace ui

2
src/gui/interface/Component.h
View File

@ -1,6 +1,4 @@
#pragma once
#include "Config.h"
#include "common/String.h"
#include "Appearance.h"
#include "Point.h"

3
src/gui/interface/ContextMenu.cpp
View File

@ -1,8 +1,7 @@
#include "ContextMenu.h"
#include "graphics/Graphics.h"
#include "common/tpt-minmax.h"
#include "SimulationConfig.h"
using namespace ui;

2
src/gui/interface/DirectionSelector.h
View File

@ -2,9 +2,7 @@
#include "Component.h"
#include "Colour.h"
#include "graphics/Graphics.h"
#include <iostream>
#include <cmath>
#include <vector>
#include <functional>

3
src/gui/interface/DropDown.h
View File

@ -1,7 +1,6 @@
#pragma once
#include <utility>
#include "Component.h"
#include <utility>
#include <functional>
namespace ui {

9
src/gui/interface/Engine.cpp
View File

@ -1,16 +1,11 @@
#include "Engine.h"
#include <cmath>
#include <cstring>
#include "Config.h"
#include "PowderToy.h"
#include "Window.h"
#include "common/Platform.h"
#include "graphics/Graphics.h"
#include "gui/dialogues/ConfirmPrompt.h"
#include <cmath>
#include <cstring>
using namespace ui;

3
src/gui/interface/Engine.h
View File

@ -1,10 +1,9 @@
#pragma once
#include <stack>
#include "common/String.h"
#include "common/ExplicitSingleton.h"
#include "graphics/Pixel.h"
#include "gui/interface/Point.h"
#include <stack>
class Graphics;
namespace ui

3
src/gui/interface/Label.cpp
View File

@ -1,13 +1,10 @@
#include "Label.h"
#include "Format.h"
#include "Point.h"
#include "PowderToy.h"
#include "ContextMenu.h"
#include "graphics/Graphics.h"
#include "graphics/FontReader.h"
#include <SDL.h>
using namespace ui;

3
src/gui/interface/Panel.h
View File

@ -1,9 +1,8 @@
#pragma once
#include <vector>
#include "graphics/Pixel.h"
#include "gui/interface/Point.h"
#include "gui/interface/Component.h"
#include <vector>
class Graphics;
namespace ui

8
src/gui/interface/RichLabel.cpp
View File

@ -1,16 +1,12 @@
#include "RichLabel.h"
#include <vector>
#include <exception>
#include "Colour.h"
#include "common/Platform.h"
#include "graphics/FontReader.h"
#include "graphics/Graphics.h"
#include "gui/interface/Component.h"
#include "gui/interface/Point.h"
#include <vector>
#include <exception>
using namespace ui;

1
src/gui/interface/SaveButton.cpp
View File

@ -11,6 +11,7 @@
#include "gui/dialogues/ErrorMessage.h"
#include "graphics/Graphics.h"
#include "SimulationConfig.h"
#include <SDL.h>
namespace ui {

1
src/gui/interface/Slider.h
View File

@ -2,7 +2,6 @@
#include "Component.h"
#include "Colour.h"
#include "graphics/Pixel.h"
#include <functional>
namespace ui {

4
src/gui/interface/Spinner.cpp
View File

@ -1,8 +1,6 @@
#include "Spinner.h"
#include <cmath>
#include "graphics/Graphics.h"
#include <cmath>
using namespace ui;

6
src/gui/interface/Textbox.cpp
View File

@ -1,18 +1,12 @@
#include "Textbox.h"
#include "Config.h"
#include "Format.h"
#include "PowderToy.h"
#include "common/Platform.h"
#include "graphics/FontReader.h"
#include "graphics/Graphics.h"
#include "gui/interface/Engine.h"
#include "gui/interface/Point.h"
#include "ContextMenu.h"
#include <SDL.h>
using namespace ui;

2
src/gui/interface/Window.cpp
View File

@ -6,6 +6,8 @@
#include "graphics/Graphics.h"
#include "Config.h"
#include "SimulationConfig.h"
#include <SDL.h>
using namespace ui;

2
src/gui/interface/Window.h
View File

@ -1,7 +1,7 @@
#pragma once
#include "common/String.h"
#include <vector>
#include "gui/interface/Point.h"
#include <vector>
class Graphics;
namespace ui

3
src/gui/localbrowser/LocalBrowserController.h
View File

@ -1,8 +1,5 @@
#pragma once
#include "Config.h"
#include "common/String.h"
#include <functional>
class SaveFile;

4
src/gui/localbrowser/LocalBrowserModel.h
View File

@ -1,8 +1,6 @@
#pragma once
#include "Config.h"
#include <vector>
#include "common/String.h"
#include <vector>
class SaveFile;

8
src/gui/localbrowser/LocalBrowserView.cpp
View File

@ -1,20 +1,14 @@
#include "LocalBrowserView.h"
#include "LocalBrowserController.h"
#include "LocalBrowserModel.h"
#include "gui/interface/Button.h"
#include "gui/interface/Textbox.h"
#include "gui/interface/Label.h"
#include "gui/interface/SaveButton.h"
#include "PowderToy.h"
#include "Config.h"
#include "client/SaveFile.h"
#include "graphics/Graphics.h"
#include "SimulationConfig.h"
#include <SDL.h>
LocalBrowserView::LocalBrowserView():

2
src/gui/localbrowser/LocalBrowserView.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <vector>
#include "gui/interface/Window.h"
#include <vector>
namespace ui
{

3
src/gui/login/LoginController.h
View File

@ -1,9 +1,6 @@
#pragma once
#include "Config.h"
#include "common/String.h"
#include "client/User.h"
#include <functional>
class LoginView;

4
src/gui/login/LoginModel.h
View File

@ -1,9 +1,7 @@
#pragma once
#include "Config.h"
#include <vector>
#include "common/String.h"
#include "client/User.h"
#include <vector>
class LoginView;
class LoginModel

2
src/gui/options/OptionsController.h
View File

@ -1,6 +1,4 @@
#pragma once
#include "Config.h"
#include <functional>
class GameModel;

2
src/gui/options/OptionsModel.h
View File

@ -1,6 +1,4 @@
#pragma once
#include "Config.h"
#include <vector>
class GameModel;

12
src/gui/options/OptionsView.cpp
View File

@ -1,21 +1,13 @@
#include "OptionsView.h"
#include <cstdio>
#include <cstring>
#include <cmath>
#include <SDL.h>
#include "Format.h"
#include "OptionsController.h"
#include "OptionsModel.h"
#include "common/Platform.h"
#include "graphics/Graphics.h"
#include "graphics/Renderer.h"
#include "gui/Style.h"
#include "simulation/ElementDefs.h"
#include "client/Client.h"
#include "gui/dialogues/ConfirmPrompt.h"
#include "gui/dialogues/InformationMessage.h"
#include "gui/interface/Button.h"
@ -25,6 +17,10 @@
#include "gui/interface/Label.h"
#include "gui/interface/Textbox.h"
#include "gui/interface/DirectionSelector.h"
#include <cstdio>
#include <cstring>
#include <cmath>
#include <SDL.h>
OptionsView::OptionsView():
ui::Window(ui::Point(-1, -1), ui::Point(320, 340))

5
src/gui/preview/PreviewController.cpp
View File

@ -1,19 +1,16 @@
#include "PreviewController.h"
#include "Config.h"
#include "Controller.h"
#include "PreviewModel.h"
#include "PreviewModelException.h"
#include "PreviewView.h"
#include "client/Client.h"
#include "client/SaveInfo.h"
#include "common/Platform.h"
#include "gui/dialogues/ErrorMessage.h"
#include "gui/dialogues/InformationMessage.h"
#include "gui/login/LoginController.h"
#include "gui/login/LoginView.h"
#include "Config.h"
PreviewController::PreviewController(int saveID, int saveDate, bool instant, std::function<void ()> onDone_):
saveId(saveID),

Some files were not shown because too many files have changed in this diff Show More