Howard Stearns
7d30cd0159
checkpoint: it works!
2015-11-19 09:18:40 -08:00
Anthony J. Thibault
721da29432
WIP checkpoint
...
* No longer normalizing scale in AnimSkeleton and AnimClip
This means graph is animating in 'geometry' coordinates
before unit scale is even applied. This is necessary to
properly work with both Avatar based models and ModelEntity
based models
Many things are broken.
* debug rendering (translations are x100)
* IK hand targets
* follow cam
* I did not even dare to try HMD mode
2015-11-18 18:47:33 -08:00
samcake
90ee205a66
Merge pull request #6429 from ZappoMan/samConditionalLove
...
make preferences dialog resizable
2015-11-18 18:07:07 -08:00
Brad Hefta-Gaub
dc093159a1
make preferences dialog resizable
2015-11-18 17:54:51 -08:00
samcake
74beeefe06
Merge pull request #6420 from jherico/dargo
...
Make recording and playback work in interface, playback in agent
2015-11-18 17:52:09 -08:00
Stephen Birarda
cb708859fb
resolve conflicts on merge with upstream master
2015-11-18 15:34:56 -08:00
howard-stearns
42a1ee353e
checkpoint
2015-11-18 14:09:33 -08:00
Brad Davis
5b8047ded4
Make recording and playback work in interface, playback in agent
2015-11-18 14:04:45 -08:00
Anthony Thibault
d3d3ddfaf1
Merge pull request #6417 from AndrewMeadows/avatar-capsule
...
fix bounding capusule calculations for new avatars
2015-11-18 13:02:48 -08:00
Brad Hefta-Gaub
35677d3a48
Merge pull request #6418 from birarda/test-ds-settings-fail
...
move keepalive pings transparently to NL
2015-11-18 11:12:16 -08:00
Stephen Birarda
c54dffac12
fix entity-server avg ping, remove debug
2015-11-18 10:32:35 -08:00
Andrew Meadows
ae88057ad9
remove dangling whitespace
2015-11-18 10:24:10 -08:00
Stephen Birarda
0e3d3451d7
make keep alive pings the responsibility of NL
2015-11-18 10:24:10 -08:00
Brad Davis
2636e43fab
Merge pull request #6413 from samcake/controllers
...
Recording: Moving the Recording js interface to the Script engine
2015-11-18 10:22:55 -08:00
Anthony J. Thibault
b481d7c73d
Merge branch 'master' into tony/remove-joint-states
2015-11-18 09:38:21 -08:00
Andrew Meadows
ee751ed1b9
use kDop volume of avatar mesh parts for capsule
2015-11-18 09:22:40 -08:00
Howard Stearns
fee13d4375
Rebuild on a new branch after original stopped building.
2015-11-17 20:06:25 -08:00
Brad Hefta-Gaub
a1e10a9f04
Merge pull request #6309 from thoys/20724
...
CR for Job #20724 - Camera entity mode
2015-11-17 20:05:22 -08:00
Philip Rosedale
450608bf5b
Merge pull request #6390 from sethalves/average-near-holds
...
Average near holds
2015-11-17 20:01:46 -08:00
samcake
368f19b4e2
Merging with todays upstream and checking
2015-11-17 18:58:10 -08:00
samcake
d2f3b48637
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-17 17:36:38 -08:00
Stephen Birarda
5dc48dc9dc
resolve conflicts on merge with upstream/master
2015-11-17 17:04:12 -08:00
Stephen Birarda
935c0cc137
handle AudioInjectorManager cleanup in Application
2015-11-17 16:39:23 -08:00
Brad Davis
48b0465e56
Fixing race condition on seek, correcting some issues with frame timing
2015-11-17 15:18:32 -08:00
Brad Davis
900f425f35
Recording fixes
2015-11-17 15:18:31 -08:00
Andrew Meadows
2b07daa976
Merge pull request #6404 from hyperlogic/tony/bugfixes-for-avatars-with-no-eyes
...
Bug fixes for avatars with no eyes
2015-11-17 14:29:20 -08:00
Brad Davis
6664d8d919
Merge pull request #6398 from ZappoMan/messaging
...
messages-mixer
2015-11-17 14:03:03 -08:00
Anthony J. Thibault
e93b5c5838
Bug fixes for avatars with no eyes
...
Changed default eye position to 1.9 meters because
the hifi_team avatars are 2.0 meters tall.
Also, prevent array access with negative indices when eye bones are missing.
ಠ_ಠ
2015-11-17 14:02:27 -08:00
Brad Hefta-Gaub
32bf81ef0d
move MessagesClient to agent
2015-11-17 12:59:12 -08:00
Brad Hefta-Gaub
e7a8df306c
fix warnings
2015-11-17 11:18:36 -08:00
Sam Gateau
5b92929833
Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client
2015-11-17 09:32:22 -08:00
samcake
8553033d59
Refactoring the mess for the Agent
2015-11-16 19:27:28 -08:00
Brad Hefta-Gaub
1e0b66a68f
more work
2015-11-16 19:23:39 -08:00
Anthony J. Thibault
80eb247b9c
WIP checkin
...
* AnimManipulator: added absolute and relative position and translation support
* Rig: added _overrideFlags and _overridePoses for script overrides.
2015-11-16 18:49:47 -08:00
samcake
71cc36fdd8
removing ms to seconds conversion in MyAvatar
2015-11-16 18:31:24 -08:00
Brad Hefta-Gaub
12f206e2f0
more work on messages
2015-11-16 17:00:03 -08:00
Brad Davis
8a27a2fba5
Fixing recording interface times
2015-11-16 16:29:10 -08:00
Stephen Birarda
aa77c4894c
add an AudioInjectorManager for more efficient threading
2015-11-16 16:04:10 -08:00
Brad Davis
d099f61170
Updating audio record/playback mechanism to more closely match actual audio input
2015-11-16 14:57:24 -08:00
Brad Davis
cb26fc67fc
Move recording interface back to float/seconds
2015-11-16 14:44:22 -08:00
Howard Stearns
35f7a1cf10
Merge pull request #6391 from AndrewMeadows/sisyphus7
...
simplify MyAvatar::deriveBodyFromHMDSensor() take 2
2015-11-16 13:55:22 -08:00
U-GAPOS\andrew
df05a9c8aa
fix bug: bodySensorMatrix constantly reset when walking
2015-11-16 12:02:16 -08:00
Seth Alves
36af315e5d
Merge pull request #6383 from birarda/goodbye-packet
...
send a hopeful disconnect packet from ACs and Interface
2015-11-16 11:28:48 -08:00
Anthony J. Thibault
55adedcec8
Merge branch 'master' into tony/remove-joint-states
2015-11-16 11:22:44 -08:00
Seth Alves
b567a4846d
Merge branch 'master' of github.com:highfidelity/hifi into average-near-holds
2015-11-16 10:08:01 -08:00
Seth Alves
89ed3751ae
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-14 14:00:20 -08:00
U-GAPOS\andrew
049fe4abee
minor cleanup
2015-11-13 17:42:12 -08:00
samcake
8c21ac144e
Fixing review comments
2015-11-13 16:45:19 -08:00
U-GAPOS\andrew
6733767d8b
use animation state to compute bodyInSensorFrame
2015-11-13 16:39:40 -08:00
Seth Alves
b0d24be58f
add a way to get a list of all actions of a certain type from an entity. hold actions average their positional targets.
2015-11-13 16:02:39 -08:00
Seth Alves
ac635336b7
split AvatarActionHold's finding of its location target into a new function
2015-11-13 14:58:17 -08:00
U-GAPOS\andrew
91bc7ca062
cleanup start/stop logic for HMD follow
2015-11-13 14:04:36 -08:00
Stephen Birarda
ea38c4cc49
don't allow domain check-ins while shutting down
2015-11-12 18:04:15 -08:00
Stephen Birarda
d932ba74fd
remove the avatar kill packet from Interface
2015-11-12 17:58:12 -08:00
samcake
1fd37b51a2
trying to get somewhere....
2015-11-12 17:54:35 -08:00
Stephen Birarda
6b2987eef8
handle domain server node removal in NodeList
2015-11-12 17:47:51 -08:00
Seth Alves
d7be1699a7
adjust how the decision to send action changes over the wire is made
2015-11-12 15:27:10 -08:00
Seth Alves
a78b1619be
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 14:20:23 -08:00
Seth Alves
a8cd891e48
adjust how the decision to send action changes over the wire is made
2015-11-12 14:19:23 -08:00
Brad Davis
ee1545f649
Cleaning up clip and transform
2015-11-12 11:48:47 -08:00
Seth Alves
3519dd248b
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 09:53:11 -08:00
Brad Davis
f521be10fe
Avatar recording work in progress
2015-11-12 00:33:38 -08:00
Anthony J. Thibault
e698d3c1e8
Isolate JointStates within the Rig class
...
Except for SkeletalModel::computeBounds() JointStates are now completly
encapsulated by the Rig. Now we can start using AnimPoses instead and
in parallel with the JointState implementation. Then we can assert that
they are identical, before removing JointStates.
This check in has many comments with the AJT tag.
Each one of these cases will need to be revisitied and fixed.
In particular // AJT: LEGACY will be used to enclose all code
in the Rig which manipulates the _jointState QVector.
2015-11-11 18:23:58 -08:00
Thijs Wenker
4c2c37acce
Merge branch 'master' of https://github.com/worklist/hifi into 20724
2015-11-12 02:19:35 +01:00
Anthony J. Thibault
11440f92f4
Removed rig animations
...
* Deleted AnimationHandle class
* Removed enableAnimGraph and anableRigAnimations from Menu.
* Removed *some* references to old IK system.
But it is still used when computing collision bounding volumes
2015-11-11 15:32:57 -08:00
Anthony J. Thibault
533773d1cd
Removed animationHandles section from Avatar prefs
2015-11-11 13:21:37 -08:00
Anthony J. Thibault
cce967df94
Removed AnimationsDialog
2015-11-11 12:14:56 -08:00
Anthony J. Thibault
56e96ed24c
Merge branch 'master' into tony/script-start-stop-anim
2015-11-11 11:33:24 -08:00
Anthony J. Thibault
936c55a94e
New MyAvatar animation JS interface
...
JavaScript changes:
* removed MyAvatar.playAnimation
* removed MyAvatar.stopAnimation
* removed MyAVatar.getGetAnimationDetails
* removed MyAvatar.startAnimationByRole
* removed MyAvatar.stopAnimationByRole
* removed MyAVatar.getGetAnimationDetailsByRole
* removed MyAVatar.clearJointPriorities
* added MyAvatar.overrideAnimation(url, fps, loop, firstFrame, lastFrame)
* added MyAvatar.restoreAnimation()
* added MyAvatar.getAnimationRoles()
* added MyAvatar.overrideRoleAnimation(role, url, fps, loop, firstFrame, lastFrame)
* added MyAvatar.restoreRoleAnimation(role)
* added MyAvatar.prefetchAnimation(url)
* update kneel.js with new api.
* added theBird.js to test role override api.
C++ changes:
* Added getParent() and replaceChild() to AnimNode
* Added findByName() and traverse() to AnimNode
* Changed AnimStateMachine to hold nodes by childIndex instead of smart pointer.
This allows script to replace nodes dynamically via overrideRoleAnimation
2015-11-10 16:34:38 -08:00
Seth Alves
4df65e4c11
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-10 15:02:07 -08:00
samcake
d3d5d3a19e
Removing useless code
2015-11-10 12:02:20 -08:00
Thijs Wenker
27495b99f2
Merge branch 'master' of https://github.com/worklist/hifi into 20724
2015-11-10 19:17:33 +01:00
Seth Alves
b9ca509f07
Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup
2015-11-10 09:50:12 -08:00
samcake
d1df6854ac
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-10 09:16:28 -08:00
Anthony J. Thibault
eacc2cae0c
WIP checkpoint
2015-11-09 18:36:23 -08:00
Anthony J. Thibault
af2b3bb9d5
MyAvatar: removed priority, hold and maskedJoints from playAnimation js call
2015-11-09 16:56:49 -08:00
Atlante45
767a7a7f1e
Fix warnings on OS X
2015-11-09 14:26:23 -08:00
Thijs Wenker
a58bd4ff05
Merge branch 'master' of https://github.com/worklist/hifi into 20724
2015-11-09 22:37:44 +01:00
samcake
2078c753ae
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-09 09:23:59 -08:00
Seth Alves
f3d26e163d
turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system
2015-11-07 07:19:27 -08:00
Clément Brisset
2c27d18922
Merge pull request #6282 from jherico/externals
...
Runtime plugins fixes
2015-11-06 19:30:40 -08:00
Brad Davis
6122fa145d
More PR feedback
2015-11-06 17:17:26 -08:00
Brad Davis
37a9538f10
PR feedback, ensure destruction of shared objects
2015-11-06 16:57:31 -08:00
Brad Davis
11733c039f
Allow shared libraries to access core global objects
2015-11-06 16:57:31 -08:00
Atlante45
0a65bb145b
Some more code cleanup
2015-11-06 16:44:28 -08:00
samcake
5fb2c3ccd1
resolve merge conflict
2015-11-06 16:27:47 -08:00
Brad Davis
7c433f47c0
Breaking up input devices and input plugins classes.
2015-11-06 15:20:00 -08:00
James B. Pollack
8eea7ff67c
Merge pull request #6329 from sethalves/fix-grab-release
...
send to server upon grab release
2015-11-06 14:33:08 -08:00
AlessandroSigna
fdd4a55057
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 12:47:04 -08:00
AlessandroSigna
6d3a79af83
changed the behaviour of Standard.LY input
2015-11-06 12:46:08 -08:00
samcake
703a6bdb95
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 12:38:07 -08:00
Clément Brisset
5d80dc0c90
Merge pull request #6324 from sethalves/smooth-hold-action-velocity
...
smooth hold action velocity over 2 frames
2015-11-06 12:25:52 -08:00
Seth Alves
46b7b92b2f
prefix private member variables with _
2015-11-06 11:54:51 -08:00
samcake
a82c2d66ed
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 11:53:49 -08:00
Brad Davis
1dc392bb36
Merge pull request #6330 from Atlante45/master
...
// FIXME incredibly evil....
2015-11-06 11:43:33 -08:00
Atlante45
c53c0ec53f
Fix double delete on shutdown
2015-11-06 11:13:10 -08:00
samcake
2f9c33dbfb
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 09:35:48 -08:00
samcake
46d9a14951
Work in progress, fixing the animation playback
2015-11-06 09:35:20 -08:00
Seth Alves
4ed8a1e5d1
changes to send an update to entity-server when AvatarActionHold releases an entity
2015-11-06 09:25:53 -08:00
Thijs Wenker
de98a17ada
- rename CameraEntityItem to AnchorEntityItem
2015-11-06 01:58:08 +01:00
Atlante45
ffafd3194e
Recording audio fixes
2015-11-05 16:46:59 -08:00
Seth Alves
28d4d29bb6
smooth hold action velocity over 2 frames
2015-11-05 15:07:00 -08:00
Anthony J. Thibault
50370479e4
Application.h: coding standard fixes
2015-11-05 11:03:32 -08:00
Anthony J. Thibault
d9f4b0218e
Merge branch 'master' into tony/mac-fixes
2015-11-05 08:26:44 -08:00
samcake
00797b4dea
Merge pull request #6314 from jherico/homer
...
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 23:33:45 -08:00
Brad Davis
86b852231e
Merge pull request #6286 from EdgarPironti/master
...
Spacemouse migration
2015-11-04 19:15:35 -08:00
Brad Davis
20d1035821
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 15:54:50 -08:00
Anthony J. Thibault
d46d521d81
Added #else branch to #if 0
2015-11-04 15:10:23 -08:00
Thijs Wenker
42cbccc725
fix stretchy HMD view on entity camera
2015-11-04 21:39:22 +01:00
Thijs Wenker
ee218faf5e
Merge branch '20724' of github.com:thoys/hifi into 20724
2015-11-04 21:21:57 +01:00
Anthony J. Thibault
69f1cfbcb9
Fixes for Mac build and crash on startup
...
For some reason the qt code gen is getting confused by the #if 0
in 3DConnextionClient.h, so I added a stub implementation.
In Application.cpp the change of moving idle into paintGL had a sideeffect
of calling OffscreenGlCanvas before it was initialized. To work around this
I added a guard to prevent calling idle before all the gl windows/widgets have
been initialized.
2015-11-04 12:04:34 -08:00
Anthony Thibault
275b248547
Merge pull request #6302 from AndrewMeadows/fix-avatar-drift
...
fix slow drift of avatar when wearing HMD
2015-11-04 11:19:45 -08:00
samcake
ce5e89ce66
removing the pulsing mechanism in MyAvatar and making a new stadnard.json mapping file
2015-11-04 10:53:53 -08:00
U-GAPOS\andrew
9de5721a48
set _hmdFollowVelocity to zero when done following
2015-11-04 10:23:55 -08:00
Seth Alves
270b4b97fc
remove a left-over kludge that was causing the appearence of frame-lag in held objects
2015-11-04 02:26:02 -08:00
EdgarPironti
7adf38f781
Spacemouse migration
2015-11-03 18:22:55 -08:00
EdgarPironti
2a84cadd5d
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 18:22:29 -08:00
Thijs Wenker
d7279e4c88
Support for Camera Entities.
...
- New entity type: camera, with just the basic properties of an entity (position, rotation, name etc.).
- New CameraMode: CameraEntity
- Example script using the new cameraEntity
- Updated edit.js to use the CameraEntities (with button to preview the camera)
2015-11-04 02:51:23 +01:00
Brad Hefta-Gaub
71e4092276
Merge pull request #6283 from hyperlogic/tony/one-update-for-every-render
...
Remove idleTimer and call idle directly from paintGL.
2015-11-03 16:38:43 -08:00
Anthony J. Thibault
31f361d49c
Moved fps timing to beginning of paintGL
...
This should improve accuracy.
However the fps displayed can still sometimes be slightly greater then the
vsync, this is either due to timer accuracy problems or QTimer delay within
OpenGLDisplayPlugin.
2015-11-03 15:51:18 -08:00
U-GAPOS\andrew
d544b7a645
fix bug: avatar can't walking when HMD at rest
2015-11-03 13:59:15 -08:00
Andrew Meadows
4215ce5d25
Merge pull request #6212 from howard-stearns/dont-use-other-avatar-sounds
...
Don't play other avatar's collision sounds.
2015-11-03 13:40:27 -08:00
Andrew Meadows
498cec3abd
Merge pull request #6294 from AndrewMeadows/fix-hydra-sans-hmd
...
fix hydra sensor matrix when no HMD is attached
2015-11-03 13:37:03 -08:00
EdgarPironti
d99838de9c
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 12:25:19 -08:00
Andrew Meadows
e160e2a7ae
the minimal fix
2015-11-03 11:37:30 -08:00
Brad Davis
4c076d8b12
Disabling billboard rendering, source of the evil black rectangles
2015-11-03 11:34:05 -08:00
Andrew Meadows
12ff9734e0
init _bodySensorMatrix in ctor
2015-11-03 11:26:49 -08:00
Anthony J. Thibault
c139b62217
fps calculation now based on moving average
...
fps stat is now calcualted the same way as simRate and avatarRate are calculated,
based on a moving average that is sampled once a second.
Also, Removed unused constants and renamed Application::checkFPS to Application::ping
2015-11-03 11:19:49 -08:00
EdgarPironti
603405ad61
Do not merge - Spacemouse
2015-11-02 23:29:15 -08:00
Brad Davis
764ecba2a8
Adding diagnostics to track down the 'black rectangles of death'
2015-11-02 21:55:35 -08:00
Anthony J. Thibault
0c12bb5a4e
Remove idleTimer and call idle directly from paintGL.
2015-11-02 18:47:18 -08:00
Seth Alves
310a5c9bfb
don't initialize SMI sdk unless we need it
2015-11-02 13:42:12 -08:00
U-GAPOS\andrew
a77f888f15
more correct HMD offset correction velocity
2015-11-02 11:29:17 -08:00
U-GAPOS\andrew
a545d770d8
fix bug preventing avatar motion in 2D mode
2015-11-02 11:07:43 -08:00
Andrew Meadows
9799693135
remove extra whitespace
2015-11-02 11:07:41 -08:00
Andrew Meadows
fd557c4e52
route HMD-following through the physics simulation
2015-11-02 11:07:40 -08:00
Howard Stearns
fc63fa6f7b
Update comments, and don't continue through collisions after finding one for our avatar.
2015-11-01 18:55:43 -08:00
Howard Stearns
ea2971a24f
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-11-01 17:02:59 -08:00
Brad Hefta-Gaub
9c23f2551d
Merge pull request #6207 from jherico/pluginSupport
...
Support for runtime plugins (DLLs)
2015-11-01 14:57:13 -08:00
Brad Davis
cfb2fd1523
Support for runtime plugins (DLLs)
2015-11-01 11:12:12 -08:00
Brad Hefta-Gaub
e899229cde
tweaks to how VrMenu is shown
2015-11-01 09:55:30 -08:00
Brad Hefta-Gaub
05dea847be
add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu
2015-10-31 15:47:40 -07:00
Howard Stearns
79f05c63e5
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-31 11:23:18 -07:00
Seth Alves
896ed3927c
merge from upstream
2015-10-30 19:17:43 -07:00
Anthony J. Thibault
085282db4f
Crash fix for AvatarManager when iterating over _avatarHash
...
The main problem is that a null shared pointer was inserted into the _avatarHash
via the AvatarManager::getAvatarBySessionID(). When the sessionID is not present
in the _avatarHash, [QHash](http://doc.qt.io/qt-5/qhash.html#operator-5b-5d ) will *insert*
an empty smart_ptr into the hash.
2015-10-30 16:13:04 -07:00
Andrew Meadows
f652e983a9
flag kinematic objs when changed in stepSimulation()
2015-10-30 14:53:29 -07:00
Howard Stearns
28246c1951
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-30 13:21:56 -07:00
Brad Hefta-Gaub
8839458d54
Merge pull request #6242 from highfidelity/controllers
...
New Controller interfaces/api
2015-10-30 12:47:51 -07:00
Seth Alves
93503d0a21
make kinematic grab set entities kinematic in bullet and update entity position
2015-10-30 11:03:13 -07:00
Howard Stearns
792fed0090
We weren't setting type for avatar motion states.
2015-10-29 22:15:26 -07:00
