diff options
| author | Mel <einebeere@gmail.com> | 2024-02-19 13:12:57 +0100 |
|---|---|---|
| committer | Mel <einebeere@gmail.com> | 2024-02-19 13:12:57 +0100 |
| commit | 3ae3891ca2698d5fd2160fbed5b780a91651a218 (patch) | |
| tree | ebfd259ed517a1ddc9a26c469b7c34fc165d5ced /src | |
| parent | 3e6eb265a018fd0422b59ca9ea1b8918abee5c16 (diff) | |
| download | meowcraft-3ae3891ca2698d5fd2160fbed5b780a91651a218.tar.zst meowcraft-3ae3891ca2698d5fd2160fbed5b780a91651a218.zip | |
Fix for GCC and Linux
Diffstat (limited to 'src')
| -rw-r--r-- | src/Game.cpp | 4 | ||||
| -rw-r--r-- | src/Input.hpp | 1 | ||||
| -rw-r--r-- | src/Render.hpp | 2 | ||||
| -rw-r--r-- | src/Util/ImageViewer.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 1 |
5 files changed, 6 insertions, 4 deletions
diff --git a/src/Game.cpp b/src/Game.cpp index dd04b2f..6c6df7c 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -50,14 +50,14 @@ void Game::run() const { for (auto chunk : world.get_visible_chunks(time, camera.position())) { auto position = chunk->chunk.value().position(); actions.add({ - .program = GFX::Resources::Program::Terrain, .mesh = &chunk->land_mesh.value(), + .program = GFX::Resources::Program::Terrain, .transform = Transform(position), }); actions.add({ - .program = GFX::Resources::Program::Terrain, .mesh = &chunk->water_mesh.value(), + .program = GFX::Resources::Program::Terrain, .transform = Transform(position - Vec3{0, 0.2, 0}), .alpha = 0.4, }); diff --git a/src/Input.hpp b/src/Input.hpp index 683ee55..b6f24b6 100644 --- a/src/Input.hpp +++ b/src/Input.hpp @@ -1,5 +1,6 @@ #pragma once +#include <memory> #include "Time.hpp" #include "Common/Casts.hpp" #include "Common/Sizes.hpp" diff --git a/src/Render.hpp b/src/Render.hpp index 6b7cb65..09c6fee 100644 --- a/src/Render.hpp +++ b/src/Render.hpp @@ -1,7 +1,7 @@ #pragma once #include <condition_variable> -#include "Defines.hpp" +#include <mutex> #include "Common/Sizes.hpp" #include "GFX/Actions.hpp" #include "GFX/Camera.hpp" diff --git a/src/Util/ImageViewer.cpp b/src/Util/ImageViewer.cpp index 05d316c..abb22d4 100644 --- a/src/Util/ImageViewer.cpp +++ b/src/Util/ImageViewer.cpp @@ -6,8 +6,8 @@ void ImageViewer::render(GFX::Actions& actions) { // TODO: Re-add texture support // TODO: Add orthographic camera support actions.add({ - .program = GFX::Resources::Program::ImageViewer, .mesh = &m_mesh, + .program = GFX::Resources::Program::ImageViewer, .transform = Transform(), }); } diff --git a/src/main.cpp b/src/main.cpp index 94061f1..737c045 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,6 +2,7 @@ #include <GL/glew.h> #include <GLFW/glfw3.h> +#include "Defines.hpp" #include "Game.hpp" #include "Render.hpp" #include "ThreadRole.hpp" |