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

Merge remote-tracking branch 'origin/master' into 1.10

Browse Source 
# Conflicts:
#	Source/Engine/Graphics/Materials/MaterialShader.h
This commit is contained in:
Wojtek Figat
2025-02-18 09:19:59 +01:00
parent d501018feb c81ddd09cc
commit a6fb651ff4
133 changed files with 2253 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Engine/Graphics/Materials/MaterialShader.cpp
View File

@@ -3,6 +3,7 @@
#include "MaterialShader.h"
#include "Engine/Core/Log.h"
#include "Engine/Serialization/MemoryReadStream.h"
#include "Engine/Level/LargeWorlds.h"
#include "Engine/Renderer/RenderList.h"
#include "Engine/Graphics/RenderTask.h"
#include "Engine/Graphics/GPUDevice.h"
@@ -33,6 +34,8 @@ GPU_CB_STRUCT(MaterialShaderDataPerView {
Float4 ViewInfo;
Float4 ScreenSize;
Float4 TemporalAAJitter;
Float3 LargeWorldsChunkIndex;
float LargeWorldsChunkSize;
});
IMaterial::BindParameters::BindParameters(::GPUContext* context, const ::RenderContext& renderContext)
@@ -78,6 +81,8 @@ void IMaterial::BindParameters::BindViewData()
cb.ViewInfo = view.ViewInfo;
cb.ScreenSize = view.ScreenSize;
cb.TemporalAAJitter = view.TemporalAAJitter;
cb.LargeWorldsChunkIndex = LargeWorlds::Enable ? (Float3)Int3(view.Origin / LargeWorlds::ChunkSize) : Float3::Zero;
cb.LargeWorldsChunkSize = LargeWorlds::ChunkSize;
// Update constants
GPUContext->UpdateCB(PerViewConstants, &cb);

2
Source/Engine/Graphics/Materials/MaterialShader.h
View File

@@ -10,7 +10,7 @@
/// <summary>
/// Current materials shader version.
/// </summary>
#define MATERIAL_GRAPH_VERSION 171
#define MATERIAL_GRAPH_VERSION 172
class Material;
class GPUShader;