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

785 commits

Author SHA1 Message Date
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
ZappoMan
86ad0da09f Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats 2013-07-20 11:35:10 -07:00
ZappoMan
83290bc8b7 first cut at real voxel stats dialog box 2013-07-19 17:28:37 -07:00
Andrzej Kapolka
640ecd7f94 Working on integrating LibVPX for VP8 (9?) encoding. 2013-07-17 11:33:36 -07:00
Andrzej Kapolka
5c590638f3 Working on mesh rendering for faces. 2013-07-15 13:12:22 -07:00
Stephen Birarda
93b122bc76 Revert "link STK to interface" 
This reverts commit d55387f727.
 2013-07-12 13:12:52 -07:00
Stephen Birarda
d55387f727 link STK to interface 2013-07-12 11:18:15 -07:00
Andrzej Kapolka
61f6b8b974 Moved all the avatar bits to their own subdirectory. 2013-07-11 14:53:46 -07:00
Andrzej Kapolka
0aa1b396db Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-10 14:08:03 -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
atlante45
5703a60797 Merge branch 'master' of git://github.com/worklist/hifi into 19368 2013-07-09 10:25:58 +02:00
Andrzej Kapolka
b1050c633b Suppress warnings for OpenNI. 2013-07-08 14:17:03 -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
f2dbad4e57 resolve conflicts on merge with upstream master 2013-07-02 15:42:36 -07:00
Stephen Birarda
1993601389 don't link a NOTFOUND leap library 2013-07-02 15:27:30 -07:00
Andrzej Kapolka
2a0d3310de Merge branch 'master' of https://github.com/worklist/hifi into kinected 2013-07-02 09:46:07 -07:00
atlante45
b062295ecb Merge with master 2013-07-02 16:22:39 +02: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
atlante45
8cc3f202ab Merge with upstream master 2013-07-01 17:12:05 +02:00
tosh
639858dfc9 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-07-01 10:29:56 +02:00
tosh
c18400f8b7 Merge branch 'master' of git://github.com/worklist/hifi into 19377 2013-06-29 15:41:56 +02:00
Andrzej Kapolka
b4b09b0070 Back up and running, now with OpenNI rather than libfreenect. 2013-06-28 17:31:49 -07:00
Andrzej Kapolka
ea9566596a Build OpenNI/NITE into interface if available. 2013-06-28 16:47:08 -07:00
Stephen Birarda
73a8882a9e resolve conflicts on merge with upstream master 2013-06-27 15:22:21 -07:00
Stephen Birarda
491b3d67f9 resolve conflicts on merge with upstream master 2013-06-27 15:17:51 -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
6fcff30ed8 ignore warnings from OpenCV headers 2013-06-26 16:30:51 -07:00
Stephen Birarda
59a9fc8eff remove the Speex library 2013-06-26 16:08:03 -07:00
Stephen Birarda
0b243ec881 add fervor updater and run during launch if OS X release 2013-06-26 10:36:32 -07:00
atlante45
d6c70ea6ca #19368 - Improve editing/building workflow in Interface 2013-06-25 00:24:21 +02:00
tosh
290c20bfc7 introduces bandwidth meter / dialog 2013-06-22 04:22:10 +02: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
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
Andrzej Kapolka
556a64eab9 Adding UVCCameraControl. 2013-06-18 16:47:11 -07:00
tosh
682a7c9cdf libspeexdsp-based echo cancellation (untested) 2013-06-18 22:18:27 +02:00
Andrzej Kapolka
a771f53df3 Read the webcam frames in a separate thread, since the call blocks. 2013-06-17 18:07:53 -07:00
Andrzej Kapolka
0d4efad490 Missed QuartzCore. 2013-06-17 13:58:19 -07:00
Andrzej Kapolka
6b065ab856 Find Zlib the right way. 2013-06-17 13:57:01 -07:00
Andrzej Kapolka
2c0bea3f33 More required libraries for OS X. 2013-06-17 13:53:48 -07:00
Andrzej Kapolka
ec495e14d3 Missed these guys. 2013-06-17 13:29:24 -07:00
Stephen Birarda
c3915ed078 use system flag for external library includes 2013-06-07 11:34:01 -07:00
Stephen Birarda
233ce67379 don't link STK library while not being used 2013-06-06 11:57:38 -07:00
Stephen Birarda
6c2dcb86c8 Merge remote-tracking branch 'upstream/master' into synthesis 2013-06-05 09:55:16 -07:00
Andrzej Kapolka
bc8eadd526 More work on voxeltars; separated default pose from bind pose. 2013-06-04 10:22:58 -07:00
Stephen Birarda
2d7c397138 create a FreeVerb object for each other agent per agent 2013-05-31 15:47:57 -07:00
Stephen Birarda
200d81e0eb DRY up resource subdir copying for OS X bundle 2013-05-22 14:40:01 -07:00
Stephen Birarda
62cf452e3d non-DRY fix for correct copy of resources for OS X bundle 2013-05-22 13:16:55 -07:00
Stephen Birarda
910683c047 remove an extra space 2013-05-21 15:43:29 -07:00
Stephen Birarda
d2c2150b8f include QtGui dir with isystem flag to remove warning 2013-05-21 15:39:57 -07:00
Stephen Birarda
a2f8d8ae25 break audio out of shared into its own library 2013-05-16 13:00:40 -07:00
birarda
ff6ce63a31 Merge pull request #311 from birarda/master 
fix casing of PORTAUDIO_ROOT_DIR
 2013-05-14 12:13:23 -07:00
