Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-07 08:59:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70414 commits 70 branches 57 tags 1.2 GiB
Commit graph

531 commits

Author SHA1 Message Date
Seth Alves
92e24e6ded code review 2016-11-13 16:09:57 -08:00
Seth Alves
9868ddd602 global/static QStrings in plugins appear to cause crashes during shutdown 2016-11-13 10:22:14 -08:00
Seth Alves
804f25740d these qDebugs happen too late and cause a crash 2016-11-13 10:21:27 -08:00
Brad Davis
162f24decd Add stutter tracking for Oculus 2016-11-11 10:12:41 -08:00
Brad Hefta-Gaub
2c28316e39 CR feedback 2016-10-24 20:40:43 -07:00
Brad Hefta-Gaub
ed4279783d CR feedback 2016-10-24 20:38:49 -07:00
Brad Hefta-Gaub
779f326452 cleanup 2016-10-24 15:03:41 -07:00
Brad Hefta-Gaub
a25d50387e gak 2016-10-24 14:47:10 -07:00
Brad Hefta-Gaub
0f8967970a Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 2016-10-24 08:11:31 -07:00
Brad Hefta-Gaub
a282d83546 more work on extra lasers 2016-10-24 07:46:04 -07:00
Brad Davis
861b69aa94 Add free GPU memory to the displayed stats 2016-10-23 13:07:38 -07:00
howard-stearns
0141110805 fix flicker in system (inside the hud) hand-lasers. 2016-10-20 15:42:19 -07:00
Brad Hefta-Gaub
1a28732b64 Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers 
Conflicts:
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.h
 2016-10-20 09:38:03 -07:00
Brad Hefta-Gaub
bf732127ca Merge pull request #8856 from jherico/geometry_ids 
Remove the use of implicit ids in geometry cache
 2016-10-20 08:14:49 -07:00
Anthony J. Thibault
55c062098a Adjustment to position and visibility of grab sphere. 
* The grab sphere used to detect near grabbing is now 10cm in radius instead of 4cm.
* The visual representation of this grab sphere is always hidden, by default.
* This representation can be enabled in via the "Developer > Show Grab Sphere" menu item.
 2016-10-19 17:33:05 -07:00
Anthony J. Thibault
bcd31e3d99 Adjust size and offset of grab balls to better align with hand controllers. 
(cherry picked from commit d97a8c2e7eace2494d3142e8187022a33aedc060)
 2016-10-19 15:59:26 -07:00
Brad Davis
2705ee7030 Remove the use of implicit ids in geometry cache 2016-10-19 11:18:25 -07:00
Brad Hefta-Gaub
6bd193cdd8 hacking 2016-10-18 21:33:37 -07:00
Brad Davis
46326ed27c Fix crash in switching to plugin that uses the composite framebuffer in customizeContext 2016-10-13 16:46:02 -07:00
Brad Hefta-Gaub
0e1b377227 Merge pull request #8785 from jherico/oculus_crash 
Additional plugin debugging, better plugin resource cleanup
 2016-10-13 13:54:34 -07:00
