From cfd1c1f318d478a3675aa5d59311767ac3c0ee68 Mon Sep 17 00:00:00 2001
From: maj00r <maj00r@host>
Date: Thu, 10 Sep 2026 00:52:06 +0200
Subject: [PATCH] repair the include reordering

The previous pass dropped imports into the middle of HR_RETURN's
line continuations, breaking nvrenderer_d3d12.cpp, and its scan gave up
on the first line of any file with a BOM - which is why nvtexture.cpp
still had five includes sitting after its imports. Rewritten to skip
macro continuations, tolerate a BOM, and insert only immediately before
the first import.
---
 betterRenderer/renderer/source/nvrenderer.cpp | 26 +++++++++----------
 .../renderer/source/nvrenderer_d3d12.cpp      |  3 ++-
 betterRenderer/renderer/source/nvtexture.cpp  | 10 +++----
 .../renderer/source/track_batching.cpp        |  2 +-
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/betterRenderer/renderer/source/nvrenderer.cpp b/betterRenderer/renderer/source/nvrenderer.cpp
index b3a068e8..11a54113 100644
--- a/betterRenderer/renderer/source/nvrenderer.cpp
+++ b/betterRenderer/renderer/source/nvrenderer.cpp
@@ -11,15 +11,8 @@
 #include <string>
 #include <utility>
 #include <vector>
-import eu07.simcore;
-import eu07.utilities.logs;
-import eu07.utilities.timer;
-import eu07.application.application;
 #include <nvrhi/utils.h>
-import eu07.simulation.simulation;
-
 #include <future>
-
 #include "auto_exposure.h"
 #include "bloom.h"
 #include "config.h"
@@ -39,18 +32,25 @@ import eu07.simulation.simulation;
 #include "sky.h"
 #include "ssao.h"
 #include "tonemap.h"
+#include <fmt/chrono.h>
+#include <fmt/format.h>
+#include "rt_model.h"
+#include "tinyexr.h"
+#include "windshield_rain.h"
+#include "utilities/utilities_macros.h"
+import eu07.simcore;
+import eu07.utilities.logs;
+import eu07.utilities.timer;
+import eu07.application.application;
+import eu07.simulation.simulation;
+
+
 
 #define TINYEXR_USE_MINIZ 0
 #define TINYEXR_USE_STB_ZLIB 1
 #define TINYEXR_IMPLEMENTATION
-#include <fmt/chrono.h>
-#include <fmt/format.h>
 
-#include "rt_model.h"
-#include "tinyexr.h"
-#include "windshield_rain.h"
 import eu07.glm;
-#include "utilities/utilities_macros.h"
 import eu07.utilities.utilities;
 
 bool NvRenderer::Init(GLFWwindow *Window) {
diff --git a/betterRenderer/renderer/source/nvrenderer_d3d12.cpp b/betterRenderer/renderer/source/nvrenderer_d3d12.cpp
index de7071d0..f39c62e4 100644
--- a/betterRenderer/renderer/source/nvrenderer_d3d12.cpp
+++ b/betterRenderer/renderer/source/nvrenderer_d3d12.cpp
@@ -17,9 +17,10 @@
 
 #include "nvrendererbackend.h"
 
-#define HR_RETURN(op)                                      \
 import eu07.utilities.globals;
 import eu07.utilities.logs;
+
+#define HR_RETURN(op)                                      \
   hr = (HRESULT)(op);                                      \
   if (FAILED(hr)) {                                        \
     ErrorLog(fmt::format(#op " returned HRESULT={}", hr)); \
diff --git a/betterRenderer/renderer/source/nvtexture.cpp b/betterRenderer/renderer/source/nvtexture.cpp
index ac35c87f..de058522 100644
--- a/betterRenderer/renderer/source/nvtexture.cpp
+++ b/betterRenderer/renderer/source/nvtexture.cpp
@@ -11,20 +11,20 @@
 #include <sstream>
 #include <string>
 #include <utility>
+#include <fmt/format.h>
+#include "utilities/utilities_macros.h"
+#include "nvrendererbackend.h"
+#include "stbi/stb_image.h"
+#include "stbi/stb_image_resize2.h"
 import eu07.utilities.globals;
 import eu07.scripting.pyint;
 import eu07.application.application;
 import eu07.utilities.dictionary;
-#include <fmt/format.h>
-#include "utilities/utilities_macros.h"
 import eu07.utilities.utilities;
 
 import eu07.utilities.logs;
 // #include "Texture.h"
-#include "nvrendererbackend.h"
-#include "stbi/stb_image.h"
 #define STB_IMAGE_RESIZE2_IMPLEMENTATION
-#include "stbi/stb_image_resize2.h"
 import eu07.model.texture;
 #undef STB_IMAGE_RESIZE2_IMPLEMENTATION
 
diff --git a/betterRenderer/renderer/source/track_batching.cpp b/betterRenderer/renderer/source/track_batching.cpp
index ea12fe04..f10dd22e 100644
--- a/betterRenderer/renderer/source/track_batching.cpp
+++ b/betterRenderer/renderer/source/track_batching.cpp
@@ -13,11 +13,11 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
+#include "utilities/utilities_macros.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;