feb6b39060
secondlife/viewer#2991 : Fix PBR terrain sometimes not loading textures
2024-11-25 22:22:27 +02:00
6aa9110b2a
secondlife/viewer#1883 : Local-only PBR terrain paintmap with developer tools
2024-08-06 16:28:47 -07:00
ab87978cbc
1836 dont store texture in system memory unless absolutely necessary ( #1843 )
...
* #1836 Texture memory usage overhaul. Much decrufting
- don't keep a copy of textures in system memory
- use GPU to downrez textures instead of reloading from cache
- use GPU to generate brightness/darkness bumpmaps
2024-06-27 13:12:43 -05:00
fcf9af42fa
secondlife/viewer#907 : Review feedback
2024-06-13 12:49:48 -07:00
9775d7ea10
Merge remote-tracking branch 'origin/release/maint-a' into project/gltf_development
2024-06-11 17:42:17 -07: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
eb431ee879
secondlife/viewer#1475 : Fix whitespace and remove comment
2024-06-10 11:16:12 -07:00
6de0086ae9
secondlife/viewer#1475 : Add PBR terrain repeats editing
2024-06-07 18:14:32 -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
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
b06a99f7c7
Post-merge spaces fix
2024-05-15 12:47:27 +03:00
d21f29b643
Merge branch 'project/gltf_development' into project/gltf_development
2024-05-14 14:22:46 -05:00
9441608623
secondlife/viewer#907 : Local PBR terrain texture transforms
2024-05-10 17:42:54 -07: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
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
19c0504671
secondlife/viewer#1184 : Fix mac build
2024-04-25 17:33:02 -07:00
aac18ada71
secondlife/viewer#1184 : Use more robust/memory-friendly setLoadedCallback for minimap gen. Fix some emissive maps.
2024-04-25 16:48:07 -07:00
47255bf44d
secondlife/viewer#1184 : Stop making terrain textures undeletable
2024-04-11 17:26:02 -07:00
b7b962affd
viewer#1163: Unboost terrain textures when done to allow deletion
2024-04-10 15:34:48 -07:00
7c92398cf6
secondlife/viewer#759 : Fix minimap loading for 2k PBR materials, and probably other odd cases
2024-04-08 10:26:14 -07:00
96933d05ec
secondlife/viewer#1027 : Fix noise on transparent PBR materials on minimap
2024-03-20 17:07:44 -07:00
0cb9e7f7e5
secondlife/viewer#712 : Remember previously set textures/materials when possible. Not persistent.
2024-02-29 16:52:35 -08:00
d79498e259
secondlife/viewer#712 : More intuitive selection of PBR vs texture terrain, and update dropdown to match
2024-02-29 14:52:55 -08:00
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
2cbf4a15df
secondlife/viewer#773 : Fix RenderTerrainPBREnabled requiring restart and respect simulator feature PBRTerrainEnabled
2024-02-09 12:42:26 -08:00
9c6e351e05
secondlife/viewer-issues#67 : Improve PBR terrain loading robustness
2024-02-08 13:24:16 -08:00
c583c666d2
secondlife/viewer#67 : (debug) Add temporary setting to force-load PBR terrain
2024-02-07 09:11:26 -08:00
ab3b4edac7
DRTVWR-592: Fix broken minimap loading, improve minimap view of PBR materials (still not accurate, but better...)
2023-10-13 10:39:03 -07:00
d6aced7abf
DRTVWR-592: Remove WIP separate code path for terrain geometry rebuilds for PBR as that is not needed at the moment
2023-10-13 10:38:54 -07:00
b9ba57fd00
DRTVWR-592: (WIP) Fix terrain PBR texture repeat seam. Legacy terrain texture repeats currently broken
2023-10-13 10:38:42 -07:00
57433341ab
Revert "Revert "DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin hooking up code for PBR-specific terrain geometry updates. Unfortunately, this version has a bug which can cause rebuilds to be skipped. Needs more work/testing""
...
This reverts commit 2318d65766
2023-10-13 10:36:51 -07:00
2318d65766
Revert "DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin hooking up code for PBR-specific terrain geometry updates. Unfortunately, this version has a bug which can cause rebuilds to be skipped. Needs more work/testing"
...
This reverts commit de9184479c
2023-10-13 10:31:51 -07:00
de9184479c
DRTVWR-592: (WIP) Fix tiling only in the PBR case. Begin hooking up code for PBR-specific terrain geometry updates. Unfortunately, this version has a bug which can cause rebuilds to be skipped. Needs more work/testing
2023-10-13 09:58:50 -07:00
14c3730bf1
DRTVWR-592: Fix unable to undo effect of local terrain debug setting without restarting viewer
2023-10-13 09:58:20 -07:00
94d8f669ac
DRTVWR-592: Add debug options LocalTerrainAssetN. Fix PBR terrain texture flickering
2023-10-13 09:58:13 -07:00
039116abd4
DRTVWR-592: (WIP) Roughly working draft of PBR terrain
2023-10-13 09:58:05 -07:00
3553fec208
DRTVWR-592: (WIP) Separate code path for terrain rendering and shaders. Just copy/paste for now. Use same draw pool
2023-10-13 09:57:10 -07:00
94e824739b
DRTVWR-592: Render PBR material terrain like legacy, using baseColor texture
2023-10-13 09:57:02 -07:00
76bf3390eb
DRTVWR-592: (WIP) Detect when terrain materials are loaded, use as fallback when terrain textures do not load
2023-10-13 09:56:55 -07:00
43c0dc7f15
Attempt to restore SL-17823 fix after merge with DRTVWR-559 texture pipeline work removed the getDecodePriority() method.
2022-12-12 18:03:09 -08:00
742ecbd4ec
SL-17823 FIXED Terrain texture does not show in minimap when relogging.
2022-09-02 12:14:32 +03:00
78007d2592
SL-16088 Fix for stall from many calls to glGenBuffers.
2021-09-27 22:35:50 +00:00
30b36a7215
SL-10344 Named logging
2019-04-16 22:15:32 +03:00
847afb9c65
SL-10344 Fix decode priority
2019-04-16 18:10:39 +03:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Cosmic Linden