Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-06 22:33:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87168 commits 25 branches 0 tags 1.1 GiB
Commit graph

2050 commits

Author SHA1 Message Date
Andrzej Kapolka
f707719f4e Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus 2014-04-09 15:34:29 -07:00
Andrzej Kapolka
ef8eb00778 Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus 2014-04-09 15:23:11 -07:00
Stephen Birarda
c208af2246 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 15:10:48 -07:00
Stephen Birarda
3f84f36d60 add proper boilerplate to GnuTLS find module 2014-04-09 15:00:57 -07:00
Stephen Birarda
d4f2c9e631 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-09 14:40:14 -07:00
Stephen Birarda
6ce5a24460 missed copyright cleanups in apache header 2014-04-09 09:44:38 -07:00
Stephen Birarda
fbd2066b0c more apache licensing for cmake files 2014-04-09 09:25:34 -07:00
Stephen Birarda
ff9fd2d8e9 tweak headers in cmake find modules 2014-04-08 17:49:30 -07:00
Andrzej Kapolka
98011da1ef Starting on Faceplus integration. 2014-04-08 17:07:45 -07:00
Jeroen Baert
d2800ccd55 For some GLEW distributions, it's just lib 2014-04-03 11:52:13 +01:00
Stephen Birarda
6c08e2a407 add option for domain-server to enforce DTLS 2014-03-31 15:06:58 -07:00
Stephen Birarda
dc38b27485 using GnuTLS read self-signed key and cert on DS load 2014-03-31 12:31:34 -07:00
Stephen Birarda
9ae06913a0 remove QCA which only supports DTLS v1 2014-03-31 09:45:19 -07:00
Stephen Birarda
89aeb034d1 add find module for QCA and link to interface and DS 2014-03-28 15:22:44 -07:00
Dimitar Dobrev
f427f524bf Patched the Qt CMake function for auto-translations so that *.ts files 
are not deleted on clean.
 2014-03-12 01:24:31 +02:00
