GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce separate GI directory

Browse Source
This commit is contained in:
Wojciech Figat
2022-05-02 12:09:53 +02:00
parent 4b6fce7e5d
commit acd064c364
10 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Shaders/GI/GlobalSurfaceAtlas.flax (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Shaders/GlobalSurfaceAtlas.flax (Stored with Git LFS)
View File

Binary file not shown.

2
Source/Editor/Cooker/Steps/DeployDataStep.cpp
View File

@@ -69,7 +69,7 @@ bool DeployDataStep::Perform(CookingData& data)
data.AddRootEngineAsset(TEXT("Shaders/BitonicSort"));
data.AddRootEngineAsset(TEXT("Shaders/GPUParticlesSorting"));
data.AddRootEngineAsset(TEXT("Shaders/GlobalSignDistanceField"));
data.AddRootEngineAsset(TEXT("Shaders/GlobalSurfaceAtlas"));
data.AddRootEngineAsset(TEXT("Shaders/GI/GlobalSurfaceAtlas"));
data.AddRootEngineAsset(TEXT("Shaders/Quad"));
data.AddRootEngineAsset(TEXT("Shaders/Reflections"));
data.AddRootEngineAsset(TEXT("Shaders/Shadows"));

2
Source/Engine/Level/Actors/StaticModel.cpp
View File

@@ -10,7 +10,7 @@
#include "Engine/Level/Prefabs/PrefabManager.h"
#include "Engine/Level/Scene/Scene.h"
#include "Engine/Renderer/GlobalSignDistanceFieldPass.h"
#include "Engine/Renderer/GlobalSurfaceAtlasPass.h"
#include "Engine/Renderer/GI/GlobalSurfaceAtlasPass.h"
#include "Engine/Utilities/Encryption.h"
#if USE_EDITOR
#include "Editor/Editor.h"

8
Source/Engine/Renderer/GlobalSurfaceAtlasPass.cpp → Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.cpp
View File

@@ -1,9 +1,9 @@
// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
#include "GlobalSurfaceAtlasPass.h"
#include "GlobalSignDistanceFieldPass.h"
#include "RenderList.h"
#include "ShadowsPass.h"
#include "../GlobalSignDistanceFieldPass.h"
#include "../RenderList.h"
#include "../ShadowsPass.h"
#include "Engine/Core/Math/Matrix3x3.h"
#include "Engine/Core/Math/OrientedBoundingBox.h"
#include "Engine/Engine/Engine.h"
@@ -192,7 +192,7 @@ bool GlobalSurfaceAtlasPass::setupResources()
// Load shader
if (!_shader)
{
_shader = Content::LoadAsyncInternal<Shader>(TEXT("Shaders/GlobalSurfaceAtlas"));
_shader = Content::LoadAsyncInternal<Shader>(TEXT("Shaders/GI/GlobalSurfaceAtlas"));
if (_shader == nullptr)
return true;
#if COMPILE_WITH_DEV_ENV

2
Source/Engine/Renderer/GlobalSurfaceAtlasPass.h → Source/Engine/Renderer/GI/GlobalSurfaceAtlasPass.h
View File

@@ -2,7 +2,7 @@
#pragma once
#include "RendererPass.h"
#include "../RendererPass.h"
/// <summary>
/// Global Surface Atlas rendering pass. Captures scene geometry into a single atlas texture which contains surface diffuse color, normal vector, emission light, and calculates direct+indirect lighting. Used by Global Illumination and Reflections.

2
Source/Engine/Renderer/Renderer.cpp
View File

@@ -22,7 +22,7 @@
#include "HistogramPass.h"
#include "AtmospherePreCompute.h"
#include "GlobalSignDistanceFieldPass.h"
#include "GlobalSurfaceAtlasPass.h"
#include "GI/GlobalSurfaceAtlasPass.h"
#include "Utils/MultiScaler.h"
#include "Utils/BitonicSort.h"
#include "AntiAliasing/FXAA.h"

2
Source/Engine/Terrain/Terrain.cpp
View File

@@ -14,7 +14,7 @@
#include "Engine/Graphics/Textures/GPUTexture.h"
#include "Engine/Profiler/ProfilerCPU.h"
#include "Engine/Renderer/GlobalSignDistanceFieldPass.h"
#include "Engine/Renderer/GlobalSurfaceAtlasPass.h"
#include "Engine/Renderer/GI/GlobalSurfaceAtlasPass.h"
Terrain::Terrain(const SpawnParams& params)
: PhysicsColliderActor(params)

0
Source/Shaders/GlobalSurfaceAtlas.hlsl → Source/Shaders/GI/GlobalSurfaceAtlas.hlsl
View File

4
Source/Shaders/GlobalSurfaceAtlas.shader → Source/Shaders/GI/GlobalSurfaceAtlas.shader
View File

@@ -5,9 +5,9 @@
#include "./Flax/Common.hlsl"
#include "./Flax/Math.hlsl"
#include "./Flax/GlobalSurfaceAtlas.hlsl"
#include "./Flax/GlobalSignDistanceField.hlsl"
#include "./Flax/LightingCommon.hlsl"
#include "./Flax/GlobalSignDistanceField.hlsl"
#include "./Flax/GI/GlobalSurfaceAtlas.hlsl"
META_CB_BEGIN(0, Data)
float3 ViewWorldPos;