Andrew Meadows
4bf99fe9d2
remove unused variable
2017-10-10 17:05:54 -07:00
Andrew Meadows
026195223a
more correct use of BufferView in GeometryCache
2017-10-10 17:02:26 -07:00
Bradley Austin Davis
e42068f681
Merge branch 'master' into android_new
2017-09-26 14:31:29 -07:00
Bradley Austin Davis
b93e91b9f3
New android toolchain
2017-09-19 13:45:12 -07:00
SamGondelman
f68a588323
rename isAA isAntiAliased
2017-09-13 10:24:10 -07:00
SamGondelman
1b85a453ab
working on text3d overlays and entities
2017-09-12 16:49:51 -07:00
SamGondelman
4a49801217
web overlays and entities are always nonAA
2017-08-24 14:23:21 -07:00
Chris Collins
2456126bcc
Merge pull request #11157 from SamGondelman/tabletLayer
...
Render non-AA overlays correctly
2017-08-18 14:59:20 -07:00
Sam Gateau
d624413c14
Merge pull request #11189 from SamGondelman/line3DFix
...
Fix drawInFront overlays only rendering in left eye
2017-08-15 09:26:18 -07:00
SamGondelman
194b7d6655
warning
2017-08-14 16:08:07 -07:00
SamGondelman
8163430282
fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds
2017-08-14 15:03:14 -07:00
SamGondelman
e4c954e862
merge from master
2017-08-10 16:30:33 -07:00
SamGondelman
353a3e8c68
properly fix AA stenciling
2017-08-10 16:07:40 -07:00
SamGondelman
96b179386f
working on fixing non-AA overlays
2017-08-10 16:07:40 -07:00
Olivier Prat
3316be4dea
Working fade parameters through instanced draw calls
2017-07-18 17:01:17 +02:00
Olivier Prat
dbf0b64dfb
Refactored Fade.slh to take into account differences between instanced draw and normal draw
2017-07-18 12:49:34 +02:00
Olivier Prat
1f14b6ef38
Shape entities have the correct pipeline picked when fading is activated. Still need to support instanced rendering
2017-07-17 17:50:59 +02:00
Olivier Prat
f8b2ffe359
Removed transparency on fading shapes
2017-07-17 15:06:32 +02:00
Olivier Prat
1b8696fdda
First draft of custom pipeline on geometry cache
2017-07-13 17:09:49 +02:00
Olivier Prat
06d69d04c3
TransitionStage + FadeJob compiling but not linked to entity events
2017-07-07 18:22:11 +02:00
Olivier Prat
4256a1f2a7
Preparing for merge with stage. DOESN'T COMPILE!
2017-07-07 15:16:20 +02:00
Sam Gateau
d15c4ea2d3
Merging with the stage branch
2017-07-07 15:12:40 +02:00
Sam Gateau
53ffca796f
Drafting a better SHape plumber to render the items
2017-07-06 16:35:40 +02:00
Olivier Prat
8a12d0c106
Fade effect working again for basic enter domain but with various Fade jobs
2017-06-29 08:54:23 +02:00
samcake
20d8c11e28
ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore
2017-06-22 17:54:16 -07:00
Olivier Prat
24d45e0f5b
Updated from upstream master because of change of protocol
2017-06-13 10:43:25 +02:00
Liv
7785473ccb
moving else
2017-06-09 12:59:08 -07:00
Liv
8c488d95d1
Stylish updates
2017-06-09 11:46:38 -07:00
Liv
1808505d8b
Coding standard fixes
2017-06-09 10:54:57 -07:00
Liv
34bd2b8a2b
style fix
2017-06-08 09:01:01 -07:00
Olivier Prat
20d4fcbbc7
Fixed fading on skinned objects. Added initialiazeShapePipelines on GeometryCache to postpone simple pipeline creation after initializeGL
2017-06-08 09:24:12 +02:00
Liv
c3bf915fd4
Changing loop to avoid unused warnings
2017-06-07 15:04:39 -07:00
Liv
5579c409e7
Style fix
2017-06-05 18:03:10 -07:00
Liv
42cb2332d5
Remove unimplemented comment on circle
2017-06-05 17:46:13 -07:00
Liv
393aa84a55
Renaming conical to isConical
2017-06-05 17:45:52 -07:00
Liv
e4963e076a
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/add-primitive-shapes
2017-06-05 17:38:28 -07:00
samcake
c5e9551bab
more cleanup
2017-06-01 18:05:18 -07:00
samcake
9c1e99fe3f
Removing cruft and organizing the stencil config
2017-06-01 13:06:22 -07:00
Liv
8bcaacbe40
Removing incomplete torus function
2017-05-31 15:46:35 -07:00
Liv
2808ab4865
Sort of making progress on torus vertex buffer
2017-05-26 10:45:29 -07:00
Liv
10408a0fe4
basic circle function to be used as base for torus
2017-05-25 15:32:49 -07:00
Liv
ffbe39df0a
Refactor to add optional conical parameter to existing extrude polygon function
2017-05-25 13:06:24 -07:00
Liv
d3e900e42f
Adding first pass on cone shape
2017-05-25 12:54:49 -07:00
Liv
417d9ec80b
Surface cylinder option for primitive shape to html
2017-05-25 11:04:25 -07:00
Liv
362e08a90d
Add extrudePolygon for cylinder
2017-05-25 10:23:28 -07:00
Sam Cake
29545f0918
FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend
2017-04-13 23:53:56 -07:00
sam
e1aad8bd63
Deep dive into the shape key and filters and the PLumber construction
2017-02-24 00:35:10 -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
Brad Davis
3074be7ad0
Glow line replacement without geometry shader
2016-11-18 17:42:55 -08:00
Brad Davis
fa841620ab
Disable glow line temporarily while fixing implementation
2016-11-16 12:50:47 -08:00