Dimitar Dobrev
e10dacdbfe Changed the searcning for qxmpp to include debug libraries as well. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
86643803cf Moved the connection and configuration of XMPP to the log-in process. 2014-03-12 01:24:30 +02:00
Dimitar Dobrev
1c2e752f3c Integrated QXmpp in the build system. 2014-03-12 01:16:10 +02:00
Stephen Birarda
002738037c only look for the 32-bit oculus lib on windows 2014-03-10 09:28:20 -07:00
Stephen Birarda
4e382099fb have FindGLEW only look for 32-bit static lib 2014-03-10 09:27:32 -07:00
Stephen Birarda
6d5515a41d clarify that Windows builds are 32-bit, fix double GLEW_STATIC 2014-03-10 09:27:01 -07:00
ZappoMan
9c93149bd7 fix searching for sixense SDK on windows 2014-03-08 18:46:36 -08:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
Stephen Birarda
6f81803a3d don't have GLUT find module look for the DLL 2014-03-07 14:47:24 -08:00
Stephen Birarda
a72cac8c9c default to using Release LibOVR, include instructions for OS X rebuild 2014-03-07 14:31:59 -08:00
Stephen Birarda
03a9d6c02d glut dll search is for path, not library 2014-03-07 14:14:15 -08:00
Stephen Birarda
720846fa62 fix FindGLUT to get path to GLUT dll 2014-03-07 14:11:45 -08:00
Stephen Birarda
b8a03cf0f4 glew to be linked statically so dll not required at runtime 2014-03-07 14:08:30 -08:00
Stephen Birarda
1bd3529395 more module fixes and sixense readme change for OS X dylib 2014-03-07 13:59:50 -08:00
Stephen Birarda
569dd694fe cmake styling cleanup in Visage find module and interface CMakeLists 2014-03-07 13:42:13 -08:00
Stephen Birarda
23249866f7 have cmake copy dlls for glut and glew beside executable 2014-03-07 13:41:00 -08:00
Stephen Birarda
5452b81d58 use a path suffix in GLEW finder to get correct dir 2014-03-07 12:24:03 -08:00
Stephen Birarda
e3363dd304 conditionally include the OPENGL_INCLUDE_DIR since it is empty on windows 2014-03-07 12:22:58 -08:00
Stephen Birarda
01f155a103 use a PATH_SUFFIXES command in freeglut path find 2014-03-07 12:21:16 -08:00
Stephen Birarda
9db4b803c6 print out the GLUT include dir from GLUT find module 2014-03-07 12:18:39 -08:00
Stephen Birarda
1ec48b5999 fix a dumb elseif in custom find glut module 2014-03-07 12:16:09 -08:00
Stephen Birarda
a9c277312c don't mark useful variables as advanced 2014-03-07 12:11:46 -08:00
Stephen Birarda
dbf8021ccd include GLUT and OpenGL dirs as system includes 2014-03-07 12:07:19 -08:00
Stephen Birarda
20dd5d6e8d cmake file standardization in Sixense find module 2014-03-07 11:58:51 -08:00
Stephen Birarda
0ec0a87849 tweaks to GLEW and freeglut find modules 2014-03-07 11:57:20 -08:00
Stephen Birarda
bcaaa56b3d cleanup in GLUT find module 2014-03-07 11:51:35 -08:00
Stephen Birarda
3b9ae75162 make FindGLUT error if it is not found 2014-03-07 11:50:09 -08:00
Stephen Birarda
638d079c0c more module cleanup and simplification 2014-03-07 11:47:46 -08:00
Stephen Birarda
46e575838b simplify GLEW find module for Win32 2014-03-07 11:45:05 -08:00
Stephen Birarda
af18840c4e simplify GLUT find module for Win32 2014-03-07 11:41:40 -08:00
Stephen Birarda
30e0cbe639 fix arch dir for Win32 in GLEW module 2014-03-07 11:36:33 -08:00
Stephen Birarda
42addd4ed4 more GLUT module cleanup 2014-03-07 11:33:47 -08:00
Stephen Birarda
45ff1e4055 more cmake styling and module cleanup 2014-03-07 11:31:46 -08:00
Stephen Birarda
40bd46c782 cmake styling cleanup and glew module fixes 2014-03-07 11:21:36 -08:00
Stephen Birarda
8ba82649df pick the correct arch for GLEW on windows 2014-03-07 10:57:11 -08:00
Stephen Birarda
c3ebd83ae7 repair the glut find module to check include for header 2014-03-07 10:45:18 -08:00
Stephen Birarda
b56d995cf2 have the FindGLM module check HIFI_LIB_DIR 2014-03-07 10:42:21 -08:00
Stephen Birarda
3dc41bc19b fix the Sixense and LibOVR find modules 2014-03-07 10:20:19 -08:00
Stephen Birarda
aef15b86bf also look in HIFI_LIB_DIR for oculus lib 2014-03-07 10:03:16 -08:00
Stephen Birarda
3b06bbd88d move sixense directory to lowercase, have find module look in env dir 2014-03-07 09:59:24 -08:00
Stephen Birarda
a364655f63 Merge branch 'master' of https://github.com/highfidelity/hifi into cleanup-externals 2014-03-07 09:40:50 -08:00
Stephen Birarda
0bf0edc0f0 look in {HIFI_LIB_DIR}/glm for glm on windows 2014-03-06 17:53:51 -08:00
Stephen Birarda
b91a55d89d tweak the GLEW and glut modules to be more hifi specific 2014-03-06 17:53:07 -08:00
Stephen Birarda
594d43db84 add a find module for glew and tweak glm module 2014-03-06 17:41:14 -08:00
Stephen Birarda
636d12510c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-06 14:45:02 -08:00
Stephen Birarda
031c553a8d find LibOVR depending on architecure and build type on Linux and Win 2014-03-06 14:31:26 -08:00
Stephen Birarda
816a631b05 tweak the oculus find module to take copied-in folders 2014-03-06 14:16:38 -08:00
Stephen Birarda
7451cfe130 remove glm so it is referenced only externally 2014-03-04 15:19:47 -08:00
Stephen Birarda
cade36356d some more string quoting in cmake files 2014-03-03 16:38:39 -08:00
Andrzej Kapolka
3c4d2aa199 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-19 10:29:57 -08:00
Andrzej Kapolka
1d7f1afa5b Merge branch 'master' of https://github.com/highfidelity/hifi into kissage 2014-02-17 21:48:21 -08:00
Andrzej Kapolka
5b1229e1d0 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-14 15:49:36 -08:00
Andrzej Kapolka
bb56e2847f Global edits, edits use virtual function. 2014-02-12 20:00:07 -08:00
Andrzej Kapolka
8206f8d2b3 Fixes for Windows. Compiles, but the license doesn't work yet. 2014-02-11 19:00:41 -08:00
Andrzej Kapolka
87f7e2465f Missed a spot. 2014-02-11 17:25:25 -08:00
Andrzej Kapolka
a9b415b0f9 More build settings. 2014-02-11 17:22:40 -08:00
Andrzej Kapolka
b3fba320fc We need the dependencies, too. 2014-02-11 17:03:24 -08:00
Andrzej Kapolka
25066f8b4f Starting on Visage integration. 2014-02-11 16:44:25 -08:00
Andrzej Kapolka
78e15e0212 Starting on Visage support. 2014-02-11 16:03:23 -08:00
stojce
7fc66392cc Interface OS X hifi URL scheme 2014-02-08 12:04:55 +01:00
Andrzej Kapolka
7f20750e80 Working on sending edits. 2014-01-24 16:03:25 -08:00
Stephen Birarda
495d227950 remove Faceshift here report, Quazip find module 2014-01-16 14:18:27 -08:00
Stephen Birarda
323aa18c0e remove MotionDriver and pthread libraries 2014-01-16 14:16:38 -08:00
Andrzej Kapolka
865b495e6c Merge branch 'master' of https://github.com/worklist/hifi into debone 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Menu.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Webcam.cpp
	interface/src/devices/Webcam.h
	interface/src/renderer/FBXReader.cpp
 2014-01-16 13:35:03 -08:00
