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

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

Browse Source 
# Conflicts:
#	Content/Editor/DebugMaterials/DDGIDebugProbes.flax
#	Source/Editor/Windows/OutputLogWindow.cs
#	Source/Engine/Level/Actor.cpp
This commit is contained in:
Wojtek Figat
2025-09-24 18:18:27 +02:00
parent f323fdb592 47670251ef
commit 87e2c4c4d5
136 changed files with 1821 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Graphics/Models/ModelData.cpp
View File

@@ -372,6 +372,8 @@ bool MaterialSlotEntry::UsesProperties() const
Opacity.TextureIndex != -1 ||
Math::NotNearEqual(Roughness.Value, 0.5f) ||
Roughness.TextureIndex != -1 ||
Math::NotNearEqual(Metalness.Value, 0.5f) ||
Metalness.TextureIndex != -1 ||
Normals.TextureIndex != -1;
}

9
Source/Engine/Graphics/Models/ModelData.h
View File

@@ -327,14 +327,23 @@ struct FLAXENGINE_API MaterialSlotEntry
{
float Value = 0.5f;
int32 TextureIndex = -1;
uint8 Channel = 0;
} Roughness;
struct
{
float Value = 0.0f;
int32 TextureIndex = -1;
uint8 Channel = 0;
} Metalness;
struct
{
int32 TextureIndex = -1;
} Normals;
bool TwoSided = false;
bool Wireframe = false;
bool UsesProperties() const;
static float ShininessToRoughness(float shininess);