7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
f79890669d
SL-16006 and SL-16009 Rigged mesh rendering optimization pass
2021-09-20 18:58:09 +00:00
abee63cddc
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-04-23 18:31:20 +02:00
a4b1c0330a
Merge branch 'master' into DRTVWR-482
...
# Conflicts:
# indra/newview/app_settings/shaders/class1/objects/previewV.glsl
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
2020-04-21 13:12:05 +03:00
0e5d00af97
Merge DRTVWR-482
2020-02-24 21:05:15 +01:00
6a3cb73009
SL-379 Joint overrides tab
2020-02-10 18:29:52 +02:00
ee65b14ec8
Merge DRTVWR-482
2020-01-29 17:22:18 +01:00
c5859778bc
SL-379 WIP Joint overrides tab
2020-01-17 21:08:38 +02:00
61c56570ab
Merge viewer-eep
2019-08-13 19:05:23 +02:00
71af0a2a9e
Fix shutdown crash in teardown of joint heirarchy.
...
Ifdef'd code for potential skinning speed up to avoid lots of int<->float conversions (expensive and static for min space investment)
as updating rigged VBs shows up as a profiling bottleneck for Low rendering (where we actually use CPU skinning).
2019-08-06 14:41:55 -07:00
76128c4357
SL-10566 Use vector for some high-traffic, low-item count containers instead of list.
...
Provide method of storing joint indices sep from weight data for faster runtime processing.
2019-08-05 12:04:29 -07:00
258ca74893
Merge axon
2018-08-22 12:51:42 +02:00
56458152ac
SL-704 - code cleanup, mostly old AXON comments.
2018-08-08 22:11:32 +01:00
228525aa27
SL-915 - tracking joint is rigged state
2018-06-04 14:43:06 +01:00
e86839fac1
SL-915 - WIP on dynamic joint box tracking
2018-06-01 15:08:59 +01:00
10bf9c2486
Merge axon
2018-05-18 13:56:50 +02:00
b42b0a9fb9
MAINT-8554 - disabled joint position clamping for now
2018-05-14 14:15:10 +01:00
191dd04c73
Merge axon
2018-05-01 12:24:28 +02:00
bc773adf61
MAINT-8549 - refactoring of streaming cost and related calculations
2018-04-24 16:55:55 +01:00
f954abd9df
MAINT-8549, MAINT-8554 - improvements to animesh ARC, restrict joint position overrides to +/-5m
2018-04-20 13:37:07 +01:00
01d8e7e347
Merge axon
2017-09-20 01:09:14 +02:00
b2a0657818
SL-697 - global scale function for LLControlAvatar, to support arbitrary scaling of animated objects. Not currently used.
2017-06-16 16:03:06 +01:00
18dfdc2ae0
Merge bento-box
2016-11-11 16:00:37 +01:00
204e474225
SL-524 - resetSkeleton() now includes collision volume joint positions. Also removed no-longer-needed LLJoint::mId field
2016-11-04 14:24:03 -04:00
7447da6943
SL-503 - more info in archetype dump files
2016-10-27 09:39:39 -04:00
ef3b8ad594
Merge bento-box
2016-09-28 14:45:26 +02:00
44ab8b8f4b
Merge with firestorm-lgpl.
2016-09-17 19:35:49 +02:00
24308dc929
The sheer amount of calls into LLVOAvatar::getJoint get very costly in complex scenes. This is due to a string being used as index. Change the index to U32 for faster access.
2016-09-16 21:46:39 +02:00
34ced1aa2c
SL-395 - partial support for joint scale locking via flag in skin info
2016-09-02 16:44:57 -04:00
a2875ba53e
merge
2016-09-02 14:34:06 -04:00
5ebf9b3cae
SL-426 - strings.xml fix for pec attachments, SL-402 - diagnostics for investigation
2016-06-29 09:41:06 -04:00
d2302886bc
MAINT-6380, SL-399 - vertical flicker related to joint offsets for mPelvis. Having a joint offset for mPelvis is still a bad idea, but it won't cause as much flickering now.
2016-06-15 15:24:54 -04:00
3a53109152
SL-395 - support scale overrides (currently no way to get these into a dae, so the actual scale values are fabricated at run-time based on the joint name)
2016-06-07 10:39:32 -04:00
f47ceb47bb
merged jelly-doll viewer-release into bento
2016-05-21 08:15:28 -04:00
ec471497f5
SL-375, SL-378 - rudimentary logging info to list joint offsets during mesh import. dae_tool.py work to enable joint offset tweaking.
2016-04-29 11:25:17 -04:00
70156605e2
SL-374 - don't allow sliders to modify joint positions if there's already a mesh-imposed override in place.
2016-04-22 14:51:57 -04:00
223f090709
SL-371 - more tracking on partial joint overrides
2016-04-18 19:31:29 -04:00
11f3e485e9
SL-276 - two more bones, corresponding to foot bones for the hind limbs
2016-03-25 15:20:41 -04:00
934a168fb5
SL-315 - joint scale debug tracing
2016-03-10 15:43:05 -05:00
62d14e1a33
SL-333 WIP - added back some unused constructors to make the appearance utility happier
2016-02-12 15:40:46 -05:00
f8ee9ffce6
SL-333 work - attachment joints now get a valid mJointNum, more checking on valid joint num values. Also reduced log spam slightly.
2016-02-03 16:52:27 -05:00
ef02c9ea69
SL-315 - context strings, comments, debugging. joint_test temporarily disabled.
2016-02-03 08:59:25 -05:00
e91a192301
SL-315 WIP - added callstack info to joint debugging. Made joint debugging run-time configurable via debug setting DebugAvatarJoints
2016-01-26 11:11:52 -05:00
94d7d6a623
SL-271 WIP, SL-201 WIP - add support for end point to joints, use for debug rendering display to show bones.
2015-11-17 16:41:55 -05:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
58992e2cb4
SL-234 WIP - Track which joints are part of base skeleton, remap non-base ones when not being rendered.
2015-10-16 15:05:29 -04:00
bd3ee81e8d
Merge with viewer-release and become 3.7.27
2015-03-24 19:52:46 +02:00
553b7ede72
Moved AvatarPosFinalOffset to per-account settings file
2014-12-22 11:14:15 -05:00
6cffbfba8b
merge
2014-12-02 14:48:45 -05:00
1135ba80ec
MAINT-4537, MAINT-4687 WIP
2014-11-19 09:19:03 -05:00
Ansariel