diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-06 17:30:31 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-06 17:30:31 +0200 |
| commit | 437dd5940bad6133561cb896cd558881fa5c8b44 (patch) | |
| tree | b8f8103801d0f232ae05e728e83774673ae8413f /main/main.cpp | |
| parent | ded69f52906990cf975a62c0efbaca4b6cfa5e88 (diff) | |
a
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/main/main.cpp b/main/main.cpp index 14828cad..22cec94f 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -6,9 +6,7 @@ #include "floor-mesh.hpp" #include "wall-mesh.hpp" #include "compat/defs.hpp" - #include <bitset> - #include <Magnum/Magnum.h> #include <Magnum/Math/Vector.h> #include <Magnum/GL/DefaultFramebuffer.h> @@ -55,10 +53,10 @@ struct app final : Platform::Application chunk make_test_chunk(); tile_shader _shader; - tile_atlas_ floor1 = loader.tile_atlas("../share/game/images/metal1.tga", {2, 2}); - tile_atlas_ floor2 = loader.tile_atlas("../share/game/images/floor1.tga", {4, 4}); - tile_atlas_ wall1 = loader.tile_atlas("../share/game/images/wood2.tga", {2, 2}); - tile_atlas_ wall2 = loader.tile_atlas("../share/game/images/wood1.tga", {2, 2}); + tile_atlas_ floor1 = loader.tile_atlas("share/game/images/metal1.tga", {2, 2}); + tile_atlas_ floor2 = loader.tile_atlas("share/game/images/floor1.tga", {4, 4}); + tile_atlas_ wall1 = loader.tile_atlas("share/game/images/wood2.tga", {2, 2}); + tile_atlas_ wall2 = loader.tile_atlas("share/game/images/wood1.tga", {2, 2}); chunk _chunk = make_test_chunk(); floor_mesh _floor_mesh; wall_mesh _wall_mesh; |