Commit Graph

73 Commits (bfdf7dbec9a2dbddd2da8da4ceb4ef830a062e91)

Author SHA1 Message Date
Andrey Lihatskiy 9b0569840f Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
Howard Stearns 87e7b732ba SL-98-a - fix jumping ground plane 2022-05-16 11:39:04 -07:00
Andrey Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
Andrey Lihatskiy 026ad511ea Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llvovolume.cpp
2022-04-18 20:43:49 +03:00
Andrey Kleshchev 84e22d410e SL-17121 Fix error threshold value 2022-04-01 22:32:57 +03:00
Andrey Kleshchev 14e792766e SL-17121 Adjust uploader for possible 0 input. 2022-04-01 01:39:35 +03:00
Andrey Kleshchev 7f0e62ea9e SL-17121 Revert "SL-15940 Remove ability to set zero triangle limit"
This reverts commit b45c0e3ed9.
2022-04-01 00:53:52 +03:00
Ptolemy bcd37186f1 SL-16993: Fix Model Upload Physics Analyze rendering physics hull as black mesh 2022-03-18 19:54:27 -07:00
Mnikolenko Productengine c58c308d21 SL-17002 FIXED The "include joint positions" checkbox is displayed inactive 2022-03-15 16:13:24 +02:00
Mnikolenko Productengine 0b56a3da94 SL-16980 FIXED Uploading model preview disappeared after changing the Triangle limit 2022-03-09 23:53:20 +02:00
Mnikolenko Productengine 5e89e26554 SL-16980 FIXED Uploading model preview disappeared after changing the Triangle limit 2022-03-09 17:32:22 +02:00
Andrey Kleshchev c012e872a2 SL-3787 Fallback in case meshopt precise simplification methd fails entirely 2022-03-07 17:03:23 +02:00
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
Andrey Lihatskiy 1e0eafd50c Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
Andrey Lihatskiy 73eec89131 Merge branch 'master' into DRTVWR-540-maint
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsys.cpp
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
Andrey Kleshchev 92c302d6fb SL-15940 Verify triangle limit
to not trigger an assert inside meshoptimizer
2022-02-25 18:56:54 +02:00
Andrey Kleshchev c141ecdcc2 SL-3787 Fixed sloppy mode returning invalid model
In automatic mode for simple models gradualy increase sloppy decimator until something valid is found.
2022-02-25 13:51:19 +02:00
Andrey Kleshchev 21baea0907 SL-3787 Fixed mesh uploader LoD generation returning worse results than higher lod 2022-02-24 14:42:04 +02:00
Andrey Kleshchev a5f06a1b81 SL-4488 Fixed ambiguity mapped weights to vertices in uploader
Were not displaying and uploading correctly.
2022-02-12 23:13:36 +02:00
Howard Stearns ca43cc2305 SL-98 - Remove special new tab-specific display behavior 2022-02-04 14:13:19 -08:00
Howard Stearns f1df486208 SL-98 - move new renderGroundPlane from LLVOAvatar to LLModelPreview 2022-02-04 13:55:08 -08:00
Howard Stearns 57a7f63dcc SL-98 - Render a "ground plane" in the model upload preview, so users can see any added offset 2022-02-04 09:55:05 -08:00
Andrey Kleshchev 2d0d7c71e6 SL-16485 Crash at memcpyNonAliased16 2021-12-15 14:40:44 +02:00
Andrey Kleshchev 0a9ade4687 SL-16479 'sloppy' precision in automated mode. 2021-12-09 21:17:57 +02:00
Andrey Kleshchev 9e38e5a187 SL-16471 Removed unneeded MeshOpt generation method 2021-12-09 00:33:57 +02:00
Andrey Kleshchev 2ed229473d SL-14403 Remove unused shader binds
remains from glod
2021-12-02 17:35:03 +02:00
Andrey Kleshchev 1cd1d3fbe2 SL-16420 Upload's physics LODs are broken in preview #2 2021-12-02 02:28:29 +02:00
Andrey Kleshchev 06c94c83fe SL-16420 Upload's physics LODs are broken in preview 2021-12-01 22:13:17 +02:00
Dave Houlton 68e09edad0 SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction 2021-11-30 17:04:35 -07:00
Andrey Kleshchev 27e4e245d9 Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546 2021-11-29 20:33:13 +02:00
Andrey Kleshchev cba1daaf6b SL-16226 Fix crash with extra large faces 2021-11-17 22:03:38 +02:00
Andrey Kleshchev 3641541c6c SL-15756 Removed mHasGeneratedFaces
mHasGeneratedFaces is always true for some types of models and glod was treating faces as one mesh by default, so meshoptimizer should do the same regardles of mHasGeneratedFaces
2021-11-15 23:23:09 +02:00
Andrey Kleshchev 33f52ee51d SL-14403 Removed glod 2021-11-10 17:48:55 +02:00
Dave Parks 4e8cd9437b SL-16193 Fix for mesh selection outline not rendering correctly (and broken physics shapes display). 2021-10-26 14:07:00 +00:00
Andrey Kleshchev a448846ca3 SL-16226 Crash at genMeshOptimizerPerModel 2021-10-21 18:46:06 +03:00
Dave Parks f79890669d SL-16006 and SL-16009 Rigged mesh rendering optimization pass 2021-09-20 18:58:09 +00:00
Andrey Kleshchev b45c0e3ed9 SL-15940 Remove ability to set zero triangle limit
Setting lod to zero triangles doesn't work and shouldn't work, so UI shouldn't allow setting less then one triangle per model as well.
2021-09-06 21:29:51 +03:00
Andrey Kleshchev bac30c9ba5 SL-15940 Limit wasn't adjusting for a model with less than 30 triangles 2021-09-03 21:15:00 +03:00
Andrey Kleshchev 3772249c2f SL-15756 Falback in case no triangles were generated 2021-09-03 00:34:19 +03:00
Andrey Kleshchev 17ce44e24a DRTVWR-542 Automated method selection #2 2021-08-06 09:46:11 +03:00
Andrey Kleshchev 1a17932440 DRTVWR-542 Automated method selection
Normally simplification methods apply for whole upload, but this one selects methods per model or per face.
2021-08-04 21:14:00 +03:00
Andrey Kleshchev 7235d333ea DRTVWR-542 Fix incorect dropbox state 2021-08-04 00:15:49 +03:00
Andrey Kleshchev 1531a31cd9 DRTVWR-542 Rename simplification methods in UI and add a fallback 2021-07-28 21:25:18 +03:00
Andrey Kleshchev d64b1bded9 DRTVWR-542 Already optimized 2021-07-27 20:14:39 +03:00
Andrey Kleshchev 61d2717cfc DRTVWR-542 Attempt to simplify all faces of an object as a whole and split back into faces #3 2021-07-27 19:55:12 +03:00
Andrey Kleshchev 8e725e74aa DRTVWR-542 Attempt to simplify all faces of an object as a whole and split back into faces #2 2021-07-26 21:20:53 +03:00
Andrey Kleshchev 9aaac1bb98 DRTVWR-542 Attempt to simplify all faces of an object as a whole and split back into faces 2021-07-23 21:30:13 +03:00
Andrey Kleshchev d5857b376f DRTVWR-542 Generate placehodler triangles when face got optimized away like glod does 2021-07-20 21:52:10 +03:00
Andrey Kleshchev a607e76420 DRTVWR-542 output buffer should be indentical in size to indices array 2021-07-13 20:07:28 +03:00
Andrey Kleshchev 33819e157e DRTVWR-542 Fixed size of indices array 2021-07-13 11:32:59 +03:00