summaryrefslogtreecommitdiffhomepage
path: root/main
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2022-10-24 22:55:06 +0200
committerStanislaw Halik <sthalik@misaki.pl>2022-10-24 22:55:06 +0200
commit9076ef2ee672877bbf339d5ca8db182445f127f7 (patch)
treeb1c2c8a379e864867f8ad3878fc81d9f06fa1bda /main
parent27a04888cfeca3d3db127744dde60b67fe497b94 (diff)
a
Diffstat (limited to 'main')
-rw-r--r--main/debug.cpp2
-rw-r--r--main/floormat-app.hpp2
-rw-r--r--main/floormat-main-impl.cpp6
-rw-r--r--main/floormat.hpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/main/debug.cpp b/main/debug.cpp
index 04c76343..f46c63d5 100644
--- a/main/debug.cpp
+++ b/main/debug.cpp
@@ -61,7 +61,7 @@ void main_impl::register_debug_callback()
{
GL::DebugOutput::setCallback(_debug_callback, this);
-#if 0
+#if 1
/* Disable rather spammy "Buffer detailed info" debug messages on NVidia drivers */
GL::DebugOutput::setEnabled(GL::DebugOutput::Source::Api, GL::DebugOutput::Type::Other, {131185}, false);
#endif
diff --git a/main/floormat-app.hpp b/main/floormat-app.hpp
index 3f382e32..60ecc52c 100644
--- a/main/floormat-app.hpp
+++ b/main/floormat-app.hpp
@@ -26,7 +26,7 @@ struct floormat_app
[[deprecated]] floormat_app& operator=(floormat_app&&) = default;
virtual void update(float dt) = 0;
- virtual void maybe_init_chunk(const chunk_coords& pos, chunk& c) = 0;
+ virtual void maybe_initialize_chunk(const chunk_coords& pos, chunk& c) = 0;
virtual void draw_msaa();
virtual void draw() = 0;
diff --git a/main/floormat-main-impl.cpp b/main/floormat-main-impl.cpp
index 0dfd3e01..dc9bc0b0 100644
--- a/main/floormat-main-impl.cpp
+++ b/main/floormat-main-impl.cpp
@@ -143,10 +143,10 @@ void main_impl::draw_world() noexcept
for (std::int16_t x = minx; x <= maxx; x++)
{
if (const chunk_coords c = {x, y}; !_world.contains(c))
- app.maybe_init_chunk(c, *_world[c]);
+ app.maybe_initialize_chunk(c, _world[c]);
const chunk_coords c{x, y};
const with_shifted_camera_offset o{_shader, c};
- _floor_mesh.draw(_shader, *_world[c]);
+ _floor_mesh.draw(_shader, _world[c]);
}
for (std::int16_t y = miny; y <= maxy; y++)
@@ -154,7 +154,7 @@ void main_impl::draw_world() noexcept
{
const chunk_coords c{x, y};
const with_shifted_camera_offset o{_shader, c};
- _wall_mesh.draw(_shader, *_world[c]);
+ _wall_mesh.draw(_shader, _world[c]);
}
}
diff --git a/main/floormat.hpp b/main/floormat.hpp
index dffb551f..3bf4b492 100644
--- a/main/floormat.hpp
+++ b/main/floormat.hpp
@@ -20,7 +20,7 @@ struct fm_settings
Magnum::Math::Vector2<int> resolution{1024, 768};
Corrade::Containers::String title{"Test"};
Corrade::Containers::String disabled_extensions; // TODO
- std::uint8_t msaa_samples = 4;
+ std::uint8_t msaa_samples = 16;
fm_tristate vsync = fm_tristate::maybe;
fm_gpu_debug gpu_debug = fm_gpu_debug::on;
fm_log_level log_level = fm_log_level::normal;