Brad Davis
28771cbda9 Additional plugin debugging, better plugin resource cleanup 2016-10-11 19:40:02 -07:00
Brad Hefta-Gaub
93d9cf7917 adjust grab indicators 2016-10-11 12:42:26 -07:00
Anthony J. Thibault
3158439cba Prevent deadlock when rapidly switching between openvr and desktop mode 2016-10-06 15:44:24 -07:00
Brad Davis
488d191428 Remove all oglplus usage and references 2016-10-02 11:44:34 -07:00
Brad Davis
265996156c Remove unused header and typedef 2016-10-01 11:39:45 -07:00
Brad Hefta-Gaub
cc8aa540b4 fix unix build 2016-09-20 15:54:57 -07:00
Brad Hefta-Gaub
52f0b5f6c8 cleanup 2016-09-20 14:06:02 -07:00
Brad Hefta-Gaub
6c68d9abb3 beter center image around center of eye 2016-09-20 14:04:51 -07:00
Brad Hefta-Gaub
73a7d1b63b redraw no-preview message if window size changes 2016-09-20 10:15:27 -07:00
Brad Hefta-Gaub
8f5c5ebf0e improved disabled preview wording 2016-09-19 18:19:35 -07:00
Brad Hefta-Gaub
09b3292f94 fix unix build 2016-09-19 16:32:36 -07:00
Brad Hefta-Gaub
8eb5f6682a cleanup code 2016-09-19 15:09:03 -07:00
Brad Hefta-Gaub
f923b2ede4 first cut at improved HMD preview 2016-09-18 20:32:23 -07:00
Seth Alves
e5e9bb0052 Merge branch 'master' of github.com:highfidelity/hifi into grab-point-adjustments 2016-09-14 11:28:10 -07:00
Brad Davis
dbedb896f8 Fix overlays when scaling resolution 2016-09-08 11:21:43 -07:00
Seth Alves
746d0cd91c get various hand lasers to all line up with grab-point sphere 2016-09-07 16:10:37 -07:00
Seth Alves
37db1cba26 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-06 09:38:44 -07:00
Seth Alves
342f7edff3 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-02 16:12:41 -07:00
Brad Davis
94210d2e69 Use dynamic count for global thread pool 2016-09-02 15:23:35 -07:00
Brad Davis
91bfa7677c Updating stats display for threaded rendering 2016-09-02 14:41:49 -07:00
Seth Alves
25f6e1d79d Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-01 15:06:52 -07:00
Stephen Birarda
7c2fea4598 remove glew/oglplus requirement for android interface 2016-08-31 11:03:53 -07:00
Seth Alves
87fbbd68ae Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-29 17:37:58 -07:00
Brad Davis
617633b85c Moving to custom context creation 2016-08-29 11:21:54 -07:00
Seth Alves
3c90413ebb don't render stray/invalid hand-lasers in HMD mode 2016-08-29 04:06:53 -07:00
Howard Stearns
89b00883dd Merge pull request #8428 from highfidelity/discovery 
Snapshot of Snapshot-Discovery to master
 2016-08-23 14:32:10 -07:00
howard-stearns
4d7d483c0e use ceil 2016-08-19 09:51:58 -07:00
howard-stearns
f6670a6374 new optional aspect-ratio argument to snapshot chain (javascript through 
c++ display plugin). When non-zero, it pulls out the largest piece from
the center that maintains that ratio.  Snapshot button uses 1.91.
 2016-08-18 16:29:42 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
