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
bd1a661d01
Merge pull request #5416 from ctrlaltdavid/webwindow-title
...
Add ability to update title of WebWindow after it's created
2015-07-24 08:27:54 -07: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
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
David Rowe
c1e1caa709
Add ability to update title of WebWindow after it's created
2015-07-23 21:59:19 -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
Philip Rosedale
a1544956e3
Merge pull request #5348 from ctrlaltdavid/20602
...
DO NOT MERGE - QA for #20602 - Fix and improve eye saccades
2015-07-23 17:42:24 -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
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
Sam Gondelman
7c9189cfbe
trying to fix init issue
2015-07-23 16:13:27 -07:00
Bradley Austin Davis
901dd77f05
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-23 18:11:25 -04: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
Andrew Meadows
b26f4b0c8d
fix for underdamped avatar rotation momentum
2015-07-23 14:49:15 -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
0bb3d5b5a0
disabled fullscreen, disabled sixense on mac temporarily
2015-07-23 11:51:36 -07: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
ZappoMan
720f6ec529
completely remove six sense lasers
2015-07-23 11:17:22 -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
7c4f6b665b
Use a default eye diameter for models without eyes, e.g., the masks
2015-07-23 11:04:58 -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
Bradley Austin Davis
1db4162371
Merge branch 'master' into plugins
2015-07-23 13:42:03 -04:00
Niraj Venkat
9ccf316513
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-23 10:36:46 -07:00
David Rowe
68254c1ff0
Merge branch 'master' into 20630
2015-07-23 09:46:20 -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
e729a87328
Merge pull request #5393 from ctrlaltdavid/20632
...
WL#20632 - Remove unused postLighting variable from code
2015-07-23 08:24:09 -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
ZappoMan
c2113ea96b
remove non-batch versions of GeometryCache renderXYZ() methods
2015-07-23 07:42:58 -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
David Rowe
11078d0d02
Get Developer > Avatar > Show Collision Bounding Shapes working again
...
Note: Currently doesn't display well because alpha isn't working.
2015-07-22 17:50:56 -07:00
David Rowe
3362358dcd
Remove unused postLighting variable from Avatar and MyAvatar
...
Fixes Leap and Hydra laser pointers not displaying.
Enables:
- Avatar billboard display
- Avatar collision bounding shape display
- Hand information display
2015-07-22 17:50:55 -07:00
David Rowe
b515b163fb
Remove dead code from Head
2015-07-22 17:50:54 -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
SamGondelman
e27ba86f75
fixing merge issues with plugins
2015-07-22 14:57:59 -07:00
Ryan Huffman
9e2eb7fdbd
Fix face-camera functionality for BillboardOverlay
2015-07-22 14:49:20 -07:00
SamGondelman
505ef4c5cc
set up sixense/vive menu items with correct event forwarding
2015-07-22 11:36:31 -07:00
Sam Gateau
f70553ec95
Fixing merge
2015-07-22 11:31:46 -07:00
Anthony J. Thibault
700909d537
Fix for mirror rendering
...
RenderArgs _renderMode was not getting set properly in
renderRearViewMirror(). Previously this was set in PaintGL but was lost
during display plugins refactor.
2015-07-22 11:11:12 -07:00
Bradley Austin Davis
68cf3776f0
Make stars a little smaller
2015-07-22 13:44:37 -04:00
Sam Gateau
7ac2030862
Preparing for first pr
2015-07-22 10:43:50 -07:00
Niraj Venkat
adf7a1098d
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-22 10:27:39 -07:00
Bradley Austin Davis
408bb082d7
Merge fixes, OSX compile fixes
2015-07-22 13:24:47 -04:00
David Rowe
9d33cfa965
Allow for look-at positions being not quite up to date as avatars move
...
So that looking-at-me indicators don't flicker on when they shouldn't.
2015-07-22 09:53:37 -07:00
David Rowe
e44cba500d
Guard against head model not being available yet
2015-07-22 09:52:49 -07:00
Bradley Austin Davis
114ab9e47f
Merge branch 'master' into plugins
2015-07-22 11:47:56 -04:00
Bradley Austin Davis
2f13488f11
Fixing FBO bug on resizing windows
2015-07-22 11:28:36 -04:00
Brad Hefta-Gaub
4e04f0d887
Merge pull request #5381 from jherico/bart
...
Fix deadlock when using textoverlay from main thread
2015-07-22 07:59:35 -07:00
Brad Hefta-Gaub
2bd2004bda
Merge pull request #5380 from jherico/maggie
...
Restoring starfield size and color variation
2015-07-22 07:58:15 -07:00
Bradley Austin Davis
65732d874c
Merge branch 'maggie' into marge
2015-07-22 09:07:50 -04:00
Bradley Austin Davis
c0048afbec
Merge branch 'bart' into marge
2015-07-22 09:07:45 -04:00
Bradley Austin Davis
190984657e
Merge branch 'homer' into marge
2015-07-22 09:07:33 -04:00
Bradley Austin Davis
a93e17d622
Fix domain connection status border
2015-07-22 08:27:51 -04:00
Bradley Austin Davis
9596452c32
Trying to fix oculus rendering
2015-07-22 08:07:44 -04:00
Bradley Austin Davis
ae539afafb
Fix deadlock when using textoverlay from main thread
2015-07-22 07:23:12 -04:00
David Rowe
87dbbdb2e8
Set an initial alpha in anticipation of sphere alpha working
2015-07-21 18:25:35 -07:00
David Rowe
55683e0cd5
Size looking-at-me eye spheres per avatar model dimensions
2015-07-21 18:24:47 -07:00
David Rowe
bed266dfe9
Fade looking-at-me eye spheres over half a second
2015-07-21 18:23:50 -07:00
David Rowe
9ac4e2f687
Render spheres over avatar eyes if they're looking at me
2015-07-21 18:22:27 -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
SamGondelman
e3bc4b3b89
working on plugin menu manipulation
2015-07-21 13:45:33 -07:00
Brad Hefta-Gaub
6dbe6bc375
Merge pull request #5332 from ctrlaltdavid/20612
...
Fix full-screen mirror not mirroring correctly with Faceshift or DDE
2015-07-21 13:32:56 -07:00
Niraj Venkat
e0634de403
Turn on/off debug AO from menu item
2015-07-21 12:14:09 -07:00
Sam Gateau
7b35048e52
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-21 11:18:15 -07:00
Sam Gateau
93afdf79a3
Removing the gl driver version report intiialization code out of applciation
2015-07-21 11:17:41 -07:00
Philip Rosedale
cf88bce082
Merge pull request #5367 from ctrlaltdavid/fix-speech-bubble-not-rendering
...
Fix Avatar > Blue Sphere While Speaking not rendering
2015-07-21 09:11:36 -07: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
5b63863dca
Merge pull request #5378 from ZappoMan/warningFixes
...
coding standard fix
2015-07-21 08:52:17 -07:00
David Rowe
716211c6b7
Merge branch 'master' into fix-speech-bubble-not-rendering
2015-07-21 08:45:13 -07:00
ZappoMan
558f10640b
coding standard fix
2015-07-21 08:30:33 -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
9fd80d7954
Working on batch
2015-07-20 19:21:29 -07:00
Brad Davis
5744200f64
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/MyAvatar.h
2015-07-20 19:21:02 -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
Sam Gateau
ad1771c738
removing dead code
2015-07-20 17:09:11 -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
