Sam Gateau
f525a8a245
Removing all the unecessary calls of Batch from the gl legacy time
2015-07-27 17:17:56 -07:00
Sam Gateau
a5ad40bee9
INtroduce the resetStage command to clear up all cache and state in the gpu::Conference and make sure no more resource are linked
2015-07-27 14:07:28 -07:00
samcake
f3dc159e33
Merge pull request #5401 from ZappoMan/renderLaserPointers
...
remove renderLaserPointers()
2015-07-24 10:41:32 -07:00
Brad Hefta-Gaub
939638a3a8
Merge pull request #5414 from birarda/slow-events
...
allow the QEvent queue in Application to get behind
2015-07-24 10:10:42 -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
samcake
e6f2504514
FIx the problem of clear when the color mask is not WRITE_ALL
2015-07-24 09:26:32 -07:00
Brad Davis
6899279d7d
Merge pull request #5399 from ZappoMan/fixJSRayPick
...
Fix JS calls to computePickRay() when mini-mirror is showing
2015-07-24 11:46:07 -04:00
Seth Alves
6841a47c4b
Merge pull request #5412 from AndrewMeadows/bohrium
...
decouple FPS from rotation rate during mouse drag
2015-07-24 07:44:22 -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
samcake
8421aafe33
try to fix the scaling issues on mac
2015-07-23 18:17:10 -07:00
Stephen Birarda
cdcab299b6
bring back delayed queue of Application events
2015-07-23 18:00:35 -07:00
Andrew Meadows
2fc158246d
decouple FPS from rotation rate during mouse drag
2015-07-23 17:30:50 -07:00
Sam Gateau
a424ff98ca
Fixing issues with the review process
2015-07-23 16:55:18 -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
Sam Gateau
dc10f30d3d
Merged
2015-07-23 15:10:42 -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
David Rowe
ad7167c67a
Merge branch 'master' into 20602
2015-07-23 11:22:05 -07:00
ZappoMan
f4ec09a48b
move renderLaserPointers() into a draw item
2015-07-23 10:42:22 -07:00
ZappoMan
3350d638dd
always use the _viewFrustum for caluclating the pick ray, not the _displayViewFrustum which can be the mirror
2015-07-23 09:29:27 -07:00
Brad Hefta-Gaub
a27a2f601b
Merge pull request #5395 from huffman/fix-ray-picking
...
Fix ray picking working intermittently
2015-07-23 08:15:15 -07:00
Ryan Huffman
198b6cfa88
Fix ray picking working intermittently
...
Ray picking relies on the Application's viewFrustum which was being set
to both the main camera and mirror camera for their respective pass
while rendering. This makes sure the viewFrustum only ever holds the
main camera. Application::_displayViewFrustum still gets updated to
the current camera while rendering.
2015-07-23 06:17:08 -07:00
Stephen Birarda
7cee5f3ce5
don't reset the idleTimer if the interval hasn't changed
2015-07-22 18:05:04 -07:00
Stephen Birarda
db5e8c72ee
force event processing up to a certain max time
2015-07-22 17:59:07 -07:00
Stephen Birarda
785ae190ca
add back send posted touch events
2015-07-22 17:49:27 -07:00
ZappoMan
71eeecc7f6
Revert "Instrument the inter-idle time and tweaking the timeout setting"
...
This reverts commit 0c88972f09
2015-07-22 16:53:56 -07:00
Sam Gateau
f70553ec95
Fixing merge
2015-07-22 11:31:46 -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
c0048afbec
Merge branch 'bart' into marge
2015-07-22 09:07:45 -04:00
Bradley Austin Davis
ae539afafb
Fix deadlock when using textoverlay from main thread
2015-07-22 07:23:12 -04:00
Bradley Austin Davis
fda1cb6f7b
Merge remote-tracking branch 'upstream/master' into marge
2015-07-21 08:59:29 -07:00
Brad Davis
9016f437a8
Merge pull request #5371 from Atlante45/smart_pointers
...
Smart pointers fixes
2015-07-21 08:52:29 -07:00
Brad Davis
6d4c7cd4f2
Merge pull request #5374 from ZappoMan/warningFixes
...
Warning fixes and removing dead code
2015-07-21 07:23:40 -07:00
Brad Davis
51973674f5
Merge remote-tracking branch 'upstream/master' into marge
2015-07-20 17:26:36 -07:00
Brad Davis
c3a2b72c13
Breaking framebuffer ops out of texture cache
2015-07-20 17:26:26 -07:00
David Rowe
ac4b64c853
Merge branch 'master' into 20602
2015-07-20 17:14:52 -07:00
Sam Gateau
5bf85961d2
removing dead code
2015-07-20 17:13:02 -07:00
Brad Davis
94d57a2e43
fixing missing glew init
2015-07-20 16:51:01 -07:00
Sam Gateau
9d9142c274
cleaning commented code supposedly dead now
2015-07-20 16:50:24 -07:00
Sam Gateau
6a0ca6e113
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-20 16:22:12 -07:00
Stephen Birarda
9fb8b55359
repairs to early return for sendNackPackets
2015-07-20 16:10:11 -07:00
Sam Gateau
b5090883a0
merge with latest network pr
2015-07-20 15:49:10 -07:00
David Rowe
a488a12151
Merge branch 'master' into 20602
2015-07-20 15:37:43 -07:00
Sam Gateau
59666f664a
merging my changes to remove cruff from application to AUstin;s latest
2015-07-20 15:37:17 -07:00
ZappoMan
648d0f6d43
fix a bunch of warnings
2015-07-20 15:12:27 -07:00
Atlante45
8d6ff2d9f9
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 14:50:44 -07:00
Brad Davis
c0859ffd4c
Removing some dead forward declarations
2015-07-20 14:33:10 -07:00
Andrew Meadows
7578a70c4c
Merge pull request #5359 from birarda/protocol
...
Network Protocol Refactor
2015-07-20 14:30:58 -07:00
