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

788 commits

Author SHA1 Message Date
Anthony Thibault
5d606981de Added HMD Avatar Alignment Type 
Adds a new API to set this type, and an option to the Avatar App.

* "eye" - Match the user eyes with the avatar eyes. The previous default behavior.
  If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down.
* "head" - Match the user head with the avatar head.  The new default behavior.
  This prevents the body from lifting off of the ground while wearing a large headed avatar.  But can cause an offset between the users eyes and the avatars eyes.
 2019-01-08 18:35:28 -08:00
David Rowe
84c6bb4797 Introduce optional timestamp into internal Controller axis values 
This can be used to determine if consecutive identifical values should
be output.
 2018-12-31 12:15:51 +13:00
amantley
bc78ebe05d cleaned up the button event code for the proximity sensor button 2018-12-19 14:21:14 -08:00
amantley
d0802b9d62 fixed merge conflict in fbxserializer 2018-12-19 13:46:02 -08:00
amantley
a7510cbfbe removed debug print statements 2018-12-19 13:43:50 -08:00
amantley
b8c0d6d9f9 removed print statement in application.cpp and added check of button flag in openvrhelpers.cpp 2018-12-19 12:00:40 -08:00
amantley
da05692e5d added auto switch to vive, checking for the proximity button on vive, to do: make sure ik is off for the head when in desktop mode. 2018-12-18 18:53:48 -08:00
amantley
ff9b0a1ac4 added debug for hmd events 2018-12-17 16:18:43 -08:00
amantley
893e9649be removed eye joint debug statements 2018-12-17 15:30:49 -08:00
amantley
cb672b878c looking at vive user flag behaviour 2018-12-17 08:42:53 -08:00
sabrina-shanman
566d09dc9c Add model preparation step to ModelCache using new library model-baker 2018-12-11 11:15:54 -08:00
Jamil Akram
bc5166d1d8
Merge pull request #14531 from hyperlogic/feature/drop-after-delay-out-of-range-tracking 
Added DropAfterDelay strategy to Vive Tracker Calibration Dialog
 2018-12-07 12:09:44 -08:00
John Conklin II
bbc8e4de70
Merge pull request #14534 from SamGondelman/vive 
Case 20138: Fix vive crash
 2018-12-06 14:28:24 -08:00
SamGondelman
58396b845f move back to plugin thread 
(cherry picked from commit 98d3f6a9d1191031cda1ff040e69093ef6824f1c)
 2018-12-04 17:38:48 -08:00
SamGondelman
0c64d1227a fix vive crash 2018-12-04 16:41:03 -08:00
Anthony Thibault
7f2e427584 Added DropAfterDelay strategy to Vive Tracker Calibration Dialog 
This is a hybrid of None and Drop strategies.
Basically, if the puck is out of range for less then 1/2 a second we still use it, however any longer then that and we mark it as invalid.
 2018-12-03 18:56:45 -08:00
Anthony Thibault
c0bf832e39 Head and Hand offsets for Vive Trackers now function as expected 
In the Settings > Controller... > Calibration menu, when using head or hand trackers
The provided Y and Z offsets should function correctly now.  This gives you the ability to adjust
the offsets of the pucks to the hands/head.  For example: this allows you to wear the hand pucks on your forearms
rather then the backs of your palms.
 2018-12-02 16:18:36 -08:00
Brad Hefta-Gaub
153b8920be
Merge pull request #14348 from sabrina-shanman/hfm_library 
(case 19302) Create the HFM library and namespace
 2018-11-13 12:03:53 -08:00
Brad Hefta-Gaub
47cd6b332c
Merge pull request #14349 from hyperlogic/bug-fix/head-trackers-in-desktop-mode 
Bug fix for head trackers in desktop mode
 2018-11-13 11:49:24 -08:00
Brad Hefta-Gaub
4bafcd2cfa
Merge pull request #14271 from SamGondelman/oculus 
Case 19475: Fix various Oculus Store test failures
 2018-11-13 11:06:39 -08:00
Jeff Clinton
6bd08325ec
Merge pull request #14272 from FlameSoulis/fix/spacenavigator 
Update Spacemouse plugin + Proposal to main build
 2018-11-13 10:59:11 -08:00
sabrina-shanman
753557736e Merge branch 'master' into hfm_library 2018-11-12 15:03:30 -08:00
Brad Davis
8c4f0ec774 Vcpkg migration 2018-11-08 12:28:06 -08:00
Anthony Thibault
ac8869eb61 Bug fix for head trackers in desktop mode 
Sitting and standing modes work even in desktop mode.
We were inadvertently checking for HMD Mode instead of if the head was valid.
* A change was made to the ViveControllerManager to return head poses in the correct standing universe when in desktop mode.
* The default sensorToWorld matrix in desktop mode is similar to the one returned by the system for Vive and Oculus sensor frame; y = 0 is at floor level.
* Sitting mode, walking mode and recentering flags are now visible in the AnimStats.
 2018-11-05 16:21:19 -08:00
