Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 19:08:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29956 commits 25 branches 0 tags 1.1 GiB
Commit graph

4041 commits

Author SHA1 Message Date
Brad Davis
155f88e267 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/devices/TV3DManager.h
	libraries/gpu/src/gpu/GPUConfig.h
 2015-07-31 10:28:06 -07:00
Bradley Austin Davis
ac0ec0a458 Ensure the app moves back to a non-rift screen if the saved geometry is bad 2015-07-30 17:09:08 -07:00
Brad Davis
948d5dab0c Cleaning up diff 2015-07-30 15:30:05 -07:00
Sam Gateau
14f4c9c6c0 REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend 2015-07-30 15:07:36 -07:00
Brad Davis
f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/MyAvatar.h
	tests/ui/src/main.cpp
 2015-07-30 12:55:22 -07:00
Bradley Austin Davis
fccb07dc93 Tweaking timing of geometry restoration 2015-07-30 12:44:47 -07:00
Sam Gondelman
b19376ef6e trying to fix connexion linker errors, general style fixes, renamed some files 2015-07-30 12:17:36 -07:00
Brad Davis
5878a4661c Restoring HMD tools dialog, phase 1 2015-07-30 11:35:55 -07:00
Brad Davis
382ef057b0 Revert to using QGLWidget 2015-07-30 10:59:05 -07:00
David Rowe
46b4817155 Add DDE option to couple eyelids 
Use the most "open" value for both.
 2015-07-29 20:08:58 -07:00
samcake
e32e45ed2b make sure the writting mask is on for depth buffer 2015-07-29 18:06:46 -07:00
samcake
ac46b2bd17 Keep the resetstage in 2015-07-29 17:38:23 -07:00
Sam Gateau
8b7ad9cfcb merge with upstream 2015-07-29 17:13:48 -07:00
Sam Gateau
ab4b940d83 merge with upstream 2015-07-29 17:11:13 -07:00
Sam Gondelman
9025bc3ead press o to toggle overlays in case you don't have a middle mouse click 2015-07-29 16:43:25 -07:00
David Rowe
02ae008c9c Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
 2015-07-29 16:24:30 -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
Brad Davis
900c2c11df Another whack at touch events 2015-07-29 10:29:27 -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
Brad Davis
07553e7a7c Accept touch events in the GL window 2015-07-29 10:00:41 -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
Brad Davis
bb29127eff Merge remote-tracking branch 'upstream/master' into plugins 2015-07-28 23:14:41 -07: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
Brad Davis
3210037bc1 Merge pull request #5449 from ZappoMan/plugins 
Plugins Branch - Fix a crash in pendingChanges.updateItem() for the Particle Entity
 2015-07-28 16:49:30 -07:00
Brad Davis
91768b3992 Merge pull request #5450 from SamGondelman/sam/input-plugins 
Plugins branch - re-remove hand lasers
 2015-07-28 16:25:55 -07:00
Brad Davis
8202862750 Working on display plugins stability 2015-07-28 16:22:22 -07:00
samcake
9cf3dfd3f7 test this on windows ? 2015-07-28 15:49:39 -07:00
ZappoMan
c15161b71a fix crash in Particle Entities and pendingChanges.updateItem() 2015-07-28 14:56:38 -07:00
David Rowe
f0ed8d8cef Add menu item that enables / disables simulated eye tracking 2015-07-28 14:07:25 -07:00
SamGondelman
482f064c64 Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins 2015-07-28 12:56:54 -07:00
SamGondelman
782a5c491e removed hand lasers because they had been renamed so they weren't removed 2015-07-28 12:56:31 -07:00
Bradley Austin Davis
6df260b3f9 Bad variable usage on OSX 2015-07-28 12:47:52 -07:00
Brad Davis
2bb7a20578 Working on fullscreen targeting 2015-07-28 11:30:35 -07:00
David Rowe
72a590e34c Initialize, start, and stop eye tracking with simulated data 2015-07-28 11:02:56 -07:00
Sam Gateau
22e70ee691 merged master 2015-07-28 10:13:05 -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
Sam Gateau
baf7873ce1 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2015-07-27 17:40:19 -07:00
Sam Gateau
f525a8a245 Removing all the unecessary calls of Batch from the gl legacy time 2015-07-27 17:17:56 -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
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
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
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
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
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
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