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

Fix terrain shader compilation regression

Browse Source
This commit is contained in:
Wojtek Figat
2024-09-22 11:28:26 +02:00
parent c943b3a526
commit da5570e89f
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content/Editor/MaterialTemplates/Terrain.shader
View File

@@ -3,6 +3,7 @@
#define MATERIAL 1 #define MATERIAL 1
#define USE_PER_VIEW_CONSTANTS 1 #define USE_PER_VIEW_CONSTANTS 1
#define LoadObjectFromCB(var) var = GetObject()
@3 @3
// Enables/disables smooth terrain chunks LOD transitions (with morphing higher LOD near edges to the lower LOD in the neighbour) // Enables/disables smooth terrain chunks LOD transitions (with morphing higher LOD near edges to the lower LOD in the neighbour)
#define USE_SMOOTH_LOD_TRANSITION 1 #define USE_SMOOTH_LOD_TRANSITION 1
@@ -162,8 +163,6 @@ ObjectData GetObject()
return object; return object;
} }
#define LoadObjectFromCB(var) var = GetObject()
MaterialInput GetMaterialInput(PixelInput input) MaterialInput GetMaterialInput(PixelInput input)
{ {
MaterialInput output = GetGeometryMaterialInput(input.Geometry); MaterialInput output = GetGeometryMaterialInput(input.Geometry);

BIN
Content/Engine/DefaultTerrainMaterial.flax (Stored with Git LFS)
View File

Binary file not shown.

2
Source/Shaders/MaterialCommon.hlsl
View File

@@ -119,6 +119,7 @@ ObjectData LoadObject(Buffer<float4> objectsBuffer, uint objectIndex)
return object; return object;
} }
#ifndef LoadObjectFromCB
// Loads the object data from the constant buffer into the variable // Loads the object data from the constant buffer into the variable
#define LoadObjectFromCB(var) \ #define LoadObjectFromCB(var) \
var = (ObjectData)0; \ var = (ObjectData)0; \
@@ -129,6 +130,7 @@ ObjectData LoadObject(Buffer<float4> objectsBuffer, uint objectIndex)
var.WorldDeterminantSign = WorldDeterminantSign; \ var.WorldDeterminantSign = WorldDeterminantSign; \
var.LODDitherFactor = LODDitherFactor; \ var.LODDitherFactor = LODDitherFactor; \
var.LightmapArea = LightmapArea; var.LightmapArea = LightmapArea;
#endif
// Material properties // Material properties
struct Material struct Material