fef469cca4
More style fixes for the Great and Powerful Thoys
2020-01-15 18:00:27 -06:00
f93e47cfcd
Merge branch 'opus-plugin' of https://github.com/MarcusLlewellyn/project-athena into opus-plugin
2020-01-15 13:51:12 -06:00
9a67ee19e0
More review fixes since I missed 66 of them.
2020-01-15 13:49:25 -06:00
d96da21dd7
Update plugins/opusCodec/src/OpusDecoder.cpp
...
Co-Authored-By: Thijs Wenker <me@thoys.nl>
2020-01-15 13:06:42 -06:00
0a3dfdefce
Update plugins/opusCodec/src/plugin.json
...
Co-Authored-By: Thijs Wenker <me@thoys.nl>
2020-01-15 13:05:43 -06:00
5ff8654363
Update plugins/opusCodec/src/plugin.json
...
Co-Authored-By: Thijs Wenker <me@thoys.nl>
2020-01-15 13:04:59 -06:00
24669c98f6
Made changes requested by reviewer
...
Fixed missing copyright headers.
Fixed exceeding 120 columns.
Fixed #include
Fixed if conditional style.
Fixed C++ reference symbol placement.
2020-01-15 12:57:18 -06:00
f23dfc7d0d
Cleanup some kruft.
...
Removed some unecessary files, defines, and includes.
2020-01-14 17:41:55 -06:00
Dale Glass
830f3ab337
Instrument HifiAC code with performance timers
...
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
2020-01-14 16:58:05 -06:00
HifiExperiments
c45ee33e97
review comment
2020-01-13 17:44:32 -08:00
6a294404c2
fix marcus being very stoopid
2020-01-13 15:44:46 -06:00
3a5059a613
Re-enable hifiAC and pcmCodec projects
...
These has been disabled for testing purpose. They are now restored.
2020-01-13 13:35:36 -06:00
0022170400
Fix minor cmake oopsie.
2020-01-12 18:33:46 -06:00
2b8c0ffbdc
Merge branch 'daleglass/opus-plugin' into opus-plugin
2020-01-12 18:18:14 -06:00
c9595016f8
DEBUG: Temp removal of hifiCodec and pcmCodec projects.
...
This is to ensure that no other codecs are being fallen back upon when testing the Opus codec.
2020-01-10 12:19:19 -06:00
32c438ffc2
Update CMakeLists.txt
...
Fix interface linking errors on Windows.
2020-01-10 12:17:53 -06:00
Dale Glass
18e83aa93d
Remove encoder/decoder logging spam
2020-01-09 23:07:53 +01:00
Dale Glass
09aab2a2c6
Bump default quality
2020-01-09 23:07:40 +01:00
Dale Glass
91b3be036f
Dump encoder arguments
2020-01-09 18:50:29 +01:00
Dale Glass
bf3d9cec8e
Always maintain size of audio output buffer.
...
More debug output.
2020-01-09 16:43:12 +01:00
Dale Glass
fdab09c7a1
use constData() for encoding, it's faster
2020-01-09 16:43:12 +01:00
Dale Glass
7616c9c06e
Don't attempt FEC decoding in decode(). More logging.
...
Also use the fixed size audio buffer for decoding -- audio always
works in packets of the same size, so we should always get the same
amount out of decoding.
2020-01-09 16:43:12 +01:00
Dale Glass
cf56bf415f
Initial attempt at Opus compression.
2020-01-09 16:43:11 +01:00
a39ad97a1f
Opus cleanup and C++ wrapper
...
Did a tiny amount of fleshing out and some cleanup. Also added a Google implemented C++ Opus wrapper in case it will be useful.
2020-01-09 16:43:11 +01:00
3d8d359c35
Initial work on Opus audio plugin
...
This commit is made up of changes to VCPKG and CMake to include the Opus libraries, as well as a skeleton project for an Opus audio plugin.
2020-01-09 16:43:11 +01:00
HifiExperiments
ef8f085b47
support blendshapes on model entities
2020-01-05 02:37:44 -08:00
9b4c419b2c
Opus cleanup and C++ wrapper
...
Did a tiny amount of fleshing out and some cleanup. Also added a Google implemented C++ Opus wrapper in case it will be useful.
2019-12-21 12:05:14 -06:00
9887bf14ee
Initial work on Opus audio plugin
...
This commit is made up of changes to VCPKG and CMake to include the Opus libraries, as well as a skeleton project for an Opus audio plugin.
2019-12-21 09:30:16 -06:00
Fluffy Jenkins
6563d32395
Fixed something thats for sure
2019-12-20 00:57:38 +00:00
Fluffy Jenkins
95c7998720
Changed code to correct type
2019-12-19 23:34:29 +00:00
Fluffy Jenkins
7d402f4bae
Changed so it will fail to load VR straight away instead of trying so much it causes audio failures
2019-12-19 23:19:05 +00:00
Kasen IO
94df2c304b
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
2019-12-01 22:08:45 -05:00
Kasen IO
b24cc3658c
Update CMakeLists.txt
...
re-added oculus plugins to cmakelists.txt
2019-12-01 22:08:26 -05:00
Kasen IO
0b46c53df1
Merge branch 'kasen/core' into v0860-kasen-release+freshstart
2019-12-01 19:59:59 -05:00
Anthony J. Thibault
404d1a3c93
Fix several bugs for eye tracking from input plugins to function
2019-11-21 17:57:44 -08:00
Anthony J. Thibault
9d6ce44131
Head is now computed in proper sensor space
...
Eye tracking now works.
2019-11-20 15:30:16 -08:00
Anthony J. Thibault
befbdcef48
Upgraded OSC plugin with changes from ARKit blendshape work.
2019-11-19 13:13:56 -08:00
Brad Davis
d4b3a9ba49
Github actions
2019-11-18 15:20:37 -08:00
Ryan Huffman
37aee77c32
Fix oculus calibration screen crash if touch not on
2019-10-08 12:31:05 -07:00
Seth Alves
af14245d45
provide a way to get at _sensorResetMat from outside class
2019-09-17 09:43:18 -07:00
humbletim
271fac4bca
Merge remote-tracking branch 'upstream/master' into kasenvr-kpi-v1-modkit-rc-merge
2019-09-05 09:46:21 -04:00
David Rowe
5624ba6e14
Fix JSDoc for some Controller.Hardware.Vive property names
2019-09-04 21:05:06 +12:00
Kalila R
28b27a1e48
Merge branch 'v0.83.0-rc' into kasen/core
2019-08-03 15:27:23 -04:00
humbletim
058c81aa1a
Merge branch 'hifi-master' into kpi-v1-modkit-rc
2019-07-26 01:36:52 -04:00
humbletim
52d2938be3
DeprecatedScriptPlugin => ExampleScriptPlugin
2019-07-26 01:32:09 -04:00
humbletim
6ae75ecafe
segregated scripting/ plugins (re: permissions checkbox)
2019-07-26 01:31:42 -04:00
humbletim
c5b2514e0e
fix linux build warning; remove unnecessary code
2019-07-23 12:13:49 -04:00
Anthony Thibault
a31c834009
macos include fix. On macos with a case sensitive harddrive this include fails.
...
Change it to the more standard form.
2019-07-16 10:49:37 -07:00
Seth Alves
22a913bee2
fix bug that caused comfort-mode to be active at all times in HMD
2019-07-15 21:10:42 -07:00
kasenvr
e9e9607a3b
modkit core changes initial commit
...
whitespace corrections + warnings
updated cmake plugin
rework with focus on JS API integration example
cleanup edit_filter scope
separate-out edit_filter wantsScope stuff
-plugin metadata
split scriptengines out separately
cleanup __url/__filename sets
additional cleanup
fix typo; consolidate ScriptInitializerMixin inits
add more example API protoypes
cleanup pass; fix entity_server / agent init
fix whitespace
remove technically unnessary plugin filtering
+EDIT_FILTER_SCRIPT; cleanup
reorder public/slot/private
use std::count_if
formatting
better debug output; cleanup
fix msvc compiler warning
cleanup
eradicate QtScript references from API Example
updated header comments
Updated KasenAPIExample
2019-07-14 21:35:13 -04:00
Seth Alves
9baf4c7078
comfort mode -- squeeze vision to avoid sickness
2019-07-12 09:14:17 -07:00
Anna
787359fdfb
fixed ui flipping issue
2019-07-01 10:52:03 -07:00
Anna
59505ab20f
fixed color banding on rift
2019-06-26 09:29:06 -07:00
Anna
8c3ddc049c
works on desktop, android mobile, rift and quest
2019-06-21 20:08:09 -07:00
Anna
3d36c5714f
added comments and cleaned up
2019-06-21 11:34:10 -07:00
Anna
250d18d7df
restructured gamma correction so snapshots look correct
2019-06-21 11:11:44 -07:00
Anna
a1a3eccad9
fixed gamma on rift, removed extraneous code from quest, clarified variable names
2019-06-18 19:23:40 -07:00
Anna
1d3867d777
works on quest but not desktop
2019-06-17 18:34:26 -07:00
Revofire
47af406440
merged 0.80.0-kasen into 0.81.0-kasen, 0.81.0-kasen source ready for build.
...
various changes, idk, added a whitelist filter to ent script filter
2019-05-01 22:13:51 -04:00
David Rowe
407ce745d5
Merge branch 'master' into M22075
...
# Conflicts:
# libraries/controllers/src/controllers/Actions.cpp
2019-04-27 10:51:13 +12:00
SamGondelman
c730e51d1e
wip redo stencil work
2019-04-11 13:22:51 -07:00
David Rowe
59533d0f59
Controller JSDoc update
2019-04-10 08:51:14 +12:00
Sam Gondelman
660818aded
Revert "Case 20060: Grab correct stencil masks from display plugins"
2019-04-05 11:59:46 -07:00
Sam Gondelman
85bf1da0a1
Merge pull request #15266 from SamGondelman/stencil
...
Case 20060: Grab correct stencil masks from display plugins
2019-04-04 13:36:25 -07:00
Brad Davis
44fc0d21db
Revert "Remove _compositeFramebuffer from display plugins"
...
This reverts commit cb311408c6
2019-04-03 13:43:39 -07:00
SamGondelman
8d2495ef7a
vive coordinates in clip space
2019-03-29 16:24:04 -07:00
SamGondelman
4ed7c09016
grab correct stencil masks from display plugins
2019-03-26 13:42:18 -07:00
Brad Davis
cb311408c6
Remove _compositeFramebuffer from display plugins
2019-03-12 12:20:20 -07:00
danteruiz
1941e53cc3
track oculus controllers while in oculus home
2019-03-05 15:32:18 -08:00
SamGondelman
13ece79476
merge with master
2019-02-13 16:30:22 -08:00
SamGondelman
f7a487a020
move materialcache et al to material-networking library
2019-02-08 10:28:07 -08:00
Brad Davis
d3301803d3
Support custom display / input plugin lists and small tweaks
2019-02-07 15:15:26 -08:00
Jeff Clinton
536a76a791
Merge pull request #14787 from wayne-chen/oculusLoginFeature
...
MS20874: Only initialize plugin if started through Oculus Store
2019-01-29 10:57:03 -08:00
Wayne Chen
0cbaea4e27
callback return upon request if not running
2019-01-28 14:46:50 -08:00
Wayne Chen
28ab4096d0
optimizing ctor/dtor
2019-01-28 14:44:00 -08:00
Wayne Chen
e4c3011a0b
only init platform if oculus store is running
2019-01-28 14:37:18 -08:00
Wayne Chen
0f1aebea82
adding init/shutdown for plugin init
2019-01-28 14:35:41 -08:00
Wayne Chen
c06f2f337e
adding code for if oculus is running
2019-01-28 14:20:03 -08:00
Wayne Chen
09770920a8
only initialize plugin if oculus store starting
2019-01-28 11:12:12 -08:00
Shannon Romano
f084021fdf
Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type
...
Added HMD Avatar Alignment Type
2019-01-25 17:32:41 -08:00
Wayne Chen
1c6521486e
fixing compile errors
2019-01-25 13:56:56 -08:00
Wayne Chen
6f49914167
Merge branch 'oculusLoginFeature' of https://github.com/wayne-chen/hifi into oculusLoginFeature
2019-01-25 12:19:20 -08:00
Wayne Chen
635c7533b9
more code review feedback
2019-01-25 12:15:38 -08:00
Wayne Chen
c136f24181
Merge branch 'master' into oculusLoginFeature
2019-01-25 11:44:14 -08:00
Wayne Chen
0928b1bff1
code review feedback
2019-01-25 11:36:58 -08:00
Wayne Chen
9da7465698
readding render session, adding newlines for oculus failure
2019-01-24 15:33:50 -08:00
Anthony Thibault
a7a71e4286
Merge branch 'master' into feature/hmd-avatar-alignment-type
2019-01-23 15:52:20 -08:00
Wayne Chen
512805d48f
removing leftover variable
2019-01-23 14:45:41 -08:00
Wayne Chen
4cf90050b5
reverting old code
2019-01-23 14:39:58 -08:00
Wayne Chen
1ae2ddd926
dont setup another oculus session
2019-01-22 11:08:15 -08:00
Wayne Chen
4d61a65bbf
wrapping request nonce and userID with conditional
2019-01-21 09:48:12 -08:00
SamGondelman
59fafa1f5c
only do entitlements check once
2019-01-17 11:47:12 -08:00
Wayne Chen
ef63213d28
fixing linking account problems on oculus/steam, changing callback
2019-01-16 21:07:54 -08:00
Wayne Chen
bb61334c0d
Merge branch 'master' into oculusLoginFeature
2019-01-16 17:24:22 -08:00
Wayne Chen
d38a657c54
filling username with oculus username, checking create error
2019-01-16 17:05:54 -08:00
Wayne Chen
2d16e71e74
adding sending oculus ID including username
2019-01-16 17:05:52 -08:00
Wayne Chen
7e674ba3c4
better check for if oculus is running
2019-01-16 17:05:51 -08:00
Wayne Chen
ca0916886a
adding more qml for oculus login
2019-01-16 17:05:51 -08:00
Wayne Chen
39a68a88f0
fixing typos in callback implementation
2019-01-16 17:05:51 -08:00
Wayne Chen
ed39b43d3b
changing request to have a callback function passed
2019-01-16 17:05:51 -08:00
Wayne Chen
6bc1164d58
more wip on oculus login
2019-01-16 17:05:50 -08:00
Wayne Chen
4320f4cbe4
migrating platform plugin
2019-01-16 17:05:50 -08:00
Wayne Chen
a905310a58
more staging
2019-01-16 17:05:49 -08:00
Wayne Chen
704f005604
changing user id variable type
2019-01-16 17:05:49 -08:00
Wayne Chen
a24ebe2718
oculus functions live in the display plugin; display plugins update
2019-01-16 17:05:49 -08:00
Wayne Chen
970798705c
improving flow from Oculus API to login dialog wip
2019-01-16 17:05:48 -08:00
Wayne Chen
1af57bdba6
staging
2019-01-16 17:05:48 -08:00
Wayne Chen
ebb9cd7de6
adding new plugin
2019-01-16 17:05:48 -08:00
Wayne Chen
db06533018
adding more staging
2019-01-16 17:05:48 -08:00
Wayne Chen
c22ad2b15a
staging some oculus helper code
2019-01-16 17:05:47 -08:00
Seth Alves
fd09180776
Merge pull request #14645 from ctrlaltdavid/M19774-d
...
Make mouselook directly proportional to right-click mouse
2019-01-16 09:09:38 -08:00
Seth Alves
6a88941166
put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.
2019-01-10 15:07:06 -08:00
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
