From a9bcdaeb6322ed2c226d7a0b2785e51151742eae Mon Sep 17 00:00:00 2001 From: Maximilian Giller Date: Thu, 15 Jun 2023 19:00:55 +0200 Subject: [PATCH] Very minor progress on tiling --- CMakeLists.txt | 2 +- assets/isometric-tiles.png | Bin 0 -> 4119 bytes src/config.h | 2 +- src/sprites/tilemap/tilemap.cpp | 1 + src/sprites/tilemap/tilemap.hpp | 13 +++++++++++++ src/sprites/tilemap/tilemap_config.hpp | 12 ++++++++++++ 6 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 assets/isometric-tiles.png create mode 100644 src/sprites/tilemap/tilemap.cpp create mode 100644 src/sprites/tilemap/tilemap.hpp create mode 100644 src/sprites/tilemap/tilemap_config.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index a708826..9bf2beb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,7 +94,7 @@ set(SOURCES src/game/collectables/collection/collectables_collection.cpp src/game/collectables/collection/collectables_collection.hpp src/game/collectables/collection/collectables_depth_collection.cpp - src/game/collectables/collection/collectables_depth_collection.hpp src/game/collectables/collectable_in_level.hpp src/game/collectables/collectable_factory.cpp src/game/collectables/collectable_factory.hpp src/game/player/player_collection.cpp src/game/player/player_collection.hpp) + src/game/collectables/collection/collectables_depth_collection.hpp src/game/collectables/collectable_in_level.hpp src/game/collectables/collectable_factory.cpp src/game/collectables/collectable_factory.hpp src/game/player/player_collection.cpp src/game/player/player_collection.hpp src/sprites/tilemap/tilemap.cpp src/sprites/tilemap/tilemap.hpp src/sprites/tilemap/tilemap_config.hpp) set(PHYSICS_00_SOURCES src/prototypes/physics_00.cpp) diff --git a/assets/isometric-tiles.png b/assets/isometric-tiles.png new file mode 100644 index 0000000000000000000000000000000000000000..9b4314276bd72400754131f42f9fd8ee7c0860b5 GIT binary patch literal 4119 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 literal 0 HcmV?d00001 diff --git a/src/config.h b/src/config.h index adb33a4..a0d6572 100644 --- a/src/config.h +++ b/src/config.h @@ -23,7 +23,7 @@ #define KEY_REPEAT_ENABLED false // Graphic settings -#define ISOMETRIC_SKEW 0.3f +#define ISOMETRIC_SKEW (15.f/32.f) #define MOVEMENT_SKEW sf::Vector2f(1.f, 1/ISOMETRIC_SKEW/2.f) #define WORLD_TO_ISO_SCALE 50.0f // 50.f, don't change. Rather adjust the zoom of the camera diff --git a/src/sprites/tilemap/tilemap.cpp b/src/sprites/tilemap/tilemap.cpp new file mode 100644 index 0000000..bafdf69 --- /dev/null +++ b/src/sprites/tilemap/tilemap.cpp @@ -0,0 +1 @@ +#include "tilemap.hpp" diff --git a/src/sprites/tilemap/tilemap.hpp b/src/sprites/tilemap/tilemap.hpp new file mode 100644 index 0000000..05306e7 --- /dev/null +++ b/src/sprites/tilemap/tilemap.hpp @@ -0,0 +1,13 @@ +#ifndef HOLESOME_TILEMAP_HPP +#define HOLESOME_TILEMAP_HPP + + +#include "../../game/game_object.h" + +class Tilemap : public GameObject +{ + +}; + + +#endif //HOLESOME_TILEMAP_HPP diff --git a/src/sprites/tilemap/tilemap_config.hpp b/src/sprites/tilemap/tilemap_config.hpp new file mode 100644 index 0000000..483c376 --- /dev/null +++ b/src/sprites/tilemap/tilemap_config.hpp @@ -0,0 +1,12 @@ +#ifndef HOLESOME_TILEMAP_CONFIG_HPP +#define HOLESOME_TILEMAP_CONFIG_HPP + +#include +#include + +struct TilemapConfig { + std::string tileSheetName; + std::vector> tiles; +}; + +#endif //HOLESOME_TILEMAP_CONFIG_HPP