Stephen Birarda
306d2a4b98 casing is important for UNIX 2013-05-14 12:12:36 -07:00
Andrzej Kapolka
c9b688b876 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 11:56:36 -07:00
Stephen Birarda
c117d62532 fix old reference to LODEPNG_LIBRARY 2013-05-14 11:54:35 -07:00
Andrzej Kapolka
c6ce992332 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-14 11:49:27 -07:00
Stephen Birarda
241c170345 refactor find modules so they complain when things are missing 2013-05-14 11:46:19 -07:00
Andrzej Kapolka
174fdb8109 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-05-14 11:32:43 -07:00
Stephen Birarda
4c9d1c19ff link PortAudio as a static library instead of compiling as dependency 2013-05-14 11:22:34 -07:00
Andrzej Kapolka
e0388515a4 Massive migration from GLUT/globals to Qt/class members. Mostly there. 2013-05-13 21:11:54 -07:00
Stephen Birarda
4c2b729047 assume that oculus will only be from APPLE machines 2013-05-10 15:27:02 -07:00
Stephen Birarda
e15cf93443 Revert "link to LIBOVR_LIBRARY before calling add_executable" 
This reverts commit b2776f25ac.
 2013-05-10 15:05:36 -07:00
Stephen Birarda
b2776f25ac link to LIBOVR_LIBRARY before calling add_executable 2013-05-10 15:03:46 -07:00
Stephen Birarda
7edb7590a7 link the OVR library seperately from the QT_LIBRARIES 2013-05-10 14:54:44 -07:00
Stephen Birarda
a059e44011 resolve conflicts on merge with upstream master 2013-05-10 14:01:52 -07:00
Stephen Birarda
9ee3f889ab Merge remote-tracking branch 'upstream/master' into oculus 2013-05-10 14:00:10 -07:00
Andrzej Kapolka
5a113fd546 Added a stub for a Qt application class that creates a menu (which, since it's 
unparented, will only appear on OS X) with a test item connected to a slot.
 2013-05-10 12:07:47 -07:00
Stephen Birarda
999ab5cb20 initial setup to connect to oculus and grab sensors 2013-05-09 15:45:09 -07:00
Stephen Birarda
613066f786 add linking of LibOVR to interface CMakeLists.txt 2013-05-09 15:03:14 -07:00
Andrzej Kapolka
7c8a06ed4d Added wrapper classes for shaders/shader programs to ease the process of 
compiling, linking, assigning uniforms, etc.  They're modeled after the ones
included in QtOpenGL, which we can't use at the moment because they require
a Qt OpenGL context.
 2013-05-07 17:40:55 -07:00
Andrzej Kapolka
ccdc1146a2 Removed cut and paste error from CMake file, made a couple variables in 
TextRenderer more descriptive.
 2013-04-30 10:26:47 -07:00
Andrzej Kapolka
068d3d216e Need to commit these, too, for the font rendering change. 2013-04-29 19:12:34 -07:00
Stephen Birarda
a558597b6a complete an initial version of eve that sits at 0,0,0 2013-04-22 13:10:21 -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
4702e6ade0 remove the unecessary trailing slash when setting root dir 2013-04-15 14:59:48 -07:00
Stephen Birarda
d0eed92699 add an avatars library and move AvatarAgentData there 2013-04-15 14:51:34 -07:00
Stephen Birarda
cc2f35ca89 pass a ROOT_DIR to LinkHifiLibrary 2013-04-12 15:59:16 -07:00
Stephen Birarda
aff3732052 some light refactoring in interface CMakeLists 2013-04-12 13:29:27 -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
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
vincent
4f41aab89a last merge without Curl 2013-04-09 22:17:59 +02:00
vincent
56aac7077c changes after merge 2013-04-09 19:12:49 +02:00
Stephen Birarda
320fa9e5c8 link curl to shared library, not interface 2013-04-03 15:14:35 -07:00
tosh
2341af271b Merge branch 'master' of git://github.com/worklist/hifi into 19188 
Conflicts:
	interface/CMakeLists.txt
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
	shared/src/VoxelTree.cpp
 2013-04-03 22:44:22 +02:00
tosh
0733f06143 adds cmake support for starfield subdirectory 2013-04-03 22:04:09 +02:00
Stephen Birarda
aa17cc6edc link ALSA after PortAudio for UNIX build 2013-04-02 15:34:10 -07:00
Stephen Birarda
6005629d15 fix framework inclusions in CMakeLists after previous change 2013-04-02 15:27:46 -07:00
Stephen Birarda
757aadf53e changes to CMakeLists to remove double links on OS X 2013-04-02 15:07:04 -07:00
tschw
baa0a6de12 comments out ++(C++) build settings, for now 
in case it needs more than a clean rebuild to compile
the project on recent Xcode - will revisit when I can
ensure things build safely
 2013-04-01 15:33:22 +03:00
