Commit Graph

27335 Commits (35cc62f24c8a3f1fe3d6c879a4435dfebcb6fc8e)

Author SHA1 Message Date
Geenz 35cc62f24c Merge + propagated class 2 alphaF changes to class 1 alphaF. 2013-04-17 16:40:10 -04:00
Geenz bb5bf632c6 First pass of gamma correction reimplementation. 2013-04-17 15:53:09 -04:00
Dave Parks 67af268b78 NORSPEC-90 Alpha pool hookups for materials. 2013-04-17 01:51:39 -05:00
Geenz c72c3691ec Merged Graham's stuff amongst others. 2013-04-15 19:40:12 -04:00
Geenz 39544a3b06 Hooked up normal and specular texture coordinates. 2013-04-15 02:29:03 -04:00
Geenz 6257a8394c Normal mapped alpha support. Specular and environment map support needs a bit of extra work (in progress). 2013-04-15 01:35:21 -04:00
g fafa21315f Fix issue with alphaNonIndexedNoColorF shader and static init fail on default spec color (real source of NORSPEC-94, I think) 2013-04-12 15:21:35 -07:00
g f4becc0e1b NORSPEC-91 default to alpha blend when a material is present and a diff tex with alpha is applied 2013-04-12 13:42:52 -07:00
Graham Madarasz 7bf67f7866 NORSPEC-111 probable fix for IntelHD advanced lighting crasher 2013-04-12 08:14:46 -07:00
graham linden 85e16a373f Merged lindenlab/viewer-development-materials into default 2013-04-11 20:21:56 -07: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
Oz Linden d8f2ecd5b3 merge NORSPEC-94 2013-04-11 20:53:45 -04:00
Dave Parks 66b4900e70 Pass binormal masks in on particles and in lldrawpoolalpha 2013-04-11 15:17:55 -05:00
Graham Madarasz (Graham Linden) 19430bfce0 NORSPEC-98 fix? for mac shader compiler crasher 2013-04-11 11:57:50 -07:00
Geenz cfc3757778 First pass on alpha blended materials 2013-04-11 14:57:11 -04:00
Graham Madarasz (Graham Linden) 35400fb415 NORSPEC-96 less insane repeats per meter behavior in planar mode for norm/spec maps 2013-04-11 10:24:27 -07:00
Tonya Souther 81781bf0d8 NORSPEC-94: Set default specular color to white. 2013-04-11 10:21:33 -05:00
graham linden 4d7f2df106 Merged lindenlab/viewer-development-materials into default 2013-04-11 07:02:58 -07:00
Oz Linden a280ff382c merge per pixel improvement from geenz 2013-04-10 17:40:38 -04:00
Graham Madarasz (Graham Linden) 250175a0fa NORSPEC-56 slight tweak to log formatting to correct material count 2013-04-10 13:12:15 -07:00
Graham Madarasz (Graham Linden) afb846756f Remove temp patch file 2013-04-10 10:42:17 -07:00
graham linden 5c507f9648 Merged lindenlab/viewer-development-materials into default 2013-04-10 10:37:48 -07:00
Graham Madarasz 9e9e0f3ea6 NORSPEC-98 side-step nV compiler fail-o-rama 2013-04-10 10:31:51 -07:00
Graham Madarasz (Graham Linden) 72f6017dc2 Merge 2013-04-10 10:23:54 -07:00
Graham Madarasz (Graham Linden) 6a417acd63 NORSPEC-92 More UI fixes 2013-04-10 10:23:03 -07:00
Dave Parks 41097e74ec NORSPEC-75 Fix bug introduced by previous change where objects with an emissive mask appear fullbright. 2013-04-10 01:24:26 -05:00
Dave Parks f86fd87437 Fix for mac build? 2013-04-10 01:12:18 -05:00
Dave Parks aaad46c18b Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-10 00:28:03 -05:00
Dave Parks 78d23e6642 NORSPEC-75 Add appropriate draw calls to underwater render passes so objects with material data don't disappear in water. 2013-04-10 00:27:32 -05:00
Oz Linden 8f84d75ae4 merge fixes from graham 2013-04-09 17:09:52 -04:00
Geenz 84475635b9 More per-pixel lighting fanciness. 2013-04-09 16:35:10 -04:00
Oz Linden 0229b65a4d merge changes for fix from geenz 2013-04-09 16:01:07 -04:00
Oz Linden 8fe17529c6 fix? race condition that occasionally fails in unit test 2013-04-09 15:57:23 -04:00
Geenz 356d738250 Merged with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-09 15:41:37 -04:00
Graham Madarasz 991a3cf40e Merge 2013-04-09 12:39:01 -07:00
Graham Madarasz 893bcf34f7 NORSPEC-59 work around nV driver crash when doing deferred rendering on NV 9400M/9600M 2013-04-09 12:37:57 -07:00
graham linden 76f36001e2 Merged lindenlab/viewer-development-materials into default 2013-04-09 12:18:05 -07:00
Geenz e4faf91bb2 Start using R16F again, and divide the bloom contrib by 6. 2013-04-09 14:45:27 -04:00
Graham Madarasz (Graham) 2a220ca9eb NORSPEC-84 fix alpha mode UI appearing when coming back from media mode 2013-04-09 09:39:57 -07:00
Graham Madarasz (Graham) 74712b47df NORSPEC-84 fix alpha mode UI appearing when coming back from media mode 2013-04-09 09:39:57 -07:00
Graham Madarasz (Graham) f7b7f4a5fb NORSPEC-87 NORSPEC-88 fix interaction between norm/spec scale (aka repeats) and repeats per meter control 2013-04-09 09:24:58 -07:00
Graham Madarasz (Graham) af44715f90 NORSPEC-87 NORSPEC-88 fix interaction between norm/spec scale (aka repeats) and repeats per meter control 2013-04-09 09:24:58 -07:00
Geenz 27fbf5efc9 Re-added RGB10_A2 normal buffer, this time encoded with a sphere map transform so we can store the environment intensity in the blue channel. 2013-04-09 11:46:52 -04:00
Geenz c2df68743d First pass of per-pixel lit alpha blended objects. 2013-04-08 23:02:57 -04:00
Geenz 3f01526e71 Fix for specular exponents not being applied appropriately from the normal map alpha. 2013-04-08 21:09:29 -04:00
Graham Madarasz (Graham) ffc4981bb9 NORSPEC-83 repts per meter active with bumpy none 2013-04-08 16:48:24 -07:00
Graham Madarasz (Graham) b2ebfbf665 NORSPEC-83 repts per meter active with bumpy none 2013-04-08 16:48:24 -07:00
Graham Madarasz (Graham) 7fa137ab1d NORSPEC-86 Shiny type resets when editing spec glossiness 2013-04-08 15:42:45 -07:00
Graham Madarasz (Graham) 1a4c8775f8 NORSPEC-86 Shiny type resets when editing spec glossiness 2013-04-08 15:42:45 -07:00
Graham Madarasz (Graham) bd3716b775 NORSPEC-82 NORSPEC-85 More UI shenanigans 2013-04-08 11:40:10 -07:00