Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 16:42:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36314 commits 71 branches 56 tags 1.2 GiB
Commit graph

165 commits

Author SHA1 Message Date
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