c29a661b22
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llglslshader.cpp
# indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
# indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
# indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
# indra/newview/gltf/accessor.cpp
# indra/newview/gltf/accessor.h
# indra/newview/gltf/animation.h
# indra/newview/gltf/asset.cpp
# indra/newview/gltf/primitive.cpp
# indra/newview/gltf/primitive.h
# indra/newview/gltfscenemanager.h
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llimprocessing.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-13 01:54:18 +02:00
1ebf62e102
Clean up line endings that got mangled up during last merge
2024-06-11 15:40:09 +02:00
d9789bfaf2
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
...
# Conflicts:
# indra/llappearance/llavatarappearance.h
# indra/llimage/llimage.cpp
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llrendertarget.cpp
# indra/llrender/llshadermgr.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llpanelvolume.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvocache.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-11 13:38:43 +02:00
c95b4bf3ea
Post-merge - trim trailing whitespace
2024-06-10 20:45:59 +03:00
c0fad3028f
Re-enable compiler warnings C4018, C4100, C4231 and C4506
2024-06-10 16:42:43 +02:00
9e45c1e506
Fix issues resulting from b42f9d836b
2024-06-09 16:17:03 +02:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
15fd13f830
#1530 Increase joint limit for GLTF Assets ( #1582 )
...
* Migrate GLTF scene rendering to its own shaders
* Add support for ambient occlusion map separate from metallic roughness map (or absent)
* Use UBO's for GLTF joints
* Better error handling of downloading GLTF assets
2024-05-29 16:56:39 -05:00
799ebf2162
Fix broken merge and BOOL/bool issues
2024-05-10 15:16:06 +02:00
c6d752b880
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
2024-05-06 16:48:58 -05:00
e361671018
Port from OpenEXR to TinyEXR for reduced installer and library size ( #1287 )
2024-04-19 14:39:28 -05:00
92efb16039
#854 Fix for skies that shouldn't be auto-adjusted getting auto-adjusted. ( #1115 )
2024-04-02 15:27:22 -05:00
c1bde75768
HDRI Local Preview ( #953 )
...
* #926 WIP - HDRI import prototype v0
* #926 WIP -- add OpenEXR to autobuild.xml
* #926 WIP -- Add OpenEXR cmake
* #926 WIP -- Attempt at using OpenEXR autobuild package and don't hard code .exr file to load
* #926 Unmangle autobuild.xml and get dll's in the right place (thanks, Caladbolg!)
* implement mac shared libs plumbing for OpenEXR for secondlife/viewer#926
* Fix Xcode/clang compile error regarding new[]/delete[] mismatch
* #926 HDRI Preview finishing touches.
- Full ACES when HDRI is enabled
- Fix for probes getting stuck paused
- Add exposure and rotation controls
---------
Co-authored-by: Brad Linden <brad@lindenlab.com>
2024-03-08 12:01:20 -06:00
1fc45a50ff
#681 Add probe blending for mirrors.
2024-03-06 17:56:16 -08:00
b3283036af
#681 Start adding blending boilerplate.
2024-02-26 04:02:09 -08:00
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
2d9e00eff5
Fix for a potential crash in LLReflectionMapManager::registerSpatialGroup()
...
The spatial partion could potentially be NULL and shall therefore been tested for this case.
Similar fix to 08cf926d3b
2024-02-08 22:47:50 +02:00
373b06398c
Merge remote-tracking branch 'origin/release/materials_featurette' into DRTVWR-583
2024-01-24 14:37:33 -08:00
529d56ed9c
SL-20606: Fix cached probe flags for material preview potentially exceeding storage bounds
2024-01-19 17:09:11 -08:00
2f18d74f9a
SL-20606: Full GLTF material preview. Works for most materials.
2024-01-19 15:43:13 -08:00
c28eb36a2c
SL-20654 Fix for box probes sometimes glitching out at the corners. Incidental fix for crash when mWaterPool is null.
2023-12-05 19:50:25 -06:00
a29f7c3b4a
SL-20498 Preserve default probe when resetting reflection probes.
2023-10-23 13:54:00 -05:00
09aedbb7a9
SL-20258 Fix for LSL spamming new probes into the scene deadlocking probe updater. Add probe update debug display.
2023-10-16 13:54:38 -05:00
bd9c0a2e65
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-10-16 08:48:50 -07:00
bc4e90ea5e
SL-20124 Wipe reflection probes when applying parcel EEP settings and pause updates on probes until transition completes.
2023-10-02 14:19:04 -05:00
348d427db6
Add a probe strength uniform for hero probes.
...
On standard reflection probes this doesn't really do anything.
DRTVWR-583
2023-08-29 05:08:47 -07:00
423820475c
Revert LLReflectionMapManager
...
DRTVWR-583
2023-08-07 00:17:04 -07:00
b861832102
Making more progress, need to add the heroprobe manager.
...
DRTVWR-583
2023-08-06 23:33:29 -07:00
3d73326516
Fix for irradiance breaking.
...
Still need to fix the problem with individual faces getting tossed around though. Will work on that tomorrow.
DRTVWR-583
2023-07-18 00:14:34 -07:00
040050af19
Merge branch 'DRTVWR-559' into DRTVWR-583
2023-07-17 15:06:23 -07:00
f7f9601567
Got hero probes rendering from the camera.
...
DRTVWR-583
2023-07-17 15:05:47 -07:00
53b2efd131
Remove doHeroProbeUpdate
...
DRTVWR-583
2023-06-29 17:35:24 -04:00
5ade456ee7
Make sure we're passing the cube array as a parameter to updateProbeFace.
...
DRTVWR-583
2023-06-28 13:27:15 -04:00
d8dd4d9c0c
Just about got hero reflection maps working.
...
DRTVWR-583
2023-06-27 20:01:52 -07:00
ca47c7ff44
DRTVWR-559 Fix for manual probes not updating as often as they should when nearby (bad distance calculation)
2023-06-27 20:11:01 -05:00
85967398ff
SL-19792 Fix for visible gaps in water between region water and void water.
2023-06-21 20:50:50 -05:00
ad956699c0
SL-19811 Update fallback probe every 2 seconds to smooth out water cloud updates.
2023-06-13 14:45:12 -05:00
50ec54831d
DRTVWR-559 Revert skies to be very close to release and disable tone mapping when probe ambiance is zero.
...
Hack for desaturating legacy materials has been removed for performance and quality reasons.
Adds a new setting for auto adjusting legacy skies. This is the PBR "opt out" button. If disabled, legacy skies will disable tonemapping, automatic probe ambiance, and HDR/exposure. If enabled, legacy skies will behave as if probe ambiance and HDR scale are 1.0, and ambient will be cut in half.
HDR scale will act as a sky brightener, but will automatically adjust dynamic exposure so the sky will be properly exposed. If you want relatively even exposure all the time, set HDR Scale to 1.0. If you want a high range of exposures between indoor/dark areas and outdoor/bright areas, increase HDR Scale.
Also tuned up SSAO (thanks Rye!).
Reviewed with Brad.
2023-06-01 19:49:23 -05:00
46e04fe273
DRTVWR-559 Remove RenderReflectionProbeCount (which is bugged) and lean on RenderReflectionProbeLevel for preferences (which works).
2023-05-23 16:11:43 -05:00
5d862c994c
DRTVWR-559 Optimization pass on probe allocation and search. Incidental decruft.
2023-04-25 14:48:16 -05:00
37eee397b7
DRTVWR-559 Add control for automatic reflection probes to advanced preferences and featuretable. Remove Reflections checkbox. Don't persist reflection probe volume display between sessions. Incidental decruft.
2023-04-18 19:11:38 -05:00
4747392264
SL-19538 Nudge probe scheduler to unstick probes that are "complete".
2023-04-08 11:22:50 -05:00
413ce656c8
SL-19538 Clear probes on sky setting slam. Better probe update prioritization. Incidental decruft.
2023-04-07 14:10:53 -05:00
de73cf7599
SL-19538 Remove clouds from irradiance maps and don't conflate max probe samples with max probe neighbors, and don't move manual probes after they are complete (removes flickering around Sponza).
2023-04-07 11:06:09 -05:00
1f79379bf2
SL-19538 Followup -- tune exposure parameters and clamp local light ambiance. Make render targets 16F and scrube NaNs (thanks Rye). Update midday. ( #154 )
2023-04-05 11:55:51 -05:00
698966f8e7
SL-19538 Remove hacky ambiance scale and take the mittens off probe a… ( #151 )
...
* SL-19538 Remove hacky ambiance scale and take the mittens off probe ambiance values. Fix for sky brightening being done in sRGB space.
2023-04-04 10:29:12 -07:00
70bdf55439
SL-19517 Followup -- fix broken fallback probe. Adjust water brightness.
2023-03-30 16:24:04 -05:00
e8114dbe14
SL-19517 Fix for RenderReflectionProbeCount other than 256 causing black reflections.
2023-03-30 14:53:01 -05:00
b5917fbd16
DRTVWR-559 Reduce probe flashing and exposure flickering.
2023-03-30 13:14:23 -05:00
6162b9208a
DRTVWR-559 Add RenderAutomaticReflectionProbes control. Tweak automatic exposure.
2023-03-30 10:41:04 -05:00
Ansariel