a

9 files changed, 9 insertions, 8 deletions

diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake
index e54431bc..ea01163a 100644
--- a/cmake/msvc.cmake
+++ b/cmake/msvc.cmake
@@ -93,7 +93,7 @@ else()
     set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL" CACHE INTERNAL "" FORCE)
 endif()
 set(_CXXFLAGS "${_CFLAGS} -Zc:throwingNew -Zc:lambda")
-set(_CFLAGS_RELEASE "-O2 -Oit -Oy- -Ob3 -fp:fast -GS- -GF -GL -Gw -Gy")
+set(_CFLAGS_RELEASE "-O2 -Oit -Oy -Ox -Ob3 -fp:fast -GS- -GF -GL -Gw -Gy")
 if(NOT floormat-simd STREQUAL "")
     set(_CFLAGS_RELEASE "${_CFLAGS_RELEASE} -arch:${floormat-simd}")
 endif()
diff --git a/editor/app.cpp b/editor/app.cpp
index ace6718a..4c81ffda 100644
--- a/editor/app.cpp
+++ b/editor/app.cpp
@@ -33,7 +33,7 @@ app::~app() = default;
 
 void app::reset_world()
 {
-    reset_world(floormat::world{});
+    reset_world(world{});
 }
 
 void app::ensure_player_character(world& w)
diff --git a/editor/events.cpp b/editor/events.cpp
index 1c73188c..0863e6ec 100644
--- a/editor/events.cpp
+++ b/editor/events.cpp
@@ -220,7 +220,7 @@ void app::on_mouse_leave() noexcept
     update_cursor_tile(NullOpt);
 }
 
-void app::do_key(floormat::key k)
+void app::do_key(key k)
 {
     do_key(k, get_key_modifiers());
 }
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 7c9949ca..df0de0dc 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -260,6 +260,7 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES)
         set(BENCHMARK_ENABLE_DOXYGEN OFF)
         set(BENCHMARK_INSTALL_DOCS OFF)
         set(BENCHMARK_ENABLE_GTEST_TESTS OFF)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG")
         add_subdirectory(benchmark ${system})
         install(TARGETS benchmark RUNTIME DESTINATION "bin")
     endfunction()
diff --git a/shaders/texture-unit-cache.cpp b/shaders/texture-unit-cache.cpp
index c3defb44..857092d0 100644
--- a/shaders/texture-unit-cache.cpp
+++ b/shaders/texture-unit-cache.cpp
@@ -79,7 +79,7 @@ void texture_unit_cache::invalidate()
     cache_miss_count = 0;
 }
 
-void texture_unit_cache::lock(floormat::size_t i, GL::AbstractTexture* tex)
+void texture_unit_cache::lock(size_t i, GL::AbstractTexture* tex)
 {
     fm_assert(i < unit_count);
     units[i] = { .ptr = tex, .lru_val = (uint64_t)-1, };
diff --git a/src/path-search-dijkstra.cpp b/src/path-search-dijkstra.cpp
index 994ca0ee..2ff87b00 100644
--- a/src/path-search-dijkstra.cpp
+++ b/src/path-search-dijkstra.cpp
@@ -148,7 +148,7 @@ size_t astar::edge_hash::operator()(const edge& e) const
 #endif
 }
 
-bool astar::edge::operator==(const floormat::astar::edge& other) const = default;
+bool astar::edge::operator==(const astar::edge& other) const = default;
 #endif
 
 path_search_result astar::Dijkstra(world& w, point from_, point to_, object_id own_id, uint32_t max_dist,
diff --git a/src/point.hpp b/src/point.hpp
index abf50501..10963c22 100644
--- a/src/point.hpp
+++ b/src/point.hpp
@@ -48,7 +48,7 @@ constexpr point::point(global_coords coord, Vector2b offset) : point{coord.chunk
 constexpr point::point(chunk_coords_ coord, local_coords tile, Vector2b offset) :
     cx{coord.x}, cy{coord.y}, cz{coord.z}, tile{tile}, _offset{offset}
 {}
-constexpr point::point(const floormat::point& other) = default;
+constexpr point::point(const point& other) = default;
 constexpr point& point::operator=(const point& other) = default;
 
 constexpr bool point::operator==(const point&) const noexcept = default;
diff --git a/src/world.cpp b/src/world.cpp
index 9b19aed4..5f2bb870 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -192,7 +192,7 @@ void world::throw_on_wrong_object_type(object_id id, object_type actual, object_
     fm_throw("object '{}' has wrong object type '{}', should be '{}'"_cf, id, (size_t)actual, (size_t)expected);
 }
 
-auto world::neighbors(floormat::chunk_coords_ coord) -> std::array<neighbor_pair, 8>
+auto world::neighbors(chunk_coords_ coord) -> std::array<neighbor_pair, 8>
 {
     std::array<neighbor_pair, 8> ret;
     for (auto i = 0uz; const auto& x : neighbor_offsets)
diff --git a/userconfig-sthalik@Windows-Clang.cmake b/userconfig-sthalik@Windows-Clang.cmake
index e0796dcf..cd11fcdf 100644
--- a/userconfig-sthalik@Windows-Clang.cmake
+++ b/userconfig-sthalik@Windows-Clang.cmake
@@ -31,7 +31,7 @@ set(CMAKE_INSTALL_MESSAGE NEVER)
 sets(STRING
      CMAKE_C_FLAGS ""
      CMAKE_C_FLAGS_DEBUG "-O0 -g -ggdb -gcolumn-info -gmodules -gdwarf-aranges -gz=zlib -fstack-protector-all"
-     CMAKE_C_FLAGS_RELEASE "-O3 -ffast-math -ftree-vectorize -march=core2 -mtune=skylake -mtune=native -mavx"
+     CMAKE_C_FLAGS_RELEASE "-O3 -g -ggdb -ffast-math -march=nehalem -mtune=native -mpopcnt -mavx -fomit-frame-pointer -fno-stack-protector"
      CMAKE_EXE_LINKER_FLAGS_DEBUG ""
      CMAKE_SHARED_LINKER_FLAGS_DEBUG ""
 )