Commit graph

2433 commits

Author SHA1 Message Date
samcake
9ffdc03dc9 setting the shaeKeys for the overly properly because most of them are CustomPipleline 2017-02-24 18:25:24 -08:00
samcake
1b501487fd simple shader checks 2017-02-24 16:03:28 -08:00
sam
5257194c48 SImplify the overlay PLumber 2017-02-24 01:11:59 -08:00
sam
e1aad8bd63 Deep dive into the shape key and filters and the PLumber construction 2017-02-24 00:35:10 -08:00
sam
67031850aa Deep dive into the shape key and filters and the PLumber construction 2017-02-24 00:05:54 -08:00
samcake
6d59144a4f Trying to fix the emissive for overlay in front ? 2017-02-23 17:42:02 -08:00
samcake
c7b164d8f2 Adding differenciation for the Material shapeKey bit 2017-02-22 18:21:18 -08:00
samcake
a00216cb4f debugging the emissive issue for verlay in front 2017-02-21 18:20:55 -08:00
samcake
55611d2373 Backing up to master 2017-02-21 14:56:07 -08:00
samcake
5e3c79d197 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-21 14:49:52 -08:00
Atlante45
1201932ee9 Fix SSE2 macros for Macos 2017-02-14 14:10:53 -08:00
samcake
9261e81ba2 Cleaning up the interface 2017-02-10 17:47:56 -08:00
samcake
2da1801fbf Fixing the failing shader 2017-02-10 14:40:39 -08:00
samcake
37541e4ed2 Start capping the time budget for draw opaque 2017-02-10 14:29:29 -08:00
samcake
b9102204ea FIx the filtering problem on color and normals introduced since we generate mips with QImage 2017-02-10 11:40:39 -08:00
samcake
c864e57855 first pass on a working image class and the mip generation 2017-02-06 08:51:04 -08:00
samcake
e8cdee71ed avoid assertion on mac 2017-02-03 22:49:41 -08:00
sam
2ecda8b64e Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-02-01 18:03:07 -08:00
Seth Alves
ab8be15ce0 Merge pull request #9570 from highfidelity/tablet-ui
Tablet ui
2017-02-01 09:38:13 -08:00
samcake
c88d070868 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-01-31 11:49:25 -08:00
samcake
04d5173328 Merge pull request #9530 from AndrewMeadows/computeBoundsOutsideLambda
compute Model's local bounds outside pending changes queue
2017-01-31 11:40:21 -08:00
samcake
0b139c906c Assigniing default textures that make sense 2017-01-31 10:56:30 -08:00
Brad Hefta-Gaub
cff49ea5f3 Merge pull request #9556 from samcake/blue
Adding support for disabling texturing from the material
2017-01-31 10:39:44 -08:00
Anthony J. Thibault
0f75668923 Moved Model setting of _spatiallyNestableOverride to constructor 2017-01-31 09:36:21 -08:00
samcake
249ec80d74 Writting a better version of the no texture case 2017-01-30 15:48:48 -08:00
Anthony J. Thibault
0962a15a06 Fix for one-frame lag in the tablet stylus. 2017-01-30 15:39:55 -08:00
samcake
3c56bd2960 Adding support for disabling texturing from the material 2017-01-30 15:03:04 -08:00
Anthony J. Thibault
39d68828ab Disable FXAA on tablet overlay in desktop mode.
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass.  Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.

Two new shaders were introduced.

simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf

These are tailored to write into the main framebuffer instead of the g-buffer.
2017-01-30 11:24:59 -08:00
Anthony J. Thibault
a9b478888c First cut of Web3DOverlays without FXAA applied. 2017-01-30 11:24:58 -08:00
Andrew Meadows
489fbc6299 compute Model's local bounds outside render lambda 2017-01-27 09:35:36 -08:00
Seth Alves
db38503d57 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 13:48:59 -08:00
Andrew Meadows
09707217ec remove Model::simulateInternal() 2017-01-26 08:35:25 -08:00
Andrew Meadows
08bba5f45f add and remove some profile data points 2017-01-26 08:35:25 -08:00
Seth Alves
be8bc9652b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 09:44:04 -08:00
Andrew Meadows
10cdea9cd8 cleanup model fade logic 2017-01-19 14:17:50 -08:00
Andrew Meadows
b7c1bfaf58 another attempt to fix model transform 2017-01-19 14:01:40 -08:00
Andrew Meadows
d3af420516 fix broken model transforms 2017-01-19 13:07:50 -08:00
Andrew Meadows
1d6f47e3d8 repack to reduce MeshPartPayload footprint 8 bytes 2017-01-19 12:56:08 -08:00
Andrew Meadows
bfbef91f53 re-enable cauterization of meshes for MyAvatar 2017-01-19 12:56:07 -08:00
Andrew Meadows
3dd8fd838b move cauterization out of Model class 2017-01-19 12:56:07 -08:00
Seth Alves
eb25e1c12d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-19 09:41:49 -08:00
samcake
149e727cf3 Merge pull request #9429 from gcalero/android_forward_shaders
Create render forward version of pixel shaders
2017-01-19 00:48:25 -08:00
Gabriel Calero
5602479988 Create render forward version of pixel shaders 2017-01-18 19:18:59 -03:00
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -08:00
samcake
960f4f0ead Move the drawBOunds job to DrawTasks 2017-01-16 18:33:42 -08:00
samcake
0b9b5d595c Merge branch 'master' of https://github.com/highfidelity/hifi into meta 2017-01-16 17:48:16 -08:00
samcake
83d1c3ad01 Adding support for the meta rendering 2017-01-16 17:47:58 -08:00
Andrew Meadows
fd28457807 fix cauterization hack 2017-01-16 15:13:28 -08:00
Chris Collins
2557c797af Merge pull request #9300 from zzmp/graphics/forward-opaque
Add opaques/skinned to forward rendering path
2017-01-16 08:48:18 -08:00
Seth Alves
5a81dface9 avoid filling log with bogus warning 2017-01-13 12:00:51 -08:00