Commit graph

289 commits

Author SHA1 Message Date
Bradley Austin Davis
7d046c30a9 Bypass baffling OSX GL error 2016-03-08 12:23:29 -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 Davis
b4a7dc113e Safer shutdown behavior in QML surfaces 2016-02-22 14:25:30 -08:00
Triplelexx
949eab62ec Merge remote-tracking branch 'refs/remotes/highfidelity/master' into 20769
# Conflicts:
#	libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp

removed deviceID
2016-02-21 22:04:14 +00:00
Brad Davis
64ec56bf89 Guards and warnings in QML rendering 2016-02-19 15:36:51 -08:00
Triplelexx
087e2e7f66 revise touchscreen camera control manipulation
Touchscreen camera control is now via a touchscreen device. Input must
be enabled with the menu option. Currently supports dragging and
gesturing to control avatar camera. Gesturing is handled by integration
of the Qt implementation.
2016-02-19 13:47:28 +00:00
Brad Davis
a4f2fc58fd Ensure the QML content gets destroyed on deletion of a QML surface 2016-02-10 11:27:18 -08:00
Bradley Austin Davis
ebf0bf394a Fix native text rendering by forcing positions to integer values 2016-02-05 11:43:31 -08:00
Atlante45
ad215f23c6 Deactivate SSBOs for now 2016-02-01 22:41:01 +01:00
Atlante45
52885545ea Use feature name for ifdef 2016-02-01 18:50:01 +01:00
David Rowe
6232a83f43 Specify minimum OpenGL version in gl library's config
Note: Defines minimum OpenGL version as 4.1 in anticipation of Interface
soon properly supporting both 4.1 and 4.3 on Windows.
2016-01-29 13:03:54 +13:00
David Rowe
2020514974 Move OpenGLVersionChecker to gl library 2016-01-29 12:29:21 +13:00
Brad Davis
cea57a111b Desktop cleanup 2016-01-26 16:56:33 -08:00
Brad Davis
d2900200a1 More cleanup & menu fixing 2016-01-20 11:23:56 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
Brad Davis
660304a0a3 Stop QML hanging the app on shutdown 2016-01-07 12:25:25 -08:00
Brad Davis
a0196f0cde Ensure we don't hang if the QML thread doesn't shutdown 2015-12-31 15:23:39 -08:00
Brad Davis
462cc325e5 Cleanup, moving some QML objects to OffscreenUI 2015-12-31 12:39:56 -08:00
Brad Davis
6098c4a1d6 Revert "Revert "Migrate QML based web views to Qt WebEngine""
This reverts commit 1f3adeb666.
2015-12-18 17:18:46 -08:00
Brad Davis
1f3adeb666 Revert "Migrate QML based web views to Qt WebEngine" 2015-12-18 17:09:38 -08:00
Brad Davis
88b88a3306 Fixing warnings 2015-12-18 14:32:35 -08:00
Brad Davis
fa5bab08b1 Support web content inside QML 2015-12-16 16:25:38 -08:00
Atlante45
d9583064f1 Move QOpenGL wrappers to the gl lib 2015-12-11 16:31:27 -08:00
Atlante45
9e51947c25 More warning fixes 2015-12-11 16:31:27 -08:00
Bradley Austin Davis
04b8251a83 Refactoring escrow due to long unsignaled syncs reported by Philip 2015-12-11 15:05:38 -08:00
Bradley Austin Davis
ae1345bb13 Adding nsight instrumenting to the QML render thread 2015-12-11 11:00:33 -08:00
Bradley Austin Davis
265bd8ee67 Moving QML rendering off the main thread 2015-12-11 10:28:31 -08:00
Bradley Austin Davis
b7aeb34a8c Fix crashes on exit due to poor cleanup 2015-12-07 17:50:08 -08:00
Brad Davis
11917ca501 Fixing preview / vsync functionality 2015-12-04 12:46:19 -08:00
Brad Davis
b9ace94ff1 Prototyping threaded present 2015-12-04 10:28:16 -08:00
Brad Davis
cc80dfb9e1 Fixing case on gl surface format helper 2015-12-03 13:08:26 -08:00
Brad Davis
0023c034c4 Fixing naming of GL classes 2015-11-30 18:27:03 -08:00
Brad Davis
a94b6667b1 Moving most of GLCanvas to gl library 2015-11-30 17:19:42 -08:00
Brad Davis
cb26fc67fc Move recording interface back to float/seconds 2015-11-16 14:44:22 -08:00
Seth Alves
c381da24a7 get interface building on my linux box 2015-11-02 10:42:06 -08:00
Brad Davis
49e7d42c2c Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-30 10:07:40 -07:00
Brad Hefta-Gaub
a149a2dd60 fix some warnings 2015-10-30 00:19:14 -07: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