Commit Graph

27408 Commits (d42a0e4e80d2b2cd51e43f7d340a6043b55635ec)

Author SHA1 Message Date
Graham Madarasz d42a0e4e80 NORSPEC-126 Make objects with normal maps applied obey legacy shiny settings 2013-05-06 08:56:32 -07:00
Graham Madarasz e0f2a242a7 Remove unnecessary assert as ternary protects against null ptr deref 2013-05-04 18:13:26 -07:00
Graham Madarasz (Graham) 930dfc4f17 NORSPEC-160 fix trashing of spec map from sunshine integration snafu 2013-05-03 15:59:43 -07:00
Graham Madarasz (Graham) 04fceb5f00 NORSPEC-151 make disabling bumpyshiny disable adv lighting model as well 2013-05-03 09:16:15 -07:00
Dave Parks f1975f0fe9 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-05-02 17:09:32 -05:00
Graham Madarasz dd06eb4021 NORSPEC-157 make texture repeats/offsets controls display in media mode 2013-05-02 13:05:25 -07:00
Dave Parks 6bb9c2720e NORSPEC-149 Fix for objects set to alpha blend sometimes getting tossed into alpha mask pool. 2013-05-02 12:35:48 -05:00
Graham Madarasz 1a880b47ab NORSPEC-119 redux : fix getState to find the material ID of individually selected faces correctly 2013-05-01 19:03:09 -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
Dave Parks 73404da266 Fix for sky being too bright with advanced lighting enabled 2013-05-01 16:48:27 -05:00
Dave Parks 5534078e9d Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-05-01 16:43:08 -05:00
Dave Parks 0938ce04f7 Fix up specular highlights and gamma correction for projectors. 2013-05-01 16:42:07 -05:00
Graham Madarasz (Graham) d7877e078e Add missing debian dir for appearnace util packaging 2013-05-01 12:07:07 -07:00
Graham Madarasz (Graham) fb73cf01af NORSPEC-144 make code to nerf use of FBOs on old windows drivers not affect Mac too 2013-05-01 11:56:15 -07:00
Graham Madarasz 70c1e21956 Fix gcc ternary type inference fail to unbreak Mac and Linux builds 2013-04-30 13:49:46 -07:00
Graham Madarasz 806d09b114 Merge 3.5.1 into Materials 2013-04-30 19:50:05 -07:00
Dave Parks b06ec66a5d MATBUG-78 Fix for alpha lighting distance attenuation not matching opaque distance attenuation 2013-04-30 14:49:53 -05:00
Dave Parks ad9e308174 NORSPEC-153 Workaround for AMD driver bug that doesn't like '\' on #define's 2013-04-29 15:01:48 -05:00
Geenz a8a3401d78 Merged with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-29 14:21:02 -04:00
Geenz 2a96a5f3ea Fix any missing color space conversions where appropriate, tweak the sun's intensity to match pre-gamma correction results, and also mask spotlight specular by the projected texture. 2013-04-29 14:15:59 -04:00
Dave Parks 243c7bd064 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-26 11:47:15 -05:00
Dave Parks 15852b88d9 Bump resolution on lightFunc to avoid banding. 2013-04-25 18:21:08 -05:00
Dave Parks 8bf4f15911 NORSPEC-104 Fix for texture animation sometimes not overriding specular and normal map texture coordinates. 2013-04-25 17:15:47 -05:00
Dave Parks 4102d3fb06 NORSPEC-106 Fix for emissive mask overriding environment mask. 2013-04-25 16:03:19 -05:00
Oz Linden 6f953cc97b merge changes for latest rendering fixes 2013-04-25 16:54:49 -04:00
Oz Linden d7136bac52 NORSPEC-67: fix update problem by not updating texture pickers when they are open 2013-04-25 16:50:02 -04:00
Oz Linden 399c2baaa5 add isPickerShown method 2013-04-25 16:21:55 -04:00
Oz Linden e66a32b4e2 add some debug logging, make a single return in "get" method 2013-04-25 16:14:45 -04:00
Dave Parks 3a2576cefa NORSPEC-118 Compatibility pass against advanced lighting disabled. 2013-04-25 13:29:40 -05:00
Dave Parks 454ae4cf61 NORSPEC-146 Fix for objects with alpha mode set to none or mask being shiny 2013-04-24 20:35:16 -05:00
Dave Parks d46c7039bc Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-04-24 12:41:14 -05:00
Graham Madarasz 4ae48c225b Correct fix to include affect on ambient term and make work on Mac nV 2013-04-24 10:37:29 -07:00
Graham Madarasz ce48b9d8cf Fix mismerge that lost Geenz colorspace conversion of diffuse in alphaV 2013-04-24 10:33:38 -07:00
Graham Madarasz 7931804321 NORSPEC-59 NORSPEC-125 make materials and alpha shaders work on Mac laptops with nV mobile graphics cards 2013-04-24 06:24:21 -07:00
Geenz fbbbb80752 Fix for overbrigtened alpha blended objects in deferred. Linearize diffuse surface color in the vertex shader before passing it to the fragment shader. 2013-04-24 05:16:02 -04:00
Dave Parks fcec034a38 Tweak to remove usage of GL_DEPTH_CLAMP for now until projectors can be made to work with it. 2013-04-23 17:03:57 -05:00
Oz Linden 1744d2150b NORSPEC-132 Correct rotation limits to +/- 180 for all textures 2013-04-23 16:19:31 -04:00
Dave Parks 95672cabb9 NORSPEC-142 Fix for unusable performance on GTX 285 2013-04-23 12:50:47 -05:00
Dave Parks 3d7c100062 NORSPEC-141 Back out a change that seems to cause shadow artifacts on rigged attachments. 2013-04-22 13:59:25 -05:00
Dave Parks 6881b01ea9 NORSPEC-139 Fix for non-fullscreen spotlight lighting mismatching fullscreen spotlight lighting 2013-04-19 17:20:52 -05:00
Dave Parks f9ff68b5e3 Cleanup specular highlights from spot lights 2013-04-19 02:56:15 -05:00
Geenz b145007941 Fix for alpha blended objects becoming too bright when gamma correction is applied. 2013-04-18 23:18:21 -04:00
Geenz 9e53724538 Merged with latest viewer-development-materials. 2013-04-18 23:11:38 -04:00
Geenz b6a6479c37 Mitigation for light attenuation looking different with gamma correction. Assume that light attenuation wants to be linearized before we apply gamma correction. 2013-04-18 21:31:10 -04:00
Geenz 14b807e55e Don't apply gamma correction underwater (for now). 2013-04-18 21:05:16 -04:00
Geenz 15bf1a81d1 This should take care of alpha blended full bright objects and gamma correction. 2013-04-18 20:42:31 -04:00
Dave Parks 509c35d5ba NORSPEC-90 Cleanup avatar alpha shaders 2013-04-18 19:21:08 -05:00
Geenz 6b836eacaf Use GL_SRGB8_ALPHA8 for the diffuse and specular buffers, and correct gamma *before* glow and other post processing effects that don't care about being gamma correct. 2013-04-18 19:43:30 -04:00
Dave Parks 28fcb3d549 NORSPEC-90 Remove unused state from alphaF/alphaV 2013-04-18 18:31:49 -05:00