put every include before every import

A header first pulled in through an imported module's global module
fragment leaves no include guard in the importing unit - macros do not
cross a module boundary - so a later textual include parses it again and
MSVC rejects the redefinition. Redoes the betterRenderer sweep with
placement that stays out of #if blocks, which is where the previous one
dropped <fstream> and broke nvrenderer_d3d12.cpp.

betterRenderer/eu07_source/register.cpp

@@ -1,7 +1,7 @@
-import eu07.utilities.logs;
-#include "nvrenderer/nvrenderer.h"
 #include <memory>
+#include "nvrenderer/nvrenderer.h"
 
+import eu07.utilities.logs;
 namespace {
 std::unique_ptr<gfx_renderer> create_nvrenderer_for_d3d12() {
   return std::make_unique<NvRenderer>(NvRenderer::Api::D3D12);

betterRenderer/renderer/include/nvrenderer/nvrenderer.h

@@ -24,20 +24,6 @@
 // EU07 includes. This header is consumed by translation units that include
 // nothing else, so everything it names has to be imported here rather than
 // relied on to arrive from the including file.
-import eu07.utilities.classes;
-import eu07.utilities.globals;
-import eu07.simcore;
-import eu07.rendering.geometrybank;
-import eu07.global_include.interfaces.imaterial;
-import eu07.global_include.interfaces.itexture;
-import eu07.gl.shader;
-
-#include "nvrenderer_enums.h"
-#include "quadtree.h"
-import eu07.rendering.renderer;
-#include "resource_registry.h"
-import eu07.environment.sky;
-import eu07.glm;
 #include <array>
 #include <condition_variable>
 #include <cstddef>
@@ -50,6 +36,20 @@ import eu07.glm;
 #include <utility>
 #include <vector>
 
+#include "nvrenderer_enums.h"
+#include "quadtree.h"
+#include "resource_registry.h"
+
+import eu07.utilities.classes;
+import eu07.utilities.globals;
+import eu07.simcore;
+import eu07.rendering.geometrybank;
+import eu07.global_include.interfaces.imaterial;
+import eu07.global_include.interfaces.itexture;
+import eu07.gl.shader;
+import eu07.rendering.renderer;
+import eu07.environment.sky;
+import eu07.glm;
 namespace Rt {
 struct IRtModel;
 }

betterRenderer/renderer/include/nvrenderer/quadtree.h

@@ -3,11 +3,11 @@
 #include <array>
 #include <memory>
 #include <vector>
-import eu07.glm;
-#include <cstdint>
 #include <cstddef>
 #include <limits>
+#include <cstdint>
 
+import eu07.glm;
 struct QuadTreeLeave {
   QuadTreeLeave(const glm::dvec3& origin, const glm::dvec3& extent,
                 uint32_t index)

betterRenderer/renderer/include/nvrenderer/resource_registry.h

@@ -3,11 +3,11 @@
 #include <nvrhi/nvrhi.h>
 
 #include <entt/entt.hpp>
-import eu07.glm;
 #include <cstddef>
 #include <cstdint>
 #include <memory>
 
+import eu07.glm;
 class NvTextureManager;
 class MaResourceRegistry;
 

betterRenderer/renderer/source/IntelTAA.h

@@ -1,3 +1,4 @@
+#include <cstdint>
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Copyright (C) 2016-2021, Intel Corporation 
 // 
@@ -19,7 +20,6 @@
 #ifdef __cplusplus
 
 #include <cmath>
-#include <cstdint>
 
 namespace IntelTAA
 {

betterRenderer/renderer/source/XeGTAO.h

@@ -31,8 +31,8 @@
 
 #include <cmath>
 #include "imgui/imgui.h"
-import eu07.glm;
 
+import eu07.glm;
 namespace XeGTAO
 {
 

betterRenderer/renderer/source/bloom.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <nvrhi/nvrhi.h>
-import eu07.glm;
 #include <vector>
 
+import eu07.glm;
 struct Bloom {
   struct BloomConstants {
     glm::vec4 m_prefilter_vector;

betterRenderer/renderer/source/contactshadows.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <nvrhi/nvrhi.h>
-import eu07.glm;
 #include <cstdint>
 
+import eu07.glm;
 struct MaContactShadows {
   MaContactShadows(class NvRenderer* renderer, class NvGbuffer* gbuffer);
   void Init();

betterRenderer/renderer/source/environment.cpp

@@ -8,15 +8,15 @@
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
 #include "nvtexture.h"
-import eu07.simulation.simulationenvironment;
-#include "sky.h"
 #include <cstddef>
 #include <cstdint>
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
+#include "sky.h"
 
+import eu07.simulation.simulationenvironment;
 int MaEnvironment::GetCurrentSetIndex() {
   if (m_locked_set_index >= 0 && IsReady()) {
     m_current_set_index = std::exchange(m_locked_set_index, -1);

betterRenderer/renderer/source/fsr.cpp

@@ -14,12 +14,12 @@
 #endif
 
 #include "utilities/Globals_macros.h"
-import eu07.utilities.globals;
 #include "gbuffer.h"
 #include "gbufferblitpass.h"
-import eu07.glm;
 #include <queue>
 
+import eu07.utilities.globals;
+import eu07.glm;
 NvFSR::NvFSR(NvRenderer* renderer)
     : m_backend(renderer->m_backend.get()),
       m_inputpass(renderer->m_gbuffer_blit.get()),

betterRenderer/renderer/source/fsr.h

@@ -3,10 +3,10 @@
 #include <ffx-fsr2-api/ffx_fsr2.h>
 
 #include "nvrendererbackend.h"
-import eu07.glm;
 #include <cstddef>
 #include <string>
 
+import eu07.glm;
 struct NvFSR {
   NvFSR(class NvRenderer* renderer);
   void Init();

betterRenderer/renderer/source/fullscreenpass.cpp

@@ -3,7 +3,6 @@
 #include "fullscreenpass.h"
 
 #include "nvrendererbackend.h"
-#include <cstring>
 
 FullScreenPass::FullScreenPass(NvRendererBackend* backend)
     : m_backend(backend) {}

betterRenderer/renderer/source/gbufferblitpass.cpp

@@ -1,7 +1,6 @@
 #include "gbufferblitpass.h"
 
 #include <chrono>
-import eu07.utilities.timer;
 #include <nvrhi/utils.h>
 
 #include "contactshadows.h"
@@ -11,8 +10,9 @@ import eu07.utilities.timer;
 #include "nvrendererbackend.h"
 #include "sky.h"
 #include "ssao.h"
-import eu07.glm;
 
+import eu07.utilities.timer;
+import eu07.glm;
 GbufferBlitPass::GbufferBlitPass(NvRenderer* renderer, NvGbuffer* gbuffer,
                                  NvGbuffer* gbuffer_shadow, NvSsao* ssao,
                                  MaEnvironment* environment,

betterRenderer/renderer/source/gbufferlighting.cpp

@@ -7,9 +7,9 @@
 #include "nvrendererbackend.h"
 #include "ssao.h"
 #include "config.h"
-import eu07.glm;
 #include <cstdint>
 
+import eu07.glm;
 void GbufferLighting::Init() {
   auto fb_info = m_renderer->m_gbuffer->m_framebuffer->getFramebufferInfo();
   m_width = fb_info.width;

betterRenderer/renderer/source/gbufferlighting.h

@@ -2,12 +2,12 @@
 
 #include <nvrenderer/nvrenderer.h>
 #include <nvrhi/nvrhi.h>
-import eu07.glm;
 #include <cstddef>
 #include <cstdint>
 #include <vector>
 
 
+import eu07.glm;
 struct GbufferLighting : public MaResourceRegistry {
   GbufferLighting(NvRenderer* renderer)
       : MaResourceRegistry(renderer), m_renderer(renderer) {}

betterRenderer/renderer/source/imgui_nvrhi.cpp

@@ -54,8 +54,6 @@ SOFTWARE.
 #include "nvrendererbackend.h"
 #include "config.h"
 #include <cstdint>
-#include <cstdio>
-#include <cstring>
 
 struct VERTEX_CONSTANT_BUFFER
 {

betterRenderer/renderer/source/materialparser.cpp

@@ -3,21 +3,21 @@
 #include "nvrenderer/nvrenderer.h"
 
 #include "utilities/Globals_macros.h"
-import eu07.utilities.globals;
-import eu07.utilities.logs;
-#include <fmt/format.h>
-import eu07.model.material;
-import eu07.utilities.parser;
-#include "utilities/utilities_macros.h"
-import eu07.utilities.utilities;
-#include <yaml-cpp/yaml.h>
-#include <string>
-#include <filesystem>
 #include <memory>
 #include <optional>
 #include <sstream>
 #include <utility>
+#include <fmt/format.h>
+#include "utilities/utilities_macros.h"
+#include <yaml-cpp/yaml.h>
+#include <string>
+#include <filesystem>
 
+import eu07.utilities.globals;
+import eu07.utilities.logs;
+import eu07.model.material;
+import eu07.utilities.parser;
+import eu07.utilities.utilities;
 std::string_view MaterialAdapter::GetTexturePathForEntry(
     std::string_view key) const {
   if (m_material_internal) {

betterRenderer/renderer/source/materialparser.h

@@ -7,8 +7,8 @@
 #include <unordered_map>
 
 #include <string>
-import eu07.glm;
 
+import eu07.glm;
 struct MaterialAdapterInternal {
   virtual ~MaterialAdapterInternal() = default;
   virtual std::string_view GetTexturePathForEntry(

betterRenderer/renderer/source/motioncache.h

@@ -2,11 +2,11 @@
 
 #include <cstdint>
 #include <functional>
-import eu07.glm;
-#include <cassert>
 #include <cstddef>
 #include <unordered_map>
+#include <cassert>
 
+import eu07.glm;
 struct MotionCacheId {
   union {
     struct {

betterRenderer/renderer/source/nvmaterial.cpp

@@ -4,7 +4,12 @@
 #include <fmt/format.h>
 #include <nvrhi/utils.h>
 
-import eu07.utilities.logs;
+#include <array>
+#include <cstddef>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
 #include "csm.h"
 #include "environment.h"
 #include "gbuffer.h"
@@ -12,13 +17,8 @@ import eu07.utilities.logs;
 #include "nvrendererbackend.h"
 #include "nvtexture.h"
 #include "sky.h"
-#include <array>
-#include <cstddef>
-#include <memory>
-#include <string>
-#include <unordered_map>
-#include <vector>
 
+import eu07.utilities.logs;
 bool NvRenderer::MaterialTemplate::CreateBindingSet(size_t pipeline_index,
                                                     MaterialCache &cache) {
   // for (size_t i = 0; i < cache.m_pipelines.size(); ++i) {

betterRenderer/renderer/source/nvrenderer.cpp

@@ -1,5 +1,16 @@
 #include "nvrenderer/nvrenderer.h"
 
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <limits>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <string>
+#include <utility>
+#include <vector>
 import eu07.simcore;
 import eu07.utilities.logs;
 import eu07.utilities.timer;
@@ -41,20 +52,6 @@ import eu07.simulation.simulation;
 import eu07.glm;
 #include "utilities/utilities_macros.h"
 import eu07.utilities.utilities;
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <limits>
-#include <memory>
-#include <mutex>
-#include <optional>
-#include <string>
-#include <utility>
-#include <vector>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 
 bool NvRenderer::Init(GLFWwindow *Window) {
   m_message_callback = std::make_shared<NvRendererMessageCallback>();

betterRenderer/renderer/source/nvrenderer_d3d12.cpp

@@ -3,8 +3,10 @@
 #include <fmt/format.h>
 
 #include "utilities/Globals_macros.h"
-import eu07.utilities.globals;
+#include <fstream>
-import eu07.utilities.logs;
+#include <ios>
+#include <memory>
+#include <string>
 #include "config.h"
 #include "nvrenderer/nvrenderer.h"
 
@@ -14,12 +16,10 @@ import eu07.utilities.logs;
 #include <nvrhi/validation.h>
 
 #include "nvrendererbackend.h"
-#include <fstream>
-#include <ios>
-#include <memory>
-#include <string>
 
 #define HR_RETURN(op)                                      \
+import eu07.utilities.globals;
+import eu07.utilities.logs;
   hr = (HRESULT)(op);                                      \
   if (FAILED(hr)) {                                        \
     ErrorLog(fmt::format(#op " returned HRESULT={}", hr)); \

betterRenderer/renderer/source/nvrenderer_d3d12.h

@@ -4,6 +4,8 @@
 
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
+#include <string>
+#include <vector>
 
 #if LIBMANUL_WITH_D3D12
 
@@ -11,8 +13,6 @@
 #include <dxgi1_6.h>
 #include <dxgidebug.h>
 #include <nvrhi/d3d12.h>
-#include <string>
-#include <vector>
 
 class NvRendererBackend_D3D12 : public NvRendererBackend {
   friend class NvRenderer;

betterRenderer/renderer/source/nvrenderer_vulkan.cpp

@@ -4,19 +4,6 @@
 #include <fmt/format.h>
 
 #include "utilities/Globals_macros.h"
-import eu07.utilities.globals;
-import eu07.utilities.logs;
-#include "config.h"
-#include "nvrenderer/nvrenderer.h"
-
-#if LIBMANUL_WITH_VULKAN
-
-#include <nvrhi/validation.h>
-
-VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
-
-#include "nvrendererbackend.h"
-#include <queue>
 #include <cstddef>
 #include <cstdint>
 #include <iostream>
@@ -27,6 +14,19 @@ VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
 #include <string>
 #include <unordered_set>
 #include <vector>
+#include "config.h"
+#include "nvrenderer/nvrenderer.h"
+
+#if LIBMANUL_WITH_VULKAN
+
+#include <nvrhi/validation.h>
+
+import eu07.utilities.globals;
+import eu07.utilities.logs;
+VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
+
+#include "nvrendererbackend.h"
+#include <queue>
 
 #define MA_ERROR_LOG(fmt_str, ...) ErrorLog(fmt::format(fmt_str, __VA_ARGS__))
 #define MA_INFO_LOG(fmt_str, ...) WriteLog(fmt::format(fmt_str, __VA_ARGS__))

betterRenderer/renderer/source/nvrenderer_vulkan.h

@@ -4,6 +4,10 @@
 
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
+#include <cstdint>
+#include <string>
+#include <unordered_set>
+#include <vector>
 
 #if LIBMANUL_WITH_VULKAN
 
@@ -12,10 +16,6 @@
 
 #include <vulkan/vulkan.hpp>
 #include <queue>
-#include <cstdint>
-#include <string>
-#include <unordered_set>
-#include <vector>
 
 class NvRendererBackend_Vulkan : public NvRendererBackend {
   friend class NvRenderer;

betterRenderer/renderer/source/nvrendererbackend.cpp

@@ -1,11 +1,11 @@
 #include "nvrendererbackend.h"
 
-import eu07.utilities.logs;
-#include <fmt/format.h>
 #include <cstddef>
 #include <string>
 #include <unordered_map>
+#include <fmt/format.h>
 
+import eu07.utilities.logs;
 void NvRendererMessageCallback::message(nvrhi::MessageSeverity severity,
                                         const char *messageText) {
   switch (severity) {

betterRenderer/renderer/source/nvtexture.cpp

@@ -2,6 +2,15 @@
 #include "nvrenderer/nvrenderer.h"
 
 #include "utilities/Globals_macros.h"
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <fstream>
+#include <ios>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <utility>
 import eu07.utilities.globals;
 import eu07.scripting.pyint;
 import eu07.application.application;
@@ -17,16 +26,6 @@ import eu07.utilities.logs;
 #define STB_IMAGE_RESIZE2_IMPLEMENTATION
 #include "stbi/stb_image_resize2.h"
 import eu07.model.texture;
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <fstream>
-#include <ios>
-#include <memory>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <cstring>
 #undef STB_IMAGE_RESIZE2_IMPLEMENTATION
 
 uint64_t NvTexture::s_change_counter = 0;

betterRenderer/renderer/source/nvtexture.h

@@ -6,15 +6,15 @@
 #include <nvrhi/nvrhi.h>
 
 #include "global_include/interfaces/ITexture_macros.h"
-import eu07.global_include.interfaces.itexture;
-#include "nvrenderer/nvrenderer_enums.h"
-import eu07.glm;
 #include <cstddef>
 #include <cstdint>
 #include <string>
 #include <utility>
 #include <vector>
+#include "nvrenderer/nvrenderer_enums.h"
 
+import eu07.global_include.interfaces.itexture;
+import eu07.glm;
 enum MaTextureTraits {
   MaTextureTraits_Sharpen,
   MaTextureTraits_ClampS,

betterRenderer/renderer/source/resource_registry.cpp

@@ -1,15 +1,15 @@
 #include "nvrenderer/resource_registry.h"
 
-import eu07.utilities.logs;
-#include "fmt/compile.h"
-#include "nvtexture.h"
-#include "nvrenderer/nvrenderer.h"
 #include <cstddef>
 #include <cstdint>
 #include <memory>
 #include <stdexcept>
 #include <string>
+#include "fmt/compile.h"
+#include "nvtexture.h"
+#include "nvrenderer/nvrenderer.h"
 
+import eu07.utilities.logs;
 MaResourceMappingSet& MaResourceMappingSet::Add(
     const MaResourceMapping& mapping) {
   m_mappings.push_back(mapping);

betterRenderer/renderer/source/rt_model.cpp

@@ -9,7 +9,6 @@
 
 #include <vector>
 
-import eu07.simcore;
 #include <array>
 #include <cstddef>
 #include <limits>
@@ -17,6 +16,7 @@ import eu07.simcore;
 #include <tuple>
 #include <unordered_map>
 
+import eu07.simcore;
 namespace Rt {
 
 using Bbox = bvh::v2::BBox<float, 3>;

betterRenderer/renderer/source/rt_model.h

@@ -6,9 +6,9 @@
 
 // TSubModel/TModel3d are owned by the simulation core; a forward
 // declaration here would be a second, conflicting declaration.
+
 import eu07.simcore;
 import eu07.glm;
-
 namespace Rt {
 struct IRtModel {
   virtual TSubModel const* Intersect(NvRenderer::Renderable const& renderable,

betterRenderer/renderer/source/sky.cpp

@@ -4,14 +4,14 @@
 
 #include "environment.h"
 #include "nvrendererbackend.h"
-import eu07.simulation.simulationenvironment;
-import eu07.simulation.simulationtime;
-#include "imgui/imgui.h"
-import eu07.glm;
 #include <array>
 #include <limits>
 #include <memory>
+#include "imgui/imgui.h"
 
+import eu07.simulation.simulationenvironment;
+import eu07.simulation.simulationtime;
+import eu07.glm;
 namespace {
 static const float PI = 3.14159265358979323846f;
 static const float INV_PI = 0.31830988618379067154f;

betterRenderer/renderer/source/ssao.cpp

@@ -9,10 +9,10 @@
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
 #include "imgui/imgui.h"
-import eu07.glm;
 #include <array>
 #include <cstddef>
 
+import eu07.glm;
 NvSsao::NvSsao(NvRenderer* renderer)
     : m_backend(renderer->m_backend.get()),
       m_gbuffer(renderer->m_gbuffer.get()),

betterRenderer/renderer/source/ssao.h

@@ -5,10 +5,10 @@
 #include <memory>
 
 #include "XeGTAO.h"
-import eu07.glm;
 #include <array>
 #include <cstddef>
 
+import eu07.glm;
 struct NvSsao {
   NvSsao(class NvRenderer* renderer);
   void Init();

betterRenderer/renderer/source/topo_utils.h

@@ -1,7 +1,7 @@
 #pragma once
 
-import eu07.simcore;
 
+import eu07.simcore;
 struct MaTopologyUtils {
 
   void ConvertTopology(gfx::index_array &Indices, gfx::vertex_array &Vertices,

betterRenderer/renderer/source/track_batching.cpp

@@ -4,13 +4,6 @@
 #include "nvrenderer/nvrenderer.h"
 #include "nvrendererbackend.h"
 
-import eu07.utilities.timer;
-import eu07.simcore;
-import eu07.simulation.simulation;
-import eu07.glm;
-#include "utilities/utilities_macros.h"
-import eu07.utilities.utilities;
-import eu07.utilities.float3d;
 #include <cstddef>
 #include <cstdint>
 #include <functional>
@@ -20,6 +13,13 @@ import eu07.utilities.float3d;
 #include <unordered_map>
 #include <utility>
 #include <vector>
+import eu07.utilities.timer;
+import eu07.simcore;
+import eu07.simulation.simulation;
+import eu07.glm;
+#include "utilities/utilities_macros.h"
+import eu07.utilities.utilities;
+import eu07.utilities.float3d;
 
 namespace BatchingUtils {