sabrina-shanman
2801f324b7 Switch references to HFM to the HFM lib and remove HFM classes in FBX 2018-11-05 12:47:34 -08:00
SamGondelman
dd96881724 don't submit frames while oculus says it's not visible 2018-10-30 12:15:46 -07:00
SamGondelman
83fba2ee41 shutdown when oculus display lost 2018-10-30 11:23:36 -07:00
SamGondelman
799db33b34 reenable entitlements check 2018-10-29 17:22:45 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter 
Quality Improvements to Avatars driven by Vive Trackers
 2018-10-25 08:51:59 -07:00
Flame Soulis
f1f5f57650 Re-enabled all Axis (by popular request) 2018-10-24 08:52:34 -04:00
Flame Soulis
f25820c81a Add destroyInputPlugins() 2018-10-24 08:24:42 -04:00
Flame Soulis
f86518df08 Changed QString to char* for SpacemouseManager 2018-10-24 07:59:43 -04:00
John Conklin II
e21e7d30d7
Merge pull request #14126 from amantley/squattyPottyFix 
Sit State for the seated user in HMD:  Squatty Potty Fix
 2018-10-23 15:20:49 -07:00
Brad Davis
c8e664a0a1 New SPIRV Shader toolchain 2018-10-23 10:40:12 -07:00
amantley
cce2f295a1 fixed conflict in myskeletonmodel.cpp 2018-10-22 17:49:30 -07:00
amantley
ab7a70acba Merge remote-tracking branch 'origin/squattyPottyFix' into squattyPottyFix 2018-10-11 22:55:55 -07:00
Clement
8983fe2bcf Fix new Mac warnings 2018-10-09 12:11:55 -07:00
Anthony Thibault
a776f7e55a Changed default for OutOfRange data to Drop. 2018-10-09 10:51:02 -07:00
Anthony Thibault
7777f3edd0 Added OutOfRangeDataStrategy parameter to Controller Settings 
The openvr SDK provides a way to gauge the quality of tracking on a given device via the eTrackingResult enum.

* Drop - Only Running_OK is considered valid, all other eTrackingResults will return invalid poses.
* Freeze - Only Running_OK is considered valid, but other valid TrackingResults will return the last Running_OK pose.
  In esseces this will freeze the puck in place at the last good value.
* None - All valid eTrackingResults will be valid, including OutOfRange and Calibrating results.  This is the default.
 2018-10-09 10:51:02 -07:00
amantley
c4187f0d60 Merge remote-tracking branch 'upstream/master' into squattyPottyFix 2018-10-08 17:07:55 -07:00
Gabriel Calero
1719f4a474 Build libplugins_libhifiCodec.so 2018-10-05 23:49:06 -03:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586 
Teleport with play area
 2018-10-03 11:02:33 -07:00
John Conklin II
8bd8d05409
Merge pull request #14118 from luiscuenca/handTouchLMFix 
Disable Hand Touch when Leap Motion is running
 2018-10-03 09:03:43 -07:00
Anthony Thibault
b62ca2b75c Better configuration, i.e. which puck is associated with which limb. 
Previously we where incorrectly sorting the pucks along the x axis.
This could cause the order to be wrong if you were not standing along the z axis w.r.t the vive tracked volume.
 2018-10-01 18:43:19 -07:00
amantley
90feeffa9d cleaning up. putting squat fix in vertical recenter 2018-10-01 14:21:00 -07:00
luiscuenca
5ccbc5c029 Disable Hand Touch when Leap Motion is running 2018-10-01 10:47:06 -07:00
amantley
3a2a8fe4f8 adjusted openvr to use 0.0 for the floor instead of -1.6 2018-09-29 15:49:11 -07:00
amantley
fa9abf0fff added the floor at 0.0 in sensor space for oculus. to do: vive 2018-09-26 18:08:00 -07:00
amantley
ad6bbc7ff6 latest squatty changes 2018-09-25 11:22:44 -07:00
Anthony Thibault
b6d7b9b544 spelling 2018-09-25 10:44:00 -07:00
Anthony Thibault
a41591323b Code review feedback. 2018-09-25 10:42:43 -07:00
Anthony Thibault
fa27bb7e11 Bug fix for Vive puck calibration of hands and feet 
Before this PR, there were small errors that can occur if you calibrate while not facing down the z-axis in vive sensor space.
As indicated by the small arrow in the steam vr grid.

The hands could end up flipped 180 degrees and the feet could end up with an incorrect offset resulting in a wider or narrower stance then expected.
This PR is intended to fix these issues.
 2018-09-24 16:56:22 -07:00
David Rowe
96767c1103 Merge branch 'master' into M17217-b 
# Conflicts:
#	plugins/openvr/src/OpenVrDisplayPlugin.cpp
 2018-08-08 10:43:58 +12:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