howard-stearns
2ca1fda71b Re add fix for hmd after merge 2016-08-16 12:02:49 -07:00
Brad Davis
574737fbb5 More GPU api fixes, protect Buffer::flush 2016-08-12 22:29:04 -07:00
Brad Davis
d34ac2cea8 Fix hand laser alignment 2016-08-12 22:29:03 -07:00
Brad Davis
511eb34e5f Fixing mac build 2016-08-12 22:29:02 -07:00
Brad Davis
cac529a1b1 Display plugins now use gpu::Context API 2016-08-12 22:29:00 -07:00
Brad Davis
6d7edd38cc Rename clearViewTransform 2016-08-12 22:28:59 -07:00
Brad Davis
82081d7d57 Address vsync weirdness 2016-08-12 22:28:58 -07:00
Brad Davis
719e555381 Restoring reprojection to OpenVR 2016-08-12 22:28:55 -07:00
Brad Davis
029721fd45 Restore screenshot 2016-08-12 22:28:53 -07:00
Bradley Austin Davis
f65b636a09 Re-disable HMD preview on OSX 2016-08-12 22:28:52 -07:00
Bradley Austin Davis
f1fd8ac6e4 Fix OSX Oculus issues 2016-08-12 22:28:51 -07:00
Brad Davis
884ee1a68b Disable debug HMD plugin, ensure we release resources each frame 2016-08-12 22:28:45 -07:00
Bradley Austin Davis
d2fd7f88fd Enabling OSX Oculus plugin 2016-08-12 22:28:43 -07:00
Brad Davis
b12332b517 Add preview window toggle, fix cursor in HMD 2016-08-12 22:28:42 -07:00
Brad Davis
619158b6f2 Remove glfinish 2016-08-12 22:28:38 -07:00
Brad Davis
9cd1d69f1e Restoring preview and removing excessive GL state sync 2016-08-12 22:28:37 -07:00
Brad Davis
9f4fb0e8bd Stop messing about with the context, leave it bound on the render thread 2016-08-12 22:28:35 -07:00
Brad Davis
841d27ad20 Temporarily disable on-screen mirror and conform present batch to conventions 2016-08-12 22:28:34 -07:00
Brad Davis
0396694715 Fix initial state of view correction, plus overkill 2016-08-12 22:28:33 -07:00
Brad Davis
29ff401506 Fix resizing of window in 2D mode 2016-08-12 22:28:31 -07:00
Brad Davis
d8b0fee934 Fixing color balance, enabling vive controllers 2016-08-12 22:28:30 -07:00
Brad Davis
901e2da828 Hand lasers 2016-08-12 22:28:29 -07:00
Brad Davis
b10e2020a7 Don't crash on plugin switch 2016-08-12 22:28:29 -07:00
Brad Davis
c2509e9492 Working on draw crash bug, adding render thread trash handling 2016-08-12 22:28:27 -07:00
Brad Davis
09ddad0fe0 HMD compositing and buffer debugging 2016-08-12 22:28:26 -07:00
Brad Davis
2340afc48e Updating object transform code 2016-08-12 22:28:25 -07:00
Brad Davis
64ece05f40 Move compositing framebuffer to main GL plugin 2016-08-12 22:28:25 -07:00
Brad Davis
adcfd55cc0 Batch replay reprojection 2016-08-12 22:28:23 -07:00
Brad Davis
7e93747acf Working on reprojection 2016-08-12 22:28:22 -07:00
Bradley Austin Davis
cab1843eff Buffers on the render thread need special treatment 2016-08-12 22:18:40 -07:00
Bradley Austin Davis
274321de8a First pass at threaded rendering 2016-08-12 22:18:36 -07:00
Brad Davis
85b0440e32 Disable glow lines (and the use of geometry shaders) on non-Windows platforms for now 2016-07-23 11:06:33 -07:00
Brad Davis
317dee1b23 Fix decoration inflation 2016-07-15 16:15:53 -07:00
Brad Davis
6242816f68 Adding glow to hand lasers 2016-07-12 10:10:01 -07:00
Brad Davis
0efc684992 Add glow to the termination point of UI pointers 2016-07-12 10:10:00 -07:00
Brad Hefta-Gaub
abcd1e0062 Merge pull request #8164 from SamGondelman/macHMDPreview 
Added Mac preview image if VSync is enabled
 2016-07-07 09:01:40 -07:00
SamGondelman
d05a27e0e6 embed image locally 2016-07-06 17:27:53 -07:00
Brad Hefta-Gaub
372f8245e6 Merge pull request #8162 from SamGondelman/snapshotFix 
Snapshot takes picture of HMD window instead of preview
 2016-07-05 09:25:59 -07:00
SamGondelman
057fc8adce endable blending 2016-06-30 10:25:49 -07:00
SamGondelman
be102ba926 remove unused variable 2016-06-30 10:05:57 -07:00
SamGondelman
40d584021a replace old code completely, removed unnecessary blit 2016-06-29 18:09:46 -07:00
SamGondelman
335ed667bb dk2 snapshot takes picture of HMD window 2016-06-29 16:05:17 -07:00
SamGondelman
15d09bb4fa cleanup, fixed texture corruption bug 2016-06-29 13:33:33 -07:00
SamGondelman
af2a0ed924 preserve preview aspect ratio, fix device pixel ratio scaling 2016-06-29 11:02:43 -07:00
Brad Davis
21d2c977a3 Remove roll from cursor in HMD 2016-06-28 18:30:07 -07:00
SamGondelman
a741ae5069 moved _firstPreview after download 2016-06-28 17:43:15 -07:00
SamGondelman
55c5d53640 fixed signal 2016-06-28 16:58:42 -07:00
SamGondelman
a82930cb7a cleanup 2016-06-28 15:59:58 -07:00
SamGondelman
12b5cccfc7 merge from master 2016-06-28 14:05:43 -07:00
SamGondelman
8f0d966810 working on enabling preview image 2016-06-28 13:53:57 -07:00
SamGondelman
0bfe3ea817 added support for disabling vsync on macs, but doesn't work with the rift 2016-06-27 11:34:44 -07:00
Sam Gondelman
3c809ef40c Merge pull request #8123 from AlexanderOtavka/first-person-hmd 
Automatically enter first person when in HMD mode
 2016-06-24 15:58:38 -07:00
