Brad Hefta-Gaub
faa8e629a0
checkpoint
2017-02-15 20:28:32 -08:00
Seth Alves
bc5f563f57
make _parentID and _parentJointIndex private to avoid accidental direct access
2017-02-12 11:37:29 -08:00
Seth Alves
fa61bbe2a6
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 18:21:39 -08:00
ZappoMan
4c80422a73
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-26 14:34:58 -08:00
Seth Alves
0b51b1d566
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 11:00:02 -08:00
Ryan Huffman
f0f5f8871c
Fix Overlay-as-child of model entity with reg point
...
This fixes as issue where when you set the parent of an overlay to be a
model entity with a non-(0.5, 0.5, 0.5) registration point, the overlay would
still be positioned relative to the center of the model. The issue is
that the default parent joint index was 0, which is the center of the
model.
Entities had a default parent joint index of -1 (technically 65535
because it is a uint16). Avatars previously defaulted to 0, and that is
maintained here.
2017-01-23 16:08:01 -08:00
Seth Alves
4a29cce584
adjust when USER_COLLISION_GROUP_MY_AVATAR is auto-disabled
2017-01-10 06:17:40 -08:00
Seth Alves
45a26d599f
if something is a child of the local avatar, never let it collide with MY_AVATAR
2017-01-09 16:40:28 -08:00
Brad Hefta-Gaub
73bfc069da
more work on only sending changes
2016-12-27 17:19:55 -08:00
Seth Alves
339d6a55cf
getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation
2016-11-03 10:06:07 -07:00
Seth Alves
844cc03dcb
fix names of model-entity joint setters
2016-11-02 10:24:01 -07:00
Seth Alves
7bc1235c54
local velocity and angular velocity in scripts is now handled the way local position and rotation are
2016-08-16 16:47:13 -07:00
Seth Alves
28e0ca2e49
when a parent of a 3d overlay is deleted, delete the overlay
2016-08-01 10:55:34 -07:00
Seth Alves
e4e86c245e
3d overlays can be children of entities or avatars
2016-07-31 14:11:56 -07:00
Seth Alves
f8f62a4ff1
remove unused function
2016-06-13 15:10:52 -07:00
Seth Alves
eba518cb65
try to make code that converts bullet-calculated values to parent-frame values more effecient
2016-06-13 14:26:41 -07:00
Seth Alves
e1ae2a193f
EntityMotionState now uses parent-relative position and rotation and velocity when deciding if it needs to send an edit packet to the entity-server
2016-06-10 11:49:15 -07:00
Andrew Meadows
905c5398c4
add EntityItem::set/getTransformAndVelocities()
2016-04-22 09:38:43 -07:00
Andrew Meadows
a263091c94
fix entity-server crash for out of bounds
2016-04-14 15:23:14 -07:00
Seth Alves
43f735dd21
avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.
2016-04-09 22:18:43 -07:00
Seth Alves
d814d7b35d
merge from upstream
2016-04-04 16:32:49 -07:00
Seth Alves
69bb0ebd74
Revert "faster kinematic motion for entities"
2016-04-04 16:11:54 -07:00
Seth Alves
b8587e0711
update collision shapes of entities which are children of avatars
2016-04-04 16:06:53 -07:00
Andrew Meadows
0830c55bcf
getLocalEverything->getLocalTransformAndVelocities
2016-04-01 17:48:56 -07:00
Andrew Meadows
442b52313f
faster kinematic motion calculations
2016-04-01 13:14:03 -07:00
howard-stearns
b09b9a4a0a
snapshot after using tree from entity item.
2016-03-28 16:58:20 -07:00
howard-stearns
c6347eb92a
checkpoint for debugging/comparing edit.js
2016-03-28 13:39:43 -07:00
Seth Alves
cbfde2032c
fix bug which caused observers of a parenting grab to not see the entity in the grabber's hand
2016-03-17 17:09:32 -07:00
Seth Alves
5f05d576cc
move checkAndAdjustQueryAACube into SpatiallyNestable
2016-03-11 15:55:42 -08:00
Seth Alves
c0c5084149
handle parenting loops
2016-02-26 14:05:02 -08:00
Seth Alves
3f922240d0
clean up handling of success flag and some debugging prints
2016-02-10 16:42:13 -08:00
Anthony J. Thibault
6a82594a4f
SpatiallyNestable: more locks, less contention
2016-02-08 20:09:32 -08:00
Anthony J. Thibault
9a0e206843
SpatiallyNestable: made getParentPointer protected again.
2016-02-08 20:04:45 -08:00
Anthony J. Thibault
072172b1a2
SpatiallyNestable: now with velocity support!
...
Moved velocity and angularVelocity into the SpatiallyNestable base class.
Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities.
MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.
2016-02-08 19:43:23 -08:00
Anthony Thibault
c4f9a4805c
MyAvatar: moving platform support
...
* pass sum of desired and parent velocity onto avatar's character controller.
* pass local position and velocity to Rig for animation purposes.
2016-02-07 14:07:40 -08:00
Andrew Meadows
58a7528b68
Merge pull request #6854 from sethalves/access-avatar-parent-id-from-js
...
Access avatar parent information from js
2016-01-21 09:19:40 -08:00
Seth Alves
09dd3e2a56
merge from upstream, respond to code review
2016-01-19 14:38:22 -08:00
Seth Alves
e365d93ed9
don't save entites with invalid parentIDs (or with IDs that indicates an avatar) to the persist file
2016-01-18 16:50:26 -08:00
Andrew Meadows
6a642bdcf8
fix misusage of smart-pointers
2016-01-07 10:19:46 -08:00
Andrew Meadows
6eb177091b
overhaul of MotionState cleanup
...
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
2016-01-07 10:19:46 -08:00
Seth Alves
942e77166e
merge from upstream
2016-01-05 11:11:19 -08:00
Seth Alves
96f506a98d
code review
2016-01-05 07:27:27 -08:00
Seth Alves
7f2e0cd103
expose a way to set translation and rotation of all model joints at once
2016-01-04 14:13:08 -08:00
Seth Alves
84bcfb7d71
hook up a way for scripts to set model-entity joint state
2015-12-22 17:43:01 -08:00
Seth Alves
688448fe41
more queryAABox experimenting
2015-12-17 16:18:41 -08:00
Seth Alves
473212e5b7
try to be more coherent about queryAABox meaning
2015-12-17 14:29:41 -08:00
Seth Alves
165c41d843
add a way to remember which entities couldn't be properly placed in octree due to missing parents
2015-12-14 14:19:19 -08:00
Seth Alves
c74f8bca49
location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent
2015-12-14 09:13:36 -08:00
Seth Alves
24fb43e8cd
first steps toward a puffed-out query-box for child entities
2015-12-12 12:33:14 -08:00
Seth Alves
6c033d9603
call locationChanged when receiving changing avatar joints over the network. RenderableModelEntityItem uses locationChanged to relay updates to _model
2015-12-11 11:35:42 -08:00