David Rowe
11b85e30db Merge branch 'master' into M17217-a 2018-08-04 09:44:39 +12:00
David Rowe
41c4ecd465 Add HMD play area to API; Oculus and Vive 2018-08-01 15:20:51 +12:00
David Rowe
a3e677e64f Code review 2018-07-20 08:32:21 +12:00
David Rowe
5e624246a8 Fix HMD.mountedChanged() API signal 2018-07-19 13:00:57 +12:00
Alexander Ivash
57f32e64c1 remove the code of the rendering vive controllers and any code that uses that menu option. 2018-07-06 21:00:56 +03:00
Alexander Ivash
eb97f99db1 Revert "commented out code responsible for creating / populating 'Avatar' menu (per request from Mukul)" 
This reverts commit d40d1a9985770d2da82f5291ee33a7cfe8a73652.
 2018-07-06 21:00:55 +03:00
Alexander Ivash
bc6bfc1003 commented out code responsible for creating / populating 'Avatar' menu (per request from Mukul) 2018-07-06 21:00:55 +03:00
Brad Davis
197fb469eb Fix touch controller button handling when Oculus remote is paired 2018-06-15 10:16:32 -07:00
John Conklin II
287fd67e67
Merge pull request #13313 from dback2/gamepadEnabled 
Enable gamepad by default
 2018-06-07 12:42:04 -07:00
Bradley Austin Davis
e38059797d Update Oculus integration 2018-06-06 17:27:30 -07:00
David Back
c1dceda4ac enable gamepad by default 2018-06-05 12:01:06 -07:00
John Conklin II
6095a3b319
Merge pull request #13082 from jherico/feature/shader_cache 
Shader load time performance optimiziations
 2018-05-30 13:55:34 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -07:00
David Rowe
6d4f704279 Regularize some JSDoc usage 2018-05-21 09:32:10 +12:00
Anthony J. Thibault
ed726c9d77 OpenVR: Remove reference to HMD Standing Mode menu item 
This menu item has not existed for over a year.
I was sometimes seeing a crash on startup when the display plugin
attempted to reference this menu item.
 2018-05-14 13:51:13 -07:00
John Conklin II
5cd225e4de
Merge pull request #12947 from jherico/feature/splash2 
Additional work on splash screen
 2018-05-11 11:26:37 -07:00
Brad Davis
72526781d9 Additional work on splash screen 2018-05-04 16:40:05 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
John Conklin II
236e75b6c6
Merge pull request #12903 from druiz17/add-more-hmd-data 
Get the correct device name connect to OpenVr
 2018-04-24 13:29:41 -07:00
David Rowe
f865a13326 Doc review 2018-04-21 14:10:14 +12:00
David Rowe
748052614f Doc review 2018-04-21 12:45:00 +12:00
David Rowe
9f83c606e9 Controller API JSDoc 2018-04-17 11:46:40 +12:00
Dante Ruiz
aa985fa682 add-more-hmd-data 2018-04-16 15:30:28 -07:00
Dante Ruiz
5af1ea54d3 Merge branch 'master' of github.com:highfidelity/hifi into add-more-hmd-data 2018-04-16 10:10:55 -07:00
John Conklin II
5bd3d0fab9
Merge pull request #12647 from birarda/feat/client-only-installer 
add a CLIENT_ONLY build option and handle for installer
 2018-03-21 11:20:36 -07:00
Sam Gateau
4341347148
Merge pull request #12639 from SamGondelman/aa 
Use correct platform-specific gpu library
 2018-03-20 14:47:26 -07:00
Stephen Birarda
1405c8fcb3 add a client only option to cmake 2018-03-20 14:20:58 -07:00
Stephen Birarda
f8df90e36d disable the sixense plugin by default 2018-03-15 13:53:10 -07:00
SamGondelman
21381a7295 fix building with gles on desktop (still crashes) 2018-03-14 11:44:00 -07:00
Dante Ruiz
1bae22fed0 get actual name for OpenVrDispayPlugin 2018-02-28 16:32:53 -08:00
Dante Ruiz
1bc8484a4b determine OpenVr headset namme 2018-02-28 11:50:52 -08:00
Brad Davis
8853bd6388 Fix spectator camera crash 2018-02-14 11:11:28 -08:00
Andrew Meadows
342ba5f8aa add 'task' lib dependency to HMD plugins 2018-02-13 08:57:20 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml 
Migrating QML rendering off the main thread
 2018-02-12 15:32:33 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs 
Misc bug fixes
 2018-02-12 14:31:38 -08:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
Atlante45
8ebb3e52d8 Misc bug fixes 2018-02-02 13:10:49 -08:00
samcake
f078ff611a Refining the declaraion signatures and adding the binary capture 2018-01-30 15:10:52 -08:00
Brad Davis
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Bradley Austin Davis
cb3456195e Fix OSX Oculus plugin 2018-01-15 10:48:39 -08:00
Brad Davis
acb95d1355 GLAD polish 2018-01-14 00:10:05 -08:00
Brad Davis
c924cbf2a7 Remove explicit gpu-gl dependencies 2018-01-13 12:20:41 -08:00