diff --git a/The Great Machine/Dungeon.cpp b/The Great Machine/Dungeon.cpp index ba82546..f2a7141 100644 --- a/The Great Machine/Dungeon.cpp +++ b/The Great Machine/Dungeon.cpp @@ -12,6 +12,7 @@ Dungeon::Dungeon() void Dungeon::Generate() { + TileSet = new olc::Sprite("./res/dungeon_tileset.png"); } @@ -32,7 +33,22 @@ void Dungeon::Update(float fTime) void Dungeon::Draw(olc::PixelGameEngine* engine) { + int ActiveTile = MapVector[y * MAPWIDTH + x]; + // sky + if (ActiveTile == -1) continue; + + // find tile in map + auto DrawFrom = [&](int tile) { + // mod w for x int div y - JavidX9 + int w = tile % (TileSet->width / 16); + int h = tile / (TileSet->width / 16); + return olc::vi2d(w * 16, h * 16); + }; + + //engine->DrawPartialSprite( + // { static_cast(Coords.x + camera->Coords.x), static_cast(Coords.y + camera->Coords.y) }, + // SpriteMap, SpriteTextureMask, { 16, 16 }); } Dungeon::~Dungeon() diff --git a/The Great Machine/Dungeon.hpp b/The Great Machine/Dungeon.hpp index 815e6b7..bd5c245 100644 --- a/The Great Machine/Dungeon.hpp +++ b/The Great Machine/Dungeon.hpp @@ -28,10 +28,12 @@ public: Playable* Player; Camera* ActiveCamera; - std::unordered_map DungeonTiles; + std::vector DungeonTiles; std::unordered_map Entities; // key here could be room? std::unordered_map FixedItems; + olc::Sprite* TileSet; + ~Dungeon(); }; diff --git a/The Great Machine/Things.cpp b/The Great Machine/Things.cpp index 06938c2..a1618d7 100644 --- a/The Great Machine/Things.cpp +++ b/The Great Machine/Things.cpp @@ -6,10 +6,3 @@ void Tile::Update(float fTime) { } - -void Tile::Draw(olc::PixelGameEngine* engine, Camera* camera) -{ - engine->DrawPartialSprite( - { static_cast(Coords.x + camera->Coords.x), static_cast(Coords.y + camera->Coords.y) }, - SpriteMap, SpriteTextureMask, { 16, 16 }); -} diff --git a/The Great Machine/Things.hpp b/The Great Machine/Things.hpp index a3aa41f..84091be 100644 --- a/The Great Machine/Things.hpp +++ b/The Great Machine/Things.hpp @@ -81,6 +81,11 @@ public: }; +class TileDictionary +{ + +}; + class Tile { public: @@ -92,7 +97,6 @@ public: olc::Sprite* SpriteMap; virtual void Update(float fTime); - void Draw(olc::PixelGameEngine* engine, Camera* camera); }; #endif diff --git a/The Great Machine/logs.log b/The Great Machine/logs.log index 5ff147f..dd72272 100644 --- a/The Great Machine/logs.log +++ b/The Great Machine/logs.log @@ -99143,3 +99143,558 @@ [30-08-2020 19:10:03] [INFO] Game Constructed [30-08-2020 19:11:06] [INFO] Game Constructed [30-08-2020 19:11:46] [INFO] Game Constructed +[30-08-2020 22:26:26] [INFO] Game Constructed +[30-08-2020 22:27:40] [INFO] Game Constructed +[30-08-2020 22:27:40] [DEBUG] 0.0408765 +[30-08-2020 22:27:40] [DEBUG] 0.0713198 +[30-08-2020 22:27:40] [DEBUG] 0.131137 +[30-08-2020 22:27:40] [DEBUG] 0.137645 +[30-08-2020 22:27:40] [DEBUG] 0.144388 +[30-08-2020 22:27:40] [DEBUG] 0.15148 +[30-08-2020 22:27:40] [DEBUG] 0.162429 +[30-08-2020 22:27:40] [DEBUG] 0.172211 +[30-08-2020 22:27:40] [DEBUG] 0.179227 +[30-08-2020 22:27:40] [DEBUG] 0.186296 +[30-08-2020 22:27:40] [DEBUG] 0.193947 +[30-08-2020 22:27:40] [DEBUG] 0.20026 +[30-08-2020 22:27:40] [DEBUG] 0.21342 +[30-08-2020 22:27:40] [DEBUG] 0.223487 +[30-08-2020 22:27:40] [DEBUG] 0.228787 +[30-08-2020 22:27:40] [DEBUG] 0.234647 +[30-08-2020 22:27:40] [DEBUG] 0.241704 +[30-08-2020 22:27:40] [DEBUG] 0.248946 +[30-08-2020 22:27:40] [DEBUG] 0.262733 +[30-08-2020 22:27:40] [DEBUG] 0.26997 +[30-08-2020 22:27:40] [DEBUG] 0.276532 +[30-08-2020 22:27:40] [DEBUG] 0.283341 +[30-08-2020 22:27:40] [DEBUG] 0.290372 +[30-08-2020 22:27:40] [DEBUG] 0.301373 +[30-08-2020 22:27:40] [DEBUG] 0.311481 +[30-08-2020 22:27:40] [DEBUG] 0.318233 +[30-08-2020 22:27:40] [DEBUG] 0.32503 +[30-08-2020 22:27:40] [DEBUG] 0.331955 +[30-08-2020 22:27:40] [DEBUG] 0.338787 +[30-08-2020 22:27:40] [DEBUG] 0.351018 +[30-08-2020 22:27:40] [DEBUG] 0.360066 +[30-08-2020 22:27:40] [DEBUG] 0.367018 +[30-08-2020 22:27:40] [DEBUG] 0.374071 +[30-08-2020 22:27:40] [DEBUG] 0.381147 +[30-08-2020 22:27:40] [DEBUG] 0.387684 +[30-08-2020 22:27:40] [DEBUG] 0.401545 +[30-08-2020 22:27:40] [DEBUG] 0.408897 +[30-08-2020 22:27:40] [DEBUG] 0.415508 +[30-08-2020 22:27:40] [DEBUG] 0.422405 +[30-08-2020 22:27:40] [DEBUG] 0.429276 +[30-08-2020 22:27:40] [DEBUG] 0.440863 +[30-08-2020 22:27:40] [DEBUG] 0.450519 +[30-08-2020 22:27:40] [DEBUG] 0.457026 +[30-08-2020 22:27:40] [DEBUG] 0.463883 +[30-08-2020 22:27:40] [DEBUG] 0.470798 +[30-08-2020 22:27:40] [DEBUG] 0.477765 +[30-08-2020 22:27:40] [DEBUG] 0.488809 +[30-08-2020 22:27:40] [DEBUG] 0.498944 +[30-08-2020 22:27:40] [DEBUG] 0.505543 +[30-08-2020 22:27:40] [DEBUG] 0.513093 +[30-08-2020 22:27:40] [DEBUG] 0.519479 +[30-08-2020 22:27:40] [DEBUG] 0.526381 +[30-08-2020 22:27:40] [DEBUG] 0.540452 +[30-08-2020 22:27:40] [DEBUG] 0.547613 +[30-08-2020 22:27:40] [DEBUG] 0.554095 +[30-08-2020 22:27:40] [DEBUG] 0.561314 +[30-08-2020 22:27:40] [DEBUG] 0.568115 +[30-08-2020 22:27:40] [DEBUG] 0.585753 +[30-08-2020 22:27:40] [DEBUG] 0.595926 +[30-08-2020 22:27:40] [DEBUG] 0.60292 +[30-08-2020 22:27:41] [DEBUG] 0.609813 +[30-08-2020 22:27:41] [DEBUG] 0.616559 +[30-08-2020 22:27:41] [DEBUG] 0.628013 +[30-08-2020 22:27:41] [DEBUG] 0.637567 +[30-08-2020 22:27:41] [DEBUG] 0.64434 +[30-08-2020 22:27:41] [DEBUG] 0.651362 +[30-08-2020 22:27:41] [DEBUG] 0.658645 +[30-08-2020 22:27:41] [DEBUG] 0.665284 +[30-08-2020 22:27:41] [DEBUG] 0.679305 +[30-08-2020 22:27:41] [DEBUG] 0.686423 +[30-08-2020 22:27:41] [DEBUG] 0.693347 +[30-08-2020 22:27:41] [DEBUG] 0.700684 +[30-08-2020 22:27:41] [DEBUG] 0.707366 +[30-08-2020 22:27:41] [DEBUG] 0.726127 +[30-08-2020 22:27:41] [DEBUG] 0.818685 +[30-08-2020 22:27:41] [DEBUG] 0.825401 +[30-08-2020 22:27:41] [DEBUG] 0.832237 +[30-08-2020 22:27:41] [DEBUG] 0.846217 +[30-08-2020 22:27:41] [DEBUG] 0.853157 +[30-08-2020 22:27:41] [DEBUG] 0.867445 +[30-08-2020 22:27:41] [DEBUG] 0.873988 +[30-08-2020 22:27:41] [DEBUG] 0.881228 +[30-08-2020 22:27:41] [DEBUG] 0.895365 +[30-08-2020 22:27:41] [DEBUG] 0.906728 +[30-08-2020 22:27:41] [DEBUG] 0.915841 +[30-08-2020 22:27:41] [DEBUG] 0.922471 +[30-08-2020 22:27:41] [DEBUG] 0.929723 +[30-08-2020 22:27:41] [DEBUG] 0.936914 +[30-08-2020 22:27:41] [DEBUG] 0.943582 +[30-08-2020 22:27:41] [DEBUG] 0.95498 +[30-08-2020 22:27:41] [DEBUG] 0.964488 +[30-08-2020 22:27:41] [DEBUG] 0.971071 +[30-08-2020 22:27:41] [DEBUG] 0.978167 +[30-08-2020 22:27:41] [DEBUG] 0.984781 +[30-08-2020 22:27:41] [DEBUG] 0.991993 +[30-08-2020 22:27:41] [DEBUG] 1.00576 +[30-08-2020 22:27:41] [DEBUG] 1.01382 +[30-08-2020 22:27:41] [DEBUG] 1.01999 +[30-08-2020 22:27:41] [DEBUG] 1.0267 +[30-08-2020 22:27:41] [DEBUG] 1.03395 +[30-08-2020 22:27:41] [DEBUG] 1.05113 +[30-08-2020 22:27:41] [DEBUG] 1.06173 +[30-08-2020 22:27:41] [DEBUG] 1.06843 +[30-08-2020 22:27:41] [DEBUG] 1.07496 +[30-08-2020 22:27:41] [DEBUG] 1.08236 +[30-08-2020 22:27:41] [DEBUG] 1.09306 +[30-08-2020 22:27:41] [DEBUG] 1.10332 +[30-08-2020 22:27:41] [DEBUG] 1.11018 +[30-08-2020 22:27:41] [DEBUG] 1.11684 +[30-08-2020 22:27:41] [DEBUG] 1.12371 +[30-08-2020 22:27:41] [DEBUG] 1.14372 +[30-08-2020 22:27:41] [DEBUG] 1.15166 +[30-08-2020 22:27:41] [DEBUG] 1.15866 +[30-08-2020 22:27:41] [DEBUG] 1.16549 +[30-08-2020 22:27:41] [DEBUG] 1.17232 +[30-08-2020 22:27:41] [DEBUG] 1.19059 +[30-08-2020 22:27:41] [DEBUG] 1.20026 +[30-08-2020 22:27:41] [DEBUG] 1.2076 +[30-08-2020 22:27:41] [DEBUG] 1.21405 +[30-08-2020 22:27:41] [DEBUG] 1.22126 +[30-08-2020 22:27:41] [DEBUG] 1.23251 +[30-08-2020 22:27:41] [DEBUG] 1.24168 +[30-08-2020 22:27:41] [DEBUG] 1.24862 +[30-08-2020 22:27:41] [DEBUG] 1.2557 +[30-08-2020 22:27:41] [DEBUG] 1.26273 +[30-08-2020 22:27:41] [DEBUG] 1.26947 +[30-08-2020 22:27:41] [DEBUG] 1.2835 +[30-08-2020 22:27:41] [DEBUG] 1.29042 +[30-08-2020 22:27:41] [DEBUG] 1.29735 +[30-08-2020 22:27:41] [DEBUG] 1.30447 +[30-08-2020 22:27:41] [DEBUG] 1.31125 +[30-08-2020 22:27:41] [DEBUG] 1.31813 +[30-08-2020 22:27:41] [DEBUG] 1.33217 +[30-08-2020 22:27:41] [DEBUG] 1.33927 +[30-08-2020 22:27:41] [DEBUG] 1.34619 +[30-08-2020 22:27:41] [DEBUG] 1.353 +[30-08-2020 22:27:41] [DEBUG] 1.35981 +[30-08-2020 22:27:41] [DEBUG] 1.37095 +[30-08-2020 22:27:41] [DEBUG] 1.38093 +[30-08-2020 22:27:41] [DEBUG] 1.38752 +[30-08-2020 22:27:41] [DEBUG] 1.39432 +[30-08-2020 22:27:41] [DEBUG] 1.40153 +[30-08-2020 22:27:41] [DEBUG] 1.40835 +[30-08-2020 22:27:41] [DEBUG] 1.4197 +[30-08-2020 22:27:41] [DEBUG] 1.4295 +[30-08-2020 22:27:41] [DEBUG] 1.4361 +[30-08-2020 22:27:41] [DEBUG] 1.4431 +[30-08-2020 22:27:41] [DEBUG] 1.44993 +[30-08-2020 22:27:41] [DEBUG] 1.45693 +[30-08-2020 22:27:41] [DEBUG] 1.47137 +[30-08-2020 22:27:41] [DEBUG] 1.47801 +[30-08-2020 22:27:41] [DEBUG] 1.48481 +[30-08-2020 22:27:41] [DEBUG] 1.4917 +[30-08-2020 22:27:41] [DEBUG] 1.49874 +[30-08-2020 22:27:41] [DEBUG] 1.5103 +[30-08-2020 22:27:41] [DEBUG] 1.51965 +[30-08-2020 22:27:41] [DEBUG] 1.52641 +[30-08-2020 22:27:41] [DEBUG] 1.53322 +[30-08-2020 22:27:41] [DEBUG] 1.54049 +[30-08-2020 22:27:41] [DEBUG] 1.54758 +[30-08-2020 22:27:41] [DEBUG] 1.55834 +[30-08-2020 22:27:41] [DEBUG] 1.56834 +[30-08-2020 22:27:41] [DEBUG] 1.57511 +[30-08-2020 22:27:41] [DEBUG] 1.5821 +[30-08-2020 22:27:41] [DEBUG] 1.58879 +[30-08-2020 22:27:41] [DEBUG] 1.59581 +[30-08-2020 22:27:42] [DEBUG] 1.60987 +[30-08-2020 22:27:42] [DEBUG] 1.61707 +[30-08-2020 22:27:42] [DEBUG] 1.62406 +[30-08-2020 22:27:42] [DEBUG] 1.6305 +[30-08-2020 22:27:42] [DEBUG] 1.63749 +[30-08-2020 22:27:42] [DEBUG] 1.65538 +[30-08-2020 22:27:42] [DEBUG] 1.66532 +[30-08-2020 22:27:42] [DEBUG] 1.6723 +[30-08-2020 22:27:42] [DEBUG] 1.67953 +[30-08-2020 22:27:42] [DEBUG] 1.68614 +[30-08-2020 22:27:42] [DEBUG] 1.69914 +[30-08-2020 22:27:42] [DEBUG] 1.70708 +[30-08-2020 22:27:42] [DEBUG] 1.7141 +[30-08-2020 22:27:42] [DEBUG] 1.72094 +[30-08-2020 22:27:42] [DEBUG] 1.72787 +[30-08-2020 22:27:42] [DEBUG] 1.7349 +[30-08-2020 22:27:42] [DEBUG] 1.74871 +[30-08-2020 22:27:42] [DEBUG] 1.75595 +[30-08-2020 22:27:42] [DEBUG] 1.7628 +[30-08-2020 22:27:42] [DEBUG] 1.76971 +[30-08-2020 22:27:42] [DEBUG] 1.77662 +[30-08-2020 22:27:42] [DEBUG] 1.7949 +[30-08-2020 22:27:42] [DEBUG] 1.8047 +[30-08-2020 22:27:42] [DEBUG] 1.8114 +[30-08-2020 22:27:42] [DEBUG] 1.81829 +[30-08-2020 22:27:42] [DEBUG] 1.82539 +[30-08-2020 22:27:42] [DEBUG] 1.83749 +[30-08-2020 22:27:42] [DEBUG] 1.84614 +[30-08-2020 22:27:42] [DEBUG] 1.85321 +[30-08-2020 22:27:42] [DEBUG] 1.86015 +[30-08-2020 22:27:42] [DEBUG] 1.86695 +[30-08-2020 22:27:42] [DEBUG] 1.8737 +[30-08-2020 22:27:42] [DEBUG] 1.88804 +[30-08-2020 22:27:42] [DEBUG] 1.89439 +[30-08-2020 22:27:42] [DEBUG] 1.90134 +[30-08-2020 22:27:42] [DEBUG] 1.90829 +[30-08-2020 22:27:42] [DEBUG] 1.91536 +[30-08-2020 22:27:42] [DEBUG] 1.92239 +[30-08-2020 22:27:42] [DEBUG] 1.93633 +[30-08-2020 22:27:42] [DEBUG] 1.94321 +[30-08-2020 22:27:42] [DEBUG] 1.95022 +[30-08-2020 22:27:42] [DEBUG] 1.95693 +[30-08-2020 22:27:42] [DEBUG] 1.96388 +[30-08-2020 22:27:42] [DEBUG] 1.97508 +[30-08-2020 22:27:42] [DEBUG] 1.98518 +[30-08-2020 22:27:42] [DEBUG] 1.99195 +[30-08-2020 22:27:42] [DEBUG] 1.99859 +[30-08-2020 22:27:42] [DEBUG] 2.00548 +[30-08-2020 22:27:42] [DEBUG] 2.01273 +[30-08-2020 22:27:42] [DEBUG] 2.02693 +[30-08-2020 22:27:42] [DEBUG] 2.03357 +[30-08-2020 22:27:42] [DEBUG] 2.04093 +[30-08-2020 22:27:42] [DEBUG] 2.04754 +[30-08-2020 22:27:42] [DEBUG] 2.0542 +[30-08-2020 22:27:42] [DEBUG] 2.0614 +[30-08-2020 22:27:42] [DEBUG] 2.07563 +[30-08-2020 22:27:42] [DEBUG] 2.08216 +[30-08-2020 22:27:42] [DEBUG] 2.08885 +[30-08-2020 22:27:42] [DEBUG] 2.09581 +[30-08-2020 22:27:42] [DEBUG] 2.103 +[30-08-2020 22:27:42] [DEBUG] 2.11401 +[30-08-2020 22:27:42] [DEBUG] 2.12379 +[30-08-2020 22:27:42] [DEBUG] 2.13206 +[30-08-2020 22:27:42] [DEBUG] 2.13766 +[30-08-2020 22:27:42] [DEBUG] 2.14451 +[30-08-2020 22:27:42] [DEBUG] 2.15133 +[30-08-2020 22:27:42] [DEBUG] 2.16563 +[30-08-2020 22:27:42] [DEBUG] 2.17217 +[30-08-2020 22:27:42] [DEBUG] 2.17925 +[30-08-2020 22:27:42] [DEBUG] 2.18644 +[30-08-2020 22:27:42] [DEBUG] 2.19315 +[30-08-2020 22:27:42] [DEBUG] 2.20004 +[30-08-2020 22:27:42] [DEBUG] 2.2143 +[30-08-2020 22:27:42] [DEBUG] 2.22085 +[30-08-2020 22:27:42] [DEBUG] 2.22762 +[30-08-2020 22:27:42] [DEBUG] 2.23475 +[30-08-2020 22:27:42] [DEBUG] 2.2418 +[30-08-2020 22:27:42] [DEBUG] 2.25941 +[30-08-2020 22:27:42] [DEBUG] 2.26965 +[30-08-2020 22:27:42] [DEBUG] 2.27658 +[30-08-2020 22:27:42] [DEBUG] 2.28328 +[30-08-2020 22:27:42] [DEBUG] 2.2903 +[30-08-2020 22:27:42] [DEBUG] 2.30124 +[30-08-2020 22:27:42] [DEBUG] 2.31138 +[30-08-2020 22:27:42] [DEBUG] 2.31828 +[30-08-2020 22:27:42] [DEBUG] 2.32521 +[30-08-2020 22:27:42] [DEBUG] 2.33186 +[30-08-2020 22:27:42] [DEBUG] 2.33885 +[30-08-2020 22:27:42] [DEBUG] 2.35806 +[30-08-2020 22:27:42] [DEBUG] 2.37205 +[30-08-2020 22:27:42] [DEBUG] 2.40511 +[30-08-2020 22:27:42] [DEBUG] 2.41527 +[30-08-2020 22:27:42] [DEBUG] 2.42231 +[30-08-2020 22:27:42] [DEBUG] 2.42939 +[30-08-2020 22:27:42] [DEBUG] 2.43616 +[30-08-2020 22:27:42] [DEBUG] 2.44312 +[30-08-2020 22:27:42] [DEBUG] 2.45009 +[30-08-2020 22:27:42] [DEBUG] 2.4569 +[30-08-2020 22:27:42] [DEBUG] 2.464 +[30-08-2020 22:27:42] [DEBUG] 2.47085 +[30-08-2020 22:27:42] [DEBUG] 2.47804 +[30-08-2020 22:27:42] [DEBUG] 2.48505 +[30-08-2020 22:27:42] [DEBUG] 2.49169 +[30-08-2020 22:27:42] [DEBUG] 2.49901 +[30-08-2020 22:27:42] [DEBUG] 2.5056 +[30-08-2020 22:27:42] [DEBUG] 2.51242 +[30-08-2020 22:27:42] [DEBUG] 2.5194 +[30-08-2020 22:27:42] [DEBUG] 2.52663 +[30-08-2020 22:27:42] [DEBUG] 2.53326 +[30-08-2020 22:27:42] [DEBUG] 2.54031 +[30-08-2020 22:27:42] [DEBUG] 2.54715 +[30-08-2020 22:27:42] [DEBUG] 2.55408 +[30-08-2020 22:27:42] [DEBUG] 2.56125 +[30-08-2020 22:27:42] [DEBUG] 2.5681 +[30-08-2020 22:27:42] [DEBUG] 2.57501 +[30-08-2020 22:27:42] [DEBUG] 2.58203 +[30-08-2020 22:27:42] [DEBUG] 2.58911 +[30-08-2020 22:27:42] [DEBUG] 2.59587 +[30-08-2020 22:27:42] [DEBUG] 2.60279 +[30-08-2020 22:27:43] [DEBUG] 2.60984 +[30-08-2020 22:27:43] [DEBUG] 2.61673 +[30-08-2020 22:27:43] [DEBUG] 2.62353 +[30-08-2020 22:27:43] [DEBUG] 2.63079 +[30-08-2020 22:27:43] [DEBUG] 2.63788 +[30-08-2020 22:27:43] [DEBUG] 2.64508 +[30-08-2020 22:27:43] [DEBUG] 2.65136 +[30-08-2020 22:27:43] [DEBUG] 2.6587 +[30-08-2020 22:27:43] [DEBUG] 2.66544 +[30-08-2020 22:27:43] [DEBUG] 2.67219 +[30-08-2020 22:27:43] [DEBUG] 2.67916 +[30-08-2020 22:27:43] [DEBUG] 2.68639 +[30-08-2020 22:27:43] [DEBUG] 2.69309 +[30-08-2020 22:27:43] [DEBUG] 2.70043 +[30-08-2020 22:27:43] [DEBUG] 2.7073 +[30-08-2020 22:27:43] [DEBUG] 2.7143 +[30-08-2020 22:27:43] [DEBUG] 2.7213 +[30-08-2020 22:27:43] [DEBUG] 2.72861 +[30-08-2020 22:27:43] [DEBUG] 2.73492 +[30-08-2020 22:27:43] [DEBUG] 2.74182 +[30-08-2020 22:27:43] [DEBUG] 2.74863 +[30-08-2020 22:27:43] [DEBUG] 2.75585 +[30-08-2020 22:27:43] [DEBUG] 2.76273 +[30-08-2020 22:27:43] [DEBUG] 2.76954 +[30-08-2020 22:27:43] [DEBUG] 2.77638 +[30-08-2020 22:27:43] [DEBUG] 2.78335 +[30-08-2020 22:27:43] [DEBUG] 2.79018 +[30-08-2020 22:27:43] [DEBUG] 2.79732 +[30-08-2020 22:27:43] [DEBUG] 2.80408 +[30-08-2020 22:27:43] [DEBUG] 2.81147 +[30-08-2020 22:27:43] [DEBUG] 2.81857 +[30-08-2020 22:27:43] [DEBUG] 2.8255 +[30-08-2020 22:27:43] [DEBUG] 2.83318 +[30-08-2020 22:27:43] [DEBUG] 2.84638 +[30-08-2020 22:27:43] [DEBUG] 2.85277 +[30-08-2020 22:27:43] [DEBUG] 2.86089 +[30-08-2020 22:27:43] [DEBUG] 2.86741 +[30-08-2020 22:27:43] [DEBUG] 2.88168 +[30-08-2020 22:27:43] [DEBUG] 2.88803 +[30-08-2020 22:27:43] [DEBUG] 2.89472 +[30-08-2020 22:27:43] [DEBUG] 2.90237 +[30-08-2020 22:27:43] [DEBUG] 2.90874 +[30-08-2020 22:27:43] [DEBUG] 2.92298 +[30-08-2020 22:27:43] [DEBUG] 2.92963 +[30-08-2020 22:27:43] [DEBUG] 2.93718 +[30-08-2020 22:27:43] [DEBUG] 2.94325 +[30-08-2020 22:27:43] [DEBUG] 2.95075 +[30-08-2020 22:27:43] [DEBUG] 2.96434 +[30-08-2020 22:27:43] [DEBUG] 2.97197 +[30-08-2020 22:27:43] [DEBUG] 2.97844 +[30-08-2020 22:27:43] [DEBUG] 2.98539 +[30-08-2020 22:27:43] [DEBUG] 2.99271 +[30-08-2020 22:27:43] [DEBUG] 2.99906 +[30-08-2020 22:27:43] [DEBUG] 3.00671 +[30-08-2020 22:27:43] [DEBUG] 3.01341 +[30-08-2020 22:27:43] [DEBUG] 3.02004 +[30-08-2020 22:27:43] [DEBUG] 3.03464 +[30-08-2020 22:27:43] [DEBUG] 3.03978 +[30-08-2020 22:27:43] [DEBUG] 3.04852 +[30-08-2020 22:27:43] [DEBUG] 3.05467 +[30-08-2020 22:27:43] [DEBUG] 3.06178 +[30-08-2020 22:27:43] [DEBUG] 3.06906 +[30-08-2020 22:27:43] [DEBUG] 3.07524 +[30-08-2020 22:27:43] [DEBUG] 3.08937 +[30-08-2020 22:27:43] [DEBUG] 3.09669 +[30-08-2020 22:27:43] [DEBUG] 3.1028 +[30-08-2020 22:27:43] [DEBUG] 3.1107 +[30-08-2020 22:27:43] [DEBUG] 3.12374 +[30-08-2020 22:27:43] [DEBUG] 3.13317 +[30-08-2020 22:27:43] [DEBUG] 3.145 +[30-08-2020 22:27:43] [DEBUG] 3.15235 +[30-08-2020 22:27:43] [DEBUG] 3.15823 +[30-08-2020 22:27:43] [DEBUG] 3.16595 +[30-08-2020 22:27:43] [DEBUG] 3.17262 +[30-08-2020 22:27:43] [DEBUG] 3.1802 +[30-08-2020 22:27:43] [DEBUG] 3.18657 +[30-08-2020 22:27:43] [DEBUG] 3.19327 +[30-08-2020 22:27:43] [DEBUG] 3.20046 +[30-08-2020 22:27:43] [DEBUG] 3.20798 +[30-08-2020 22:27:43] [DEBUG] 3.21446 +[30-08-2020 22:27:43] [DEBUG] 3.22094 +[30-08-2020 22:27:43] [DEBUG] 3.22879 +[30-08-2020 22:27:43] [DEBUG] 3.23504 +[30-08-2020 22:27:43] [DEBUG] 3.24932 +[30-08-2020 22:27:43] [DEBUG] 3.25608 +[30-08-2020 22:27:43] [DEBUG] 3.26257 +[30-08-2020 22:27:43] [DEBUG] 3.27037 +[30-08-2020 22:27:43] [DEBUG] 3.27662 +[30-08-2020 22:27:43] [DEBUG] 3.28384 +[30-08-2020 22:27:43] [DEBUG] 3.29063 +[30-08-2020 22:27:43] [DEBUG] 3.29798 +[30-08-2020 22:27:43] [DEBUG] 3.30499 +[30-08-2020 22:27:43] [DEBUG] 3.3114 +[30-08-2020 22:27:43] [DEBUG] 3.31818 +[30-08-2020 22:27:43] [DEBUG] 3.32615 +[30-08-2020 22:27:43] [DEBUG] 3.33219 +[30-08-2020 22:27:43] [DEBUG] 3.34654 +[30-08-2020 22:27:43] [DEBUG] 3.35318 +[30-08-2020 22:27:43] [DEBUG] 3.36027 +[30-08-2020 22:27:43] [DEBUG] 3.37421 +[30-08-2020 22:27:43] [DEBUG] 3.38113 +[30-08-2020 22:27:43] [DEBUG] 3.38808 +[30-08-2020 22:27:43] [DEBUG] 3.39534 +[30-08-2020 22:27:43] [DEBUG] 3.40882 +[30-08-2020 22:27:43] [DEBUG] 3.41602 +[30-08-2020 22:27:43] [DEBUG] 3.42242 +[30-08-2020 22:27:43] [DEBUG] 3.42985 +[30-08-2020 22:27:43] [DEBUG] 3.43649 +[30-08-2020 22:27:43] [DEBUG] 3.4433 +[30-08-2020 22:27:43] [DEBUG] 3.45075 +[30-08-2020 22:27:43] [DEBUG] 3.4573 +[30-08-2020 22:27:43] [DEBUG] 3.46443 +[30-08-2020 22:27:43] [DEBUG] 3.47224 +[30-08-2020 22:27:43] [DEBUG] 3.4781 +[30-08-2020 22:27:43] [DEBUG] 3.4922 +[30-08-2020 22:27:43] [DEBUG] 3.49946 +[30-08-2020 22:27:43] [DEBUG] 3.50614 +[30-08-2020 22:27:43] [DEBUG] 3.51301 +[30-08-2020 22:27:43] [DEBUG] 3.52034 +[30-08-2020 22:27:43] [DEBUG] 3.52672 +[30-08-2020 22:27:43] [DEBUG] 3.53412 +[30-08-2020 22:27:43] [DEBUG] 3.54111 +[30-08-2020 22:27:43] [DEBUG] 3.54764 +[30-08-2020 22:27:43] [DEBUG] 3.5543 +[30-08-2020 22:27:43] [DEBUG] 3.56111 +[30-08-2020 22:27:43] [DEBUG] 3.56829 +[30-08-2020 22:27:43] [DEBUG] 3.57548 +[30-08-2020 22:27:43] [DEBUG] 3.58227 +[30-08-2020 22:27:43] [DEBUG] 3.58947 +[30-08-2020 22:27:43] [DEBUG] 3.59618 +[30-08-2020 22:27:43] [DEBUG] 3.6031 +[30-08-2020 22:27:44] [DEBUG] 3.6102 +[30-08-2020 22:27:44] [DEBUG] 3.61669 +[30-08-2020 22:27:44] [DEBUG] 3.62363 +[30-08-2020 22:27:44] [DEBUG] 3.63045 +[30-08-2020 22:27:44] [DEBUG] 3.6376 +[30-08-2020 22:27:44] [DEBUG] 3.64439 +[30-08-2020 22:27:44] [DEBUG] 3.65147 +[30-08-2020 22:27:44] [DEBUG] 3.65821 +[30-08-2020 22:27:44] [DEBUG] 3.66525 +[30-08-2020 22:27:44] [DEBUG] 3.67212 +[30-08-2020 22:27:44] [DEBUG] 3.67905 +[30-08-2020 22:27:44] [DEBUG] 3.68618 +[30-08-2020 22:27:44] [DEBUG] 3.69304 +[30-08-2020 22:27:44] [DEBUG] 3.7 +[30-08-2020 22:27:44] [DEBUG] 3.70687 +[30-08-2020 22:27:44] [DEBUG] 3.71382 +[30-08-2020 22:27:44] [DEBUG] 3.72082 +[30-08-2020 22:27:44] [DEBUG] 3.72797 +[30-08-2020 22:27:44] [DEBUG] 3.73467 +[30-08-2020 22:27:44] [DEBUG] 3.74161 +[30-08-2020 22:27:44] [DEBUG] 3.74867 +[30-08-2020 22:27:44] [DEBUG] 3.75545 +[30-08-2020 22:27:44] [DEBUG] 3.76253 +[30-08-2020 22:27:44] [DEBUG] 3.76954 +[30-08-2020 22:27:44] [DEBUG] 3.7766 +[30-08-2020 22:27:44] [DEBUG] 3.78354 +[30-08-2020 22:27:44] [DEBUG] 3.79045 +[30-08-2020 22:27:44] [DEBUG] 3.79745 +[30-08-2020 22:27:44] [DEBUG] 3.8041 +[30-08-2020 22:27:44] [DEBUG] 3.81128 +[30-08-2020 22:27:44] [DEBUG] 3.818 +[30-08-2020 22:27:44] [DEBUG] 3.82501 +[30-08-2020 22:27:44] [DEBUG] 3.83221 +[30-08-2020 22:27:44] [DEBUG] 3.83901 +[30-08-2020 22:27:44] [DEBUG] 3.84589 +[30-08-2020 22:27:44] [DEBUG] 3.85287 +[30-08-2020 22:27:44] [DEBUG] 3.8596 +[30-08-2020 22:27:44] [DEBUG] 3.86656 +[30-08-2020 22:27:44] [DEBUG] 3.87357 +[30-08-2020 22:27:44] [DEBUG] 3.88059 +[30-08-2020 22:27:44] [DEBUG] 3.88752 +[30-08-2020 22:27:44] [DEBUG] 3.89435 +[30-08-2020 22:27:44] [DEBUG] 3.90129 +[30-08-2020 22:27:44] [DEBUG] 3.9083 +[30-08-2020 22:27:44] [DEBUG] 3.91523 +[30-08-2020 22:27:44] [DEBUG] 3.9221 +[30-08-2020 22:27:44] [DEBUG] 3.9291 +[30-08-2020 22:27:44] [DEBUG] 3.93625 +[30-08-2020 22:27:44] [DEBUG] 3.94322 +[30-08-2020 22:27:44] [DEBUG] 3.9502 +[30-08-2020 22:27:44] [DEBUG] 3.95714 +[30-08-2020 22:27:44] [DEBUG] 3.96407 +[30-08-2020 22:27:44] [DEBUG] 3.97077 +[30-08-2020 22:27:44] [DEBUG] 3.97775 +[30-08-2020 22:27:44] [DEBUG] 3.98473 +[30-08-2020 22:27:44] [DEBUG] 3.99158 +[30-08-2020 22:27:44] [DEBUG] 3.9988 +[30-08-2020 22:27:44] [DEBUG] 4.00551 +[30-08-2020 22:27:44] [DEBUG] 4.02747 +[30-08-2020 22:27:44] [DEBUG] 4.04712 +[30-08-2020 22:27:44] [DEBUG] 4.06811 +[30-08-2020 22:27:44] [DEBUG] 4.08897 +[30-08-2020 22:27:44] [DEBUG] 4.10971 +[30-08-2020 22:27:44] [DEBUG] 4.13056 +[30-08-2020 22:27:44] [DEBUG] 4.1525 +[30-08-2020 22:27:44] [DEBUG] 4.1721 +[30-08-2020 22:27:44] [DEBUG] 4.19295 +[30-08-2020 22:27:44] [DEBUG] 4.21385 +[30-08-2020 22:27:44] [DEBUG] 4.23474 +[30-08-2020 22:27:44] [DEBUG] 4.25549 +[30-08-2020 22:27:44] [DEBUG] 4.27665 +[30-08-2020 22:27:44] [DEBUG] 4.29713 +[30-08-2020 22:27:44] [DEBUG] 4.31801 +[30-08-2020 22:27:44] [DEBUG] 4.33896 +[30-08-2020 22:27:44] [DEBUG] 4.3597 +[30-08-2020 22:27:44] [DEBUG] 4.38072 +[30-08-2020 22:27:44] [DEBUG] 4.40823 +[30-08-2020 22:27:44] [DEBUG] 4.4291 +[30-08-2020 22:27:44] [DEBUG] 4.45012 +[30-08-2020 22:27:44] [DEBUG] 4.47102 +[30-08-2020 22:27:44] [DEBUG] 4.49183 +[30-08-2020 22:27:44] [DEBUG] 4.51256 +[30-08-2020 22:27:44] [DEBUG] 4.53326 +[30-08-2020 22:27:44] [DEBUG] 4.55403 +[30-08-2020 22:27:44] [DEBUG] 4.57487 +[30-08-2020 22:27:44] [DEBUG] 4.59592 +[30-08-2020 22:27:45] [DEBUG] 4.61678 +[30-08-2020 22:27:45] [DEBUG] 4.63749 +[30-08-2020 22:27:45] [DEBUG] 4.65835 +[30-08-2020 22:27:45] [DEBUG] 4.67929 +[30-08-2020 22:27:45] [DEBUG] 4.70004 +[30-08-2020 22:27:45] [DEBUG] 4.72084 +[30-08-2020 22:27:45] [DEBUG] 4.74159 +[30-08-2020 22:27:45] [DEBUG] 4.76236 +[30-08-2020 22:27:45] [DEBUG] 4.78327 +[30-08-2020 22:27:45] [DEBUG] 4.804 +[30-08-2020 22:27:45] [DEBUG] 4.82486 +[30-08-2020 22:27:45] [DEBUG] 4.84581 +[30-08-2020 22:27:45] [DEBUG] 4.86679 +[30-08-2020 22:27:45] [DEBUG] 4.88768 +[30-08-2020 22:27:45] [DEBUG] 4.90838 +[30-08-2020 22:27:45] [DEBUG] 4.92909 +[30-08-2020 22:27:45] [DEBUG] 4.95008 +[30-08-2020 22:27:45] [DEBUG] 4.97082 +[30-08-2020 22:27:45] [DEBUG] 4.99156 +[30-08-2020 22:27:45] [DEBUG] 5.01249 +[30-08-2020 22:27:45] [DEBUG] 5.03369 +[30-08-2020 22:27:45] [DEBUG] 5.05415 +[30-08-2020 22:27:45] [DEBUG] 5.07499 +[30-08-2020 22:27:45] [DEBUG] 5.09612 +[30-08-2020 22:27:45] [DEBUG] 5.11672 +[30-08-2020 22:27:45] [DEBUG] 5.13751 +[30-08-2020 22:27:45] [DEBUG] 5.15838 +[30-08-2020 22:27:45] [DEBUG] 5.17922 +[30-08-2020 22:27:45] [DEBUG] 5.20008 +[30-08-2020 22:27:45] [DEBUG] 5.22101 +[30-08-2020 22:27:45] [DEBUG] 5.24202 +[30-08-2020 22:27:45] [DEBUG] 5.26259 +[30-08-2020 22:27:45] [DEBUG] 5.28327 +[30-08-2020 22:27:45] [DEBUG] 5.30412 +[30-08-2020 22:27:45] [DEBUG] 5.32502 +[30-08-2020 22:27:45] [DEBUG] 5.34577 +[30-08-2020 22:27:45] [DEBUG] 5.36665 +[30-08-2020 22:27:45] [DEBUG] 5.38748 +[30-08-2020 22:27:45] [DEBUG] 5.40837 +[30-08-2020 22:27:45] [DEBUG] 5.42923 +[30-08-2020 22:27:45] [DEBUG] 5.44999 +[30-08-2020 22:27:45] [DEBUG] 5.47087 +[30-08-2020 22:27:45] [DEBUG] 5.49164 +[30-08-2020 22:27:45] [DEBUG] 5.51256 +[30-08-2020 22:27:45] [DEBUG] 5.53348 +[30-08-2020 22:27:45] [DEBUG] 5.55455 +[30-08-2020 22:27:45] [DEBUG] 5.57509 +[30-08-2020 22:27:45] [DEBUG] 5.59593 +[30-08-2020 22:27:46] [DEBUG] 5.61661 +[30-08-2020 22:27:46] [DEBUG] 5.63749 +[30-08-2020 22:27:46] [DEBUG] 5.65832 diff --git a/The Great Machine/main.cpp b/The Great Machine/main.cpp index 6a40c81..3d59492 100644 --- a/The Great Machine/main.cpp +++ b/The Great Machine/main.cpp @@ -12,8 +12,6 @@ private: Logger& _Logger; Dungeon* _Dungeon; - olc::Sprite* _TileSet; - public: Game() : _Logger(Logger::getInstance()) @@ -26,8 +24,6 @@ public: _Dungeon = new Dungeon(); _Dungeon->Generate(); - _TileSet = new olc::Sprite("./res/dungeon_tileset.png"); - return true; } @@ -50,17 +46,17 @@ public: Clear({ 38, 36, 40 }); - //_Logger.Debug(m_TimeAccumilator); + _Logger.Debug(m_TimeAccumilator); - //if (m_TimeAccumilator < 4.0f) - //{ - // DisplayTitle(fTime); - // return true; - //} + if (m_TimeAccumilator < 4.0f) + { + DisplayTitle(fTime); + return true; + } - // _Dungeon->Input(this); + _Dungeon->Input(this); - // _Dungeon->Draw(this); + _Dungeon->Draw(this); DrawSprite({ 0, 0 }, _TileSet); diff --git a/The Great Machine/res/dungeon_pre.png b/The Great Machine/res/dungeon_pre.png new file mode 100644 index 0000000..c6d8d52 Binary files /dev/null and b/The Great Machine/res/dungeon_pre.png differ diff --git a/The Great Machine/res/dungeon_tileset.png b/The Great Machine/res/dungeon_tileset.png new file mode 100644 index 0000000..53df861 Binary files /dev/null and b/The Great Machine/res/dungeon_tileset.png differ