Commit Graph

255 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
Brad Payne (Vir Linden) 9d44aaab46 SL-216 WIP, SL-220 WIP - stray triangles in hw skinning path 2015-09-08 12:56:44 -04:00
Brad Payne (Vir Linden) 2ea8df0593 SL-205 WIP - support for 152-joint rigged meshes with both hardware and software skinning. 2015-08-26 10:49:02 -04:00
Brad Payne (Vir Linden) 0f9700af5b merge 2015-08-20 22:51:56 -04:00
Brad Payne (Vir Linden) fa7d639f8a merge 2015-08-19 10:08:04 -04:00
Oz Linden 2efe91ef64 merge changes for 3.8.3-release 2015-08-18 15:05:01 -04:00
andreykproductengine b3916451c1 Merge viewer-release and become version 3.8.4 2015-08-18 18:51:38 +03:00
Brad Payne (Vir Linden) 003156a89d SL-133 WIP - possible fix for unknown joints warping to origin 2015-08-11 12:09:38 -04:00
Drake Arconis 0dba928920 Fix impostors. 2015-06-30 10:48:34 -04:00
Oz Linden 91d6b08827 additional debugging code for the problem with rendering too-complex avatars 2015-05-15 15:31:29 -04:00
Mnikolenko ProductEngine 89321a56fd increment viewer version to 3.7.29 2015-04-28 12:03:31 +03:00
ruslantproductengine 29bdf1a234 MAINT-4839 FIXED Animation of Mesh Dress doesn't work.
MAINT-4165 FIXED Crash on skinned, texture animated geometry with deferred rendering enabled.
2015-03-01 14:10:54 +02:00
Oz Linden 3cf8a1ce6e Clean up impostors and visual muting
Rename the settings that control them to be more descriptive
Remove the separate boolean setting (RenderUseImpostors) that governed both
Establish default values based on gpu class for impostors and visual muting
2015-02-20 12:56:45 -05:00
Oz Linden 6f3cf79a3a merge changes for 3.7.24-release 2015-01-13 13:46:45 -05:00
Oz Linden dab5acd972 merge changes for 3.7.22-release 2014-12-15 12:34:18 -05:00
Brad Payne (Vir Linden) fe5ff3e74a merge 2014-12-01 16:21:52 -05:00
callum_linden bdce32a02b Update to build on Xcode 6.0: collection of removal of unused variables [-Wunused-variable] 2014-10-18 11:56:23 -07:00
Oz Linden 7ffa456683 STORM-2080: correct fitted mesh rendering on some ATI cards 2014-10-14 11:22:39 -04:00
ruslantproductengine d47efdfe03 MAINT-3964 FIXED Textures with Alpha won't Animate on Rigged Mesh when worn : fix in shader (mul texcoord to tex matrix), array's optimization 2014-09-10 21:08:08 +03:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Dave Parks e606b7918d MAINT-3211 Fix for texture animations not working properly on rigged attachments when worn from inventory. 2014-03-24 14:04:40 -05:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
Oz Linden 9bb2bc6099 fix odd editor artifact 2014-01-30 14:18:58 -05:00
Oz Linden 7b1e1e4e35 FITMESH-6: correct bounds checking 2014-01-29 18:25:03 -05:00
Dave Parks 476e317c8b FITMESH-6, FITMESH-20 Fix for some objects disappearing when hardware skinning enabled and ALM disabled. 2014-01-23 17:55:03 -06:00
Xiaohong Bao 0c60e32808 Merge 2013-10-21 16:57:38 -06:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Dave Parks 929311869b MAINT-2968 Transplant cleanup. 2013-10-11 17:10:26 -05:00
Dave Parks ff8b002c3b Quite down log spam from loading shaders.
Up bone cap to 64 for rigged meshes.
2013-10-10 13:56:06 -05:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07:00
Graham Linden 2a03e8f9fb MAINT-3172 fix rendering regressions from release mergedown 2013-09-20 16:44:39 -07:00
Graham Linden 95e34d86b9 The unbearable lightness of being norspec 2013-09-18 18:24:16 -07:00
Richard Linden cbe397ad13 changed fast timer over to using macro
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
Graham Linden 8675ed0491 Fix merge regressions from missed changes to LoD updates 2013-08-19 16:04:28 -07:00
Xiaohong Bao d8c02bf062 Merge 2013-08-19 16:09:28 -06:00
Graham Linden 3f186aab77 Merge in viewer-release 2013-08-19 12:10:40 -07:00
Graham Linden 51dfcb9c67 NORSPEC-342 WIP MATBUG-347 make impostor rendering not contribute to depth for mostly-transparent buffer pixels, aka hair in ALM only 2013-08-12 15:55:25 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Graham Madarasz (Graham Linden) 83fa549b56 NORSPEC-322 NORSPEC-342 WIP fix black deferred impostors, lighting bugs remain 2013-08-06 18:02:26 -07:00
Graham Linden 5b400d50e1 NORSPEC-322 NORSPEC-342 fix issues with black impostors and missing alpha attachments on impostors 2013-08-06 14:16:46 -07:00
Graham Linden 6d21cd2ae1 NORSPEC-324 set gamma value for avatar alpha shader too for gamma correct eyelashes 2013-07-25 11:09:45 -07:00
Graham Linden e21ab706b9 NORSPEC-324 when using display_gamma, actually set display_gamma 2013-07-24 15:43:38 -07:00
Graham Linden 749eef31fa NORSPEC-265 WIP imposters work in non-deferred and ALM but are forward-only render 2013-07-15 17:38:38 -07:00
Graham Madarasz (Graham) d07ba61a85 NORSPEC-291 really fix missing avatar 2013-07-11 16:42:14 -07:00
Graham Madarasz (Graham) e9cdd0bfe8 NORSPEC-291 WIP fix avatar disappearing 2013-07-11 16:39:39 -07:00
Graham Madarasz (Graham) fbf3d8b781 NORSPEC-291 WIP materials underwater with haze, reflection broken, water dist broken 2013-07-11 16:21:23 -07:00
Graham Linden 326e20b0e5 NORSPEC-291 WIP materials underwater w and wo alpha, water fog color broken, no refl, no water dis 2013-07-10 09:47:46 -07:00
Dave Parks 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Richard Linden a2a6bf20d7 merge with release 2013-06-20 16:46:23 -07:00
Dave Parks 9ea2d90a0d Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-06-20 12:10:26 -05:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Dave Parks da294b79c0 NORSPEC-236 Fix for rigged attachments with materials not rendering under water when advanced lighting is enabled. 2013-06-05 11:10:32 -05:00
Dave Parks bc57b8050c MATBUG-136 Fix for glow being too bright on rigged attachments. 2013-06-03 15:45:59 -05:00
Dave Parks ee4c2e837b Fix for rigged attachments not having specular highlights with legacy shininess. 2013-05-29 20:46:29 -05:00
Dave Parks 743d1a777e NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix testing based overhaul WIP
Reviewed by Graham
2013-05-29 18:48:09 -05:00
Dave Parks 933d4c40f4 NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny descrepencies. 2013-05-23 12:47:52 -05:00
Dave Parks 369dadf823 NORSPEC-173 Fix for mac build 2013-05-13 13:34:14 -05:00
Dave Parks edd6349952 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-05-13 10:57:05 -05:00
Dave Parks efe8d75fe3 NORSPEC-173 Shrink size of matrix palette for backwards compatibility. 2013-05-10 16:08:48 -05:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
simon c7f7c4bc4d Merge viewer-beta 2013-05-09 13:14:49 -07:00
Richard Linden 6b81b8629e Spring cleaning: removed unused .cpp and.h files, and cleaned up header dependencies 2013-05-05 17:45:35 -07:00
Graham Madarasz 3e8101834b NORSPEC-99 add break statement to fix legacy bump vert program from being stomped with inappropriate material prog sans skinning 2013-05-02 10:20:55 -07:00
graham linden 33d2225666 Merged lindenlab/viewer-development-materials into default 2013-05-02 09:12:20 -07:00
Graham Madarasz de582bfe86 NORSPEC-99 add break statement to fix legacy bump vert program from being stomped with inappropriate material prog sans skinning 2013-05-02 10:20:55 -07:00
Dave Parks 90c2be46bf NORSPEC-145 Fix for improper rendering of glow pass for rigged meshes. 2013-05-01 20:01:37 -05:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Geenz 35cc62f24c Merge + propagated class 2 alphaF changes to class 1 alphaF. 2013-04-17 16:40:10 -04:00
Dave Parks 67af268b78 NORSPEC-90 Alpha pool hookups for materials. 2013-04-17 01:51:39 -05:00
Graham Madarasz (Graham Linden) 7d623abfc3 NORSPEC-98 redux...hopefully fix mac AND linux at the same time 2013-04-11 20:16:11 -07:00
Graham Madarasz (Graham Linden) e421420055 Re-apply llmin fix for Mac 2013-03-31 07:31:41 -07:00
Dave Parks 14f02e48b8 NORSPEC-66 Hook up material parameters to rigged attachments. 2013-03-29 20:12:27 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Simon Linden a03e8f05d7 Pull in downstream code with CHUI, viewer-development and bug fixes in the pipeline 2013-03-25 14:44:58 -07:00
simon 8e54ae95d1 Prototype code for "simple imposter" mode rendering of avatars.
Reviewed by Kelly
2013-03-20 15:25:14 -07:00
Dave Parks 586025bde5 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2013-03-04 18:06:29 -06:00
Dave Parks 609ed855e1 MAINT-2371 More optimizations.
Reviewed by Graham
2013-03-04 18:01:42 -06:00
Graham Madarasz (Graham) df08808640 Improve perf of GLSL uniform lookups by name 2013-02-28 09:33:41 -08:00
Graham Madarasz (Graham Linden) 2fd0e6e8f9 Merge viewer-cat and resolve conflict with alternate self 2013-02-21 16:50:04 -08:00
Dave Parks 543500c585 MAINT-2390 Fix for texture animation corrupting face repeats on rigged attachments after switching off animation. 2013-02-20 20:06:40 -06:00
Dave Parks f67087b872 MAINT-2370 Add debug setting "RenderAutoMuteRenderCostLimit" that automatically visually mutes avatars above a certain threshold (adjusted by Avatar Mesh Detail Slider) 2013-02-20 19:30:46 -06:00
Oz Linden a7dbaaa0af merge changes for DRTVWR-250 2013-01-08 09:45:27 -05:00
Dave Parks 36a7b0914d MAINT-2053 Fix for garbangles on rigged attachments. 2012-12-07 17:00:01 -06:00
Dave Parks c12b0e67f4 MAINT-2040 Remove leftover debug spam. 2012-12-07 12:56:03 -06:00
Dave Parks 40ec967428 MAINT-1760 Fix for opaque water glowing when wearing certain rigged attachments. 2012-12-05 18:27:13 -06:00
Dave Parks 1ab00f6cd3 MAINT-2040 Fix for rigged meshes sometimes not updating properly with color changes. 2012-12-05 17:39:50 -06:00
Dave Parks 81ba7e031e MAINT-1760 Fix for opaque water glowing when wearing certain rigged attachments. 2012-12-05 18:27:13 -06:00
Dave Parks 49879c254c MAINT-615 Fix for texture animation freezing under certain situations. 2012-07-25 14:46:23 -05:00
Dave Parks 096fe03786 MAINT-646 Faster traversal of render batch lists. 2012-06-01 14:27:04 -05:00
Dave Parks 2207b979eb MAINT-622 Fix for broken alpha masking on avatar clothing when Lighting and Shadows enabled. 2012-05-30 14:44:39 -05:00
Dave Parks 523f94cca9 SH-2889 Fix for crash when encountering certain attachments. 2012-02-27 17:15:35 -06:00
Dave Parks f7cee997df SH-2779 Fix for some transparent rigged attachments not being rendered correctly. 2012-01-19 12:40:44 -06:00
Dave Parks 0c1fc78bd9 SH-2794 Map buffer now performs as well as buffersubdata 2012-01-18 12:40:11 -06:00
Leslie Linden ad9e08b8a1 SH-2563 FIX -- Added diffuse map to the avatar rigid pass to properly set up the eyeball texture for Mac OS Lion 2011-11-15 15:52:29 -08:00
Dave Parks 2179e1c1f2 SH-2541 Fix for speckles on avatar on some cards -- don't use "maximum_alpha" for alpha tests in shaders as it was always being set to 1.0 anyway. 2011-11-02 13:13:38 -05:00
Dave Parks 7b6723d1e0 SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOs 2011-10-13 01:19:45 -05:00
Dave Parks cffcb414f5 SH-2488 Fix for shiny and alpha not interacting well on rigged attachments (and fix for assertion when rendering model import preview) 2011-10-07 17:44:57 -05:00
Dave Parks 328cf0d1c7 Merge cleanup 2011-09-26 20:00:38 -05:00
Dave Parks bd02cdc75f merge 2011-09-26 19:27:10 -05:00
Dave Parks 57620a9da9 SH-2244 Vertex buffer cleanup, fix for bad vertices in rigged attachments, added "RenderUseVAO" debug setting to control whether or not to use VAO's in non-core GL profiles. 2011-09-23 17:59:05 -05:00