Zander Otavka
d45694836f Add signal for display mode change in HMD 2016-06-24 11:57:12 -07:00
howard-stearns
581d87d653 feedback re magic numbers and variable name. 2016-06-22 16:40:10 -07:00
howard-stearns
e4dbb5e61a Make mouse reticle be perpendicular to head. 2016-06-22 09:57:38 -07:00
howard-stearns
8421931c56 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-21 14:47:45 -07:00
Brad Hefta-Gaub
160a5de271 CR feedback 2016-06-21 12:49:42 -07:00
Brad Hefta-Gaub
c322317878 rework plugins to not depend on PluginContainer unless they want to 2016-06-21 12:07:05 -07:00
Anthony J. Thibault
e04d86a75a Change rendering of reticle when in HMD mode 
Properly take the overlay model matrix into account.
Reticle depth is now relative to the eye, not relative to the overlay sphere.
 2016-06-17 12:10:26 -07:00
Bradley Austin Davis
6ad1008a56 Allow explicit overlay alpha from scripts 2016-06-15 17:24:32 -07:00
Bradley Austin Davis
f3c47acbb2 Fix offset when UI transform is not identity 2016-06-14 09:49:25 -07:00
Howard Stearns
d05987de6d Merge pull request #8042 from jherico/lasers 
First pass prototype of laser rendering in OpenVR plugin
 2016-06-13 18:06:15 -07:00
Bradley Austin Davis
6707f889b8 Fixing laser offset, support laser in Oculus 2016-06-13 17:33:18 -07:00
Brad Davis
130c0dda31 PR feedback 2016-06-13 13:04:11 -07:00
Brad Davis
9640727f51 Hand laser rendering support in HMD plugins. 2016-06-13 13:04:11 -07:00
Anthony J. Thibault
5ef6847dc3 HMD re-centering while driving improvements. 
Previously the HUD fading in/out would also recenter the hmd sensor and the avatar, which caused many problems including:
  * The user's view could shift vertically.
  * Your avatar would briefly go into t-pose
  * other users would see your avatar go into t-pose.

Now we now move the UI sphere instead, which results in a much smoother experience.

MyAvatar: added hasDriveInput method.

OverlayConductor:
* removed avatar and sensor reset, instead the overlay's modelTransform is changed.
* revived STANDING mode, which is active if myAvatar->getClearOverlayWhenDriving() is true and you are wearing an HMD.
* SITTING & FLAT mode should be unchanged.
* Instead of using avatar velocity to fade out/fade in the hud, We use the presense or absanse of avatar drive input.
* Additionally, we check distance to the UI sphere, and quickly recenter the hud if the users head is too close to the actual hud sphere.

CompositorHelper:
* Bug fixes for ray picks not using the modelTransform.

HmdDisplayPlugin:
* Bug fixes for rendering not using the modelTransform.
 2016-06-08 18:36:36 -07:00
Brad Davis
8c13ff4ee1 Pinned UI support 2016-06-02 17:24:25 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
Brad Hefta-Gaub
757eea16a6 Merge pull request #7809 from howard-stearns/hand-controller-pointer 
Hand controller pointer
 2016-05-10 16:37:26 -07:00
howard-stearns
af8d0dc280 Fix setReticlePosition and getReticlePosition to match. 2016-05-09 11:34:52 -07:00
Bradley Austin Davis
0f768b13b9 Working on OSX Rift functionality 2016-05-07 20:17:31 -07:00
howard-stearns
acc216726a Cleanup 2016-05-03 16:32:53 -07:00
howard-stearns
fdf9c0a217 Fix offset so that non-full-size window can be located anywhere on screen. 2016-05-03 16:26:45 -07:00
Howard Stearns
773770a7fc All but origin-correction. 2016-05-03 07:01:23 -07:00
Brad Hefta-Gaub
8f3d48190a switch to QRect instead of vec4 2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub
c7f58dc17c first cut at exposing recommend overlay rectangle 2016-04-14 20:47:31 -07:00
Brad Davis
1a02220886 Fixing wobble 2016-04-12 17:50:59 -07:00
Brad Davis
3325c58ceb Vive timewarp implementation 2016-04-12 16:44:15 -07:00
Brad Davis
df8ad57185 Fix FPS counter 2016-04-11 00:25:16 -07:00
Brad Hefta-Gaub
772e7b95f6 Merge pull request #7584 from zzmp/log/dep-is-set 
Avoid warning for expected unset PresentThread
 2016-04-07 14:47:56 -07:00
