David Rowe
02ae008c9c
Merge branch 'master' into 20639
...
Conflicts:
interface/CMakeLists.txt
2015-07-29 16:24:30 -07:00
David Rowe
212327dd46
Fix eye tracker conditional compile
2015-07-29 16:20:45 -07:00
David Rowe
f2ae7bfac0
Don't apply saccades to tracked eyes
2015-07-29 15:14:43 -07:00
David Rowe
ed259e6bbb
Merge branch 'master' into 20639
2015-07-29 11:44:58 -07:00
David Rowe
e5d2a78980
Don't check SMI Eye Tracker menu item if tracking doesn't start
2015-07-29 11:33:21 -07:00
samcake
4ebc75da1f
Merge pull request #5369 from ericrius1/hitEffect
...
Added functionality for displaying a screen-space hit effect
2015-07-29 11:28:08 -07:00
David Rowe
76fe0c8764
Control eyes only if in HMD view or simulating
2015-07-29 11:14:00 -07:00
Andrew Meadows
a1e6fdc4b2
Merge pull request #5435 from MarcelEdward/hifi-2-20069
...
Hifi 2 20069
2015-07-29 11:13:30 -07:00
ericrius1
697cb4c9d0
fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine
2015-07-29 10:02:06 -07:00
David Rowe
1ae920368d
Calculate and look at the point the eye tracker user is looking at
2015-07-29 08:38:20 -07:00
Marcel Verhagen
1d29fb9d7f
replace tabs with whitespaces.
2015-07-29 14:56:24 +02:00
Anthony J. Thibault
044ea2ace5
Changed mirror position to not be achored to the head.
...
But instead it's anchored to the "default" eye position, which
is where the eyes are in the model, before IK or animations occur.
2015-07-28 19:31:43 -07:00
David Rowe
8f0663841c
Provide more user-friendly eye tracking error messages
2015-07-28 14:09:19 -07:00
David Rowe
f0ed8d8cef
Add menu item that enables / disables simulated eye tracking
2015-07-28 14:07:25 -07:00
Marcel Verhagen
34d63cdb43
Removed double ""
2015-07-28 22:02:36 +02:00
David Rowe
72a590e34c
Initialize, start, and stop eye tracking with simulated data
2015-07-28 11:02:56 -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
David Rowe
e0ca6eb5ed
Add eye tracker class and menu item
2015-07-27 15:33:15 -07:00
David Rowe
70d155048f
Add SMI iViewHMD eye tracking as an optional library
2015-07-27 14:43:32 -07:00
Stephen Birarda
d3c6d8b3cc
move call to get VoxelPositionSize inside debug that uses it
2015-07-27 10:06:34 -07:00
Marcel Verhagen
32d0513962
The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351
...
For now without a merge conflict.
Updated the menu name.
Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
2015-07-27 19:04:49 +02: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
Brad Hefta-Gaub
a9d5723eb3
Merge pull request #5410 from kevinmthomas-carpool/20618
...
CR for Job #20618 - Move Reload Content item to Developer menu.
2015-07-26 21:54:55 -07:00
Seth Alves
24fff719c5
quiet compiler
2015-07-25 21:11:23 -07:00
Brad Davis
f66492b444
Merge pull request #5422 from ctrlaltdavid/20591
...
CR for 20591 - Fix setting WebWindow's width and height
2015-07-25 11:49:53 -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
Kevin M. Thomas
67c9a33cc0
Update Menu.cpp
2015-07-24 15:16:02 -04:00
Kevin M. Thomas
5f7fe30b9b
Merge branch 'master' of https://github.com/highfidelity/hifi into 20618
...
# Conflicts:
# interface/src/Menu.cpp
2015-07-24 15:10:34 -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
David Rowe
3893add148
Fix setting WebWindow's width and height
...
Width and height parameters now set the WebWindow's width and height
instead of its minimum size, when not part of a tool window.
2015-07-24 10:43:24 -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
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
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