tosh
3a55234436 also bumps standard library version for clang (untested) 2013-03-29 22:32:44 +01:00
tosh
8300646b33 allows new C++ standard features 2013-03-29 10:42:36 +01:00
tosh
b4f2b04241 allows qualified inclusion in subdirectories 2013-03-29 10:24:14 +01:00
vincent
83abc571f1 #19197 Create basic visual studio 2013-03-28 18:20:50 +01:00
Stephen Birarda
17904ee069 remove .mm include for interface now that menu is gone 2013-03-27 11:29:13 -07:00
tosh
5de3ec035b leftover changes / minor corrections 2013-03-24 06:30:33 +01:00
Stephen Birarda
3fa0439f29 add method to SharedUtil to chdir to OS X bundle resources 2013-03-22 10:35:55 -07:00
Kees van Prooijen
9ae11ffe77 more windows port 2013-03-20 12:13:14 -07:00
Kees van Prooijen
d70da7f215 some more warning removal, temporarily excluding portaudio for windows 2013-03-19 11:49:36 -07:00
Kees van Prooijen
cd27c74a2d prelimanary changes for windows port 2013-03-19 11:01:08 -07:00
Stephen Birarda
4a0aba9fb6 explicitly include GLUT framework for apple builds 2013-03-07 10:35:59 -08:00
Tomáš Horáček
4741eb869e add Mac OS X "Scope" menu with empty action 2013-02-22 18:22:16 +01:00
Stephen Birarda
060f4dceca use AgentData class to abstract implemenation of linked data 2013-02-21 12:56:57 -08:00
Stephen Birarda
dcb0e5add2 copy resources to OS X application bundle 2013-02-18 11:39:29 -08:00
Stephen Birarda
8c8309c1f4 add some comments to the CMakeLists files 2013-02-18 11:08:12 -08:00
Stephen Birarda
cbb7e62616 add Grayson's sexy new icon 2013-02-15 12:59:39 -08:00
Stephen Birarda
a37410968c make OS X executable an app 2013-02-15 11:27:43 -08:00
Stephen Birarda
a5d08142e1 create target for shared hifi library 2013-02-14 15:25:50 -08:00
Stephen Birarda
fab10ada3e move shared UDPSocket class to shared dir for reuse in mixer 2013-02-12 17:31:53 -08:00
Stephen Birarda
3ebb83f01d keep portaudio build contained to build directory 2013-02-12 13:04:23 -08:00
Stephen Birarda
04492b28bd link portaudio required libraries after portaudio 2013-02-12 11:44:48 -08:00
Stephen Birarda
b74e45e675 libraries for portaudio should be linked to interface 2013-02-12 11:33:56 -08:00
Stephen Birarda
6d67d6f1a6 link required unix libraries to portaudio target 2013-02-11 18:45:18 -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
b20ab5b5ca wrap prefix dir for portaudio config in quotes 2013-02-11 18:15:24 -08:00
Stephen Birarda
d2f38a4c43 ask CMake for absolute path for portaudio configure prefix 2013-02-11 18:08:30 -08:00
Stephen Birarda
788f709193 use absolute path for portaudio install dir 2013-02-11 18:04:22 -08:00
Stephen Birarda
0521a48a72 tell portaudio configure to install to same dir 2013-02-11 18:01:20 -08:00
Stephen Birarda
262b2d82ac Revert "set portaudio install dir to avoid permissions error" 
This reverts commit 903bffd797.
 2013-02-11 17:42:23 -08:00
Stephen Birarda
903bffd797 set portaudio install dir to avoid permissions error 2013-02-11 17:39:26 -08:00
Stephen Birarda
8fb58221d0 build portaudio from same directory as source 2013-02-11 17:36:41 -08:00
Stephen Birarda
b3a343f17f build portaudio as external project before interface 2013-02-08 17:28:22 -08:00
Stephen Birarda
99b96ec737 build portaudio library to link with interface 2013-02-08 15:58:12 -08:00
Stephen Birarda
9fd14c6403 fix reference to GL libraries for UNIX headers 2013-02-08 14:59:30 -08:00
Stephen Birarda
08142a8adb add header for glut to conditional include in InterfaceConfig 2013-02-08 14:57:59 -08:00
Stephen Birarda
d394035e7e switch back to ARB functions with glext include 2013-02-08 14:49:12 -08:00
Stephen Birarda
13a0597ab6 dynamic header for GLUT include 2013-02-08 12:17:35 -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
0ad551c86d use build directory to keep cmake clean 2013-02-07 11:57:35 -08:00
Stephen Birarda
4860fb086d link glm library to interface target 2013-02-07 11:41:01 -08:00
Stephen Birarda
24240a709c add all extra CMake files to gitignore 2013-02-06 18:26:19 -08:00
Stephen Birarda
1111e4837e intial restructuring for CMake setup 2013-02-06 18:07:36 -08:00