Brad Hefta-Gaub
8c15116190 fix auto-hide logic in depthReticle 2016-04-06 11:00:43 -07:00
Zach Pomerantz
37efeb7f29 Avoid warning for expected unset PresentThread 2016-04-05 14:59:59 -07:00
Brad Davis
f569cbf70e Add debugging output, fix timewarp 2016-03-30 10:40:32 -07:00
Zach Pomerantz
931cad34d1 Check plugin activation success 2016-03-28 12:05:58 -07:00
Anthony J. Thibault
73725106f0 OpenGLDisplayPlugin: For non-threaded present use fetchAndReleasewithGpuWait 2016-03-23 17:13:29 -07:00
Anthony Thibault
209524a5c0 openvr: Non-threaded present work 
In the unlikely event you hit 90htz in non-threaded present mode, you will have perfect tracking and latency.
This verifies that there are no other sources of tracking or rendering latency, other then the ones we already know about.
 2016-03-22 15:38:10 -07:00
Anthony Thibault
225c462685 Improved NSIGHT instrumentation 
* Application::idle, physics and avatar processing are tracked
* Application::paintGL frameNumber payload is tracked
* OpenGLDisplayPlugin::present is profiled with corresponding frameNumber payload
* Added color and payload support to Nsight ProfileRange class.
 2016-03-21 21:47:59 -07:00
Anthony Thibault
0d046b12de OpenVR: Moved WaitGetPoses after main window preview. 2016-03-21 17:39:10 -07:00
Anthony Thibault
5b2a050df7 display-plugins: Pulled getHeadPose into common base class. 
* Moved getHeadPose and _headPoseCache out of each derived class and into HmdDisplayPlugin.
* updated comment in application.
 2016-03-20 14:08:35 -07:00
Anthony J. Thibault
d218ca4960 openvr: fix for crash on exit 
Before this fix, a script could call into HMD.getHUDLookAtPosition2D() while the app was shutting down, which in turn would call
getHeadPose() on the currently active display plugin.  This call could cause a crash within the openvr plugin, because the SDK was either shutdown, or in the process of shutting down on the main thread.

This fixes this by spliting the previous DisplayPlugin::getHeadPose(int) into two parts:

* updateHeadPose(int) which is only called once a frame and only by the main thread.
* getHeadPose() which is thread-safe and will return a cached copy of the hmd pose sampled by the last updateHeadPose.
 2016-03-18 12:26:11 -07:00
Bradley Austin Davis
7045680bc7 Reduce crashes on switching display plugins 2016-03-17 10:13:52 -07:00
Bradley Austin Davis
384351067e Don't crash when the Rift is turned off 2016-03-16 20:16:28 -07:00
Chris Collins
ae596d79f1 Merge pull request #7317 from jherico/hmd_worn 
Expose a property in display plugins to determine if the device is visible to the user
 2016-03-11 11:46:06 -08:00
