01f9dbc4e3
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llallocator_heap_profile.cpp
# indra/llui/lllayoutstack.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/lltextureview.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_preferences_colors.xml
2024-08-20 11:21:57 +02:00
d79ff40ee2
Fix hero probes not releasing resources when disabled
2024-08-17 18:23:58 -04:00
088cc2ea35
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llpointer.h
# indra/llcommon/llqueuedthread.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llstatgraph.cpp
# indra/llui/llvirtualtrackball.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaceprofile.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvocache.cpp
# indra/newview/llworldmapview.cpp
2024-07-09 02:25:42 +02:00
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
9a2b83b294
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llmemory.cpp
# indra/llmessage/CMakeLists.txt
# indra/llmessage/llfiltersd2xmlrpc.cpp
# indra/newview/lldebugview.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/llheroprobemanager.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llslurl.cpp
# indra/newview/llsurface.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llversioninfo.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/llworld.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/de/menu_viewer.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/es/menu_viewer.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/it/menu_viewer.xml
# indra/newview/skins/default/xui/ja/menu_viewer.xml
# indra/newview/skins/default/xui/pl/menu_viewer.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/pt/menu_viewer.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/ru/menu_viewer.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/tr/menu_viewer.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
# indra/newview/skins/default/xui/zh/menu_viewer.xml
# scripts/messages/message_template.msg.sha1
2024-07-02 18:08:57 +02:00
20294e9ee8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
2024-07-02 01:23:35 +02:00
fcc7d16108
Fix for various TP where a mirror is present
...
these manifest as crashes in isDynamic, isBox and similar calls that are accessed through a dangling probe.
2024-07-01 17:22:07 +01:00
c5bbc8dac4
Tag the fix
2024-06-30 15:51:45 +01:00
b225399a7d
FIRE-34201 - Crash on TP to Mirror
...
Multiple different crashes seemingly caused by a long dead volume pointer.
Matches multiple bug splat ids.
Trigger details: have a mirror present and working. TP away, TP to a few other places. Importantly, the other places should not have any mirrors.
TP back to mirror. I believe that because the probe was never overwritten by another, upon return the code tries to reuse it only to find that the pointer is garbage.
The fix tries to ensure that the associated refelction map is cleaned up when the probe goes out of scope.
2024-06-30 15:49:06 +01:00
364a14a8aa
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llprofilercategories.h
2024-06-21 22:45:12 +02:00
80ea30af1a
#1769 gltf optimization pass ( #1816 )
...
#1814 and #1517 Fix mirror update rate and occlusion culling
2024-06-21 13:13:08 -05:00
45ab5c68ee
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llrender/llgl.h
# indra/newview/fspanelface.cpp
# indra/newview/fspanelface.h
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llheroprobemanager.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewercamera.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvocache.cpp
# indra/newview/vjlocalmesh.cpp
2024-06-21 19:58:00 +02:00
f5a6ff4880
optimise heroprobe activation a bit more.
2024-06-16 17:57:09 +01:00
362be6b939
LL Issues 1719/1721Interim fix for mirrors not turning off.
...
two issues relating to the same problem.
both essentially housekeeping issues when probes are disabled or go out of view.
2024-06-15 23:22:42 +01:00
a7b0f93911
Fixed signed/unsigned warnings after they got enabled in the maint-A merge
2024-06-11 15:39:48 -07:00
7889df945b
Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development
2024-06-04 17:39:39 -07:00
c413458fd4
#1628 Disable spherical mirror probes for the time being. ( #1631 )
2024-06-04 15:22:38 -07:00
01c82642ac
#1581 Only render mirrors when reflection probes are enabled. ( #1592 )
2024-05-29 19:31:58 -07:00
33bb511ab4
Improvements to mirror probe update rates ( #1570 )
...
#1494 Fix for mirror updates getting "stuck" on some faces.
2024-05-28 14:19:18 -07: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
b06a99f7c7
Post-merge spaces fix
2024-05-15 12:47:27 +03:00
31a3423239
Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development
2024-05-14 11:07:13 -07:00
ca5e89d741
Even more mirror fixes. ( #1429 )
...
#1271 Add support for mirrors that do not have avatars in them. It does this based on if the probe is set to dynamic or not.
#1370 More optimization work to reduce GPU utilization.
#1058 - Removed sim feature flag that was overriding mirrors enabled flags
secondlife/viewer-private#128 - Locally cache the mirror probe
#679 Add additional options to the build floater for mirror probes, including descriptions.
2024-05-08 11:28:51 -07:00
8b747cee18
BOOL to bool
2024-05-06 16:49:24 -05:00
7ef2b43802
Multiple fixes for mirrors. ( #1192 )
...
* #1064 Fix for mirror surfaces going black when the roughness is set too high.
* #1130 Fix for the user's avatar not appearing in mouselook in a mirror.
* #1059 Disable mirrors on low settings per the feature table.
* #860 Modify the settings UI to better reflect that we only have two AA modes: off and FXAA.
* #1191 Add some settings for mirrors in preferences.
* #1185 Add support for runtime mirror resolution changing. Useful for quality settings, and auto-FPS.
2024-04-10 15:21:59 -07:00
ef75523555
983 add debug setting to control the maximum download resolution ( #986 )
...
* Create RenderMaxTextureResolution.md
* #983 Add RenderMaxTextureResolution setting. Incidental crash fix.
2024-03-13 12:22:12 -05:00
4b738a619a
#681 Small fix for if a viewer object may be dead.
2024-03-06 18:24:36 -08: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
8c79297a89
#682 Further tweak the conservative update mechanism.
2024-02-26 01:21:41 -08:00
1b8523a7b6
#890 Make sure we're doing the correct distance check.
...
#682 Improve the conservative update functionality for mirror faces. Make it attenuate depending on how much the camera is facing that specific cubemap face.
2024-02-26 00:30:44 -08:00
2ba5449b8b
#889 Start removing mDrawable references. These may be null.
2024-02-25 23:38:11 -08:00
3202587297
#682 Add a low priority path for conservative probe face updates. This will update the "low priority" faces at half of the the probe update rate. Useful for less planar reflection geometry.
2024-02-25 22:52:23 -08:00
e68735ad3a
#682 Add an update rate parameter to help throttle mirror updates.
...
So far 4 seems like a good balance for performance and quality. 2 is great for quality, with 6 or 8 being for higher performance. Also bring back the gaussian filter - may end up adding the FXAA filter though instead.
2024-02-21 11:51:46 -08:00
8cea285114
#682 Separate out the radiance gen.
2024-02-20 18:21:45 -08:00
7a9cdf2b52
#682 Do conservative updates on probes.
2024-02-15 09:38:29 -08:00
a7310ae741
#671 Nudge RenderMirrors and clear shader cache as needed based on SimulatorFeatures
2024-02-08 15:07:54 -06:00
c721152c44
Fix for crash in LLHeroProbeManager
2024-02-08 14:54:01 -06:00
97d2b21621
#671 Setup the viewer to respect the MirrorsEnabled simulator feature.
2024-02-08 11:39:35 -08:00
739ff27c06
#740 Make sure we evaluate if the probe is a mirror probe or not.
...
#682 Re-enable gaussian filtering, and reduce the mirror resolution back to 1024.
Also just generally clean up the code a bit.
2024-02-06 02:53:57 -08:00
aab98046b9
#677 More clipping fixes.
2024-02-01 13:03:28 -08:00
fac63e473a
#684 Fix pixellation on mirrors regardless of mirror resolution.
2024-02-01 12:11:20 -08:00
a4225663ac
#677 Set mirror pass flag in llsettingsvo
2024-02-01 10:16:52 -06:00
476cbaed6a
#677 Some clipping WIP
2024-01-31 15:54:14 -08:00
a888531fd1
https://github.com/secondlife/viewer-issues/issues/23 Make the face selection for mirrors actually reflect what it does
2024-01-24 16:22:45 -08:00
4d39d88997
https://github.com/secondlife/viewer/issues/671 Wire up the RenderMirrors debug setting.
2024-01-24 15:50:13 -08:00
e841c73a99
Tons of masking changes and tweaks.
...
We now support masking mirrors in the GBuffer.
We also now support the concept of one arbitrary clip plane.
DRTVWR-583
2023-10-16 08:45:48 -07:00
e612d70fad
Fix for probe stealing, and also make sure we're not super sampling.
...
DRTVWR-583
2023-10-06 06:21:53 -07:00
1d3d94a514
Add probe near clipping.
...
DRTVWR-583
2023-09-29 16:25:25 -07:00
052d5c2802
Wire up the debug settings.
...
DRTVWR-583
2023-09-29 04:33:11 -07:00
Ansariel