Commit Graph

50619 Commits (0f6ef1643e6149a40aa605ad8f44d89df843bd80)

Author SHA1 Message Date
Jonathan "Geenz" Goodman 0f6ef1643e
Fix for AMD not being able to load pbrmetallicroughnessV. (#1620) 2024-06-04 09:36:37 -07:00
Dave Parks d1a8a9d0c3
#1596 Fix for GLTF uploads failing after loading from .glb file (#1602) 2024-05-30 16:28:56 -05:00
cosmic-linden 0a4d37f22f
Merge pull request #1599 from secondlife/1597-fix-gltf-orientation-test
#1597 Fix for some GLTF transforms not loading properly.
2024-05-30 12:12:53 -07:00
RunitaiLinden e279aae51a #1597 Fix for some GLTF transforms not loading properly.
Also incidental fix for unreachable code error.
2024-05-30 13:42:27 -05:00
Dave Parks 15fd13f830
#1530 Increase joint limit for GLTF Assets (#1582)
* Migrate GLTF scene rendering to its own shaders
* Add support for ambient occlusion map separate from metallic roughness map (or absent)
* Use UBO's for GLTF joints
* Better error handling of downloading GLTF assets
2024-05-29 16:56:39 -05:00
Andrey Kleshchev 2d0fe5ca7b viewer#1497 Gray out some options for Mirror (Everything)
Ambiance and Near Clip fields for a Mirror probe should be grayed out for Mirror (Everything)
2024-05-29 11:06:51 +03:00
Dave Parks 2f41200384
Remove tinygltf dependency from LL::GLTF (#1541)
* #1535 Image loading/saving support in boost::json driven GLTF parser
* #1536 GLB Support in boost::json drvien GLTF parser
2024-05-28 09:45:40 -05:00
Andrey Kleshchev db627bc354 viewer#1553 Local PBR materials are not applied to the terrain 2024-05-28 16:49:41 +03:00
Andrey Kleshchev 04c4d18f70 viewer#1573 Crash at updateMovedList
According to bugsplat data drawablep is null
2024-05-27 17:09:31 +03:00
Andrey Kleshchev ed16808113 viewer#1552 Bake textures could be applied to terrain textures 2024-05-24 18:28:52 +03:00
Brad Linden 0cc832c38a
Merge pull request #1528 from secondlife/brad/merge-maint-a-to-dev
merge maint-a (including maint-x) into gltf_development
2024-05-23 13:02:08 -07:00
Brad Linden 9f6849e081 Merge remote-tracking branch 'origin/project/gltf_development' into brad/merge-maint-a-to-dev 2024-05-23 11:35:23 -07:00
Brad Linden 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
Brad Linden 6377610f65
Protect NSIS scripts from eol-style translations. (#1556) 2024-05-23 11:23:50 -07:00
Andrey Kleshchev 7f4a4bc110 viewer-private#238 Complexity mode should persist 2024-05-23 15:39:12 +03:00
Andrey Kleshchev 3c00b5f751 triage#59 Cover cases where some attachments stayed visible 2024-05-23 12:08:40 +03:00
Ansariel bf7e46ec26 Add Git attributes file to prevent accidental line ending changes 2024-05-22 23:01:26 +03:00
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03:00
Andrey Lihatskiy 069ea06848 Fix line endings 2024-05-22 20:57:56 +03:00
Andrey Lihatskiy 6cc7dd09d5
Merge pull request #1545 from Ansariel/DRTVWR-600-maint-A
Merge main into DRTVWR-600-maint-a
2024-05-22 20:51:58 +03:00
Ansariel 7bb5afc11e Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
#	indra/llcommon/llpredicate.h
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llinventorybridge.cpp
2024-05-22 19:08:15 +02:00
Ansariel 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
nat-goodspeed ef8f481982
Merge pull request #1539 from secondlife/nat/kwds
Change `LLPredicate::Rule::requires()` to `mandates()` for C++20.
2024-05-22 10:21:28 -04:00
Nat Goodspeed eb81d5f23f Merge remote-tracking branch 'DRTVWR-600-maint-A' into nat/kwds 2024-05-22 09:30:04 -04:00
Nat Goodspeed f8ccb39b8d Bring over .xz compression from main, instead of .bz2.
The main branch, and the current rev of viewer-build-util, consistently uses
.xz for tarballs.
2024-05-22 09:26:05 -04:00
Andrey Kleshchev 47985e5822 triage#59 Fix missed 'static' declarations 2024-05-22 15:39:53 +03:00
Nat Goodspeed aa75a65e88 Update to viewer-build-util@v2 utilities.
Without this, the viewer build fails to post Windows symbols.
2024-05-21 15:17:49 -04:00
Nat Goodspeed 4215c2d49f Change 'LLPredicate::Rule::requires()' to 'mandates()' for C++20.
Although 'requires' appears in many comments and some string literals, and
'concept' in a few of each, LLPredicate::Rule appears to be the only use of
any new C++20 reserved word in the existing code base. And it seems to be
unreferenced.
2024-05-21 12:45:42 -04:00
Dave Parks 03c4458bdc
#1392 GLTF Upload (#1394)
* #1392 WIP -- Functional texture upload, stubbed out .bin upload.

* #1392 GLTF Upload WIP -- Emulates successful upload

Successfully uploads texture
Emulates successful .gltf and .bin upload by injecting into local asset cache.
Emulates rez from inventory by setting sculpt ID of selected object
Currently fails in tinygltf parsing due to missing .bin

* Add missing notification

* Build fix

* #1392 Add boost::json .gltf reading support.

* #1392 boost::json GLTF writing prototype

* Create gltf/README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* #1392 Add ability to render directly from LL::GLTF::Material

* Fix for mac build

* Mac build fix

* #1392 AssetType and Inventory Type plumbing

* #1392 More sane error handling and scheduling of uploads.

* #1392 Actually attempt to upload glbin

* Mac build fix, upload nudge

* Mac build fix

* Fix glTF asset uploads to server

* Mac build fix (inline not static)

* More consistent inline

* Add glm, mac nudge.

* #1392 For consistency with spec, start using glm over glh:: and LLFoo

* Another attempt at placating Mac builds

* Another Mac nudge

* Mac build take 23

* #1392 Prune LLMatrix4a from GLTF namespace.

* #1392 Fix for orientation being off (glm::quat is wxyz, not xyzw)

* #1392 WIP -- Actually send the sculpt type and id, nudge readme and alpha rendering

* #1392 Working download!

* #1394 Add support for GLTFEnabled SimulatorFeature

* #1392 Review feedback

---------

Co-authored-by: Pepper Linden <3782201+rohvani@users.noreply.github.com>
2024-05-20 13:22:55 -05:00
Brad Linden 6af5db09fa Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev 2024-05-20 11:14:29 -07:00
Andrey Kleshchev 6d6eabca44 triage#59 Render Friends Only option
An option for performance testing, video recording or taking photos, so
that unexpected people won't appear in your photos or tests.
2024-05-20 19:34:42 +03:00
Andrey Kleshchev e1493a10b4 viewer#1501 Crash initiating screenSpaceReflUtil.glsl
Error: Function return is not matching type
2024-05-17 17:04:01 +03:00
Andrey Kleshchev 36de04b212 viewer#1117 Use attachment info to prevent accidental nudity #2
Discard null id attachments
2024-05-17 14:45:04 +03:00
Brad Linden e1623bb276
Merge pull request #1489 from secondlife/brad/fix-mac-channel
Fix channel detection for mac builds
2024-05-16 09:55:50 -07:00
nat-goodspeed da46958824
Merge pull request #1486 from secondlife/brad/workflow-dispatch-release
Experiment with getting manually triggered workflow builds to optionally do a release
2024-05-16 10:06:05 -04:00
nat-goodspeed 5e294f6689
Merge pull request #1462 from secondlife/nat/releaseos
Run ReleaseOS builds, but only when a release page is requested.
2024-05-16 09:52:41 -04:00
Brad Linden 8011d3f457 Fix channel detection for mac builds 2024-05-15 16:08:04 -07:00
cosmic-linden eab232d3ed
Merge pull request #1488 from secondlife/brad/gltf-dev-featurttes-merge
brad/gltf dev featurttes merge
2024-05-15 15:48:58 -07:00
Brad Linden 3cb329d4fa Merge commit '29be88d60d654193926add496d2d851f7c217356' into project/gltf_development 2024-05-15 15:41:24 -07:00
cosmic-linden 6252449cd3
Merge pull request #1487 from secondlife/v-1474
secondlife/viewer#1474: Remove small texture offset from PBR terrain
2024-05-15 15:27:42 -07:00
Cosmic Linden 6e501c5a1a secondlife/viewer#1474: Remove small texture offset from PBR terrain 2024-05-15 15:15:34 -07:00
Brad Linden 7feec9998e Move all release_run logic into setvar job. 2024-05-15 15:12:52 -07:00
Cosmic Linden 28563eb8fe secondlife/viewer#1474: Fix broken shader compilation 2024-05-15 14:52:47 -07:00
Brad Linden 0960ae7892 Experiment with getting manually triggered workflow builds to optionally do a release 2024-05-15 14:49:07 -07:00
Nat Goodspeed 1f0b80f709 Streamline the new workflow `RELEASE_RUN` logic a little.
Since downstream jobs reference the output of the new `setvar` job, instead of
directly referencing global `env.RELEASE_RUN`, no need to set `RELEASE_RUN` in
the global environment.
2024-05-15 17:15:25 -04:00
Dave Parks 29be88d60d
#1267 Fix for alpha cutoff of zero and base color factor alpha of zero making objects disappear (#1485) 2024-05-15 15:40:55 -05:00
Andrey Kleshchev 43603fedba jira-archive-internal#67837 Windows' bulk export of snapshots and textures
Properly sanitize names
Better duplicate avoidance
2024-05-15 23:36:29 +03:00
Nat Goodspeed 2e144ecbb2 Merge branch 'main' into nat/releaseos following Maint X promotion 2024-05-15 16:17:09 -04:00
Nat Goodspeed 1b5f0590ce Merge commit 'e7eced3' into nat/releaseos for whitespace fix. 2024-05-15 16:15:46 -04:00
Nat Goodspeed f822193974 Make env.RELEASE_RUN the empty string if false
not the string "false", which is true.
2024-05-15 16:08:54 -04:00