e7b3d68cab
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLPhysicsExtensions.cmake
# indra/llprimitive/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/xui/en/floater_marketplace.xml
# indra/newview/skins/default/xui/en/floater_model_preview.xml
# indra/newview/skins/default/xui/en/floater_search.xml
2025-10-11 18:51:03 +02:00
d9db7bb645
p#480 Collada vs GLTF Mesh Import Naming Convention
...
Both collada and gltf have a node and a mesh. Collada uses node-name, gltf was using mesh-name.
GLTF format permits reusing single mesh for multiple nodes, but nodes are warrantied to not be reused.
Switch to using node-names for better dupplicate avoidance and to be more in line with collada.
2025-10-06 18:32:19 +03:00
5e5a3f4102
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lltextbase.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/lleventpoll.cpp
2025-09-22 23:11:55 +02:00
ac2cbdcc02
#4660 Unable to upload GLTF+bin with spaces in the name
2025-09-12 09:40:20 +03:00
0b258ac678
Address g++ compiler warnings, so we can move to g++14
...
Avoid uninitialized variable warnings on Linux/g++ by initializing translation_override in LLGLTFLoader.
Force the empty callback in LLPanelRegionTerrainInfo to decay to a function pointer to avoid warnings on Linux.
Remove initialization of mViewerObject in LLReflectionMap.h so that we are standards compliant.
(also paired with commit on fs-build-variables to ignore non-null warnings due to gcc stupidity)
2025-08-09 18:59:33 +01:00
8240af03b9
#4465 modify vertex limit threshold for starting splitting
2025-07-31 19:55:28 +03:00
472ea3b49a
#4393 Handle unknown exceptions in uploader better
...
Output is highly technical, but better than nothing
2025-07-22 21:49:19 +03:00
d84897967e
#4318 Warn or log when texture gets scaled down
...
for material and model upload
2025-07-22 19:16:26 +03:00
b046a8b72a
#4204 Cache material names, centralize texture index validation
2025-07-15 18:43:51 +00:00
d033bbacf0
#4204 Refactor material name and texture handling in GLTF loader
2025-07-14 15:45:53 +00:00
63134f7943
#4204 Cache processed materials
2025-07-14 13:22:41 +00:00
edaf157e19
#4314 Fix model suffixes #2
2025-07-09 16:28:03 +03:00
e77e74ffbb
#4314 Follow-up: duplicate logic for mSubmodelID
2025-07-09 13:23:15 +03:00
5a8b94bea6
#4324 sort indices before splits
2025-07-09 13:03:34 +03:00
60425f69f7
#4314 Fix model suffixes
...
Usecase: Unable to use the same GLB model for physics
2025-07-08 23:13:19 +03:00
b7dbe0e49e
#4290 Unresponsive viewer when uploading models
...
Fix severe log spam
2025-07-08 00:52:35 +03:00
b6343d4169
#4323 fix for transparent meshes
2025-07-04 20:37:29 +03:00
f1701d3373
#4242 Make sure group array is initialized
...
MacOS doesn't seem to like missing init.
2025-07-04 00:24:30 +03:00
5a0bbdc510
#4242 Debug dump improvement
...
for better comparison with collada output
2025-07-03 00:32:58 +03:00
b79feb60f5
#4242 Clarify some operations
...
and make scale application a bit more valid
2025-07-02 18:50:29 +03:00
900516a449
#4142 Fix missed index
2025-07-02 01:40:50 +03:00
76dd9385f9
#4315 Crash in GLTF uploader
...
Properly handle importer's crashes in general
2025-07-02 01:40:50 +03:00
fcd9a9e0de
#4242 Better issue logging
2025-07-01 20:02:29 +03:00
64b56d7ca9
#4190 Provide unsupported extension info in log file
2025-07-01 11:48:22 +03:00
75db5e8b6b
Revert "Fix LLCharacter base class constness." and restore improvements from 10a324a103 instead
2025-06-28 19:31:02 +02:00
895db142ee
#4291 Uploading without a .bin silently fails
2025-06-26 23:27:48 +03:00
8c9d0c6145
#4142 Joint grouping and stripping
...
Viewer only supports 110 joints at a time, when model has more bones
than that importer has to strip some, use groups for stripping.
2025-06-26 02:39:21 +03:00
c404b93759
#4148 Fix collision bones
2025-06-25 09:28:51 +03:00
9e87757a5b
#4257 Use filename as model initial name
2025-06-24 00:57:38 +03:00
1a6e328611
#4204 Remove more unused code
2025-06-19 23:52:37 +03:00
2083e652fe
#4204 Unused code cleanup ( #4278 )
2025-06-19 20:57:44 +03:00
f5320302d4
#4214 Revert and remake "weights remap"
...
This reverts commits fe10a83f69
2025-06-19 20:50:29 +03:00
5099401a53
#4204 Log embedded texture extraction failure
2025-06-18 18:14:59 +03:00
bb45bfae0d
#4204 Fix GLTF texture loading to match DAE loader behavior
2025-06-18 16:57:16 +03:00
46aeaf4803
#4242 Support splitting of gltf faces that are over 16bit limit
2025-06-18 10:11:47 +03:00
54660c8931
#4147 Joint Overrides #3
...
Remande skeleton translation from default skeleton to overriden skeleton
2025-06-13 21:49:02 +03:00
8322a9a61e
#4147 Joint Overrides #2
2025-06-12 15:55:47 +03:00
e2c76ec70d
#4147 Move mAlternateBindMatrices
...
For reduced log spam and calculutions and to make further modifications
easier.
2025-06-12 01:02:56 +03:00
1132b19c06
#4114 Improve GLTF mesh uploader log 2
2025-06-11 14:07:08 +03:00
48eb8a2efe
#4147 Joint override
2025-06-11 01:21:45 +03:00
fe10a83f69
#4214 Weights and Joints remap #2
2025-06-11 00:17:58 +03:00
b3fd05fa97
#4114 Improve GLTF mesh uploader log
2025-06-10 20:00:32 +03:00
4bbd6319c7
#4148 Skeleton Translation #2
2025-06-10 19:48:29 +03:00
b4fb66c4a2
#4170 Use GLTF scene definition for node traversal
...
Process nodes through the scene hierarchy as defined in the GLTF file
instead of attempting to reconstruct parent-child relationships.
This ensures proper import of models created by GLTF transform tools.
2025-06-09 22:58:57 +03:00
b20d10c0cc
#4148 Skeleton Translation
2025-06-09 20:06:01 +03:00
6924862d2e
#4170 Follow-up: Optimize GLTF node hierarchy traversal
2025-06-09 18:19:35 +03:00
689b829b67
#4170 Fix GLTF import missing mesh parts from transform tools
...
Process entire node hierarchy instead of only nodes with meshes.
GLTF transform tools often create intermediate transform nodes
without meshes that were being skipped, causing child meshes
to be omitted from import.
2025-06-09 17:04:49 +03:00
35398524e5
Fix split model vertex/joint remapping to use correct model variable
2025-06-09 17:04:49 +03:00
74d990872c
#4214 Fix material upload
2025-06-05 21:44:11 +03:00
08f6f5c697
#4214 Weights and Joints remap
2025-06-05 01:14:50 +03:00
Ansariel