mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-06 06:58:35 +01:00
hoist standard includes above everything else
Ordering them before the imports in the same file was not enough: a project header on line 1 can import a module several levels down whose global module fragment already pulled in the same standard header, and that include guard does not cross the module boundary. Putting them first means the guard is set before anything can import. Skips vendored single-header libraries and anything inside an #if.
This commit is contained in:
@@ -1,15 +1,15 @@
|
|||||||
#include "shader_compiler.hpp"
|
|
||||||
|
|
||||||
#include <fstream>
|
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
#include "utils.hpp"
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
|
#include <fstream>
|
||||||
|
#include <iostream>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include "shader_compiler.hpp"
|
||||||
|
|
||||||
|
|
||||||
|
#include "utils.hpp"
|
||||||
|
|
||||||
int MaShaderCompiler::Run() {
|
int MaShaderCompiler::Run() {
|
||||||
ParseOptions();
|
ParseOptions();
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <filesystem>
|
||||||
|
#include <string>
|
||||||
|
#include <tuple>
|
||||||
|
#include <vector>
|
||||||
#include <nvrhi/nvrhi.h>
|
#include <nvrhi/nvrhi.h>
|
||||||
#include <yaml-cpp/yaml.h>
|
#include <yaml-cpp/yaml.h>
|
||||||
|
|
||||||
#include <filesystem>
|
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
#include <WinAdapter.h>
|
#include <WinAdapter.h>
|
||||||
@@ -11,9 +14,6 @@
|
|||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
#endif
|
#endif
|
||||||
#include <dxcapi.h>
|
#include <dxcapi.h>
|
||||||
#include <string>
|
|
||||||
#include <tuple>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
using RefCountPtr = nvrhi::RefCountPtr<T>;
|
using RefCountPtr = nvrhi::RefCountPtr<T>;
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
#include <string>
|
||||||
#include <yaml-cpp/yaml.h>
|
#include <yaml-cpp/yaml.h>
|
||||||
|
|
||||||
#include <string>
|
|
||||||
#include <cstdint>
|
|
||||||
|
|
||||||
inline std::wstring ToWide(const std::string& str) {
|
inline std::wstring ToWide(const std::string& str) {
|
||||||
std::wstring wstr{};
|
std::wstring wstr{};
|
||||||
|
|||||||
@@ -1,10 +1,23 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
//STL includes required by EU07 includes
|
//STL includes required by EU07 includes
|
||||||
|
#include <array>
|
||||||
|
#include <condition_variable>
|
||||||
|
#include <cstddef>
|
||||||
|
#include <cstdint>
|
||||||
#include <deque>
|
#include <deque>
|
||||||
#include <stdexcept>
|
#include <functional>
|
||||||
|
#include <future>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include <mutex>
|
||||||
|
#include <optional>
|
||||||
|
#include <stdexcept>
|
||||||
|
#include <string>
|
||||||
|
#include <unordered_map>
|
||||||
|
#include <unordered_set>
|
||||||
|
#include <utility>
|
||||||
#include <variant>
|
#include <variant>
|
||||||
|
#include <vector>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
// OpenGL includes required by EU07 includes
|
// OpenGL includes required by EU07 includes
|
||||||
@@ -18,23 +31,10 @@
|
|||||||
#include <yaml-cpp/yaml.h>
|
#include <yaml-cpp/yaml.h>
|
||||||
|
|
||||||
#include <entt/container/dense_map.hpp>
|
#include <entt/container/dense_map.hpp>
|
||||||
#include <future>
|
|
||||||
#include <mutex>
|
|
||||||
|
|
||||||
// EU07 includes. This header is consumed by translation units that include
|
// EU07 includes. This header is consumed by translation units that include
|
||||||
// nothing else, so everything it names has to be imported here rather than
|
// nothing else, so everything it names has to be imported here rather than
|
||||||
// relied on to arrive from the including file.
|
// relied on to arrive from the including file.
|
||||||
#include <array>
|
|
||||||
#include <condition_variable>
|
|
||||||
#include <cstddef>
|
|
||||||
#include <cstdint>
|
|
||||||
#include <functional>
|
|
||||||
#include <optional>
|
|
||||||
#include <string>
|
|
||||||
#include <unordered_map>
|
|
||||||
#include <unordered_set>
|
|
||||||
#include <utility>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#include "nvrenderer_enums.h"
|
#include "nvrenderer_enums.h"
|
||||||
#include "quadtree.h"
|
#include "quadtree.h"
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <nvrhi/nvrhi.h>
|
|
||||||
|
|
||||||
#include <entt/entt.hpp>
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include <nvrhi/nvrhi.h>
|
||||||
|
|
||||||
|
#include <entt/entt.hpp>
|
||||||
|
|
||||||
import eu07.glm;
|
import eu07.glm;
|
||||||
class NvTextureManager;
|
class NvTextureManager;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include <cstdint>
|
||||||
#include "auto_exposure.h"
|
#include "auto_exposure.h"
|
||||||
|
|
||||||
#include <nvrhi/utils.h>
|
#include <nvrhi/utils.h>
|
||||||
@@ -5,7 +6,6 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "nvrenderer/nvrenderer.h"
|
#include "nvrenderer/nvrenderer.h"
|
||||||
#include "nvrendererbackend.h"
|
#include "nvrendererbackend.h"
|
||||||
#include <cstdint>
|
|
||||||
|
|
||||||
MaAutoExposure::MaAutoExposure(NvRenderer *renderer)
|
MaAutoExposure::MaAutoExposure(NvRenderer *renderer)
|
||||||
: MaResourceRegistry(renderer), m_backend(renderer->GetBackend()) {}
|
: MaResourceRegistry(renderer), m_backend(renderer->GetBackend()) {}
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
#include "nvrenderer/resource_registry.h"
|
#include "nvrenderer/resource_registry.h"
|
||||||
|
|
||||||
#include <nvrhi/nvrhi.h>
|
#include <nvrhi/nvrhi.h>
|
||||||
#include <cstdint>
|
|
||||||
|
|
||||||
class NvRenderer;
|
class NvRenderer;
|
||||||
class NvRendererBackend;
|
class NvRendererBackend;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <nvrhi/nvrhi.h>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <nvrhi/nvrhi.h>
|
||||||
|
|
||||||
import eu07.glm;
|
import eu07.glm;
|
||||||
struct Bloom {
|
struct Bloom {
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
|
#include <filesystem>
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#include "nvrenderer/nvrenderer.h"
|
#include "nvrenderer/nvrenderer.h"
|
||||||
#include "nvrendererbackend.h"
|
#include "nvrendererbackend.h"
|
||||||
#include <filesystem>
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
void MaConfig::Init(const std::filesystem::path& config_file) {
|
void MaConfig::Init(const std::filesystem::path& config_file) {
|
||||||
Init(YAML::LoadFile(config_file.generic_string()));
|
Init(YAML::LoadFile(config_file.generic_string()));
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <yaml-cpp/yaml.h>
|
|
||||||
|
|
||||||
#include <filesystem>
|
|
||||||
#include <array>
|
#include <array>
|
||||||
|
#include <filesystem>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <yaml-cpp/yaml.h>
|
||||||
|
|
||||||
|
|
||||||
struct MaConfig {
|
struct MaConfig {
|
||||||
enum MaTonemapType { Default_Srgb = 0, Linear_Rec2020 };
|
enum MaTonemapType { Default_Srgb = 0, Linear_Rec2020 };
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include <cstdint>
|
||||||
#include "contactshadows.h"
|
#include "contactshadows.h"
|
||||||
|
|
||||||
#include <nvrhi/utils.h>
|
#include <nvrhi/utils.h>
|
||||||
@@ -5,7 +6,6 @@
|
|||||||
#include "gbuffer.h"
|
#include "gbuffer.h"
|
||||||
#include "nvrenderer/nvrenderer.h"
|
#include "nvrenderer/nvrenderer.h"
|
||||||
#include "nvrendererbackend.h"
|
#include "nvrendererbackend.h"
|
||||||
#include <cstdint>
|
|
||||||
|
|
||||||
MaContactShadows::MaContactShadows(NvRenderer* renderer, NvGbuffer* gbuffer)
|
MaContactShadows::MaContactShadows(NvRenderer* renderer, NvGbuffer* gbuffer)
|
||||||
: m_backend(renderer->GetBackend()),
|
: m_backend(renderer->GetBackend()),
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <nvrhi/nvrhi.h>
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <nvrhi/nvrhi.h>
|
||||||
|
|
||||||
import eu07.glm;
|
import eu07.glm;
|
||||||
struct MaContactShadows {
|
struct MaContactShadows {
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
#include <limits>
|
||||||
|
#include <vector>
|
||||||
#include "csm.h"
|
#include "csm.h"
|
||||||
|
|
||||||
#include <nvrhi/utils.h>
|
#include <nvrhi/utils.h>
|
||||||
@@ -5,8 +7,6 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "nvrenderer/nvrenderer.h"
|
#include "nvrenderer/nvrenderer.h"
|
||||||
#include "nvrendererbackend.h"
|
#include "nvrendererbackend.h"
|
||||||
#include <limits>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
MaShadowMap::MaShadowMap(NvRenderer* renderer)
|
MaShadowMap::MaShadowMap(NvRenderer* renderer)
|
||||||
: MaResourceRegistry(renderer), m_backend(renderer->m_backend.get()) {}
|
: MaResourceRegistry(renderer), m_backend(renderer->m_backend.get()) {}
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <array>
|
||||||
|
#include <vector>
|
||||||
#include <nvrhi/nvrhi.h>
|
#include <nvrhi/nvrhi.h>
|
||||||
|
|
||||||
#include "nvrenderer/resource_registry.h"
|
#include "nvrenderer/resource_registry.h"
|
||||||
#include <array>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
struct MaShadowMap : public MaResourceRegistry {
|
struct MaShadowMap : public MaResourceRegistry {
|
||||||
MaShadowMap(class NvRenderer* renderer);
|
MaShadowMap(class NvRenderer* renderer);
|
||||||
|
|||||||
@@ -1,3 +1,9 @@
|
|||||||
|
#include <cstddef>
|
||||||
|
#include <cstdint>
|
||||||
|
#include <map>
|
||||||
|
#include <memory>
|
||||||
|
#include <string>
|
||||||
|
#include <utility>
|
||||||
#include "environment.h"
|
#include "environment.h"
|
||||||
|
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
@@ -8,12 +14,6 @@
|
|||||||
#include "nvrenderer/nvrenderer.h"
|
#include "nvrenderer/nvrenderer.h"
|
||||||
#include "nvrendererbackend.h"
|
#include "nvrendererbackend.h"
|
||||||
#include "nvtexture.h"
|
#include "nvtexture.h"
|
||||||
#include <cstddef>
|
|
||||||
#include <cstdint>
|
|
||||||
#include <map>
|
|
||||||
#include <memory>
|
|
||||||
#include <string>
|
|
||||||
#include <utility>
|
|
||||||
#include "sky.h"
|
#include "sky.h"
|
||||||
|
|
||||||
import eu07.simulation.simulationenvironment;
|
import eu07.simulation.simulationenvironment;
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "fullscreenpass.h"
|
|
||||||
#include "nvrenderer/resource_registry.h"
|
|
||||||
#include "nvrhi/nvrhi.h"
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include "fullscreenpass.h"
|
||||||
|
#include "nvrenderer/resource_registry.h"
|
||||||
|
#include "nvrhi/nvrhi.h"
|
||||||
|
|
||||||
struct MaEnvironment : public MaResourceRegistry {
|
struct MaEnvironment : public MaResourceRegistry {
|
||||||
nvrhi::TextureHandle m_skybox;
|
nvrhi::TextureHandle m_skybox;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include <queue>
|
||||||
#include "fsr.h"
|
#include "fsr.h"
|
||||||
|
|
||||||
#if LIBMANUL_WITH_D3D12
|
#if LIBMANUL_WITH_D3D12
|
||||||
@@ -16,7 +17,6 @@
|
|||||||
#include "utilities/Globals_macros.h"
|
#include "utilities/Globals_macros.h"
|
||||||
#include "gbuffer.h"
|
#include "gbuffer.h"
|
||||||
#include "gbufferblitpass.h"
|
#include "gbufferblitpass.h"
|
||||||
#include <queue>
|
|
||||||
|
|
||||||
import eu07.utilities.globals;
|
import eu07.utilities.globals;
|
||||||
import eu07.glm;
|
import eu07.glm;
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstddef>
|
||||||
|
#include <string>
|
||||||
#include <ffx-fsr2-api/ffx_fsr2.h>
|
#include <ffx-fsr2-api/ffx_fsr2.h>
|
||||||
|
|
||||||
#include "nvrendererbackend.h"
|
#include "nvrendererbackend.h"
|
||||||
#include <cstddef>
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
import eu07.glm;
|
import eu07.glm;
|
||||||
struct NvFSR {
|
struct NvFSR {
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
|
#include <cstdint>
|
||||||
#include "gbuffer.h"
|
#include "gbuffer.h"
|
||||||
|
|
||||||
#include <nvrhi/utils.h>
|
#include <nvrhi/utils.h>
|
||||||
|
|
||||||
#include "nvrenderer/nvrenderer.h"
|
#include "nvrenderer/nvrenderer.h"
|
||||||
#include "nvrendererbackend.h"
|
#include "nvrendererbackend.h"
|
||||||
#include <cstdint>
|
|
||||||
|
|
||||||
NvGbuffer::NvGbuffer(NvRenderer* renderer)
|
NvGbuffer::NvGbuffer(NvRenderer* renderer)
|
||||||
: m_backend(renderer->m_backend.get()) {}
|
: m_backend(renderer->m_backend.get()) {}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <nvrhi/nvrhi.h>
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <nvrhi/nvrhi.h>
|
||||||
|
|
||||||
struct NvGbuffer {
|
struct NvGbuffer {
|
||||||
NvGbuffer(class NvRenderer* renderer);
|
NvGbuffer(class NvRenderer* renderer);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
#include <chrono>
|
||||||
#include "gbufferblitpass.h"
|
#include "gbufferblitpass.h"
|
||||||
|
|
||||||
#include <chrono>
|
|
||||||
#include <nvrhi/utils.h>
|
#include <nvrhi/utils.h>
|
||||||
|
|
||||||
#include "contactshadows.h"
|
#include "contactshadows.h"
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include <cstdint>
|
||||||
#include "gbufferlighting.h"
|
#include "gbufferlighting.h"
|
||||||
|
|
||||||
#include <nvrhi/utils.h>
|
#include <nvrhi/utils.h>
|
||||||
@@ -7,7 +8,6 @@
|
|||||||
#include "nvrendererbackend.h"
|
#include "nvrendererbackend.h"
|
||||||
#include "ssao.h"
|
#include "ssao.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <cstdint>
|
|
||||||
|
|
||||||
import eu07.glm;
|
import eu07.glm;
|
||||||
void GbufferLighting::Init() {
|
void GbufferLighting::Init() {
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <nvrenderer/nvrenderer.h>
|
|
||||||
#include <nvrhi/nvrhi.h>
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <nvrenderer/nvrenderer.h>
|
||||||
|
#include <nvrhi/nvrhi.h>
|
||||||
|
|
||||||
|
|
||||||
import eu07.glm;
|
import eu07.glm;
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
#include <imgui.h>
|
#include <imgui.h>
|
||||||
@@ -53,7 +54,6 @@ SOFTWARE.
|
|||||||
#include "imgui_nvrhi.h"
|
#include "imgui_nvrhi.h"
|
||||||
#include "nvrendererbackend.h"
|
#include "nvrendererbackend.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <cstdint>
|
|
||||||
|
|
||||||
struct VERTEX_CONSTANT_BUFFER
|
struct VERTEX_CONSTANT_BUFFER
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -46,16 +46,16 @@ SOFTWARE.
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstddef>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <vector>
|
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
#include <vector>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#include <nvrhi/nvrhi.h>
|
#include <nvrhi/nvrhi.h>
|
||||||
|
|
||||||
#include <imgui/imgui.h>
|
#include <imgui/imgui.h>
|
||||||
#include "nvtexture.h"
|
#include "nvtexture.h"
|
||||||
#include <cstddef>
|
|
||||||
|
|
||||||
struct ImGui_NVRHI
|
struct ImGui_NVRHI
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "nvrenderer/nvrenderer.h"
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include "nvrenderer/nvrenderer.h"
|
||||||
|
|
||||||
struct InstanceCacheId {
|
struct InstanceCacheId {
|
||||||
gfx::geometry_handle m_geometry;
|
gfx::geometry_handle m_geometry;
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#include "ddspp/ddspp.h"
|
|
||||||
#include "nvtexture.h"
|
|
||||||
|
|
||||||
#include <sstream>
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <ios>
|
#include <ios>
|
||||||
|
#include <sstream>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include "ddspp/ddspp.h"
|
||||||
|
#include "nvtexture.h"
|
||||||
|
|
||||||
|
|
||||||
bool NvTexture::LoadDDS(std::string &data, int size_bias) {
|
bool NvTexture::LoadDDS(std::string &data, int size_bias) {
|
||||||
ddspp::Descriptor desc{};
|
ddspp::Descriptor desc{};
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
|
#include <filesystem>
|
||||||
|
#include <memory>
|
||||||
|
#include <optional>
|
||||||
|
#include <sstream>
|
||||||
|
#include <string>
|
||||||
|
#include <utility>
|
||||||
#include "materialparser.h"
|
#include "materialparser.h"
|
||||||
|
|
||||||
#include "nvrenderer/nvrenderer.h"
|
#include "nvrenderer/nvrenderer.h"
|
||||||
|
|
||||||
#include "utilities/Globals_macros.h"
|
#include "utilities/Globals_macros.h"
|
||||||
#include <memory>
|
|
||||||
#include <optional>
|
|
||||||
#include <sstream>
|
|
||||||
#include <utility>
|
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
#include "utilities/utilities_macros.h"
|
#include "utilities/utilities_macros.h"
|
||||||
#include <yaml-cpp/yaml.h>
|
#include <yaml-cpp/yaml.h>
|
||||||
#include <string>
|
|
||||||
#include <filesystem>
|
|
||||||
|
|
||||||
import eu07.utilities.globals;
|
import eu07.utilities.globals;
|
||||||
import eu07.utilities.logs;
|
import eu07.utilities.logs;
|
||||||
|
|||||||
@@ -1,12 +1,11 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
|
||||||
#include <string_view>
|
|
||||||
#include <optional>
|
#include <optional>
|
||||||
#include <unordered_map>
|
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <unordered_map>
|
||||||
|
#include <string_view>
|
||||||
|
|
||||||
|
|
||||||
import eu07.glm;
|
import eu07.glm;
|
||||||
struct MaterialAdapterInternal {
|
struct MaterialAdapterInternal {
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
#include "nvmaterial.h"
|
|
||||||
#include "nvrenderer/nvrenderer.h"
|
|
||||||
|
|
||||||
#include <fmt/format.h>
|
|
||||||
#include <nvrhi/utils.h>
|
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include "nvmaterial.h"
|
||||||
|
#include "nvrenderer/nvrenderer.h"
|
||||||
|
|
||||||
|
#include <fmt/format.h>
|
||||||
|
#include <nvrhi/utils.h>
|
||||||
|
|
||||||
#include "csm.h"
|
#include "csm.h"
|
||||||
#include "environment.h"
|
#include "environment.h"
|
||||||
#include "gbuffer.h"
|
#include "gbuffer.h"
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
#include "nvrenderer/nvrenderer.h"
|
#include <array>
|
||||||
|
|
||||||
#include <array>
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
#include <future>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
@@ -11,8 +10,9 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include "nvrenderer/nvrenderer.h"
|
||||||
|
|
||||||
#include <nvrhi/utils.h>
|
#include <nvrhi/utils.h>
|
||||||
#include <future>
|
|
||||||
#include "auto_exposure.h"
|
#include "auto_exposure.h"
|
||||||
#include "bloom.h"
|
#include "bloom.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
|
#include <fstream>
|
||||||
|
#include <ios>
|
||||||
|
#include <memory>
|
||||||
|
#include <string>
|
||||||
#include "nvrenderer_d3d12.h"
|
#include "nvrenderer_d3d12.h"
|
||||||
|
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
|
|
||||||
#include "utilities/Globals_macros.h"
|
#include "utilities/Globals_macros.h"
|
||||||
#include <fstream>
|
|
||||||
#include <ios>
|
|
||||||
#include <memory>
|
|
||||||
#include <string>
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "nvrenderer/nvrenderer.h"
|
#include "nvrenderer/nvrenderer.h"
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
#include <nvrhi/nvrhi.h>
|
#include <nvrhi/nvrhi.h>
|
||||||
|
|
||||||
#include "nvrenderer/nvrenderer.h"
|
#include "nvrenderer/nvrenderer.h"
|
||||||
#include "nvrendererbackend.h"
|
#include "nvrendererbackend.h"
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#if LIBMANUL_WITH_D3D12
|
#if LIBMANUL_WITH_D3D12
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
#include "imgui_nvrhi.h"
|
#include "imgui_nvrhi.h"
|
||||||
#include "nvrenderer/nvrenderer.h"
|
#include "nvrenderer/nvrenderer.h"
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
class NvImguiRenderer : public imgui_renderer {
|
class NvImguiRenderer : public imgui_renderer {
|
||||||
virtual bool Init() override;
|
virtual bool Init() override;
|
||||||
|
|||||||
@@ -1,9 +1,3 @@
|
|||||||
#include "nvrenderer_vulkan.h"
|
|
||||||
|
|
||||||
#include <GLFW/glfw3.h>
|
|
||||||
#include <fmt/format.h>
|
|
||||||
|
|
||||||
#include "utilities/Globals_macros.h"
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
@@ -14,6 +8,12 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include "nvrenderer_vulkan.h"
|
||||||
|
|
||||||
|
#include <GLFW/glfw3.h>
|
||||||
|
#include <fmt/format.h>
|
||||||
|
|
||||||
|
#include "utilities/Globals_macros.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "nvrenderer/nvrenderer.h"
|
#include "nvrenderer/nvrenderer.h"
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <nvrhi/nvrhi.h>
|
|
||||||
|
|
||||||
#include "nvrenderer/nvrenderer.h"
|
|
||||||
#include "nvrendererbackend.h"
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <nvrhi/nvrhi.h>
|
||||||
|
|
||||||
|
#include "nvrenderer/nvrenderer.h"
|
||||||
|
#include "nvrendererbackend.h"
|
||||||
|
|
||||||
#if LIBMANUL_WITH_VULKAN
|
#if LIBMANUL_WITH_VULKAN
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#include "nvrendererbackend.h"
|
|
||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
#include "nvrendererbackend.h"
|
||||||
|
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
|
|
||||||
import eu07.utilities.logs;
|
import eu07.utilities.logs;
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <nvrhi/nvrhi.h>
|
|
||||||
|
|
||||||
#include "nvrenderer/nvrenderer.h"
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <nvrhi/nvrhi.h>
|
||||||
|
|
||||||
|
#include "nvrenderer/nvrenderer.h"
|
||||||
|
|
||||||
struct ShaderDefine {
|
struct ShaderDefine {
|
||||||
std::string m_name;
|
std::string m_name;
|
||||||
|
|||||||
@@ -1,8 +1,4 @@
|
|||||||
#include "nvtexture.h"
|
#include <array>
|
||||||
#include "nvrenderer/nvrenderer.h"
|
|
||||||
|
|
||||||
#include "utilities/Globals_macros.h"
|
|
||||||
#include <array>
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
@@ -11,6 +7,10 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
#include "nvtexture.h"
|
||||||
|
#include "nvrenderer/nvrenderer.h"
|
||||||
|
|
||||||
|
#include "utilities/Globals_macros.h"
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
#include "utilities/utilities_macros.h"
|
#include "utilities/utilities_macros.h"
|
||||||
#include "nvrendererbackend.h"
|
#include "nvrendererbackend.h"
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <bitset>
|
#include <bitset>
|
||||||
|
#include <cstddef>
|
||||||
|
#include <cstdint>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
#include <utility>
|
||||||
|
#include <vector>
|
||||||
#include <nvrhi/nvrhi.h>
|
#include <nvrhi/nvrhi.h>
|
||||||
|
|
||||||
#include "global_include/interfaces/ITexture_macros.h"
|
#include "global_include/interfaces/ITexture_macros.h"
|
||||||
#include <cstddef>
|
|
||||||
#include <cstdint>
|
|
||||||
#include <string>
|
|
||||||
#include <utility>
|
|
||||||
#include <vector>
|
|
||||||
#include "nvrenderer/nvrenderer_enums.h"
|
#include "nvrenderer/nvrenderer_enums.h"
|
||||||
|
|
||||||
import eu07.global_include.interfaces.itexture;
|
import eu07.global_include.interfaces.itexture;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#include "nvrenderer/quadtree.h"
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
#include "nvrenderer/quadtree.h"
|
||||||
|
|
||||||
void QuadTreeBuilder::Node::Insert(uint32_t index, glm::dvec3 min_,
|
void QuadTreeBuilder::Node::Insert(uint32_t index, glm::dvec3 min_,
|
||||||
glm::dvec3 max_, int level) {
|
glm::dvec3 max_, int level) {
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
#include "nvrenderer/resource_registry.h"
|
|
||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include "nvrenderer/resource_registry.h"
|
||||||
|
|
||||||
#include "fmt/compile.h"
|
#include "fmt/compile.h"
|
||||||
#include "nvtexture.h"
|
#include "nvtexture.h"
|
||||||
#include "nvrenderer/nvrenderer.h"
|
#include "nvrenderer/nvrenderer.h"
|
||||||
|
|||||||
@@ -1,3 +1,10 @@
|
|||||||
|
#include <array>
|
||||||
|
#include <cstddef>
|
||||||
|
#include <limits>
|
||||||
|
#include <memory>
|
||||||
|
#include <tuple>
|
||||||
|
#include <unordered_map>
|
||||||
|
#include <vector>
|
||||||
#include "rt_model.h"
|
#include "rt_model.h"
|
||||||
|
|
||||||
#include <bvh/v2/bvh.h>
|
#include <bvh/v2/bvh.h>
|
||||||
@@ -7,14 +14,7 @@
|
|||||||
#include <bvh/v2/thread_pool.h>
|
#include <bvh/v2/thread_pool.h>
|
||||||
#include <bvh/v2/tri.h>
|
#include <bvh/v2/tri.h>
|
||||||
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#include <array>
|
|
||||||
#include <cstddef>
|
|
||||||
#include <limits>
|
|
||||||
#include <memory>
|
|
||||||
#include <tuple>
|
|
||||||
#include <unordered_map>
|
|
||||||
|
|
||||||
import eu07.simcore;
|
import eu07.simcore;
|
||||||
namespace Rt {
|
namespace Rt {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
|
#include <string>
|
||||||
#include <yaml-cpp/yaml.h>
|
#include <yaml-cpp/yaml.h>
|
||||||
|
|
||||||
#include "nvrenderer_d3d12.h"
|
#include "nvrenderer_d3d12.h"
|
||||||
#include <string>
|
|
||||||
|
|
||||||
#if LIBMANUL_WITH_D3D12
|
#if LIBMANUL_WITH_D3D12
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
|
#include <queue>
|
||||||
|
#include <string>
|
||||||
#include <yaml-cpp/yaml.h>
|
#include <yaml-cpp/yaml.h>
|
||||||
|
|
||||||
#include "nvrenderer_vulkan.h"
|
#include "nvrenderer_vulkan.h"
|
||||||
#include <queue>
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
#if LIBMANUL_WITH_VULKAN
|
#if LIBMANUL_WITH_VULKAN
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
|
#include <array>
|
||||||
|
#include <limits>
|
||||||
|
#include <memory>
|
||||||
#include "sky.h"
|
#include "sky.h"
|
||||||
|
|
||||||
#include <nvrhi/utils.h>
|
#include <nvrhi/utils.h>
|
||||||
|
|
||||||
#include "environment.h"
|
#include "environment.h"
|
||||||
#include "nvrendererbackend.h"
|
#include "nvrendererbackend.h"
|
||||||
#include <array>
|
|
||||||
#include <limits>
|
|
||||||
#include <memory>
|
|
||||||
#include "imgui/imgui.h"
|
#include "imgui/imgui.h"
|
||||||
|
|
||||||
import eu07.simulation.simulationenvironment;
|
import eu07.simulation.simulationenvironment;
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
#include "fullscreenpass.h"
|
#include "fullscreenpass.h"
|
||||||
#include "nvrenderer/resource_registry.h"
|
#include "nvrenderer/resource_registry.h"
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
struct Sky : public MaResourceRegistry {
|
struct Sky : public MaResourceRegistry {
|
||||||
Sky(class NvRenderer* renderer, struct MaEnvironment *environment);
|
Sky(class NvRenderer* renderer, struct MaEnvironment *environment);
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
#include <array>
|
||||||
|
#include <cstddef>
|
||||||
#include "ssao.h"
|
#include "ssao.h"
|
||||||
|
|
||||||
#include <nvrhi/nvrhi.h>
|
#include <nvrhi/nvrhi.h>
|
||||||
@@ -9,8 +11,6 @@
|
|||||||
#include "nvrenderer/nvrenderer.h"
|
#include "nvrenderer/nvrenderer.h"
|
||||||
#include "nvrendererbackend.h"
|
#include "nvrendererbackend.h"
|
||||||
#include "imgui/imgui.h"
|
#include "imgui/imgui.h"
|
||||||
#include <array>
|
|
||||||
#include <cstddef>
|
|
||||||
|
|
||||||
import eu07.glm;
|
import eu07.glm;
|
||||||
NvSsao::NvSsao(NvRenderer* renderer)
|
NvSsao::NvSsao(NvRenderer* renderer)
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <nvrhi/nvrhi.h>
|
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
|
|
||||||
#include "XeGTAO.h"
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
|
#include <memory>
|
||||||
|
#include <nvrhi/nvrhi.h>
|
||||||
|
|
||||||
|
|
||||||
|
#include "XeGTAO.h"
|
||||||
|
|
||||||
import eu07.glm;
|
import eu07.glm;
|
||||||
struct NvSsao {
|
struct NvSsao {
|
||||||
|
|||||||
@@ -1,10 +1,4 @@
|
|||||||
#include "config.h"
|
#include <cstddef>
|
||||||
#include "gbufferblitpass.h"
|
|
||||||
#include "motioncache.h"
|
|
||||||
#include "nvrenderer/nvrenderer.h"
|
|
||||||
#include "nvrendererbackend.h"
|
|
||||||
|
|
||||||
#include <cstddef>
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
@@ -13,6 +7,12 @@
|
|||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include "config.h"
|
||||||
|
#include "gbufferblitpass.h"
|
||||||
|
#include "motioncache.h"
|
||||||
|
#include "nvrenderer/nvrenderer.h"
|
||||||
|
#include "nvrendererbackend.h"
|
||||||
|
|
||||||
#include "utilities/utilities_macros.h"
|
#include "utilities/utilities_macros.h"
|
||||||
import eu07.utilities.timer;
|
import eu07.utilities.timer;
|
||||||
import eu07.simcore;
|
import eu07.simcore;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include <cstddef>
|
||||||
#include "windshield_rain.h"
|
#include "windshield_rain.h"
|
||||||
|
|
||||||
#include "gbuffer.h"
|
#include "gbuffer.h"
|
||||||
@@ -5,7 +6,6 @@
|
|||||||
#include "nvrendererbackend.h"
|
#include "nvrendererbackend.h"
|
||||||
#include "nvrhi/utils.h"
|
#include "nvrhi/utils.h"
|
||||||
#include "nvtexture.h"
|
#include "nvtexture.h"
|
||||||
#include <cstddef>
|
|
||||||
|
|
||||||
void WindshieldRain::Init(NvRenderer* in_renderer) {
|
void WindshieldRain::Init(NvRenderer* in_renderer) {
|
||||||
renderer = in_renderer;
|
renderer = in_renderer;
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "nvrenderer/nvrenderer.h"
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
#include "nvrenderer/nvrenderer.h"
|
||||||
|
|
||||||
struct WindshieldRain {
|
struct WindshieldRain {
|
||||||
void Init(NvRenderer *in_renderer);
|
void Init(NvRenderer *in_renderer);
|
||||||
|
|||||||
Reference in New Issue
Block a user