Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-14 11:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68048 commits 6 branches 1 tag 1.1 GiB
Commit graph

254 commits

Author SHA1 Message Date
samcake
3638a3b9c3 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 23:15:21 -07:00
Brad Davis
cbbb2a7975 Properly delete GL context and offscreen surfaces 2016-07-18 19:47:23 -07:00
samcake
8acc18ae8b Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-13 11:42:07 -07:00
Brad Davis
6242816f68 Adding glow to hand lasers 2016-07-12 10:10:01 -07:00
samcake
5d4b55eeea Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-12 09:19:28 -07:00
Brad Hefta-Gaub
bcee128de0 Merge pull request #6959 from Triplelexx/20769 
CR for Job #20769 - Touchscreen camera input for Interface
 2016-07-11 14:24:52 -07:00
samcake
ed67fe4051 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-08 09:04:40 -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
samcake
b37df393e2 Merging with the new GL45Backend 2016-06-29 10:40:28 -07:00
Brad Davis
ab7fed1af8 Switch back to disable GL 4.5 by default, add support for logging when enabled 2016-06-28 18:56:25 -07:00
SamGondelman
12b5cccfc7 merge from master 2016-06-28 14:05:43 -07:00
Brad Davis
8561581ab2 Merge pull request #8121 from SamGondelman/miniMirrorFix 
Mini mirror/multi-monitor bug fixes
 2016-06-27 22:04:39 -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
samcake
ec68eba3cb Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-24 09:37:52 -07:00
Triplelexx
fd4d9761ce merge master and resolve conflicts 
* remove use of jointsCaptured flag in inputDevice update, TouchscreenDevice now locks the userInputMapper * resolve conflict in Application.cpp, userInputMapper no longer loads default mapping
 2016-06-24 03:34:39 +01:00
howard-stearns
67f76db7e4 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-22 15:58:53 -07:00
SamGondelman
78a1845afe fixed resizing of qml overlays when device pixel ratio changes 2016-06-21 18:13:11 -07:00
Ryan Huffman
154ccb8932 Add glVersionToInteger to GLHelpers 2016-06-20 16:10:07 -07:00
Brad Davis
9640727f51 Hand laser rendering support in HMD plugins. 2016-06-13 13:04:11 -07:00
Brad Davis
c2aa9e7f61 Update SteamVR keyboard behavior 2016-06-07 21:52:21 -07:00
Brad Davis
eab611acc0 Enable Steam VR text input 2016-06-07 21:52:20 -07:00
samcake
75a5f6bd89 Intoducing the bluring as a separate Job reusable and the first version of curvature 2016-06-07 18:13:40 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
Bradley Austin Davis
0f768b13b9 Working on OSX Rift functionality 2016-05-07 20:17:31 -07:00
Atlante45
eb21b9c5d7 OSX warnings 2016-05-02 17:18:57 -07:00
Brad Hefta-Gaub
d88185eb6c Merge pull request #7703 from zzmp/fix/gl-qml 
Set GL in QML immediately
 2016-04-19 11:11:27 -07:00
Zach Pomerantz
62c252e8ef Set GL in QML immediately 2016-04-18 14:23:23 -07:00
Brad Davis
b50f835d35 Warning and error fixes 2016-04-17 10:22:26 -07:00
Brad Hefta-Gaub
3f05ded932 Merge pull request #7611 from zzmp/guard/amd 
Disable gradient QML items on AMD
 2016-04-12 08:32:57 -07:00
Zach Pomerantz
ab72d8d8fb Init QML GL from share context 2016-04-11 13:47:45 -07:00
Zach Pomerantz
52958ffc70 Move gl info queries to GLHelpers 2016-04-11 13:28:18 -07:00
Brad Hefta-Gaub
b758acb7d8 Merge pull request #7610 from zzmp/fix/standard-qt-gl 
Codify qt qml version in one header
 2016-04-11 09:45:21 -07:00
Brad Davis
7827c0f6f6 Suppress key release events for presses that were absorbed by QML 2016-04-08 17:09:11 -07:00
Zach Pomerantz
e08c9db469 Expose GL property to QML 2016-04-07 18:27:07 -07:00
Zach Pomerantz
be489e8728 Codify qt qml version in one header 2016-04-07 17:35:31 -07:00
Brad Davis
d98abbc7df First pass at threaded texture transfers 2016-04-04 10:23:01 -07:00
Triplelexx
11af0a421b Merge branch 'master' into 20769 2016-04-03 22:57:55 +01:00
Zach Pomerantz
530cb40528 Check for valid qml gl context creation 2016-03-30 15:11:54 -07:00
Zach Pomerantz
ad9027f9d6 Log OffscreenQml lifetime 2016-03-29 15:26:22 -07:00
Zach Pomerantz
77bb8bafbb Catch and report GL errors in QML render 2016-03-27 17:56:44 -07:00
Zach Pomerantz
b252139704 LMK when running with old GL version 2016-03-25 14:42:58 -07:00
Zach Pomerantz
1405daa4ee Add guards when checking vsync 2016-03-25 14:18:12 -07:00
Zach Pomerantz
a34e6773a9 Add messageBox for no gl support 2016-03-24 15:13:38 -07:00
Brad Davis
84dc15aff6 Fix potential deadlock in QML 2016-03-23 12:59:17 -07:00
Brad Hefta-Gaub
08b87b9b98 Merge pull request #7434 from zzmp/clean/incomplete-fbo 
Clean up QML Render Thread
 2016-03-23 10:43:21 -07:00
Zach Pomerantz
40b21933a5 Clean QML Surface render log 2016-03-22 18:42:54 -07:00
Zach Pomerantz
fe1d8b24b4 Lock the QML Surface resizing better 2016-03-22 18:42:46 -07:00
Zach Pomerantz
b41c106f3c Only set the context once per QML surface 2016-03-22 18:40:58 -07:00
Zach Pomerantz
745438148a Reset deadlock watch before qml load 2016-03-22 17:17:36 -07:00
Zach Pomerantz
e28a876629 Compare gl to GL_NO_ERROR, not GLEW_OK 2016-03-22 13:25:43 -07:00
Zach Pomerantz
471ac80135 Revert most of "Rm extra GL logging" 2016-03-22 13:24:29 -07:00
Zach Pomerantz
362e288be8 Rm mystery GL error before qml fbo 2016-03-22 12:05:24 -07:00
Zach Pomerantz
23e3b7e4e3 Rm extra GL logging 2016-03-22 12:04:58 -07:00
Zach Pomerantz
cc83a9bc36 Actually loop qml render and wake on pause 2016-03-21 14:36:45 -07:00
Zach Pomerantz
d3d0f229aa Merge branch 'master' of github.com:highfidelity/hifi into fix/qml-thread 2016-03-21 11:25:14 -07:00
Zach Pomerantz
41fcf4cc6d Forward declare qml render thread 2016-03-21 11:18:18 -07:00
Zach Pomerantz
62e635a52a Compile qml render thread on *nix 2016-03-18 18:43:59 -07:00
Zach Pomerantz
12aa057ff6 Always log if gl context fails 2016-03-18 18:37:14 -07:00
Zach Pomerantz
f987da4c43 Move qml rendering to defined thread 2016-03-18 18:10:45 -07:00
Zach Pomerantz
60f22c51b9 Check qml gl context on create 2016-03-17 16:56:23 -07:00
Bradley Austin Davis
7045680bc7 Reduce crashes on switching display plugins 2016-03-17 10:13:52 -07: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
b2be54a179 Ensure we don't get trapped in the QML rendering loop on shutdown 2016-03-09 13:45:00 -08:00
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