GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 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

3
Source/Engine/Level/Actors/Light.h
View File

@@ -63,7 +63,8 @@ protected:
{
const float dst2 = (float)Vector3::DistanceSquared(viewPosition, position);
const float dst = Math::Sqrt(dst2);
brightness *= Math::Remap(dst, 0.9f * ViewDistance, ViewDistance, 1.0f, 0.0f);
if (dst < ViewDistance && dst > ViewDistance * 0.9f)
brightness *= Math::Remap(dst, 0.9f * ViewDistance, ViewDistance, 1.0f, 0.0f);
return dst < ViewDistance;
}
return true;

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

@@ -129,6 +129,7 @@ void Skybox::ApplySky(GPUContext* context, RenderContext& renderContext, const M
material->SetParameterValue(TEXT("PanoramicTexture"), PanoramicTexture.Get(), false);
material->SetParameterValue(TEXT("Color"), Color * Math::Exp2(Exposure), false);
material->SetParameterValue(TEXT("IsPanoramic"), PanoramicTexture != nullptr, false);
material->SetParameterValue(TEXT("RotationEuler"), _rotationEuler, false);
material->Bind(bindParams);
}
}
@@ -163,4 +164,5 @@ void Skybox::OnTransformChanged()
_box = BoundingBox(_transform.Translation);
_sphere = BoundingSphere(_transform.Translation, 0.0f);
_rotationEuler = GetOrientation().GetEuler() * DegreesToRadians;
}

1
Source/Engine/Level/Actors/Skybox.h
View File

@@ -18,6 +18,7 @@ class FLAXENGINE_API Skybox : public Actor, public ISkyRenderer
private:
AssetReference<MaterialInstance> _proxyMaterial;
int32 _sceneRenderingKey = -1;
Float3 _rotationEuler;
public:
/// <summary>