Brad Hefta-Gaub
35016c7d69 make faceshift compile sources on windows to address linker error 2014-01-14 10:20:27 -08:00
Brad Hefta-Gaub
b3e3bcbe1b adding more opencv libraries and fix cmake for opencv and faceshift for windows 2014-01-13 20:12:31 -08:00
Brad Hefta-Gaub
7234b9ca4a try to get this to work 2014-01-10 22:58:32 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
Stephen Birarda
133ba3a230 remove Leap integration from CMakeLists 2014-01-06 11:13:19 -08:00
Andrzej Kapolka
0a56f54675 Tiny fix for CMake caching on Linux/LibOVR. 2013-12-11 10:48:17 -08:00
Stephen Birarda
146d5294a0 more PortAudio cleanup in cmake 2013-12-05 16:51:04 -08:00
Stephen Birarda
40a1517108 remove PortAudio entirely 2013-12-03 12:38:26 -08:00
Andrzej Kapolka
0e0685af04 New Oculus software with Linux support. 2013-11-25 17:30:51 -08:00
Andrzej Kapolka
0231ed133c Optional compilation for Sixense. 2013-11-18 12:09:52 -08:00
Andrzej Kapolka
9c401607b1 Missed the actual files. 2013-11-15 18:47:25 -08:00
Stephen Birarda
cb2cb05688 remove the STK library as it is no longer needed 2013-10-21 16:32:32 -07:00
Stephen Birarda
2ec42a2a5d revise linkage of civetweb for both DS and VS 2013-10-15 14:24:54 -07:00
Stephen Birarda
41e1ec180c add a JSON endpoint for current assignments 2013-10-15 13:45:40 -07:00
Stephen Birarda
17fda717fe move audio and avatar classes into assignment-client target 2013-09-17 11:04:46 -07:00
Stephen Birarda
d412e0611d Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-06 11:04:18 -07:00
Stephen Birarda
8dad031c9a add mongoose for demo webserver for DS 2013-09-05 15:27:34 -07:00
Andrzej Kapolka
213a8fcd63 Working on Faceshift integration. 2013-09-03 11:52:32 -07:00
Stephen Birarda
23152abce7 suppress warnings for glm headers that pop up in Xcode 5 2013-08-14 15:34:57 -07:00
Stephen Birarda
9f2b2d09a9 changes to CMakeLists for Qt5 2013-07-24 11:29:12 -07:00
Stephen Birarda
a8afaea542 switch to new qt5 find module setup 2013-07-23 20:49:08 -07:00
Stephen Birarda
e4169665a9 changes to CMakeLists to up to qt5 2013-07-23 20:28:11 -07:00
Andrzej Kapolka
b5a8c2710c Merge branch 'master' of https://github.com/worklist/hifi into pointy 
Conflicts:
	interface/src/Application.h
	interface/src/Audio.h
	interface/src/Webcam.cpp
 2013-07-18 18:09:57 -07:00
