Commit graph

84 commits

Author SHA1 Message Date
Atlante45
4d1529f77b typedefs 2014-12-16 14:02:22 -08:00
Atlante45
e5e2eb4e8a Moved GLCanvas in DM and DM to QSharedPointers 2014-12-15 16:20:52 -08:00
Atlante45
3b6936b47d Changed Mag and reticules data representation 2014-12-04 11:16:01 -08:00
David Rowe
583e079d3a Fix Hydra cursors in VR display
They weren't being drawn at the correct location an so weren't matching
up with location of voxel being added or deleted, for example.
2014-11-28 10:01:15 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Stephen Birarda
2ce2c9e953 add a missing slash in path for release hydra support 2014-10-03 15:33:51 -07:00
Stephen Birarda
8cb258e14c don't use just filename when searching in application framework 2014-10-02 14:35:54 -07:00
Stephen Birarda
138e57bcd8 don't set SIXENSE_LIB_FILENAME for INSTALLER_BUILD 2014-10-02 11:16:25 -07:00
Stephen Birarda
172ee3d7dc add failsafe for hydra load, look in app frameworks folder 2014-10-02 09:06:29 -07:00
Stephen Birarda
39ee62608b ensure HAVE_SIXENSE is defined to define _sixenseLibrary 2014-09-30 11:35:53 -07:00
Stephen Birarda
e512b05e62 add extra debug for hydra library initialization 2014-09-29 17:28:50 -07:00
Stephen Birarda
1f4c0b6340 wrap sixenseExit call in HAVE_SIXENSE ifdef 2014-09-29 13:09:25 -07:00
Stephen Birarda
db0bfd53ae make the sixense library name a constant 2014-09-29 12:58:40 -07:00
Stephen Birarda
f7a17b7dec dynamically load sixense lib on OS X to make avoiding hid_init crash easier 2014-09-29 12:58:01 -07:00
Andrzej Kapolka
1ef9126482 Migrating to device-independent coordinates. 2014-09-08 13:59:19 -07:00
Andrzej Kapolka
7f6b3d3649 Dimension fixes for Retina displays. 2014-09-05 16:44:45 -07:00
Stephen Birarda
4bf7bbe0df if enable VR mode is re-checked then attempt to re-connect to Oculus 2014-08-12 15:20:04 -07:00
Thijs Wenker
b6cb19c2f6 FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors) 2014-07-23 16:55:59 +02:00
barnold1953
03bc3a9ff8 Added checkable menu option for laser toggle 2014-07-21 12:35:46 -07:00
barnold1953
16fd8f224c Imrpoved repeat texture method, its almost finished 2014-07-18 21:42:20 -07:00
barnold1953
4d591de762 Applied low velocity filter to palm tip position 2014-07-10 10:52:15 -07:00
barnold1953
6e92beeb1c Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
2014-07-09 16:32:02 -07:00
Andrew Meadows
6ffa09f9e6 modified scope of devices stats 2014-07-09 13:58:54 -07:00
barnold1953
d044af1400 Made it so you can only select in a 180 degree radius with oculus 2014-07-09 11:12:02 -07:00
Philip Rosedale
f8185dec75 removed some debug logs 2014-07-08 22:26:11 -07:00
Philip Rosedale
c50d9ae3e4 Hand low velocity filter as a menu option 2014-07-08 22:22:27 -07:00
barnold1953
cc63f706a7 Functional sixense "laser" oculus selection mode. 2014-07-08 11:43:24 -07:00
Andrew Meadows
662136f01c reset timer as optimization 2014-07-03 14:13:27 -07:00
Andrew Meadows
0f7859bf83 fix return to default pose after hydra disconnect 2014-07-03 14:09:14 -07:00
Andrew Meadows
843a4db650 rotation offset for hydra controllers 2014-07-03 13:50:27 -07:00
Atlante45
7c797449ab Comments + connectedDevice 2014-06-30 19:02:43 -07:00
Atlante45
f33ad8a100 Adding logger calls 2014-06-30 17:10:17 -07:00
barnold1953
2b374470b0 Allow clicking on magnified controls 2014-06-16 15:24:53 -07:00
barnold1953
031fe323ea Got rid of some verbosity 2014-06-16 10:12:09 -07:00
barnold1953
94e58e9559 Fixed coding standard and made getCursorPixelRangeMultiplier more clear 2014-06-16 10:04:56 -07:00
barnold1953
422db14812 Fixed some improper logic and used better defaults 2014-06-13 11:34:57 -07:00
barnold1953
e4a0275f57 Exposed sixense and mouse options and oculus UI angle to preferences 2014-06-13 10:53:11 -07:00
barnold1953
16f9b8c3ed Removed some unused variables. 2014-06-12 15:49:00 -07:00
barnold1953
91f23fcf2d Fix for click and drag with sixense 2014-06-12 15:39:40 -07:00
barnold1953
bc293071d6 Removed left handed menu option 2014-06-12 12:25:22 -07:00
barnold1953
d0b1880ee4 Experimenting with ambidextrous sixense mouse input 2014-06-12 10:20:35 -07:00
barnold1953
32a9eed88d Fixed build failure 2014-06-11 18:05:10 -07:00
barnold1953
d993fd52f2 Cleaned up a small bit of code 2014-06-11 17:27:00 -07:00
barnold1953
2fec7400e2 Added menu options for sixense mouse input 2014-06-11 17:21:59 -07:00
barnold1953
eff097638c Implementd sixense mouse emulation 2014-06-11 17:02:08 -07:00
Philip Rosedale
6998dfae3c add visual indicator of thrust direction 2014-05-23 09:57:47 -07:00
Philip Rosedale
2681312b54 Velocity damped hand positions 2014-05-23 00:09:15 -07:00
Andrew Meadows
aad9d0441e merge upstream/master to andrew/bispinor
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/SkeletonModel.cpp
	libraries/avatars/src/HandData.cpp
	libraries/avatars/src/HandData.h
2014-05-14 09:38:31 -07:00
Andrew Meadows
607094075c Revert "Merge pull request #2834 from andrew/thermonuclear"
This reverts commit e088c3d115, reversing
changes made to d124c0319d.
2014-05-13 10:38:56 -07:00
Andrew Meadows
efb3edf400 Store sixense data in meters not millimeters 2014-05-12 11:39:21 -07:00