Brad Davis
87c9961aa8 Expose a property in display plugins to determine if the device is visble to the user 2016-03-10 17:19:32 -08:00
Brad Hefta-Gaub
92c47fdc8b fix build buster, CR feedback 2016-03-10 16:44:59 -08:00
Brad Hefta-Gaub
387c156ce3 add failsafe for fade, so it can't endup between start and end property value 2016-03-10 16:24:30 -08:00
Brad Hefta-Gaub
9842689ec0 remove noise and return early 2016-03-10 16:19:52 -08:00
Brad Hefta-Gaub
0c12c6ef90 dont be an idiot 2016-03-10 16:14:56 -08:00
Brad Hefta-Gaub
ff30611234 first cut at getting overlays to toggle again 2016-03-10 16:07:49 -08:00
Brad Davis
f04d1b4998 Handle fake mouse events properly when triggered from a script 2016-03-09 22:11:40 -08:00
Bradley Austin Davis
7d046c30a9 Bypass baffling OSX GL error 2016-03-08 12:23:29 -08:00
Brad Davis
8988dd9771 Fix mouse drag turning 2016-03-07 17:14:44 -08:00
Brad Davis
f5acf49e47 Fix reticle transform when depth != 1 2016-03-07 17:14:42 -08:00
Brad Davis
28103cf5ef Migrate composition of the overlay and pointer to the present thread 2016-03-07 17:14:41 -08:00
Brad Hefta-Gaub
04fa37324f tweak to virtual desktop size, to make text more readable, 240d horz FOV 2016-02-19 18:24:32 -08:00
Brad Hefta-Gaub
7be5811f34 tweak to UI size, clean up screen to overlay 2016-02-19 13:22:37 -08:00
Brad Davis
8289c39a2a Removing flicker from OpenVR mirror 2016-02-17 14:48:24 -08:00
Brad Davis
d61f4fbb25 PR feedback 2016-02-16 16:44:16 -08:00
Brad Davis
56fc9ea301 Remove distortion on HMD previews, both mono and stereo 2016-02-15 21:46:29 -08:00
Brad Davis
908e153c36 Don't drop to half the vsync rate when we can't keep up 2016-02-12 15:57:27 -08:00
Brad Davis
2b127720f8 Run the present thread at highest priority 2016-02-09 09:39:33 -08:00
Brad Davis
390df78327 Make threaded present optional 2016-02-08 14:10:51 -08:00
Bradley Austin Davis
aecf582593 Don't crash on GL error in present thread 2016-02-01 18:26:32 -08:00
Brad Hefta-Gaub
c0cf717a04 CR feedback 2016-01-11 11:13:33 -08:00
Brad Hefta-Gaub
dfba05ae5f CR feedback 2016-01-11 11:07:07 -08:00
Brad Hefta-Gaub
e2a3903def add support for advanced/developer plugins and change diplay modes to match spec 2016-01-08 16:58:25 -08:00
Brad Hefta-Gaub
86691d5d0e remove vsync and framerate menus from 2d display plugin 2016-01-08 13:12:43 -08:00
Atlante45
146581714a More warning fixes 2015-12-11 16:17:41 -08:00
Atlante45
a07d7494f0 More OS X warning cleanup 2015-12-11 14:20:36 -08:00
Seth Alves
d10221f53a merge from upstream 2015-12-10 11:21:36 -08:00
Seth Alves
b4ef2b4a08 quiet some logging 2015-12-10 10:27:31 -08:00
Howard Stearns
83078b9d8c Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate 2015-12-10 08:44:08 -08:00
Bradley Austin Davis
fd5fb3096f Disabling OpenVR plugin 2015-12-09 17:31:53 -08:00
Brad Davis
978d39b7f4 Moving OpenVR to external plugin and updating to latest version 2015-12-09 16:20:24 -08:00
Howard Stearns
3b372fd897 coding standards 2015-12-09 16:12:34 -08:00
Howard Stearns
acb43e18d0 coding standards 2015-12-09 15:54:49 -08:00
Howard Stearns
dd2d040253 Merge branch 'fix-sync-period-calc' into correct-target-frame-rate 2015-12-09 15:43:43 -08:00
howard-stearns
1d65cbce88 Remove unneeded getTargetFramePeriod and isVSynchronized. 2015-12-08 18:08:57 -08:00
howard-stearns
9ae22800fe Merge branch 'fix-sync-period-calc' into correct-target-frame-rate 2015-12-08 17:32:53 -08:00
howard-stearns
32e4967ee0 cleanup 2015-12-08 16:38:05 -08:00
Bradley Austin Davis
2604b49650 Fix occasional crashes switching from the Oculus plugin 2015-12-08 15:41:30 -08:00
howard-stearns
5b41d4da1c Snapshot of "working" version. 2015-12-08 15:30:23 -08:00
Brad Hefta-Gaub
4cbbd252d5 Merge pull request #6587 from jherico/rigel 
Fix crashes on exit due to poor cleanup
 2015-12-07 18:04:52 -08:00
