eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-06 13:58:36 +01:00
Code Issues 150 Wiki Activity

repair the include reordering

Browse Source 
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.
This commit is contained in:
maj00r
2026-09-10 00:52:06 +02:00
parent 1455583ab6
commit cfd1c1f318
4 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
betterRenderer/renderer/source/nvrenderer.cpp
View File

@@ -11,15 +11,8 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include <vector> #include <vector>
import eu07.simcore;
import eu07.utilities.logs;
import eu07.utilities.timer;
import eu07.application.application;
#include <nvrhi/utils.h> #include <nvrhi/utils.h>
import eu07.simulation.simulation;
#include <future> #include <future>
#include "auto_exposure.h" #include "auto_exposure.h"
#include "bloom.h" #include "bloom.h"
#include "config.h" #include "config.h"
@@ -39,18 +32,25 @@ import eu07.simulation.simulation;
#include "sky.h" #include "sky.h"
#include "ssao.h" #include "ssao.h"
#include "tonemap.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_MINIZ 0
#define TINYEXR_USE_STB_ZLIB 1 #define TINYEXR_USE_STB_ZLIB 1
#define TINYEXR_IMPLEMENTATION #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; import eu07.glm;
#include "utilities/utilities_macros.h"
import eu07.utilities.utilities; import eu07.utilities.utilities;
bool NvRenderer::Init(GLFWwindow *Window) { bool NvRenderer::Init(GLFWwindow *Window) {

3
betterRenderer/renderer/source/nvrenderer_d3d12.cpp
View File

@@ -17,9 +17,10 @@
#include "nvrendererbackend.h" #include "nvrendererbackend.h"
#define HR_RETURN(op) \
import eu07.utilities.globals; import eu07.utilities.globals;
import eu07.utilities.logs; import eu07.utilities.logs;
#define HR_RETURN(op) \
hr = (HRESULT)(op); \ hr = (HRESULT)(op); \
if (FAILED(hr)) { \ if (FAILED(hr)) { \
ErrorLog(fmt::format(#op " returned HRESULT={}", hr)); \ ErrorLog(fmt::format(#op " returned HRESULT={}", hr)); \

10
betterRenderer/renderer/source/nvtexture.cpp
View File

@@ -11,20 +11,20 @@
#include <sstream> #include <sstream>
#include <string> #include <string>
#include <utility> #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.utilities.globals;
import eu07.scripting.pyint; import eu07.scripting.pyint;
import eu07.application.application; import eu07.application.application;
import eu07.utilities.dictionary; import eu07.utilities.dictionary;
#include <fmt/format.h>
#include "utilities/utilities_macros.h"
import eu07.utilities.utilities; import eu07.utilities.utilities;
import eu07.utilities.logs; import eu07.utilities.logs;
// #include "Texture.h" // #include "Texture.h"
#include "nvrendererbackend.h"
#include "stbi/stb_image.h"
#define STB_IMAGE_RESIZE2_IMPLEMENTATION #define STB_IMAGE_RESIZE2_IMPLEMENTATION
#include "stbi/stb_image_resize2.h"
import eu07.model.texture; import eu07.model.texture;
#undef STB_IMAGE_RESIZE2_IMPLEMENTATION #undef STB_IMAGE_RESIZE2_IMPLEMENTATION

2
betterRenderer/renderer/source/track_batching.cpp
View File

@@ -13,11 +13,11 @@
#include <unordered_map> #include <unordered_map>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "utilities/utilities_macros.h"
import eu07.utilities.timer; import eu07.utilities.timer;
import eu07.simcore; import eu07.simcore;
import eu07.simulation.simulation; import eu07.simulation.simulation;
import eu07.glm; import eu07.glm;
#include "utilities/utilities_macros.h"
import eu07.utilities.utilities; import eu07.utilities.utilities;
import eu07.utilities.float3d; import eu07.utilities.float3d;