Andrzej Kapolka
640ecd7f94 Working on integrating LibVPX for VP8 (9?) encoding. 2013-07-17 11:33:36 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
Andrzej Kapolka
a116f5a636 Use InvenSense code to handle the rather complicated business of talking the 
sensor into giving us the compass reading.  We're getting it now, but I still
have to figure out how to incorporate it.
 2013-07-09 17:28:23 -07:00
Andrzej Kapolka
7a65ebbba3 Remove Freenect/LibUSB bits. 2013-07-05 22:17:59 -07:00
Andrzej Kapolka
e866c22518 Merge branch 'master' of https://github.com/worklist/hifi into kinected 
Conflicts:
	interface/src/Avatar.cpp
 2013-07-03 10:15:11 -07:00
Stephen Birarda
1993601389 don't link a NOTFOUND leap library 2013-07-02 15:27:30 -07:00
Andrzej Kapolka
182f4e70af More work on skeleton tracking. 2013-07-01 15:01:36 -07:00
Andrzej Kapolka
4e9595f794 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-01 09:49:01 -07:00
Andrzej Kapolka
ea9566596a Build OpenNI/NITE into interface if available. 2013-06-28 16:47:08 -07:00
Andrzej Kapolka
884f14dca1 Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-06-28 16:06:58 -07:00
Andrzej Kapolka
f83c16e578 Goodbye, skeltrack. You won't be missed. 2013-06-28 12:27:50 -07:00
Stephen Birarda
73a8882a9e resolve conflicts on merge with upstream master 2013-06-27 15:22:21 -07:00
Eric Johnston
b4f5df17ab (re-commit) Added support for Leap finger-sensing device. 
Note that the actual Leap SDK can't be in the repo for IP reasons, so there's a stub-version of the header. When the actual SDK is put into the Leap folder, cake will find it automatically and switch over.
 2013-06-27 10:54:36 -07:00
Stephen Birarda
59a9fc8eff remove the Speex library 2013-06-26 16:08:03 -07:00
Stephen Birarda
8f0478551b add the quazip library and a find module 2013-06-25 16:44:11 -07:00
Andrzej Kapolka
1d578d5b0e Lots of Kinect bits. 2013-06-25 14:27:13 -07:00
tosh
72a29979d0 Merge branch 'master' of git://github.com/worklist/hifi into 19371 
Conflicts:
	interface/CMakeLists.txt
 2013-06-20 03:46:25 +02:00
tosh
7588b7f6bb - separates audio system round trip time determination from echo cancellation 
- changes speex parameters to more humble values
- resolves build issues by removing the speex dylibs - static ones are fine
- tightens build script
 2013-06-20 02:00:12 +02:00
