Brad Davis
2bb7a20578
Working on fullscreen targeting
2015-07-28 11:30:35 -07:00
Sam Gondelman
469696f283
Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins
2015-07-28 10:06:42 -07:00
Brad Davis
a049b14d13
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-28 10:04:19 -07:00
Brad Hefta-Gaub
43eec08514
Merge pull request #5376 from venkatn93/avatar
...
New ambient occlusion effect in render pipeline
2015-07-28 09:58:51 -07:00
David Rowe
8a7cdb1c64
Make Throttle FPS If Not Focus be enabled by default
2015-07-27 19:53:38 -07:00
Niraj Venkat
34e400ac67
Changing var name to 'DebugAmbientOcclusion'
2015-07-27 17:14:09 -07:00
Sam Gondelman
b2e18b529b
toggle overlay with mouse middle click, controller 'right click'
2015-07-27 10:09:59 -07:00
Stephen Birarda
d3c6d8b3cc
move call to get VoxelPositionSize inside debug that uses it
2015-07-27 10:06:34 -07:00
Stephen Birarda
615218c77d
use a ref in stats unpacking
2015-07-27 09:58:58 -07:00
Stephen Birarda
9c57d1544f
fix OctreeSceneStat unpacking in Application
2015-07-27 09:53:27 -07:00
Niraj Venkat
83e0856279
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-27 09:20:19 -07:00
Bradley Austin Davis
0cbc12af8b
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-27 10:15:10 -04:00
Seth Alves
24fff719c5
quiet compiler
2015-07-25 21:11:23 -07:00
Bradley Austin Davis
7edf138843
Attempting to fix offscreen UI event handling
2015-07-25 19:26:38 -04:00
Sam Gondelman
f801471dd7
remove unnecessary line
2015-07-24 17:33:06 -07:00
Sam Gondelman
1af51572af
fixed init crash if you follow very specific startup steps
2015-07-24 17:10:39 -07:00
Sam Gondelman
0e4d065cbc
Merge remote-tracking branch 'upstream/plugins' into macPluginsFix
2015-07-24 16:52:16 -07:00
Brad Davis
dc4ef8e648
Merge pull request #5426 from hyperlogic/ajt/vive-camera-fix
...
paintGL camera change for Vive
2015-07-24 18:43:34 -04:00
Sam Gondelman
07aed20280
paintGL camera change for Vive
...
During rendering the application camera needs to be somewhere near where it's final position.
This is because it is used in several places, specifically it is used to determine if the camera is close
to the avatar's head, in order to hide it.
2015-07-24 15:37:39 -07:00
Bradley Austin Davis
0efa2c0eee
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-24 17:33:24 -04:00
Niraj Venkat
fc612ab8cd
Merge conflict fix
2015-07-24 11:29:52 -07:00
Niraj Venkat
e036602726
Fixing merge conflicts
2015-07-24 11:08:40 -07:00
Bradley Austin Davis
975c95eded
Merge remote-tracking branch 'tony/ajt/overlay-fade' into plugins
2015-07-24 13:59:11 -04:00
samcake
f3dc159e33
Merge pull request #5401 from ZappoMan/renderLaserPointers
...
remove renderLaserPointers()
2015-07-24 10:41:32 -07:00
Bradley Austin Davis
a60e669d3d
Merge branch 'master' into plugins
2015-07-24 13:38:18 -04: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
Anthony J. Thibault
87a0e48d30
Updates to overlay fade
...
* vive rendering works again
* overlay fades away in standing mode, if you look or move away from the overlay sphere.
* middle mouse button can be used to fade in or out the overlay
* mouse pointer renders properly on overlay
2015-07-23 20:36:58 -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
Anthony J. Thibault
1d93abf90c
Overlay can be shown and hidden and has better behavior in Standing HMD Mode.
...
Added OverlayConductor class that "orchestrates" Overlays, ApplicationCompositor & AppliationOverlay instances
so that the overlay can be smoothly animated on and off, mouse/key events are blocked when overlay is disabled.
2015-07-23 17:17:03 -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 Gondelman
7c9189cfbe
trying to fix init issue
2015-07-23 16:13:27 -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
Bradley Austin Davis
00342d2c76
Fixing the avatar / HMD pose compisition for Oculus
2015-07-23 17:48:06 -04:00
Bradley Austin Davis
4ad72be0c7
Merge remote-tracking branch 'sam2/sam/input-plugins' into plugins
2015-07-23 15:40:22 -04:00
Bradley Austin Davis
96a52c4f02
Working on mac oculus functionality
2015-07-23 15:38:23 -04:00
Sam Gondelman
4c6783a791
Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins
2015-07-23 11:46:07 -07:00
David Rowe
ad7167c67a
Merge branch 'master' into 20602
2015-07-23 11:22:05 -07:00
Bradley Austin Davis
40485948f9
Fixing merge boo-boos
2015-07-23 13:49:17 -04:00
ZappoMan
f4ec09a48b
move renderLaserPointers() into a draw item
2015-07-23 10:42:22 -07:00
