Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 01:16:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41398 commits 25 branches 0 tags 1.1 GiB
Commit graph

199 commits

Author SHA1 Message Date
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
Bradley Austin Davis
bfd0362bd8 Fixing mac build 2015-08-08 18:00:08 -07:00
Brad Davis
5515b9d8ee Decouple Application and plugin definitions, cleanup container usage 2015-08-08 17:51:16 -07:00
Brad Davis
ba498e8f33 Fixing plugin construction after removing OVR dependency from interface 2015-08-08 14:02:26 -07:00
Bradley Austin Davis
d415ee1f2e Case sensitivity breaking ubuntu 2015-08-04 01:08:52 -07:00
Bradley Austin Davis
29c9e6e45e Updating plugins to core profile 2015-08-04 00:33:03 -07:00
Bradley Austin Davis
f3e701e0d5 Don't allow leaving VR mode to target the rift 2015-07-30 17:40:02 -07:00
Bradley Austin Davis
a260be9a4d HMDTools dialog restoration phase 2, electric boogaloo 2015-07-30 12:25:21 -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
Bradley Austin Davis
80ee31edd9 Address crashes on exit 2015-07-29 11:00:00 -07:00
Brad Davis
8202862750 Working on display plugins stability 2015-07-28 16:22:22 -07:00
Bradley Austin Davis
108be1c7ab Fixing proprocessor usage 2015-07-27 10:30:08 -04:00
Bradley Austin Davis
18d4575831 Missed saving some files 2015-07-27 10:15:20 -04:00
Bradley Austin Davis
6d8adbf2b5 Make OpenVR windows only for now 2015-07-27 09:13:04 -04:00
Bradley Austin Davis
7edf138843 Attempting to fix offscreen UI event handling 2015-07-25 19:26:38 -04:00
Sam Gondelman
0aee95fe38 oculus sdk initialization done in activate/deactivate, not init/deinit 2015-07-24 17:44:20 -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
Bradley Austin Davis
08a1c6c5ab Removing dead code 2015-07-24 17:33:41 -04: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
Sam Gondelman
7c9189cfbe trying to fix init issue 2015-07-23 16:13:27 -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
3d2139691c Removing some debug code from OSX Oculus plugin 2015-07-23 16:37:27 -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
SamGondelman
fe632e13b2 trying to reenable fullscreen 2015-07-22 17:58:22 -07:00
SamGondelman
2f210be468 setting up 2d display fullscreen option 2015-07-22 12:23:05 -07:00
SamGondelman
8833d7b67e OpenVR display mode will automatically switch you to standing mode on activation, switch off on deactivation 2015-07-22 11:47:00 -07:00
SamGondelman
e3bc4b3b89 working on plugin menu manipulation 2015-07-21 13:45:33 -07:00
SamGondelman
d985d0293a correcting comments, removing dead code + back slash 2015-07-20 16:48:53 -07:00
Anthony J. Thibault
80dea6831c Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 
Conflicts:
	interface/src/Application.cpp
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
 2015-07-20 15:18:23 -07:00