Commit graph

3884 commits

Author SHA1 Message Date
sam gateau
efa1dd0274 rename the files from skin to deformed 2018-09-25 17:32:04 -07:00
sam gateau
cc0019479a fixing review comments 2018-09-25 14:07:07 -07:00
sam gateau
e41b8f06e1 Cleaning up the pipeline and checking that it is working for all cases 2018-09-25 13:57:50 -07:00
Sam Gateau
69734ce21b Getting better' 2018-09-24 22:34:43 -07:00
sam gateau
7cf7eaa7c8 Exposing the drawcall user info just a uint16 right now and use it for the skinning and blendshape 2018-09-24 17:34:42 -07:00
SamGondelman
d772cdb34a please 2018-09-24 10:16:35 -07:00
Sam Gateau
4210ce46aa bringing the tex corrd transform in the Material struct and shaving one ubo 2018-09-23 23:10:56 -07:00
sam gateau
d8984dafa0 ui allows to enable/disable the deformer componenets 2018-09-21 16:45:21 -07:00
sam gateau
aa02dcb087 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-09-21 08:19:50 -07:00
sam gateau
d3ff4b8630 Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off 2018-09-20 17:26:26 -07:00
John Conklin II
0560b8678c
Merge pull request #14022 from jherico/fix/amd_highlight
Fix AMD highlighting effect
2018-09-20 16:17:10 -07:00
sam gateau
5d80a89094 Apply fix to gl41 backend needed for proper Resource BUffer on gl41 2018-09-20 16:09:08 -07:00
Sam Gateau
377464f5a2 Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis 2018-09-19 19:00:30 -07:00
sam gateau
6b6551c8bd the missing file 2018-09-19 17:29:10 -07:00
sam gateau
4fc6466250 update shaders 2018-09-19 17:27:58 -07:00
John Conklin II
60c07280f8
Merge pull request #13971 from SamGondelman/parabola
Correct transparent parabola shader
2018-09-19 11:46:24 -07:00
Brad Davis
783ea21951 Fix AMD highlighting effect 2018-09-19 11:21:12 -07:00
sam gateau
c05cbf065b fixing the texcoord1 input in skined vertex shader 2018-09-19 10:13:14 -07:00
Sam Gateau
61644c48f0 Update the slp tp reflect the chanes in the vertex shaders 2018-09-19 09:18:09 -07:00
sam gateau
ec6117e9bb bringing the blendshape in skin shader only work in master 2018-09-18 17:40:29 -07:00
SamGondelman
2b2091290e fix everything 2018-09-12 15:32:35 -07:00
SamGondelman
1a36693161 I hate blendshapes 2018-09-11 16:58:38 -07:00
SamGondelman
0e079e78e6 correct transparent parabola shader 2018-09-10 16:20:50 -07:00
John Conklin II
ae547f8950
Merge pull request #13881 from jherico/feature/no_uniforms
Remove all uniforms from our shaders
2018-09-10 15:42:01 -07:00
SamGondelman
f9ec53a2e6 fix bloom on edges 2018-09-07 10:25:26 -07:00
John Conklin II
8c77749fb6
Merge pull request #13947 from SamGondelman/perf
Fix blendshapes crash one last time, one last time
2018-09-06 14:21:18 -07:00
Bradley Austin Davis
fade3a8de0 Fixing shader implicit type conversions 2018-09-06 09:08:36 -07:00
Brad Davis
650f112f16 Fix keyword in shader layout 2018-09-06 09:08:36 -07:00
Brad Davis
50f4932d9c PR feedback: structure alignement and size 2018-09-06 09:07:53 -07:00
Brad Davis
9a28e04e37 Remove all tabs from shaders 2018-09-06 08:59:07 -07:00
Brad Davis
2df2bbef46 Adding missing locations 2018-09-06 08:59:07 -07:00
Brad Davis
730cdb4257 Remove uniforms from unused shaders 2018-09-06 08:59:06 -07:00
Brad Davis
f704ddc11c Remove uniform from SDF text rendering 2018-09-06 08:59:06 -07:00
Brad Davis
a4cd56532e Removing uniforms from antialiasing 2018-09-06 08:59:06 -07:00
Brad Davis
cafd981744 Remove uniforms from bloom debug effect 2018-09-06 08:59:06 -07:00
Brad Davis
ac84a498b3 Cleanup dead declarations 2018-09-06 08:59:05 -07:00
Sam Gateau
03f51352aa
Merge pull request #13932 from SamGondelman/framebuffer
Fix framebuffer debugging
2018-09-05 17:38:21 -07:00
SamGondelman
cde2dc2eaa please work 2018-09-05 17:04:05 -07:00
SamGondelman
dff8292216 fix framebuffer debug 2018-09-04 12:50:25 -07:00
Sam Gateau
bd9136812d Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-31 17:53:49 -07:00
SamGondelman
028092f803 fix blendshapes one last time 2018-08-31 13:33:45 -07:00
Sam Gateau
dc852bf906 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2018-08-30 19:00:56 -07:00
Sam Gondelman
067d7b280d
Merge pull request #13900 from SamGondelman/blendshapeCrash
Fix blendshape crash
2018-08-30 17:10:24 -07:00
Sam Gateau
9e2a540bab Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-30 12:12:24 -07:00
SamGondelman
248c2621a4 fix blendshapes crash 2018-08-29 17:57:54 -07:00
SamGondelman
0c8a4cc81e merge with master 2018-08-28 17:31:51 -07:00
SamGondelman
aae06e8f49 faster aabox ray intersection and pre-computed inverse direction 2018-08-27 15:40:33 -07:00
Sam Gateau
a6f7135ad8 Merge branch 'master' of github.com:highfidelity/hifi into black 2018-08-27 10:54:23 -07:00
John Conklin II
467fe56103
Merge pull request #13845 from SamGondelman/perf
Move blendshape packing to worker thread
2018-08-27 09:40:03 -07:00
Sam Gateau
d97d655148 USing a simpler halfTan test for culling 2018-08-26 23:17:29 -07:00