b0c951ffe3
Revert "Merge develop into glTF mesh import"
2025-06-27 21:28:58 -04:00
ef7bfa5e52
Restore glTF mesh modifications.
2025-06-27 19:23:48 -04:00
6dd8a02ed1
Merge branch 'project/gltf_mesh_import' into geenz/develop-to-gltf-mesh
2025-06-27 17:18:00 -04:00
c404b93759
#4148 Fix collision bones
2025-06-25 09:28:51 +03:00
f5320302d4
#4214 Revert and remake "weights remap"
...
This reverts commits fe10a83f69
2025-06-19 20:50:29 +03:00
5bc92322e9
#4250 Crash uploading a dae model
2025-06-19 18:54:03 +03:00
98abff90a7
#4248 Add safety checks to LLMeshSkinInfo::asLLSD()
2025-06-11 00:49:22 +03:00
08f6f5c697
#4214 Weights and Joints remap
2025-06-05 01:14:50 +03:00
4c60231c3f
#4080 Rigged mesh support #6
...
For now not touching normalizeVolumeFaces() to not brick dae upload
2025-05-28 20:19:11 +03:00
875a418080
#4080 Import GLTF skin data
2025-05-19 20:40:19 +03:00
47a5c7a413
Make sure we're pushing to the joints name set as well.
2025-05-05 16:12:26 -04:00
dd74b361e3
Fix import rotation and UVs
2025-05-04 23:40:10 -04:00
10a324a103
Reduce cost of joint lookups by reducing string allocations via use of std::string_view and heterogeneous map lookups ( #3970 )
2025-04-25 20:52:38 +03:00
c8499b7f01
GLTF WIP. Still working on getting transforms working proper and need to figure out our indices.
2025-04-08 13:51:21 -04:00
99a9258d52
Issue #2687 : Honor flag sent by server indicating server side autopilot is engaged. When flag is set allow sever to update local avatar rotation.
2025-02-26 15:47:53 -08:00
934833ba97
viewer#3126 Crash at LLDAELoader::processElement
2024-11-22 15:38:53 +02:00
da341eb2da
cherry pick secondlife/viewer#912 BugSplat Crash 1412267: nvoglv64+0xadcd00 ( #2785 )
...
* secondlife/viewer#912 BugSplat Crash 1412267: nvoglv64+0xadcd00
* fix cherry-pick merge breakage.
* Fix signed/unsigned error
---------
Co-authored-by: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
2024-10-04 14:16:04 -07:00
486613e79b
Profile guided optimization pass ( #2582 )
...
- Tune up LLJointRiggingInfoTab
- Visualize joint bounding boxes when visualizing joints
- Use LLJointRiggingInfo to caclulate desired resolution of a texture
- Throttle calls to calcPixelArea
- Fetch MeshSkinInfo immediately when header is received
2024-09-16 18:49:03 -05:00
b713f56d07
Replace glh_linear usage with GLM ( #2554 )
2024-09-12 11:22:10 -05:00
8fef55b3b2
Remove or suppress left over debug messages in hot paths ( #2392 )
2024-08-22 07:43:50 +03:00
b5e306f7d8
Enable /permissive- on MSVC for better standards conformance ( #2251 )
...
* Enable /permissive- on MSVC for better C++ conformance and fix related errors
* Clean up left over warning suppressions from old library or msvc versions
2024-08-14 08:01:02 -07:00
05fd13f896
Remove dead pcre library dependency ( #2177 )
2024-08-02 13:29:28 +03: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
1296afd96a
Reduce LLSD::Binary temporaries
2024-07-05 02:56:25 -04:00
8444cd9562
Fix whitespace pre-commit hook failures
2024-06-12 13:51:21 -07:00
9775d7ea10
Merge remote-tracking branch 'origin/release/maint-a' into project/gltf_development
2024-06-11 17:42:17 -07:00
1ebf62e102
Clean up line endings that got mangled up during last merge
2024-06-11 15:40:09 +02: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
7c42711ca3
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
2024-06-10 16:22:12 -07:00
c95b4bf3ea
Post-merge - trim trailing whitespace
2024-06-10 20:45:59 +03:00
4b52dd754b
Fix incorrect use of VX/VY/VZ/VW indices when color components are accessed
2024-06-10 19:30:17 +03:00
c0fad3028f
Re-enable compiler warnings C4018, C4100, C4231 and C4506
2024-06-10 16:42:43 +02:00
6de0086ae9
secondlife/viewer#1475 : Add PBR terrain repeats editing
2024-06-07 18:14:32 -07:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
cb3bd8865a
Fix a bunch of uninitialized variable warnings that showed up in Visual Studio
2024-05-30 15:41:36 +02:00
9f6849e081
Merge remote-tracking branch 'origin/project/gltf_development' into brad/merge-maint-a-to-dev
2024-05-23 11:35:23 -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
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
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
a266a4356f
secondlife/viewer#1418 Mesh Upload - Physics - Bounding Box is not working as expected
2024-05-15 20:50:59 +02:00
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
b06a99f7c7
Post-merge spaces fix
2024-05-15 12:47:27 +03:00
bf1235b017
Merge branch 'marchcat/w-whitespace' into marchcat/x-mf-merge
2024-05-15 12:46:26 +03:00
094dcc07f8
Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705 : Maintenance X
2024-05-14 21:02:28 -04:00
31a3423239
Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development
2024-05-14 11:07:13 -07:00
87c889b370
secondlife/viewer#907 : Fix LLGLTFMaterial tests
2024-05-13 18:10:54 -07:00
cdcfbab5c4
secondlife/viewer#907 : Fix bad merge in LLGLTFMaterial
...
Caused by a conflict between the LLGLTFMaterial::getHash fix, and an improvement in LLGLTFMaterial field ordering for platform-dependent memory reduction.
2024-05-13 15:33:14 -07:00
9441608623
secondlife/viewer#907 : Local PBR terrain texture transforms
2024-05-10 17:42:54 -07:00
Jonathan "Geenz" Goodman