Bradley Austin Davis
b7aeb34a8c Fix crashes on exit due to poor cleanup 2015-12-07 17:50:08 -08:00
Howard Stearns
72ce46af59 Mac-only. 2015-12-07 11:46:36 -08:00
Howard Stearns
8666cdd689 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-render-rate 2015-12-07 11:27:30 -08:00
Atlante45
cdf621e8d0 Remove unnecessary moveToThread to remove warning 2015-12-07 09:11:41 -08:00
Howard Stearns
188c477f7e Fix render rate. 
Depending on how the threads get assigned, the actual render rate (not just the stats) could be as little as a third of what is targetted.

That's because the code was insisting on an empty texture escrow before our update/render cycle could begin, and otherwise just waits for the next whole cycle.
On my MacbookPro, this was regularly giving a render average of 20fps instead of 60.
 2015-12-05 17:32:32 -08:00
Howard Stearns
fa0ad1fe4d Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate 2015-12-04 16:12:22 -08:00
howard-stearns
0a9b42ad3c Fix present rate stats display, which was counting (roughly) twice for 2D 
display, and flickering.
 2015-12-04 15:10:46 -08:00
Brad Davis
11917ca501 Fixing preview / vsync functionality 2015-12-04 12:46:19 -08:00
Brad Davis
60aa93c38c Fixing menu items in display plugins 2015-12-04 10:28:19 -08:00
Brad Davis
7262a10e62 Refactoring present thread / GL base plugin for saner context management 2015-12-04 10:28:18 -08:00
Brad Davis
d8bb9f8d18 Fixing screenshot functionality 2015-12-04 10:28:17 -08:00
Brad Davis
b9ace94ff1 Prototyping threaded present 2015-12-04 10:28:16 -08:00
Atlante45
07387ab8c0 Fix most OpenGL warnings 2015-12-04 10:01:43 -08:00
Howard Stearns
d51785a259 Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate 2015-12-03 17:28:32 -08:00
howard-stearns
f5b25791f4 When throttling starts, we won't have noticed, so change test. 2015-12-03 13:39:41 -08:00
Howard Stearns
30bbc82c24 Restore throttling interval code. 2015-12-03 13:00:07 -08:00
Howard Stearns
a989b926b0 isVSynchronized, and proper override declarations. 2015-12-03 11:28:26 -08:00
Howard Stearns
ed86a88083 Make various forms of throttling more consistent and give it a chance of actually reaching target. 2015-12-02 21:48:06 -08:00
Howard Stearns
8ae05d8490 Plugins target frame rate and period. 2015-12-02 16:40:41 -08:00
Brad Davis
0023c034c4 Fixing naming of GL classes 2015-11-30 18:27:03 -08:00
Brad Davis
bf70ae4724 PR feedback 2015-11-06 15:59:13 -08:00
Brad Davis
7c433f47c0 Breaking up input devices and input plugins classes. 2015-11-06 15:20:00 -08:00
Brad Davis
cfb2fd1523 Support for runtime plugins (DLLs) 2015-11-01 11:12:12 -08:00
Brad Davis
3c1a0930da Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	interface/src/avatar/MyAvatar.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-10-28 13:38:22 -07:00
Brad Davis
5cbb2562cd Move GL utilities out to their own library 2015-10-27 15:53:42 -07:00
Brad Davis
80c962a4cc Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-15 12:27:53 -07:00
Brad Hefta-Gaub
c4af4c7b10 basic mono preview for the oculus display plugin 2015-10-13 17:45:29 -07:00
Brad Davis
7f8f5f66c7 Working on plugin active concept 2015-10-13 10:01:01 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Brad Davis
19fb4e92a6 Enabling programmatic access to the IPD scale 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/scripting/HMDScriptingInterface.cpp
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:08:17 -07:00
Brad Davis
8090bc8e8d Revert "Enabling programmatic access to the IPD scale" 2015-10-06 10:16:42 -07:00
Brad Davis
725ed26ac2 Enabling programmatic access to the IPD scale 2015-10-04 16:55:49 -07:00
Brad Hefta-Gaub
255689e24f add GLEW_STATIC to fix link warnings 2015-10-02 15:08:04 -07:00
Brad Davis
9b13aac37d PR comments 2015-09-29 14:23:56 -07:00
Brad Davis
7b1c04512a Adding support for accessing IPD in scripts 2015-09-28 16:24:38 -07:00
Shared Vive Room
4459708b0e Fix for getEyePose in OpenVRDisplayPlugin 2015-09-17 17:16:12 -07:00
Brad Davis
5ba6242bda Support a debug oculus plugin for performance testing 2015-09-16 19:55:57 -07:00
Sam Gateau
5410bc0945 FIx the review comment and trying to fix the simple stereo display plugin projection and eye view matrix 2015-09-15 17:48:55 -07:00
Sam Gateau
8ab96fe907 Bringin back full screen for stereo mode 2015-09-15 17:02:30 -07:00
Sam Gateau
00688172dd work in progress, gathering th eindvidual parameters of the deferred pass into a single UBO that is bound once for all the deferred lighting passes 2015-09-14 15:49:05 -07:00
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -07:00
Seth Alves
72322c0270 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-04 09:12:32 -07:00
Brad Davis
4a28361e05 Fix mirror to display on Oculus 2015-09-03 22:12:21 -07:00
Seth Alves
bb96ad1346 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-03 09:38:58 -07:00
Brad Davis
2901155a7b Fix Oculus mirroring to window 2015-09-02 18:28:44 -07:00
Brad Davis
1f83d04423 Fix oculus crash on switching display plugin to something else 2015-09-02 18:28:43 -07:00
Seth Alves
7194700c0b pull from upstream 2015-09-01 13:39:33 -07:00
Andrew Meadows
fe2d03fd37 merge 
Conflicts:
	libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
	libraries/display-plugins/src/display-plugins/stereo/StereoDisplayPlugin.cpp
	libraries/shared/src/GLMHelpers.cpp
 2015-09-01 11:17:08 -07:00
