Commit Graph

1668 Commits (293187e04b5dfbc002fd694b75ffdca4b2fdbc8e)

Author SHA1 Message Date
Andrey Kleshchev 7ed053d9a2 viewer#1520 Material upload floater displays wrong upload fee 2024-05-21 10:11:44 +03:00
Andrey Lihatskiy d9153532b8 Merge branch 'main' into marchcat/x-mf-merge
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterimagepreview.cpp
2024-05-15 12:51:21 +03:00
Andrey Lihatskiy b06a99f7c7 Post-merge spaces fix 2024-05-15 12:47:27 +03:00
Andrey Lihatskiy bf1235b017 Merge branch 'marchcat/w-whitespace' into marchcat/x-mf-merge 2024-05-15 12:46:26 +03:00
Andrey Lihatskiy 38c2a5bde9 Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge 2024-05-01 08:16:58 +03:00
Brad Linden 9b6979f458
Fix for SL-20652 shadows on mac breaking alpha blended objects. (#1264)
* Fix for SL-20652 shadows on mac breaking alpha blended objects.

fix secondlife/jira-archive-internal#71030

* clean up surrounding indentation

* Skip unnecessary casting

* Clean up LLGLSLShader::sIndexedTextureChannels usage and improve fix for SL-20652
2024-04-30 19:06:27 -05:00
Andrey Lihatskiy 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
cosmic-linden 6f51d909a2
Merge pull request #1337 from secondlife/v-1184
Cached minimap textures still using extra memory/loading still not reliable
2024-04-26 09:27:27 -07:00
RunitaiLinden cadc1a02cc
1285 GLTF Animation Prototype 2024-04-24 09:51:15 -05:00
RunitaiLinden 2880e5ceee
#1139 Fix for world going black/white in some scenes (NaNs) (#1273)
* #1139 Fix for world going black/white in some scenes (NaNs)

NaNs were coming from normal encode/decode.  Take advantage of available gbuffer space to send full normal instead of encoding.

* #1139 Cleanup

remove now unused encodeNormF.glsl

* #1139 Remove final reference to encodeNormF

* #1139 Fix for getNormalEnvIntensityFlags referencing wrong sampler for env intensity

* Mac build fix
2024-04-19 11:59:28 -05:00
RunitaiLinden bc93177ea0
1176 integrate llgltfnode with selection manager and llmaniptranslate/rotate (#1258)
* #1176 Somewhat working GLTF Node support for translate tool

* #1176 Missing file from last commit

* #1176 Better translation for rotated nodes.

* #1176 Fix for objects snapping back to original position

* #1176 GLTF Samples compatibility pass -- attempt at improving rotation manip support, incidental cleanup, GLTF node debug display

* #1176 Clean out some unused and not working functions.

* #1176 Fix for mac build, incidental cleanup

* Mac build fix
2024-04-17 16:12:49 -05:00
Andrey Lihatskiy eab5beb54c Merge branch 'main' into marchcat/x-merge
# Conflicts:
#	indra/llimage/llimageworker.cpp
#	indra/llimage/llimageworker.h
#	indra/newview/llcontrolavatar.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/lloutfitslist.h
#	indra/newview/lltexturefetch.cpp
2024-04-12 15:43:34 +03:00
Cosmic Linden 47255bf44d secondlife/viewer#1184: Stop making terrain textures undeletable 2024-04-11 17:26:02 -07:00
RunitaiLinden b2a450a308
#1126 gltf scene import prototype (#1172)
* #1126 GLTF Scene import initial prototype (working geometry import for some assets)

* #1126 WIP -- Expand support for more vertex formats, PoC material import, shadow support, scale support

* #1126 move GLTF implementation to newview/gltf

* #1126 Refactor attribute loading to be less copy/pasta for each combination of types

* #1126 Partially working object selection.  Ability to have multiple scenes at once.  Helpful message on how to use the preview button.

* #1126 Add bounding box debug display and untangle GLTF raycast from LLVOVolume raycast

* #1126 Working raycast on GLTF scenes.

* #1126 Remove some #pragma optimize offs
2024-04-09 19:21:10 -05:00
Brad Linden 5a47a3cb23 Merge remote-tracking branch 'origin/main' into release/materials_featurette 2024-04-09 14:17:34 -07:00
Andrey Lihatskiy 1ae6f5dd6f Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
#	indra/llui/lltransutil.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloaterenvironmentadjust.cpp
#	indra/newview/llpaneleditwater.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
2024-03-27 00:33:40 +02:00
Andrey Lihatskiy 78174fc865 Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W
# Conflicts:
#	.github/workflows/build.yaml
2024-03-27 00:14:56 +02:00
Henri Beauchamp b40ff113c5 Allow fading emojis characters in fading text.
In the recent emojis implementation, the text color alpha is ignored
(emojis are always rendered with an opaque white color), causing them
to fail and fade properly with the rest of the text they are printed
with.

This trivial patch fixes this issue.
2024-03-15 21:45:55 +02:00
Henri Beauchamp 2f452d06e6 Proposal #2 to restore how UI/dialogs used to render by prioritizing fallback fonts.
With the emojis support, a new font was added, which not only provides emojis
but also fancy colorful replacements for UTF-8 characters that used to be
supported by our fallback (monochrome) fonts: this causes discrepancies and
unwanted/undesired changes in scripted objects menus (e.g. an empty circle or
square may render as a black, full one, a heart may render red instead of white),
not to mention the larger font size used by the emoji characters...

This patch restores the aspect of such menus/dialogs/UI elements with UTF-8
characters that *are* supported by the usual fallback fonts (fonts which may
also vary from one viewer to another, and from one OS to another), so that
everything keeps working/rendering as it always did so far, while not impairing
the use of new colorful emojis.

This second proposal ensures that:
- "genuine" emojis (in the 0x1f000-0x1ffff range), will *always* be rendered
  using the new emojis font (this solves, for example, the monochrome "yellow
  faces" issue seen with some characters in my first proposal).
- Special UTF-8 characters (in the 0x2000-0x32FF range) which have been used by
  scripters so far, will render as they used to, using the monochrome fallback
  fonts (this repairs scripted dialogs menus).
- Remaining special characters, that do not have a corresponding glyph in the
  monochrome font, but do have one in the emojis font, will use the latter font
  to render.

It also got the nice side-effect of removing the dependency on the ICU4C library.

Note however that the recent commit:
326055ba82
will need to be reverted to allow this patch to actually fix scripted dialogs.

Also, some cleanup might be needed in skins/default/xui/*/emoji_characters.xml to
remove from it the special UTF-8 characters that will no longer be rendered with
fanciful colors, but instead with the monochrome font glyphs.
2024-03-14 01:47:14 +02:00
RunitaiLinden 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
Brad Linden 89b4879627 Merge remote-tracking branch 'origin/release/gltf-maint2' into release/materials_featurette 2024-03-05 11:11:54 -08:00
Alexander Gavriliuk 27dd9ee482 triage#86 Use Emoji font in LineEditor by default 2024-03-05 15:37:49 +01:00
Andrey Kleshchev 6c43baf029 Issue #54 LLRender::init crash 2024-03-05 01:58:57 +02:00
Andrey Kleshchev 78ce375dda SL-17896 Don't crash silently if files are missing or out of memory
Under debug LL_ERRS will show a message as well, but release won't show
anything and will quit silently so show a notification when applicable.
2024-03-05 00:29:35 +02:00
Andrey Lihatskiy b68a05e7c3 Merge branch 'main' into marchcat/x-merge
# Conflicts:
#	indra/llcommon/llstring.cpp
#	indra/llcommon/llstring.h
2024-03-04 18:01:05 +02:00
Brad Linden 8164dce567 Merge remote-tracking branch 'origin/release/gltf-maint2' into release/materials_featurette 2024-03-01 10:17:37 -08:00
Brad Linden 258c039584 Merge remote-tracking branch 'origin/main' into release/gltf-maint2 2024-03-01 10:12:00 -08:00
Andrey Lihatskiy 6d077c90a0 Merge branch 'main' into DRTVWR-588-maint-W 2024-03-01 17:30:06 +02:00
Cosmic Linden fc7abe8cb9 secondlife/viewer-issues#72: More correct interpretation of swapFBORefs 2024-02-21 16:06:11 -08:00
Cosmic Linden 589910f445 secondlife/viewer-issues#72: Fix material preview affecting exposure on main screen 2024-02-21 12:53:10 -08:00
Jonathan "Geenz" Goodman 97d2b21621 #671 Setup the viewer to respect the MirrorsEnabled simulator feature. 2024-02-08 11:39:35 -08:00
RunitaiLinden 78cc23f89c Merge branch 'release/materials_featurette' into materials_featurette/mirrors 2024-02-07 11:20:06 -06:00
RunitaiLinden 5abc68ad43 #677 Move PBR mirror radiance mixing to reflectionProbeF so transparent PBR surfaces can be mirrors 2024-02-02 15:43:56 -06:00
RunitaiLinden b2462355a3 #677 WIP -- add mirror clipping to more shaders 2024-02-01 13:19:20 -06:00
Cosmic Linden 00c65b6270 secondlife/viewer-issues#43: Fix debug normals not rendering for terrain 2024-01-31 14:31:06 -08:00
Andrey Kleshchev 56a9322569 Issue #54 LLRender::init crash 2024-01-25 01:40:53 +02:00
Jonathan "Geenz" Goodman 373b06398c Merge remote-tracking branch 'origin/release/materials_featurette' into DRTVWR-583 2024-01-24 14:37:33 -08:00
Cosmic Linden 38b3f663fc Merge branch 'release/materials_featurette' of github.com:secondlife/viewer into DRTVWR-592 2024-01-22 15:07:10 -08:00
Cosmic Linden 2f18d74f9a SL-20606: Full GLTF material preview. Works for most materials. 2024-01-19 15:43:13 -08:00
Cosmic Linden c2a30057f8 SL-20606: Remove unused strider getters 2024-01-19 15:43:12 -08:00
RunitaiLinden 6dd260c369
Merge branch 'release/materials_featurette' into DRTVWR-592 2024-01-19 11:36:56 -06:00
RunitaiLinden 19163fd0fe
Allow for upload of 2k textures (#652)
* SL-20760 Allow 2k texture uploads

* SL-20760 Fix for textures not downloading.
2024-01-18 10:33:02 -06:00
Alexander Gavriliuk ae91ae43a5 SL-20795 Part of previously typed emojis disappear in the 'Save settings as a preset...' option of the 'Preferences' floater 2024-01-17 04:34:21 +01:00
RunitaiLinden fab4cfbab2 SL-20704 Fix for pathfinding debug display not working. 2024-01-10 13:50:15 -06:00
Andrey Lihatskiy 7d4de08fa9 Merge branch 'main' into DRTVWR-489
# Conflicts:
#	indra/newview/llmaterialeditor.cpp
2024-01-08 23:49:38 +02:00
Andrey Lihatskiy fe796dac71 Merge branch 'main' into DRTVWR-588-maint-W 2024-01-08 23:15:00 +02:00
Andrey Kleshchev afe91b7eb6 Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-X
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
2024-01-08 21:33:06 +02:00
Andrey Kleshchev 51088cde7f SL-17896 Don't crash silently if files are missing or out of memory
Under debug LL_ERRS will show a message as well, but release won't show
anything and will quit silently so show a notification when applicable.
2024-01-04 21:13:06 +02:00
Andrey Lihatskiy 793bed7d06 Merge branch 'main' into DRTVWR-489
# Conflicts:
#	indra/newview/fonts/DejaVu-license.txt
#	indra/newview/fonts/DejaVuSans-Bold.ttf
#	indra/newview/fonts/DejaVuSans-BoldOblique.ttf
#	indra/newview/fonts/DejaVuSans-Oblique.ttf
#	indra/newview/fonts/DejaVuSans.ttf
#	indra/newview/fonts/DejaVuSansMono.ttf
2023-12-15 07:06:15 +02:00
Andrey Lihatskiy 4b98ae6e8a Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
# Conflicts:
#	indra/newview/llspatialpartition.cpp
2023-12-14 02:47:44 +02:00