Andrew Meadows
96b88dccd7
Merge pull request #10913 from samcake/orange
...
Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model
2017-07-10 09:46:09 -07:00
Sam Gateau
746812ff78
Merging with origin orange
2017-07-10 17:25:13 +02:00
Sam Gateau
0c3755483b
adding assert or checks whenever getting a scene stage
2017-07-10 12:37:26 +02:00
Sam Gateau
4edea433ce
Rename the _pipeline into _shapePipeline in the render::Args
2017-07-10 12:16:53 +02:00
Zach Fox
dbb48cd1aa
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-07 16:03:04 -07:00
David Kelly
f18e64ed1a
first pass at blitting correct hmd preview (in mono)
2017-07-07 15:53:29 -07:00
Seth Alves
01b612fd14
Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts
2017-07-07 10:42:12 -07:00
Seth Alves
6782a891d0
rename the joint-name caches in AvatarData and Avatar so it's more clear that they are different
2017-07-07 10:35:45 -07:00
Andrew Meadows
2349057306
Merge pull request #10879 from AndrewMeadows/avoid-null-shape
...
fix crash in ObjectMotionState::handleEasyChanges()
2017-07-07 10:22:05 -07:00
Anthony J. Thibault
64375c0438
Merge branch 'master' into feature/smooth-ik-chains
2017-07-07 09:31:46 -07:00
Anthony J. Thibault
bd8d6280a8
Interpolate out of ik chains when they are disabled
2017-07-07 09:29:57 -07:00
Sam Gateau
c3dd25e499
Drafting the mechanism to add shape pipeline
2017-07-07 18:26:10 +02:00
Seth Alves
88c39f3237
off-by-one
2017-07-07 09:15:42 -07:00
Sam Gateau
d15c4ea2d3
Merging with the stage branch
2017-07-07 15:12:40 +02:00
Sam Gateau
a8086764da
REmoving warnings for unused var
2017-07-07 12:19:22 +02:00
Sam Gateau
4c1bf6af47
REmoving comments
2017-07-07 11:38:25 +02:00
Sam Gateau
156c20d01e
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-07-07 10:58:05 +02:00
Seth Alves
ddabe940d6
dry up some code
2017-07-06 18:42:00 -07:00
Atlante45
0c18f04e58
Fix Audio Mixer crash
2017-07-06 18:41:25 -07:00
Seth Alves
801c45898f
dry up some code
2017-07-06 18:41:11 -07:00
Seth Alves
57ba2c5cd6
add invalidateJointIndicesCache method
2017-07-06 18:16:41 -07:00
Seth Alves
ef4a04b9cf
code style
2017-07-06 18:01:58 -07:00
Seth Alves
ab8d9f4885
check for faux joints before heading into code that needs to lock
2017-07-06 18:00:11 -07:00
Seth Alves
a543b957ef
fix a race
2017-07-06 17:45:57 -07:00
Seth Alves
fc61fcf494
coding style
2017-07-06 17:40:41 -07:00
Seth Alves
15d379cc5a
coding style
2017-07-06 17:36:28 -07:00
Seth Alves
2e88eca2b9
oopsy crazy
2017-07-06 16:33:37 -07:00
Seth Alves
62b7ba6446
Merge branch 'master' of github.com:highfidelity/hifi into faster-getters-on-avatar-for-scripts
2017-07-06 16:01:42 -07:00
David Kelly
b41c470064
first cut, still stereo
2017-07-06 15:59:24 -07:00
Seth Alves
e03b902a15
change when joint cache is copied
2017-07-06 15:42:24 -07:00
Seth Alves
0ac8f6efa3
cache the jointnames and indexes from FBXGeometry for out-of-thread access
2017-07-06 14:02:59 -07:00
Clément Brisset
34e3f56002
Merge pull request #10843 from birarda/bug/user-activities-interface-only
...
disable user activity logger in DS/AC/ac-client
2017-07-06 14:01:49 -07:00
Seth Alves
24c8267030
in Rig joint accessors, if on the Rig's thread use internalPoseSet, else use external
2017-07-06 13:22:14 -07:00
Stephen Birarda
bdcdff3dbc
force _isSet to be set before isSet() called
2017-07-06 12:01:08 -07:00
Anthony J. Thibault
92926e7a59
Merge branch 'master' into feature/smooth-ik-chains
2017-07-06 11:32:34 -07:00
Seth Alves
e9bdbd7715
Merge branch 'calvin' of github.com:samcake/hifi into faster-getters-on-avatar-for-scripts
2017-07-06 11:09:38 -07:00
Atlante45
1d07ab70f0
Fix warnings
2017-07-06 10:56:09 -07:00
Andrew Meadows
2299bb7718
supply minimum shape rather than null
2017-07-06 10:37:44 -07:00
Stephen Birarda
916f57772b
default the UAL off for all targets, enable manually for Interface
2017-07-06 10:21:07 -07:00
Zach Fox
ee86638c4e
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-06 09:58:00 -07:00
David Kelly
1ccf0da7d8
Merge pull request #10897 from davidkelly/dk/cacheSwitchFix
...
redo cache switch
2017-07-06 09:53:01 -07:00
Sam Gateau
53ffca796f
Drafting a better SHape plumber to render the items
2017-07-06 16:35:40 +02:00
Brad Davis
d91516c630
Merge pull request #10894 from jherico/acclient_fix
...
Fix ACClient on Linux
2017-07-05 18:26:15 -07:00
Atlante45
9a1d38384d
Remove unecessary loops
2017-07-05 17:43:09 -07:00
Atlante45
20a633eb89
Check struct sizes at compile time
2017-07-05 17:42:59 -07:00
Atlante45
95abbd0ad4
Prevent Interface from trying to send packets bigger than an MTU
2017-07-05 17:08:04 -07:00
David Kelly
4a22fbca1b
redo cache switch
2017-07-05 17:01:31 -07:00
Brad Davis
2409c83d5d
Fix ACClient on Linux
2017-07-05 16:53:42 -07:00
Atlante45
7e9ce5a58b
Don't overflow during AvatarData::toByteArray
2017-07-05 16:15:18 -07:00
Brad Davis
7f1bc07d04
Trying to fix overlay crashes again
2017-07-05 14:30:01 -07:00
Anthony J. Thibault
06d512dab9
Warning fixes
2017-07-05 10:43:24 -07:00
Sam Gateau
48b4b5f49c
Fixing the bug appearing on Nvidia 284.76
2017-07-05 18:39:09 +02:00
Anthony J. Thibault
56cd31e92d
Merge branch 'master' into feature/smooth-ik-chains
2017-07-05 09:33:22 -07:00
Anthony J. Thibault
1a24d4d8ec
added safeLerp, shortest angle quat lerp with post normalize
2017-07-05 09:31:02 -07:00
Anthony J. Thibault
7ed1382ac9
ik level interpolation of incoming targets
2017-07-03 16:32:46 -07:00
Anthony J. Thibault
2f6a37ee53
Removed interpolation of hand controllers
2017-07-03 16:31:05 -07:00
David Kelly
2a3b4b3bfb
minor cleanup, and adjusted includes per austin's suggestion
2017-07-03 15:54:54 -07:00
David Kelly
373bd0cc8a
aspect ratio preserved upon blitting, minor qml tweak, warnings fixed
2017-07-03 14:23:23 -07:00
David Kelly
5f015ec77f
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-07-03 13:57:25 -07:00
Seth Alves
70a7b302fc
Merge pull request #10860 from jherico/deadlock_guards
...
Don't use blocking connections on the main thread
2017-07-03 09:05:56 -07:00
Clément Brisset
8744b8e58d
Merge pull request #10859 from Atlante45/fix/ac-cleanup
...
Fix AC cleanup
2017-06-30 16:42:15 -07:00
Stephen Birarda
f6fe3f91fd
Merge pull request #10829 from birarda/bug/sequence-skips
...
fix avatar mixer sending empty avatar identities
2017-06-30 15:28:29 -07:00
Brad Davis
31d2c9980e
Merge pull request #10797 from ctrlaltdavid/21396
...
Make Leap Motion a plugin
2017-06-30 14:37:23 -07:00
David Kelly
09d959bdeb
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-30 14:16:01 -07:00
Anthony J. Thibault
aba164b26e
more clean up of Rig::computeAvatarBoundingCapsule
2017-06-30 13:27:53 -07:00
David Kelly
133af0b522
jittery, still not working in tablet
2017-06-30 12:55:11 -07:00
Anthony J. Thibault
237872e477
sizes and order of IKTargetVarVec and IKTargetVec are now the same.
...
Also, A change in how the bone name to bone index lookup occurs exposed a bug
in Rig::computeAvatarBoundingCapsule(), basically it was not actually preforming IK,
and the ik targets were in the wrong coordinate frame. So when IK was actually
performed it would give bad results. This bug is now fixed.
2017-06-30 12:47:01 -07:00
Brad Davis
6fc82bb351
Switch to preprocessor macro for blocking invokes to capture function information
2017-06-30 11:36:24 -07:00
Brad Davis
9c37b28ba0
Remove tool window logic
2017-06-30 10:58:19 -07:00
Zach Fox
0f9c917965
Merge pull request #10853 from samcake/brown
...
Fix projection & lighting issues identified with 2nd rendering pipeline In Master
2017-06-30 10:05:54 -07:00
Anthony J. Thibault
75e1a4a1e6
Refactor of JointChainInfo data structure
2017-06-30 09:28:39 -07:00
Anthony J. Thibault
c7e4bf931b
WIP: first steps toward smoothing ik chains
2017-06-30 09:28:38 -07:00
Brad Davis
8372d73fec
Additional thread safety
2017-06-30 09:15:06 -07:00
Brad Davis
b52dd7b822
Don't use blocking connections on the main thread
2017-06-29 20:45:17 -07:00
anshuman64
b22daa9a6f
Merge pull request #10838 from druiz17/avatar-recording-roomscale
...
Fix loading of incorrect joint data for the avatar recording
2017-06-29 12:24:37 -07:00
Atlante45
5c731636b1
Sandbox restarts crashed processes
2017-06-29 12:13:52 -07:00
Sam Gateau
f7a3b3a411
Experimenting faster getters on Avatar for scripts
2017-06-29 15:55:47 +02:00
Sam Gateau
ca7e782566
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-29 10:54:27 +02:00
Sam Gateau
b766c256db
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-29 10:29:05 +02:00
Thijs Wenker
e781f97ddc
Merge pull request #10846 from sethalves/fix-server-scripts-more
...
make ResourceManager be owned by DependencyManager
2017-06-28 17:05:30 -07:00
Seth Alves
794495c197
make ResourceManager be owned by DependencyManager
2017-06-28 14:18:14 -07:00
Andrew Meadows
e9edf01a34
Merge pull request #10831 from kencooke/audio-hrtf-optimize
...
More HRTF optimizations
2017-06-28 14:17:00 -07:00
Ken Cooke
0dbb7a71f3
CR fix: comments instead of ref code
2017-06-28 11:32:24 -07:00
Seth Alves
2f3109e4be
move the location of Q_DECLARE_METATYPE(std::function<void()>) so that the server-script AC can see it
2017-06-28 11:00:05 -07:00
Clément Brisset
a2c15c9794
Merge pull request #10770 from jherico/fix_deps_1
...
Cleanup entity dependencies
2017-06-28 10:48:58 -07:00
Ken Cooke
0acbdc7755
CR fix: use predefined PI
2017-06-28 10:18:54 -07:00
David Kelly
b73102d063
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-28 08:57:04 -07:00
Sam Gateau
9b0a0fb23b
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-28 17:33:26 +02:00
Andrew Meadows
1e23fa7baa
Merge pull request #10822 from hyperlogic/feature/no-toe-wiggle
...
Eliminated toe wiggle while pucks are enabled.
2017-06-28 08:30:27 -07:00
Dante Ruiz
96ae39989e
Merge branch 'master' of github.com:highfidelity/hifi into avatar-recording-roomscale
2017-06-28 16:22:41 +01:00
Dante Ruiz
f6ba264de6
avatar recording fix
2017-06-28 16:22:28 +01:00
Sam Gateau
93963b3257
Apply the projection and deferred transform fixes found while working on spectator camera
2017-06-28 15:44:17 +02:00
Sam Gateau
1e2b0ca91c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-28 10:21:05 +02:00
Seth Alves
e4a9674614
Merge pull request #10824 from sethalves/fix-script-sleep-busyloop
...
use QEventLoop and a timer for a less CPU using sleep + event-processing
2017-06-27 21:00:40 -07:00
Brad Davis
28d727153b
PR feedback
2017-06-27 19:22:07 -07:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
Ken Cooke
ad970c9f5c
fast compute of HRTF azimuth
2017-06-27 13:45:18 -07:00
Howard Stearns
20f713a241
Merge pull request #10803 from davidkelly/dk/cacheSwitch
...
new --cache switch for interface
2017-06-27 12:23:23 -07:00
Stephen Birarda
089a2bb362
do not manage identity data without identity data received
2017-06-27 11:58:03 -07:00
Ken Cooke
dcdf07191b
Fast acosf() using polynomial approximation
2017-06-27 11:29:44 -07:00
Anthony J. Thibault
d4122cff5a
warning fix
2017-06-27 11:29:08 -07:00
David Kelly
01155ba4e3
this handles redirecting ktx_cache, data8, prepared
2017-06-27 08:47:54 -07:00
Sam Gateau
1fbaac12ec
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-27 15:54:12 +02:00
Seth Alves
722dc46f60
Merge branch 'master' of github.com:highfidelity/hifi into fix-script-sleep-busyloop
2017-06-27 06:44:31 -07:00
Sam Gateau
63835d0863
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-27 14:24:55 +02:00
Sam Gateau
76dae279cf
Removing the default case from the renderer
2017-06-27 14:24:34 +02:00
Anthony J. Thibault
2814c94582
Hips should no longer waggle when feet are active
2017-06-26 17:43:51 -07:00
Seth Alves
4f672f93d2
avoid cast that isn't always available
2017-06-26 16:03:39 -07:00
Seth Alves
bf7da71eaf
use QEventLoop and a timer for a less CPU using sleep + event-processing
2017-06-26 15:07:22 -07:00
Anthony J. Thibault
8602d57a57
Eliminated to wiggle while pucks are enabled.
...
* Added new anim node AnimDefaultPose
* AnimNodeLoader was changed to support the addition of the AnimDefaultPose node
* Edited default avatar-animation.json to insert an AnimOverlay and AnimDefaultPose between the IK node and the rest of the "underPose".
* Rig uses this to fade in default pose for the toes when the hip/feet puck are active.
This effectively deadens the toe animations, without effecting the hand animations.
* Also, the rig was changed to use the LimitCenter solution when the feet are enabled but the hips are not.
2017-06-26 14:09:10 -07:00
Ryan Huffman
209a4f33b5
Merge pull request #10784 from huffman/feat/pal-replicated
...
Disable silence + ban buttons for replicated users
2017-06-26 12:50:23 -07:00
Seth Alves
2f2a13ec27
Merge pull request #10799 from jherico/object_parent_warnings
...
Fix warnings about creating QObjects with parents in different thread
2017-06-26 09:39:29 -07:00
Sam Gateau
7687bdc060
less comments & constant
2017-06-26 17:02:45 +02:00
Sam Gateau
5e05c41980
less comments & constant
2017-06-26 16:56:04 +02:00
Sam Gateau
6ab2dccd38
less comments & constant
2017-06-26 16:52:04 +02:00
Sam Gateau
7cbeabfc29
less comments & constant
2017-06-26 16:49:20 +02:00
Sam Gateau
a2fc44703d
One less constant
2017-06-26 16:45:54 +02:00
Sam Gateau
904f22985c
CLeaning up comments
2017-06-26 16:43:04 +02:00
Sam Gateau
77644e7e9d
Removing commented objects from deferredlighting effect
2017-06-26 14:34:09 +02:00
Sam Gateau
75e457ce7c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-26 10:05:04 +02:00
Sam Gateau
619b357ad0
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-26 10:03:53 +02:00
David Rowe
bed0e8ef87
Merge branch 'master' into 21396
...
# Conflicts:
# interface/src/avatar/MySkeletonModel.cpp
2017-06-26 12:07:25 +12:00
Seth Alves
9ae390853c
Merge pull request #10814 from jherico/linux_fix_static_plugins
...
Fix static plugin initialization on Linux
2017-06-25 08:17:16 -07:00
Seth Alves
a09986a865
Merge pull request #10815 from jherico/fix_toolbar_buttons
...
Fix toolbar button mouse click when they were added via the tablet scripting interface
2017-06-25 08:16:41 -07:00
Brad Davis
6b47981c6e
Merge pull request #10813 from sethalves/fix-initialization-order-fiasco
...
fix an initialization order fiasco
2017-06-25 02:57:26 -07:00
Brad Davis
08784ff30c
Fix toolbar button mouse click when they were added via the tablet scripting interface
2017-06-25 02:34:58 -07:00
anshuman64
8d5bdd2d84
Merge pull request #10730 from hyperlogic/feature/pole-vector
...
Pole vector support for elbow and knee joints
2017-06-24 23:08:22 -07:00
Bradley Austin Davis
960017ddd7
Fix static plugin initialization on Linux
2017-06-24 22:22:47 -07:00
Seth Alves
05f0ec267e
fix an initialization order fiasco
2017-06-24 18:53:00 -07:00
David Rowe
3de1c0a312
Make and save recording
2017-06-24 15:57:57 +12:00
Anthony J. Thibault
b8c638b2b7
warning fixes
2017-06-23 14:36:59 -07:00
Ryan Huffman
86ed61a15d
Push avatar packet version for isReplicated
2017-06-23 14:26:13 -07:00
Ryan Huffman
b56cfa56c7
Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated
2017-06-23 14:23:20 -07:00
David Rowe
6e266dfbac
Merge branch 'master' into 21396
2017-06-24 09:19:12 +12:00
samcake
c0e8b6c8bc
clean up
2017-06-23 14:18:56 -07:00
Anthony J. Thibault
f320610681
opened up shoulder constraint + other fixes
...
* bent elbows will be away from the body a bit more.
* sped up smoothing of pole vectors
2017-06-23 14:06:00 -07:00
samcake
b7b520a6e8
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-23 13:50:31 -07:00
samcake
17e2140826
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-23 13:28:58 -07:00
Brad Davis
f1fe4ed7cc
Merge pull request #10804 from jherico/fix_deps_3
...
Remove dependency between codec plugins and UI
2017-06-23 12:51:35 -07:00
Brad Hefta-Gaub
dc649e84df
Merge pull request #10792 from jherico/qml_crashes
...
Trying to fix QtQml/QtScript crashes
2017-06-23 12:41:43 -07:00
Brad Davis
fe7d4b1d23
Remove dependency between codec plugins and UI
2017-06-23 12:25:18 -07:00
Anthony J. Thibault
54af6af651
Fix for pole vector stability and knee pole vector computation
2017-06-23 10:38:21 -07:00
Brad Davis
416852c0cd
Fix warnings about creating QObjects with parents in different thread
2017-06-23 10:19:16 -07:00
Brad Davis
341646c780
Fix bad invocation, cleanup signatures
2017-06-23 09:58:27 -07:00
David Kelly
63279f4525
Merge pull request #10790 from davidkelly/dk/scriptsSwitch
...
Command line switch to override default scripts location
2017-06-23 08:53:40 -07:00
David Kelly
7ef50042ba
remove turd
2017-06-23 08:00:18 -07:00
David Rowe
9d0407cbdf
Merge branch 'master' into 21396
2017-06-23 16:52:04 +12:00
samcake
c24e254257
Add support for profiling from scripts
2017-06-22 18:10:20 -07:00
samcake
20d8c11e28
ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore
2017-06-22 17:54:16 -07:00
Brad Davis
4439de240a
Trying to fix QtQml/QtScript crashes
2017-06-22 16:39:57 -07:00
