mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-30 15:30:28 +01:00
let betterRenderer import the modules
The module file set moves to its own eu07_modules library: a target can only consume C++20 modules by linking the target that owns them, and betterRenderer is a separate add_library. Its project includes become imports. CXX_EXTENSIONS must match across the two - a BMI built with -std=c++20 is refused by a unit compiled with -std=gnu++20.
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
#include "nvrenderer/nvrenderer.h"
|
||||
#include "nvrendererbackend.h"
|
||||
#include "nvtexture.h"
|
||||
#include "simulation/simulationenvironment.h"
|
||||
import eu07.simulation.simulationenvironment;
|
||||
#include "sky.h"
|
||||
|
||||
int MaEnvironment::GetCurrentSetIndex() {
|
||||
|
||||
@@ -13,7 +13,8 @@
|
||||
#include "nvrenderer_vulkan.h"
|
||||
#endif
|
||||
|
||||
#include "utilities/Globals.h"
|
||||
#include "utilities/Globals_macros.h"
|
||||
import eu07.utilities.globals;
|
||||
#include "gbuffer.h"
|
||||
#include "gbufferblitpass.h"
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "gbufferblitpass.h"
|
||||
|
||||
#include <chrono>
|
||||
#include <utilities/Timer.h>
|
||||
import eu07.utilities.timer;
|
||||
#include <nvrhi/utils.h>
|
||||
|
||||
#include "contactshadows.h"
|
||||
|
||||
@@ -2,12 +2,14 @@
|
||||
|
||||
#include "nvrenderer/nvrenderer.h"
|
||||
|
||||
#include <utilities/Globals.h>
|
||||
#include <utilities/Logs.h>
|
||||
#include "utilities/Globals_macros.h"
|
||||
import eu07.utilities.globals;
|
||||
import eu07.utilities.logs;
|
||||
#include <fmt/format.h>
|
||||
#include <model/material.h>
|
||||
import eu07.model.material;
|
||||
#include <parser.h>
|
||||
#include <utilities/utilities.h>
|
||||
#include "utilities/utilities_macros.h"
|
||||
import eu07.utilities.utilities;
|
||||
#include <yaml-cpp/yaml.h>
|
||||
#include <string>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <fmt/format.h>
|
||||
#include <nvrhi/utils.h>
|
||||
|
||||
#include "utilities/Logs.h"
|
||||
import eu07.utilities.logs;
|
||||
#include "csm.h"
|
||||
#include "environment.h"
|
||||
#include "gbuffer.h"
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
#include "nvrenderer/nvrenderer.h"
|
||||
|
||||
#include <model/AnimModel.h>
|
||||
#include <utilities/Logs.h>
|
||||
#include <model/Model3d.h>
|
||||
#include <utilities/Timer.h>
|
||||
#include <application/application.h>
|
||||
import eu07.simcore;
|
||||
import eu07.utilities.logs;
|
||||
import eu07.utilities.timer;
|
||||
import eu07.application.application;
|
||||
#include <nvrhi/utils.h>
|
||||
#include <simulation/simulation.h>
|
||||
import eu07.simulation.simulation;
|
||||
|
||||
#include <future>
|
||||
#include <glm/gtx/transform.hpp>
|
||||
|
||||
@@ -2,8 +2,9 @@
|
||||
|
||||
#include <fmt/format.h>
|
||||
|
||||
#include "utilities/Globals.h"
|
||||
#include "utilities/Logs.h"
|
||||
#include "utilities/Globals_macros.h"
|
||||
import eu07.utilities.globals;
|
||||
import eu07.utilities.logs;
|
||||
#include "config.h"
|
||||
#include "nvrenderer/nvrenderer.h"
|
||||
|
||||
|
||||
@@ -3,8 +3,9 @@
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <fmt/format.h>
|
||||
|
||||
#include "utilities/Globals.h"
|
||||
#include "utilities/Logs.h"
|
||||
#include "utilities/Globals_macros.h"
|
||||
import eu07.utilities.globals;
|
||||
import eu07.utilities.logs;
|
||||
#include "config.h"
|
||||
#include "nvrenderer/nvrenderer.h"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "nvrendererbackend.h"
|
||||
|
||||
#include "utilities/Logs.h"
|
||||
import eu07.utilities.logs;
|
||||
#include <fmt/format.h>
|
||||
|
||||
void NvRendererMessageCallback::message(nvrhi::MessageSeverity severity,
|
||||
|
||||
@@ -1,14 +1,16 @@
|
||||
#include "nvtexture.h"
|
||||
#include "nvrenderer/nvrenderer.h"
|
||||
|
||||
#include <utilities/Globals.h>
|
||||
#include <scripting/PyInt.h>
|
||||
#include <application/application.h>
|
||||
#include <utilities/dictionary.h>
|
||||
#include "utilities/Globals_macros.h"
|
||||
import eu07.utilities.globals;
|
||||
import eu07.scripting.pyint;
|
||||
import eu07.application.application;
|
||||
import eu07.utilities.dictionary;
|
||||
#include <fmt/format.h>
|
||||
#include <utilities/utilities.h>
|
||||
#include "utilities/utilities_macros.h"
|
||||
import eu07.utilities.utilities;
|
||||
|
||||
#include "utilities/Logs.h"
|
||||
import eu07.utilities.logs;
|
||||
// #include "Texture.h"
|
||||
#include "nvrendererbackend.h"
|
||||
#include "stbi/stb_image.h"
|
||||
|
||||
@@ -6,7 +6,8 @@
|
||||
#include <nvrhi/nvrhi.h>
|
||||
|
||||
#include <glm/glm.hpp>
|
||||
#include "interfaces/ITexture.h"
|
||||
#include "global_include/interfaces/ITexture_macros.h"
|
||||
import eu07.global_include.interfaces.itexture;
|
||||
#include "nvrenderer/nvrenderer_enums.h"
|
||||
|
||||
enum MaTextureTraits {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "nvrenderer/resource_registry.h"
|
||||
|
||||
#include "utilities/Logs.h"
|
||||
import eu07.utilities.logs;
|
||||
#include "fmt/compile.h"
|
||||
#include "nvtexture.h"
|
||||
#include "nvrenderer/nvrenderer.h"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "model/Model3d.h"
|
||||
import eu07.simcore;
|
||||
|
||||
namespace Rt {
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "environment.h"
|
||||
#include "nvrendererbackend.h"
|
||||
#include "simulation/simulationenvironment.h"
|
||||
#include "simulation/simulationtime.h"
|
||||
import eu07.simulation.simulationenvironment;
|
||||
import eu07.simulation.simulationtime;
|
||||
|
||||
namespace {
|
||||
static const float PI = 3.14159265358979323846f;
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#include "nvrenderer/nvrenderer.h"
|
||||
#include "nvrendererbackend.h"
|
||||
|
||||
#include <utilities/Timer.h>
|
||||
#include <model/AnimModel.h>
|
||||
#include <simulation/simulation.h>
|
||||
import eu07.utilities.timer;
|
||||
import eu07.simcore;
|
||||
import eu07.simulation.simulation;
|
||||
|
||||
namespace BatchingUtils {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user