tosh
651dc19427 separates echo cancellation from loopback test (intermediate commit) 2013-06-19 23:55:15 +02:00
Andrzej Kapolka
776145b74c Use a CMake module for UVCCameraControl. 2013-06-19 11:14:32 -07:00
tosh
97fc38313b implements audio echo cancellation based on speex 2013-06-19 16:12:25 +02:00
tosh
682a7c9cdf libspeexdsp-based echo cancellation (untested) 2013-06-18 22:18:27 +02:00
Andrzej Kapolka
4421b21124 Working on reintegrating OpenCV (also, removed lodepng). 2013-06-17 13:24:01 -07:00
Stephen Birarda
188abd8d44 add the STK library for future audio magic 2013-05-30 12:25:29 -07:00
Stephen Birarda
a4bf95f93b don't go looking for GLM twice, check the cache 2013-05-21 15:01:41 -07:00
Stephen Birarda
9a163d2a72 conditional repairs for custom modules 2013-05-14 12:02:54 -07:00
Stephen Birarda
c3bbebee58 don't allow CMake to escape UNIX in path for PortAudio 2013-05-14 11:59:17 -07:00
Stephen Birarda
241c170345 refactor find modules so they complain when things are missing 2013-05-14 11:46:19 -07:00
Stephen Birarda
4c9d1c19ff link PortAudio as a static library instead of compiling as dependency 2013-05-14 11:22:34 -07:00
Stephen Birarda
4c2b729047 assume that oculus will only be from APPLE machines 2013-05-10 15:27:02 -07:00
Stephen Birarda
2309f30762 another typo fix for unix reference to Oculus library 2013-05-10 14:21:24 -07:00
Stephen Birarda
4d7d6aba8b use capital L for lib directory for LibOVR 2013-05-10 14:15:00 -07:00
Stephen Birarda
613066f786 add linking of LibOVR to interface CMakeLists.txt 2013-05-09 15:03:14 -07:00
Stephen Birarda
ed3f308a0e pass ROOT_DIR to IncludeGLM macro instead of MACRO_DIR, include glm for AM 2013-04-15 16:08:35 -07:00
Stephen Birarda
d094c6fc3b refactor LinkHifiLibrary, add SetupHifiLibrary macro 2013-04-15 14:41:59 -07:00
Stephen Birarda
cc2f35ca89 pass a ROOT_DIR to LinkHifiLibrary 2013-04-12 15:59:16 -07:00
Stephen Birarda
b0ff960e37 use MACRO_DIR variable to find glm in root externals dir 2013-04-12 13:20:46 -07:00
Stephen Birarda
3e6b794f11 rename domain target to domain server, use SetupHifiProject 2013-04-12 13:12:56 -07:00
Stephen Birarda
e434b06ed9 rename avatar target to avatar-mixer, add SetupHifiProject macro 2013-04-12 13:08:21 -07:00
Stephen Birarda
67efc12e59 move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00
ZappoMan
4364a0e692 moved stuff around to migrate glm to shared 2013-04-11 18:41:12 -07:00
Stephen Birarda
a33a2afcb6 move interface externals to its directory 2013-02-14 15:26:05 -08:00
Stephen Birarda
1ba48cf7fe make LODEPNG_INCLUDE_DIRS should be dir, not file 2013-02-12 11:55:46 -08:00
Stephen Birarda
aaf9b73daf add find modules for Jack and librt, link to interface 2013-02-11 18:42:28 -08:00
Stephen Birarda
99b96ec737 build portaudio library to link with interface 2013-02-08 15:58:12 -08:00
Stephen Birarda
f5cbe7a05a cmake build working for interface project 2013-02-07 17:29:01 -08:00
Stephen Birarda
f9b8d6cde0 don't use find module for glm/portaudio 2013-02-07 12:24:05 -08:00
Stephen Birarda
4860fb086d link glm library to interface target 2013-02-07 11:41:01 -08:00