sdaveb/elemental-game
sdaveb/elemental-game
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects 1 Releases Wiki Activity

Remove json serialization support from GameSettings and RenderSettings classes
Some checks failed
buildbot/elemental-game-linux-builder Build done.
Details
buildbot/elemental-game-macos-builder Build done.
Details

Browse Source
This commit is contained in:
S David 2024-09-07 22:45:48 -04:00
parent 2b0350bbdc
commit 370729c637
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Apps/Demos/phong/GameSettings.hpp
View File

@ -21,7 +21,6 @@ namespace elemental {
struct GameSettings { struct GameSettings {
RendererSettings renderer_settings; RendererSettings renderer_settings;
JSON_SERIALIZABLE(GameSettings, renderer_settings);
TOML_CLASS(GameSettings, renderer_settings); TOML_CLASS(GameSettings, renderer_settings);
}; };

17
Modules/elemental/types/rendering.hpp
View File

@ -9,7 +9,6 @@
#pragma once #pragma once
#include "IOCore/util/serialization.hpp"
#include "IOCore/util/toml.hpp" #include "IOCore/util/toml.hpp"
#include <cstdint> #include <cstdint>
@ -19,14 +18,12 @@ namespace elemental {
struct Point { struct Point {
uint32_t x, y; uint32_t x, y;
JSON_SERIALIZABLE(Point, x, y);
TOML_CLASS(Point, x, y); TOML_CLASS(Point, x, y);
}; };
using Position2D = Point; using Position2D = Point;
struct Area { struct Area {
uint32_t width, height; uint32_t width, height;
JSON_SERIALIZABLE(Area, width, height);
TOML_CLASS(Area, width, height); TOML_CLASS(Area, width, height);
}; };
using Resolution = Area; using Resolution = Area;
@ -41,7 +38,6 @@ struct Rectangle {
uint32_t& width = size.width; uint32_t& width = size.width;
uint32_t& height = size.height; uint32_t& height = size.height;
JSON_SERIALIZABLE(Rectangle, position, size);
TOML_CLASS(Rectangle, position, size); TOML_CLASS(Rectangle, position, size);
}; };
@ -54,25 +50,19 @@ TOML_ENUM(
WindowMode, WindowMode::Windowed, WindowMode::Borderless, WindowMode, WindowMode::Windowed, WindowMode::Borderless,
WindowMode::Fullscreen WindowMode::Fullscreen
); );
JSON_SERIALIZABLE_ENUM( // NOLINT(readability-identifier-length)
WindowMode, { { WindowMode::Windowed, "Windowed" },
{ WindowMode::Borderless, "Borderless" },
{ WindowMode::Fullscreen, "Fullscreen" } }
);
enum WindowPlacement { Manual, Centered }; enum WindowPlacement { Manual, Centered };
TOML_ENUM(WindowPlacement, Manual, Centered); TOML_ENUM(WindowPlacement, Manual, Centered);
struct WindowParameters { struct WindowParameters {
std::string title; std::string title;
WindowMode mode; WindowMode mode;
WindowPlacement placement; WindowPlacement placement;
Position2D position; Position2D position;
Area size; Area size;
JSON_SERIALIZABLE(
WindowParameters, title, mode, placement, position, size
);
TOML_CLASS(WindowParameters, title, mode, placement, position, size); TOML_CLASS(WindowParameters, title, mode, placement, position, size);
}; };
@ -80,8 +70,7 @@ struct RendererSettings {
WindowParameters window; WindowParameters window;
Resolution resolution; Resolution resolution;
JSON_SERIALIZABLE(RendererSettings, window, resolution); TOML_CLASS(RendererSettings, window); // resolution);
TOML_CLASS(RendererSettings, window, resolution);
}; };
} // namespace elemental } // namespace elemental