Commit Graph

119 Commits (d77edcdf137e76b135cf8dbf70d10bcda34b00a0)

Author SHA1 Message Date
Tank_Master 7b2cc02863 Merge LL fitted mesh 2014-02-06 00:41:33 -08: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
Graham Linden 95e34d86b9 The unbearable lightness of being norspec 2013-09-18 18:24:16 -07:00
Graham Madarasz (Graham Linden) f86a7c04d3 NORSPEC-314 rollback unified srgb shader code to see if we can get past Mac 10.6.8 nV driver issues 2013-07-30 11:33:58 -07:00
Graham Madarasz (Graham Linden) b44e7303d8 NORSPEC-314 WIP fix srgb_mac use and issues found with RenderDebugGL on Mac 2013-07-29 18:59:45 -07:00
Graham Linden f357269c38 NORSPEC-325 WIP restore gamma (uncorrected) attenuation and unify sRGB conversion in one place 2013-07-25 09:36:13 -07:00
Graham Linden e290dd3fa1 NORSPEC-311 make post deferred (alpha objects) respect same gamma ramp as deferred (opaque objects) 2013-07-24 04:03:27 -07:00
Dave Parks 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Dave Parks c3f14b915c NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric) 2013-06-03 12:50:48 -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
simon b864cecd6c De-bork the viewer merge, causing black in-world images. Reviewed by Kelly 2013-05-13 16:34:52 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Graham Madarasz 025c890958 Merge vwr-dev-mat 2013-05-01 08:11:15 -07:00
Graham Madarasz 806d09b114 Merge 3.5.1 into Materials 2013-04-30 19:50:05 -07:00
Graham Madarasz 1688e995eb Provide LLGLSLShader backwards compat so as not to break the appearance utility 2013-04-26 09:11:52 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Geenz cfc3757778 First pass on alpha blended materials 2013-04-11 14:57:11 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Dave Parks 609ed855e1 MAINT-2371 More optimizations.
Reviewed by Graham
2013-03-04 18:01:42 -06:00
Geenz 2ae4b6976b Added a new draw pool specifically for faces with materials applied to them. Removed materials rendering from the bump draw pool, and reverted it to its previous state. 2013-02-04 11:32:05 -05:00
Geenz aa1befd689 Specular map support. This is the vast majority of the material parameters implemented at this point for opaque geometry. 2013-01-30 12:17:04 -05:00
Geenz 5f03e197f4 Trying to set materials up for rendering! Yay! 2013-01-25 17:54:38 -05:00
Tank_Master e551fc5137 Merge LGPL 2013-09-29 20:35:40 -07:00
Tank_Master 9810792665 Back out Intel HD 4000 fixes to thoroughly test the latest driver with OGL 4.2 support
This driver seems to have fixed the rendering issues.
2013-09-29 16:14:57 -07:00
Tank_Master 119ce81029 Merge viewer bear updates + merge fixes 2013-09-23 22:10:59 -07:00
Tank_Master 0c314a0e6f Merge LGPL 2013-09-21 16:59:50 -07:00
Tank_Master 05ad3a1c29 Merge Viewer-bear (merge of materials + fixes) to FS-exp 2013-09-21 11:44:46 -07:00
Tank_Master 5519c39beb Merge Viewer-bear (Materials 3.6.6 RC) 2013-09-16 16:18:33 -07:00
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Ansariel 1c481f82be Update SSR from Tofu Buzzard with latest version from https://bitbucket.org/tofu_linden/screen-space-reflections2 2013-07-11 16:24:19 +02:00
Tank_Master 718f6fa0ff merge LL 3.6.1 2013-07-10 00:23:23 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Geenz eda11a25a4 Initial (largely complete) gamma correct rendering implementation. 2013-01-11 06:37:21 -05:00
Jonathan Goodman d5b45b0b63 Use an unordered map for custom #defines instead of a map. Lookups are faster, and we don't really care about any particular order anyways for these. 2012-08-29 08:02:46 -04:00
Jonathan Goodman c911efb953 Just pass in an empty preprocessor definition map from now on. The shader compiler won't add new #defines if it's empty. 2012-08-29 03:41:26 -04:00
Jonathan Goodman ed1b78e322 Added support for adding custom preprocessor definitions (for shader permutations) 2012-08-28 10:33:32 -04:00
Ansariel 591957ce34 Re-applied Tofu Buzzard's SSR with faster SSAO; Option to disable feature from NiranV Dean 2013-02-20 23:23:06 +01:00
Ansariel 7e528a0bb0 Backed out changeset: a5e3c6daa768 2013-02-20 22:17:45 +01:00
Ansariel 046d0818d7 Updated DoF, SSAO from Tofu Buzzard and added SSR and Macro Dapple, also from Tofu Buzzard 2013-02-20 18:40:37 +01:00
Cinders 792380c5bf Add post processing chain and vignette effect adapted from Exodus Viewer. Original code by Geenz Spad. 2013-02-19 22:58:03 -07:00
Tank_Master 65e5034f00 Backed out changeset: 2006c64a371f (Simple Shader fails to link with this) 2013-02-08 01:04:30 -08:00
Nicky c8698aaf0f Reapply pink fix. 2013-02-08 00:08:29 +01:00
Tank_Master 20544f5421 potential fix for FIRE-8942, FIRE-8987, FIRE-9001, FIRE-9004 (deferred selection issues and rendering issues on ATI cards) 2013-01-31 00:45:30 -08:00
Tank_Master 001a07a33c disable reusing already loaded shaders for testing some issues when changing settings 2013-01-22 11:42:02 -08:00
Tonya Souther 828cb2cc5a Fix shader link failures on 64-bit Linux with ATI and maximum texture index > 1. 2013-01-17 18:04:43 -06:00
Tank_Master 51d295c16f restore Nicky's anti-pink texture patch 2013-01-03 17:09:37 -08:00
Tank_Master 1762586923 Merge LL 3.4.4 beta 1, but left tcmalloc enabled. 2012-12-21 01:14:38 -08:00
Nicky ceea332a9c Change old style comments <ND> to <FS:ND> to avoid any future confusion/ 2012-12-16 05:19:32 +01:00
Nicky a55499be93 Merge ATI fix from 4.3.1 branch into default tip. 2012-12-11 13:05:32 +01:00