d06070241a
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llvovolume.cpp
2021-12-16 10:09:12 +01:00
47e2173239
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/pipeline.h
2021-12-16 08:42:54 +01:00
2d0d7c71e6
SL-16485 Crash at memcpyNonAliased16
2021-12-15 14:40:44 +02:00
0a9ade4687
SL-16479 'sloppy' precision in automated mode.
2021-12-09 21:17:57 +02:00
9e38e5a187
SL-16471 Removed unneeded MeshOpt generation method
2021-12-09 00:33:57 +02:00
ffa26108ee
This refresh is most likely unnecessary now GLOD is gone
2021-12-03 18:27:01 +01:00
381f8936f0
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llrender.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexture.cpp
2021-12-03 18:23:05 +01:00
2ed229473d
SL-14403 Remove unused shader binds
...
remains from glod
2021-12-02 17:35:03 +02:00
1cd1d3fbe2
SL-16420 Upload's physics LODs are broken in preview #2
2021-12-02 02:28:29 +02:00
028941652b
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llvertexbuffer.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/pipeline.cpp
2021-12-01 22:29:25 +01:00
06c94c83fe
SL-16420 Upload's physics LODs are broken in preview
2021-12-01 22:13:17 +02:00
68e09edad0
SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction
2021-11-30 17:04:35 -07:00
ea9aa51dfe
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-542
2021-11-30 08:43:46 +01:00
d2e5a9b1fe
Merge branch 'DRTVWR-542-meshopt' of https://bitbucket.org/lindenlab/viewer
2021-11-30 00:37:46 +01:00
27e4e245d9
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
2021-11-29 20:33:13 +02:00
cba1daaf6b
SL-16226 Fix crash with extra large faces
2021-11-17 22:03:38 +02:00
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
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
33f52ee51d
SL-14403 Removed glod
2021-11-10 17:48:55 +02:00
4e8cd9437b
SL-16193 Fix for mesh selection outline not rendering correctly (and broken physics shapes display).
2021-10-26 14:07:00 +00:00
a448846ca3
SL-16226 Crash at genMeshOptimizerPerModel
2021-10-21 18:46:06 +03:00
f79890669d
SL-16006 and SL-16009 Rigged mesh rendering optimization pass
2021-09-20 18:58:09 +00:00
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
bac30c9ba5
SL-15940 Limit wasn't adjusting for a model with less than 30 triangles
2021-09-03 21:15:00 +03:00
3772249c2f
SL-15756 Falback in case no triangles were generated
2021-09-03 00:34:19 +03:00
17ce44e24a
DRTVWR-542 Automated method selection #2
2021-08-06 09:46:11 +03:00
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
7235d333ea
DRTVWR-542 Fix incorect dropbox state
2021-08-04 00:15:49 +03:00
1531a31cd9
DRTVWR-542 Rename simplification methods in UI and add a fallback
2021-07-28 21:25:18 +03:00
d64b1bded9
DRTVWR-542 Already optimized
2021-07-27 20:14:39 +03:00
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
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
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
d5857b376f
DRTVWR-542 Generate placehodler triangles when face got optimized away like glod does
2021-07-20 21:52:10 +03:00
a607e76420
DRTVWR-542 output buffer should be indentical in size to indices array
2021-07-13 20:07:28 +03:00
33819e157e
DRTVWR-542 Fixed size of indices array
2021-07-13 11:32:59 +03:00
66ba1c4c8e
DRTVWR-542 WIP Fixed Stride
2021-07-13 02:19:57 +03:00
833a82f859
DRTVWR-542 WIP #7
2021-07-13 00:08:41 +03:00
938969c811
DRTVWR-542 WIP #6
...
Trying out 'sloppy' variant
2021-07-12 19:18:25 +03:00
eb13133e3e
DRTVWR-542 WIP #5
2021-07-12 16:50:10 +03:00
17131ac203
DRTVWR-542 WIP #4
...
Made meshoptimizer into default generation mechanism
Ensured that at least one triangle will remain of any face
2021-07-11 22:39:42 +03:00
6047b7c438
DRTVWR-542 WIP #3
...
First functional meshoptimizer
2021-07-09 23:42:37 +03:00
1a17e19a61
DRTVWR-542 WIP #2
2021-07-08 21:14:13 +03:00
7b7b8a8da8
DRTVWR-542 WIP
2021-07-07 22:40:37 +03:00
f996d7579e
BUG-230890 uppercase "DAE" breaks LOD auto detect
2021-06-25 13:14:10 +01:00
adb7c793d7
Reduce logging verbosity on uploader
2021-06-21 14:07:04 +01:00
f8204c43e8
Restore the "proper" mismatched indents cos Beq was sleep coding
2021-05-28 11:08:32 +01:00
b979ddef7d
FIRE-30979 Fix Ambient Lighting in Mesh preview
...
and a couple of typo fixes
2021-05-28 03:58:37 +01:00
99027205df
FIRE-30965 Improve mesh upload error + rewrite subset checks
...
Rewrite material parsing to properly implement material subset with the NoGeometry tag.
2021-05-28 03:07:14 +01:00
95633f80c3
FIRE-30964 [OpenSim] re-enable analyse function in opensim
2021-05-18 23:54:46 +01:00
Ansariel