diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-23 09:12:13 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-23 09:12:13 +0200 |
| commit | fc645fce732e8163c7e1d79cdd405de62e6e95a2 (patch) | |
| tree | d81ce65b7630cd1fcc7de8a87770f3cb8216018b /src | |
| parent | 81a9284fbda7bfefa417a408346ddb2abd26a1e2 (diff) | |
foo
Diffstat (limited to 'src')
| -rw-r--r-- | src/precomp.hpp | 34 | ||||
| -rw-r--r-- | src/tile-defs.hpp | 6 |
2 files changed, 27 insertions, 13 deletions
diff --git a/src/precomp.hpp b/src/precomp.hpp index 2a19a1b7..ceeeca70 100644 --- a/src/precomp.hpp +++ b/src/precomp.hpp @@ -3,25 +3,37 @@ #include "compat/prelude.hpp" #include "compat/defs.hpp" #include "compat/assert.hpp" -#include "src/tile-defs.hpp" -#include "src/tile.hpp" -#include "src/tile-atlas.hpp" -#include "src/tile-iterator.hpp" -#include "src/chunk.hpp" -#include "src/global-coords.hpp" -#include "shaders/tile-shader.hpp" -#include "serialize/json-helper.hpp" + #include <cstddef> -#include <type_traits> +#include <cstdint> #include <cmath> -#include <array> -#include <optional> +#include <cstdlib> +#include <concepts> +#include <type_traits> #include <limits> + #include <tuple> +#include <array> +#include <optional> +#include <vector> +#include <memory> #include <utility> #include <filesystem> + +#include <Corrade/Containers/StringStlView.h> +#include <Corrade/Containers/Array.h> +#include <Corrade/Containers/ArrayViewStl.h> +#include <Corrade/Utility/DebugStl.h> + #include <Magnum/Magnum.h> #include <Magnum/Math/Vector2.h> #include <Magnum/Math/Vector3.h> #include <Magnum/Math/Vector4.h> +#include <Magnum/Math/Color.h> +#include <Magnum/GL/AbstractShaderProgram.h> +#include <Magnum/GL/Buffer.h> +#include <Magnum/GL/Mesh.h> +#include <Magnum/GL/Renderer.h> +#include <Magnum/GL/Texture.h> +#include <Magnum/Trade/ImageData.h> #include <nlohmann/json.hpp> diff --git a/src/tile-defs.hpp b/src/tile-defs.hpp index df26fe8e..51b04259 100644 --- a/src/tile-defs.hpp +++ b/src/tile-defs.hpp @@ -1,11 +1,13 @@ #pragma once #include <cstddef> +#include <cstdint> +#include <type_traits> namespace floormat { constexpr inline std::size_t TILE_MAX_DIM = 16; constexpr inline std::size_t TILE_COUNT = TILE_MAX_DIM*TILE_MAX_DIM; -constexpr inline float TILE_SIZE[3] = { 128, 128, 384 }; -constexpr inline double dTILE_SIZE[3] = { 128, 128, 384 }; +constexpr inline float TILE_SIZE[3] = { 64, 64, 64 }; +constexpr inline double dTILE_SIZE[3] = { 64, 64, 64 }; } // namespace floormat |