Seth Alves
64d0ce47f3 attempting to stitch polyvox entites together 2015-08-30 09:59:33 -07:00
Andrew Meadows
614fad0811 remove warnings from linux build 2015-08-27 19:12:25 -07:00
Stephen Birarda
c5c73b7809 remove _ipd variable from OculusLegacyDisplayPlugin 2015-08-27 18:26:55 -07:00
Stephen Birarda
f7d32add0c wrap OVR variables in ifdef for MAJOR_VERSION >= 6 2015-08-27 18:26:55 -07:00
Stephen Birarda
1d6f43e0d0 cleaned up some warnings 2015-08-27 18:26:55 -07:00
Brad Davis
270f2f7a3b Fixing framerate limit, moving vsync to 2d plugin 2015-08-26 15:47:45 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Brad Davis
f176003dad Fixing aspect ratio on stereo plugins 2015-08-25 19:05:31 -07:00
Brad Davis
380b0cb23c Removing tabs from our javascript and C++ 2015-08-24 15:26:46 -07:00
Brad Davis
d3135dcfa6 Stereo rendering work 2015-08-22 16:15:10 -07:00
ZappoMan
270463fc4e restore new oculus detect code from master 2015-08-21 09:29:25 -07:00
Brad Davis
cc037c8828 Fix culling calculations in HMD with new stereo mechanism 2015-08-21 00:29:27 -07:00
ZappoMan
62e8ec3fdf add fullscreen menu item and rename side by side stereo plugin 2015-08-21 00:29:26 -07:00
Brad Davis
7fb491e48c Cleanup plugin interface, break up oculus plugins 2015-08-21 00:29:25 -07:00
Brad Davis
76f236adf6 New stereo rendering implementation 2015-08-21 00:29:24 -07:00
Brad Davis
8c7711168c Merge pull request #5603 from sethalves/linux-memory-debugger 
memory debugging on linux
 2015-08-20 19:19:24 -07:00
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Brad Davis
002aea3333 Add fullscreen menu item to 2D display plugin 2015-08-20 00:30:44 -07:00
ZappoMan
6a7f367e5f fix throttled rendering for the 2D display plugin 2015-08-19 21:11:48 -07:00
Brad Davis
3595f6a8a0 Fixing bad success macro for the Oculus SDK on windows 2015-08-11 14:06:35 -07:00