Commit Graph

80 Commits (7c42711ca3a4e67b95473aa5129dce5ff19bea15)

Author SHA1 Message Date
Ansariel 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
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03: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
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
Lars Næsbye Christensen 9e854b697a misc: BOOL to bool 2024-02-17 12:23:07 +02:00
Andrey Lihatskiy 8ec8732ec9 SL-18893 OSX buildfix 2023-01-16 23:16:43 +02:00
Fawrsk 7419037ef6
SL-18893 Fixes for pull requests #38, #41, and #42 (#46)
Eliminate unnecessary copies, and remove uses of auto
2023-01-10 11:43:27 +02:00
Fawrsk d0f115ae09
SL-18893 Cleanup for loops in llcharacter to use C++11 range based for loops (#42) 2023-01-05 13:42:27 +02:00
Dave Parks f79890669d SL-16006 and SL-16009 Rigged mesh rendering optimization pass 2021-09-20 18:58:09 +00:00
Andrey Lihatskiy 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
Andrey Kleshchev 6a3cb73009 SL-379 Joint overrides tab 2020-02-10 18:29:52 +02:00
andreykproductengine c5859778bc SL-379 WIP Joint overrides tab 2020-01-17 21:08:38 +02:00
Graham Linden 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
Graham Linden 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
Brad Payne (Vir Linden) 56458152ac SL-704 - code cleanup, mostly old AXON comments. 2018-08-08 22:11:32 +01:00
Brad Payne (Vir Linden) 228525aa27 SL-915 - tracking joint is rigged state 2018-06-04 14:43:06 +01:00
Brad Payne (Vir Linden) e86839fac1 SL-915 - WIP on dynamic joint box tracking 2018-06-01 15:08:59 +01:00
Brad Payne (Vir Linden) b42b0a9fb9 MAINT-8554 - disabled joint position clamping for now 2018-05-14 14:15:10 +01:00
Brad Payne (Vir Linden) bc773adf61 MAINT-8549 - refactoring of streaming cost and related calculations 2018-04-24 16:55:55 +01:00
Brad Payne (Vir Linden) f954abd9df MAINT-8549, MAINT-8554 - improvements to animesh ARC, restrict joint position overrides to +/-5m 2018-04-20 13:37:07 +01:00
Brad Payne (Vir Linden) 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
Brad Payne (Vir Linden) 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
Brad Payne (Vir Linden) 7447da6943 SL-503 - more info in archetype dump files 2016-10-27 09:39:39 -04:00
Brad Payne (Vir Linden) 34ced1aa2c SL-395 - partial support for joint scale locking via flag in skin info 2016-09-02 16:44:57 -04:00
Brad Payne (Vir Linden) a2875ba53e merge 2016-09-02 14:34:06 -04:00
Brad Payne (Vir Linden) 5ebf9b3cae SL-426 - strings.xml fix for pec attachments, SL-402 - diagnostics for investigation 2016-06-29 09:41:06 -04:00
Brad Payne (Vir Linden) 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
Brad Payne (Vir Linden) 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
Brad Payne (Vir Linden) f47ceb47bb merged jelly-doll viewer-release into bento 2016-05-21 08:15:28 -04:00
Brad Payne (Vir Linden) 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
Brad Payne (Vir Linden) 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
Brad Payne (Vir Linden) 223f090709 SL-371 - more tracking on partial joint overrides 2016-04-18 19:31:29 -04:00
Brad Payne (Vir Linden) 11f3e485e9 SL-276 - two more bones, corresponding to foot bones for the hind limbs 2016-03-25 15:20:41 -04:00
Brad Payne (Vir Linden) 934a168fb5 SL-315 - joint scale debug tracing 2016-03-10 15:43:05 -05:00
Brad Payne (Vir Linden) 62d14e1a33 SL-333 WIP - added back some unused constructors to make the appearance utility happier 2016-02-12 15:40:46 -05:00
Brad Payne (Vir Linden) 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
Brad Payne (Vir Linden) ef02c9ea69 SL-315 - context strings, comments, debugging. joint_test temporarily disabled. 2016-02-03 08:59:25 -05:00
Brad Payne (Vir Linden) 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
Brad Payne (Vir Linden) 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
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Brad Payne (Vir Linden) 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
andreykproductengine bd3ee81e8d Merge with viewer-release and become 3.7.27 2015-03-24 19:52:46 +02:00
Brad Payne (Vir Linden) 553b7ede72 Moved AvatarPosFinalOffset to per-account settings file 2014-12-22 11:14:15 -05:00
Brad Payne (Vir Linden) 6cffbfba8b merge 2014-12-02 14:48:45 -05:00
Brad Payne (Vir Linden) 1135ba80ec MAINT-4537, MAINT-4687 WIP 2014-11-19 09:19:03 -05:00
Brad Payne (Vir Linden) b1884d40f5 MAINT-4537 WIP - more joint position management during outfit changes 2014-11-15 14:29:39 -05:00
Brad Payne (Vir Linden) 9c4397b6ee MAINT-4537 WIP - joint position management during outfit changes 2014-11-14 15:41:03 -05:00
Brad Payne (Vir Linden) 7fec81b102 SL-93 WIP - pelvis fixup offsets 2014-11-03 05:46:31 -05:00
Brad Payne (Vir Linden) 5c8d902c1b SL-93 WIP - refactoring LLPosOverrideMap for reusability 2014-10-17 15:00:18 -04:00
Brad Payne (Vir Linden) dc0abe48c6 MAINT-4605 WIP - you can't hide your lion eyes 2014-10-29 13:07:44 -04:00