diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2023-10-13 09:14:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-13 09:14:54 -0700 |
| commit | cba71633559ccdfd394983a6086da816e739a730 (patch) | |
| tree | 787b5bcf409ea97e12867407f18784fac2a31980 /indra | |
| parent | 66da7af77c999c099f8b44e59fcace87af8ead30 (diff) | |
| parent | 07a830a4cef1ccc600f8c4dc5e4fcdba83df839b (diff) | |
Merge pull request #442 from secondlife/SL-20062
SL-20062: Fix near clip on reflection probes being clamped to at or below 10
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmath/llcamera.h | 2 | ||||
| -rw-r--r-- | indra/llprimitive/llprimitive.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llmath/llcamera.h b/indra/llmath/llcamera.h index 27eaa614c9..c4d04f5d02 100644 --- a/indra/llmath/llcamera.h +++ b/indra/llmath/llcamera.h @@ -39,7 +39,7 @@ const F32 DEFAULT_NEAR_PLANE = 0.25f; const F32 DEFAULT_FAR_PLANE = 64.f; // far reaches across two horizontal, not diagonal, regions const F32 MAX_ASPECT_RATIO = 50.0f; -const F32 MAX_NEAR_PLANE = 10.f; +const F32 MAX_NEAR_PLANE = 1023.9f; // Clamp the near plane just before the skybox ends const F32 MAX_FAR_PLANE = 100000.0f; //1000000.0f; // Max allowed. Not good Z precision though. const F32 MAX_FAR_CLIP = 512.0f; diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp index 5dfce4ae16..350d84ae6c 100644 --- a/indra/llprimitive/llprimitive.cpp +++ b/indra/llprimitive/llprimitive.cpp @@ -85,6 +85,8 @@ const F32 LIGHT_MAX_CUTOFF = 180.f; const F32 REFLECTION_PROBE_MIN_AMBIANCE = 0.f; const F32 REFLECTION_PROBE_MAX_AMBIANCE = 100.f; const F32 REFLECTION_PROBE_DEFAULT_AMBIANCE = 0.f; +// *NOTE: Clip distances are clamped in LLCamera::setNear. The max clip +// distance is currently limited by the skybox const F32 REFLECTION_PROBE_MIN_CLIP_DISTANCE = 0.f; const F32 REFLECTION_PROBE_MAX_CLIP_DISTANCE = 1024.f; const F32 REFLECTION_PROBE_DEFAULT_CLIP_DISTANCE = 0.f; |