diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-09 05:06:41 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-09 05:06:41 +0200 |
| commit | 94f6748d5f5b9fdc3047022fe59d66028bde63f3 (patch) | |
| tree | de3dd2e7944c9dea12523702773ce5a2f93beed5 /main | |
| parent | e3b2c9267e7a8da5adca522a48a9f9a8457f89d8 (diff) | |
a
Diffstat (limited to 'main')
| -rw-r--r-- | main/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | main/app.hpp | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 1d8da0a1..9723e38b 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,7 +1,7 @@ set(self "${PROJECT_NAME}-main") file(GLOB sources "*.cpp" CONFIGURE_ARGS) -link_libraries(${PROJECT_NAME}) +link_libraries(${PROJECT_NAME} ${PROJECT_NAME}-draw) link_libraries(Magnum::Sdl2Application Magnum::Trade) corrade_add_resource(res ../resources.conf) diff --git a/main/app.hpp b/main/app.hpp index 07a64d2f..c691f85d 100644 --- a/main/app.hpp +++ b/main/app.hpp @@ -3,10 +3,10 @@ #include "chunk.hpp" #include "shaders/tile-shader.hpp" #include "src/loader.hpp" -#include "floor-mesh.hpp" -#include "wall-mesh.hpp" -#include "wireframe-mesh.hpp" -#include "wireframe-quad.hpp" +#include "draw/floor-mesh.hpp" +#include "draw/wall-mesh.hpp" +#include "draw/wireframe-mesh.hpp" +#include "draw/wireframe-quad.hpp" #include "compat/enum-bitset.hpp" #include <Magnum/Timeline.h> #include <Magnum/Platform/Sdl2Application.h> @@ -44,13 +44,14 @@ struct app final : Platform::Application }; chunk make_test_chunk(); - const void* const _dummy = register_debug_callback(); + const void* _dummy = register_debug_callback(); 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}); chunk _chunk = make_test_chunk(); + floor_mesh _floor_mesh; wall_mesh _wall_mesh; wireframe_mesh<wireframe::quad> _wireframe_quad; |