9fdca96f8b
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
2024-07-08 20:27:14 +02:00
a1f49564d6
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
2024-05-23 11:31:19 -07:00
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
1b67dd855c
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
2024-05-22 19:04:52 +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
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
54fc10acb1
#1116 HDRI preview enhancements ( #1119 )
...
Don't split sky in radiance and irradiance maps
Allow for applying HDRI sky to only irradiance map
Allow for showing entire EEP sky (clouds and all) when split is set to zero
2024-04-02 16:09:20 -05:00
d909e72438
#975 Add RenderHDRISplitScreen debug setting ( #976 )
...
* #975 Add RenderHDRISplitScreen debug setting
* Create hdri_local_preview.md
2024-03-13 12:27:33 -05:00
457b720fd9
#965 Fix for EEP skies being too bright
2024-03-12 14:26:21 -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
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
8b86e2ad1b
SL-20611 Followup -- fix for depth based atmospheric mask making atmospherics effect sun/moon/clouds
2023-12-14 14:11:46 -06:00
086da3d6f8
DRTVWR-559 Make cloud pattern deterministic when cloud scroll is zero.
2023-04-12 09:55:00 -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
366bae1496
DRTVWR-559 Fix for off-white metal not looking chromed when it should (fake hacky HDR sky reflections).
2023-03-27 18:22:53 -05:00
e5a2f85005
SL-19226 Reimplement water fresnel offset/scale, exposure balance for midday, adjust reflections off, and decruft depth buffer error correction shenanigans that are no longer used.
2023-02-27 16:53:56 -06:00
68c4ff7dce
SL-18762 Fix for broken local lights on alpha when wearing a HUD attachment. Also fix stuck sun/moon and incidental decruft.
2023-02-14 10:10:12 -06:00
830cb6b665
SL-19148 Decruft some forward shaders and drawpools. Fix HUDs being in wrong color space.
2023-02-03 17:18:39 -06:00
76c6f3f002
SL-18741 Don't allow bulk upload without caps
2022-12-07 21:21:03 +02:00
1d5332b232
SL-18448 When initing views and object has pbr, open pbr in texture tab
2022-12-02 14:24:25 +02:00
321c7895d0
SL-18741 Basic bulk upload for gltf materials #1
2022-12-02 10:24:23 +02:00
a887c486b4
Merge remote-tracking branch 'origin/DRTVWR-528' into DRTVWR-559
2022-11-28 16:24:53 -08:00
159d4f9cd0
SL-18708 Shutdown crash at renderHeavenlyBodies
2022-11-24 22:31:20 +02:00
b6e576c7c2
SL-18190 Cleanup -- convert some vec4's to vec3's (as they really are), remove some unused glsl files.
2022-10-11 20:20:39 -05:00
02c71b0ac2
Merge branch 'master' v 6.6.1 into DRTVWR-528
2022-05-26 11:18:44 -06:00
cfd39c3663
SL-16606: Add profiler category DRAWPOOL
2022-01-14 11:50:19 -08:00
7a5ef999d0
SL-16386 consolidate all VertexShader capability checks to a single LLPipeline::shadersLoaded()
2021-11-30 17:04:35 -07:00
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07:00
d2dce17803
SL-16197 Optimize LLEnvironment handling of shader uniforms. Instrument LLSD. Enable Fast Timers when Tracy is enabled to catch Fast Timer overhead.
2021-10-19 02:26:41 +00:00
ced2bd5ed4
SL-14113 Fix moon haze
2021-04-29 14:07:57 -07:00
907140d248
SL-15110 Fix stars appearing in a different location in the night sky when ALM is turned on
2021-04-12 16:04:10 -07:00
ab02a6dfd4
SL-14706 Merge Sovereign Engineer's fix for stars not centered around camera: Stars render around center of sim instead of center of camera.
2021-01-29 18:41:04 -08:00
78da30936c
Revert "SL-13768 Remove glow from moon when sun is down due to it using the sun glow setting (pull request #297 )"
2020-09-15 21:25:28 +00:00
92f5d5428e
Merged in SL-13768_remove_moon_glow (pull request #297 )
...
SL-13768 Remove glow from moon when sun is down due to it using the sun glow setting
2020-09-12 04:11:11 +00:00
874d7e7e02
SL-13465 Restore Pre-EEP haze effecting moon
2020-09-11 20:46:55 -07:00
d26f17efd5
SL-13768 Remove glow from moon when sun is down due to it using the sun glow setting
2020-09-11 19:01:08 -07:00
7396879ef6
SL-13768 remove moon glow from sky and clouds
2020-08-28 09:50:01 -06:00
7a311fe30e
Merge branch 'master' into DRTVWR-497
2020-04-20 21:21:12 +03:00
4f5d785226
SL-12014 Animesh is now a separate rendering type
2019-10-25 17:32:19 +03:00
81659325b8
SL-11373
...
Fix class2/windlight clouds.
2019-06-20 08:49:09 -07:00
653133b9c0
SL-11370, SL-11372, SL-11337
...
Fix culling on Low+ water reflection pass.
Make Mid+ / High use class1 deferred sky again (no rainbows, but faster!).
Fix setting of cloud color for deferred sky/cloud shaders.
Put water reflections back in wrong colorspace for consistency with release.
2019-06-11 13:03:06 -07:00
49eae58bd0
SL-10969
...
More tweaking ambient light.
2019-06-06 16:32:55 -07:00
2408e8be5e
SL-11357
...
Nerf moisture and ice levels iff there's no sun or moon to generate light to refract.
2019-06-05 09:15:19 -07:00
c4032528af
Roll back sRGB decode changes from contrib for now.
...
Fix direct light matching across alpha/blended-material/deferred.
Get diffuse lighting to match from Low to Ultra.
2019-05-02 13:49:35 -07:00
1ff876a961
SL-11071
...
Make sun disc and moon shaders use sRGB hardware tex sampling.
Remove sun disc shader use of fullbright transport (fogging).
2019-04-30 12:19:35 -07:00
d2419ca3ca
SL-10988
...
Make moon disc image render only if current or previous textures are available.
2019-04-18 08:43:37 -07:00
0272c47e5a
Tweaked naming a bit, also white space.
...
Will wait for a response from @graham_linden regarding moving the sRGB conversion functions in llmath.h to llrender.
2019-03-29 11:57:45 -07:00
f3ea75cfa9
Back out a couple of not-so-well tested changes.
2019-03-29 10:55:07 -07:00
57d88a8a98
Gamma correction pass 2:
...
Make sure lights are in the correct color space.
Bonus: cache the sRGB color in setLightColor on point and spot lights. Frees up a pow and some multiplies on the CPU every frame.
2019-03-29 08:11:56 -07:00
7021c7a8db
Remove unused cloud shadow shader var for Clang.
2019-03-14 07:23:47 -07:00
Ansariel