Commit graph

924 commits

Author SHA1 Message Date
kasenvr
1a46b28b71
Merge pull request #62 from HifiExperiments/blendshapes
Support blendshapes on model entities
2020-05-31 18:34:42 -04:00
David Rowe
ce96fc61d6 Remove unused code 2020-05-24 13:16:26 +12:00
David Rowe
1ac184bd22 Fix further type errors 2020-05-24 13:16:15 +12:00
David Rowe
6981937697 Fix path to header file 2020-05-23 20:42:22 +12:00
David Rowe
343c6a4027 Fix Linux targeting 2020-05-23 19:46:26 +12:00
David Rowe
33a77a5dbd Fix further Linux errors 2020-05-23 19:08:16 +12:00
David Rowe
f2232b89f0 Address Linux build warnings and errors 2020-05-23 17:18:03 +12:00
David Rowe
74f50ce079 Fix Linux build error 2020-05-23 15:48:48 +12:00
David Rowe
b72d5bf80c Build OpenVR plugin on Linux 2020-05-23 14:53:43 +12:00
David Rowe
7634478aba Merge branch 'master' into feature/vive-pro-eye-tracking 2020-05-22 08:52:08 +12:00
David Rowe
c0e36b7960 Address code review comments 2020-05-16 14:37:40 +12:00
HifiExperiments
8017e30ab9
Merge branch 'master' into blendshapes 2020-05-07 13:27:22 -07:00
David Rowe
be8d97cbf7 Use new audio setting API values 2020-05-07 16:05:49 +12:00
David Rowe
f83ea58a10 Fix erroneous hard-coded audio setting string 2020-05-07 15:42:30 +12:00
David Rowe
da2aefb6b2 There are no longer so-called "high quality" overlays 2020-05-04 21:04:17 +12:00
Seth Alves
cb83e4e6c9 adjust to new eye matrix 2020-04-26 12:25:19 -07:00
Seth Alves
67f4811c2b blink actions were renamed 2020-04-26 12:24:47 -07:00
Seth Alves
a0031c6f10 eye and hand tracking for htc vive pro 2020-04-26 12:24:45 -07:00
Seth Alves
4d3da24c33 fix angularVelocity reported by leap-motion plugin 2020-04-26 12:22:53 -07:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
2020-04-09 16:46:27 +12:00
HifiExperiments
c062cb75ae Merge remote-tracking branch 'upstream/kasen/core' into blendshapes 2020-04-03 14:35:21 -07:00
997abf6543
Remove logging statement. 2020-01-19 15:40:23 -06:00
cb78daa0b1 Delete trailing whitespace. 2020-01-16 14:34:08 -06:00
26d507c39a Yet more style fixes. 2020-01-16 11:30:45 -06:00
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