mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-29 19:47:30 +01:00
build betterRenderer against the modules
Verified locally now that Vulkan and DXC are installed: all 31 targets compile. glm has to come from eu07.glm only - having it both as a plain include and as an import made every overload ambiguous. nvrenderer.h is self-sufficient, since register.cpp includes nothing else. Fixes the vcpkg triplet, which was pinned to x64-windows.
This commit is contained in:
@@ -9,10 +9,10 @@
|
||||
|
||||
// OpenGL includes required by EU07 includes
|
||||
#include <glad/glad.h> // for GLuint, GLint
|
||||
#include <GLFW/glfw3.h> // for GLFWwindow
|
||||
#include "utilities/Globals_macros.h"
|
||||
|
||||
// Div. includes required by EU07 includes
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/type_ptr.hpp>
|
||||
|
||||
#include <nvrhi/nvrhi.h>
|
||||
#include <yaml-cpp/yaml.h>
|
||||
@@ -21,15 +21,23 @@
|
||||
#include <future>
|
||||
#include <mutex>
|
||||
|
||||
// EU07 includes
|
||||
// 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;
|
||||
|
||||
namespace Rt {
|
||||
struct IRtModel;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#pragma once
|
||||
|
||||
#include <array>
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtx/component_wise.hpp>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
import eu07.glm;
|
||||
#include <cstdint>
|
||||
|
||||
struct QuadTreeLeave {
|
||||
QuadTreeLeave(const glm::dvec3& origin, const glm::dvec3& extent,
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <nvrhi/nvrhi.h>
|
||||
|
||||
#include <entt/entt.hpp>
|
||||
#include <glm/glm.hpp>
|
||||
import eu07.glm;
|
||||
|
||||
class NvTextureManager;
|
||||
class MaResourceRegistry;
|
||||
|
||||
Reference in New Issue
Block a user