0ecfbc3de9
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.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.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/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# 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/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# 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/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
2024-05-16 14:10:55 +02: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
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
80585d56fd
Merge master into DRTVWR-568 (and fix conflicts)
2022-10-24 17:48:16 -07:00
65612700f3
DRTVWR-558: Eliminate many spurious set-not-used variables.
...
With Xcode 13.4, these unused variables break Release builds.
2022-08-24 14:00:16 -04:00
076a895062
SL-17635 remove unused variables
2022-06-21 17:55:29 +03:00
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07:00
ad91d0fd92
SL-16127: Make another pass removing redundant LLSD op [] calls, unused vars, and use atmospheric already calculated
2021-10-27 10:05:13 -07:00
26e8d2d8c7
SL-16127: Const cleanup
2021-10-21 18:50:28 -07:00
a172c9d9cf
SL-16127: Replace slow getLightTransmittance with faster version
2021-10-21 16:46:06 -07:00
e466ab255d
SL-12574 Cleanup unused final_atten
2020-03-18 23:37:47 -07:00
03e0549d57
SL-12574 Fix environmentMap being too dark on EEP
2020-03-18 23:37:47 -07:00
bb99e50b26
SL-12574 Add note about duplicated procedurally generated sky texture
2020-03-18 23:37:47 -07:00
49239e8fe1
SL-12574: Tweak sky cubemap to not be as dark to better match Windlight
2020-03-16 19:44:54 -07:00
c4c8d20174
SL-12574 Tweak sky to better match Windlight
2020-02-25 13:25:15 -08:00
82d976a110
Remove unref'd var reintroduced in upstream merges.
2019-08-29 07:44:10 -07:00
c5724023dd
Work around issue with friend ops not accepting default params on Clang.
2019-08-28 15:27:23 -07:00
fd4a90858c
SL-11776 [EEP] Reduced frequency of sky updates by comparing data fuzzily
2019-08-28 21:51:22 +03:00
24537889fb
SL-11550
...
Restore mul by light_transmittance in CPU version of atmospherics.
2019-08-27 13:05:04 -07:00
8960a56f53
SL-11776
...
Fix false alarming sky updates and doing expensive CPU work for same sky pixels.
2019-08-22 11:19:04 -07:00
41c7523e08
SL-11676
...
Make sun/moon textures render on Low/Low-Mid again.
Fix solar additive being present when moon was only heavenly body in sky.
2019-08-12 13:44:59 -07:00
2b99edc099
SL-11373
...
More tweaks to CPU-generated sky cubemap color handling.
2019-07-29 14:00:53 -07:00
fd3cf756a0
SL-11654
...
Make Low graphics not gamma correct the sky colors.
2019-07-29 12:07:51 -07:00
eaf39fc573
Silence Clang warnerror about (now) unused var.
2019-07-29 10:33:02 -07:00
eb9a977a36
SL-11550
2019-07-24 16:07:53 -07:00
695ec5229f
Fix knock-on from touching the sky tex gen which also generated the shiny env map.
2019-07-11 08:33:41 -07:00
d23bf2c16e
SL-11541 WIP
...
Make LLSettingsSky::gammaCorrect work like the soft scale clip and gamma correct from release.
Add transmittance effects to the low-end sky tex gen.
2019-07-10 13:02:09 -07:00
8ba159fed9
SL-11151, SL-11504
...
Remove update threshold logic causing hiccups and rework sky updates.
Make deferred water do double transport again to match non-ALM rendering more closely.
2019-06-27 09:10:38 -07:00
7c770e97be
SL-11371
...
Remove the ugly band of fog color at the horizon in Low/Low+ entirely.
2019-06-20 16:11:31 -07:00
65927e0a76
SL-10181, SL-10546
...
Fix distortion map rendering in deferred mode not including underwater fog effects.
Fix distortion map rendering not including post-deferred content at all.
Fix distortion map rendering not including anything but sky when camera is underwater.
Update sun_up_factor/sunmoon_glow_factor uniforms even when sun disc isn't in use.
2019-02-13 13:09:14 -08:00
866f9ab17a
division by zero protection
2018-10-17 11:38:18 +03:00
79d33f9d19
Fix names of WATER_BLUR_MULTIPILER.
...
Give wave direction uniforms more meaningful names in shaders.
Add comments on glow size/focus conversions for clarity.
2018-10-10 18:44:03 +01:00
8acb87aaf3
SL-9809 [EEP] Environment becomes dark after setting "Glow Size" to the maximum value
2018-10-04 17:00:07 +03:00
1f69a685eb
MAINT-8988
...
Make rebuilding sky tex not look up invariant values by converting from LLSD 15 times per pixel.
Set range on density multiplier to be non-zero to clamp light attenuation to sane values.
Fix UI for density multiplier to include 4 decimal places and not show 0.0003 as 0.00
2018-09-07 22:10:14 +01:00
67ab0084f8
Fix env panel forward action.
...
Make env panel update environment when jumping frame to frame.
Add separate funcs for sun/moon vectors in various coord systems.
Make haze glow only pay attention to sun (i.e. fix sun glow when moon is near horizon in daytime).
2018-06-12 18:42:07 +01:00
64302d3000
Modify use of sky settings, reduce complexity, and name funcs to indicate coord systems in use.
...
Fix class2 softenLightF shader.
2018-06-01 00:18:36 +01:00
89d71617f0
Prepare for validation and storage of legacy haze settings (still pass-through for now).
...
Isolate more use of legacy haze params behind wrapper funcs.
2018-03-08 17:45:43 +00:00
087e210825
Add LLVoSky wrapper for current env sky light direction.
...
Make LLVo classes use LLVoSky wrappers instead of direct access.
Isolate more legacy haze param usage w/in settings.
2018-03-08 16:09:29 +00:00
096ea05a93
Rename getFogColor from water and sky settings to getWaterFogColor and getSkyFogColor.
2018-03-08 00:04:03 +00:00
6d77503542
Isolate more legacy atmo param use in sky (convert to getLightAttenuation and getLightTransmittance).
...
Optimize sky texture creation.
2018-03-07 23:49:37 +00:00
62a0d579b5
Move legacy atmospherics code outside of llvosky (begin teasing apart).
2018-03-07 18:37:09 +00:00
Ansariel