Commit graph

10822 commits

Author SHA1 Message Date
Brad Hefta-Gaub
89d1e82f89 Merge pull request #5431 from jherico/homer
Limit the amount of time consumed by QML rendering
2015-07-26 11:54:05 -07:00
Brad Davis
843a333727 Merge pull request #5424 from samcake/yellow
Cleaning up the FBO cache and the output stage in general
2015-07-25 11:49:22 -04:00
Bradley Austin Davis
7be33dcb58 Limit the amount of time consumed by rendering QML 2015-07-25 11:40:58 -04:00
Philip Rosedale
e24395a226 Merge pull request #5383 from ctrlaltdavid/20630
Improve looking-at-me indication
2015-07-24 16:15:13 -07:00
Sam Gateau
776d4747b2 Cleaning up the FBO cache and the output stage in general 2015-07-24 14:47:44 -07:00
Seth Alves
5f2e8f5b71 Merge pull request #5419 from birarda/master
only output the no listener for type message once
2015-07-24 10:41:11 -07:00
Brad Davis
6eec04c798 Merge pull request #5407 from samcake/yellow
Removing the glNaked code for capturing the billboard snaphot and rendering the rearViewMirror in a separate render target
2015-07-24 13:09:07 -04:00
Stephen Birarda
71557a1846 only output no listener for type message one time 2015-07-24 09:36:27 -07:00
samcake
e6f2504514 FIx the problem of clear when the color mask is not WRITE_ALL 2015-07-24 09:26:32 -07:00
samcake
52ac5b3ef6 On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize 2015-07-24 03:38:21 -07:00
Sam Gateau
cb375e8ece FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler 2015-07-24 02:15:50 -07:00
Sam Gateau
66cd17ec66 REmove the crappy solution for drawing transparent texture into overlay by a proper shader 2015-07-23 23:09:40 -07:00
Stephen Birarda
974108734a add a comment for size guard 2015-07-23 17:17:59 -07:00
Stephen Birarda
f919d2985b don't attempt to send the avatar billboard if too large 2015-07-23 17:17:15 -07:00
Sam Gateau
ded95a3dde removing dead code 2015-07-23 16:58:21 -07:00
Sam Gateau
a424ff98ca Fixing issues with the review process 2015-07-23 16:55:18 -07:00
Sam Gateau
a002560003 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-23 16:32:00 -07:00
Sam Gateau
d56b5f39fb strenghening the checks in GLBackend::downloadFramebuffer before actually calling the true glReadPixels 2015-07-23 16:31:11 -07:00
Sam Gateau
be9d99264f Introducing the download Framebuffer call on the context to capture a snapshot 2015-07-23 16:15:10 -07:00
Brad Davis
2ac6304752 Merge pull request #5404 from ZappoMan/renderBug
Fix rendering of primitive objects on Windows
2015-07-23 19:10:54 -04:00
ZappoMan
8007fba909 add type to shader include 2015-07-23 15:37:56 -07:00
Ryan Huffman
396bb613f8 Avoid creating a new variable in js print 2015-07-23 15:32:40 -07:00
Ryan Huffman
5f33ac5459 Update script print() to be variadic 2015-07-23 15:30:54 -07:00
Sam Gateau
dc10f30d3d Merged 2015-07-23 15:10:42 -07:00
ZappoMan
e6262de864 CR feedback 2015-07-23 14:56:52 -07:00
Sam Gateau
a561874ce3 Render the rear view mirror in a separate target and then display it during overlay pass 2015-07-23 14:56:14 -07:00
ZappoMan
1177ffd439 more hacking 2015-07-23 14:12:52 -07:00
ZappoMan
96e83e3ed4 remove gl_FrontMaterial 2015-07-23 14:11:28 -07:00
ZappoMan
9496b6c024 more hacking 2015-07-23 13:56:59 -07:00
ZappoMan
5774af0856 more hacking 2015-07-23 13:38:08 -07:00
ZappoMan
a0666d5e99 testing windows render bug 2015-07-23 13:17:12 -07:00
ZappoMan
91d317f964 testing windows render bug 2015-07-23 12:42:55 -07:00
samcake
fecb0e3675 Merge pull request #5398 from ZappoMan/removeTextureRescale
remove rescaling of textures
2015-07-23 11:22:38 -07:00
samcake
805e7326e0 Merge pull request #5396 from ZappoMan/deadCodeRemoval
remove non-batch versions of GeometryCache renderXYZ() methods
2015-07-23 11:11:35 -07:00
David Rowe
68254c1ff0 Merge branch 'master' into 20630 2015-07-23 09:46:20 -07:00
Bradley Austin Davis
f19800f0de Don't overwrite the normals buffer when copying the resolved lighting back to the primary FBO 2015-07-23 12:37:58 -04:00
ZappoMan
06b6c49b9a remove rescaling of textures 2015-07-23 08:56:59 -07:00
ZappoMan
bd6534a991 remove deprecated renderBatch() 2015-07-23 08:35:03 -07:00
ZappoMan
c2113ea96b remove non-batch versions of GeometryCache renderXYZ() methods 2015-07-23 07:42:58 -07:00
Andrew Meadows
bf3ff8daea fix crash for convex hull of co-planar points 2015-07-22 15:06:10 -07:00
Sam Gateau
f70553ec95 Fixing merge 2015-07-22 11:31:46 -07:00
Sam Gateau
837ff45763 Removing code aroung the selfie fremebuffer 2015-07-22 10:57:08 -07:00
Sam Gateau
8dbd991652 USing a modern singleton guard 2015-07-22 10:54:40 -07:00
Sam Gateau
7ac2030862 Preparing for first pr 2015-07-22 10:43:50 -07:00
Bradley Austin Davis
2f13488f11 Fixing FBO bug on resizing windows 2015-07-22 11:28:36 -04:00
Bradley Austin Davis
65732d874c Merge branch 'maggie' into marge 2015-07-22 09:07:50 -04:00
Bradley Austin Davis
9596452c32 Trying to fix oculus rendering 2015-07-22 08:07:44 -04:00
David Rowe
55683e0cd5 Size looking-at-me eye spheres per avatar model dimensions 2015-07-21 18:24:47 -07:00
Bradley Austin Davis
bd5da87551 Merge remote-tracking branch 'upstream/master' into marge 2015-07-21 19:23:38 -04:00
Bradley Austin Davis
d6994c6dfd Restoring star size and color variation 2015-07-21 19:22:10 -04:00