ZappoMan
a7a0f03ede
rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()
2017-10-27 18:39:17 -07:00
Anthony J. Thibault
da20eac995
Bug fix for deadlock between EntitySimulation and EntityItem locks.
...
This is a classic deadlock between the main thread and the OctreeProcessor network thread.
On the main thread, the EntitySimulation lock is taken before the EntityItem read lock is taken.
On the network thread, the EntityItem write lock is taken before the EntitySimulation lock is taken.
To work around this issue the network thread no longer takes the EntitySimulation lock when calling
PhysicalEntitySimulation::addDynamic(). Instead, a fine grained lock around the EntitySimulation's dynamic lists
is used instead.
2017-08-21 17:14:49 -07:00
Andrew Meadows
c22e4ef883
rename method to clarify where it is called
2017-05-25 13:48:19 -07:00
Andrew Meadows
a31a861e19
fix typo: physcis --> physics
2017-05-05 09:33:50 -07:00
Seth Alves
afa8fc161b
allow hinge constraint between two entities
2017-04-13 15:37:28 -07:00
Seth Alves
74c0a70cb0
rename base action classes to dynamics, start on constraints
2017-04-11 20:39:13 -07:00
Seth Alves
e1e51614d9
don't hang loop if entity isDead
2017-03-24 11:16:54 -07:00
Andrew Meadows
8ddcae2a15
restore transform of deactivated entities
2017-03-09 17:26:53 -08:00
Andrew Meadows
d4abdcb6c8
comments, namechange, and temporary debug code
2017-03-09 17:26:53 -08:00
Anthony J. Thibault
89ae3b3d6e
Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"
...
This reverts commit efe9571ab8
, reversing
changes made to 333e9ec7f4
.
2016-12-05 15:18:03 -08:00
Andrew Meadows
2bbe2be516
fix spelling: physcis --> physics
2016-12-01 10:50:10 -08:00
Seth Alves
4470338663
catagorize some qDebugs
2016-09-14 21:39:45 -07:00
Andrew Meadows
25fb7aacad
ShapeManager hands out const shape pointers
2016-08-24 22:26:56 -07:00
Andrew Meadows
e538625fe0
fix warning about convex hull vertex count cap
2016-06-28 16:35:32 -07:00
Andrew Meadows
13bb174b8b
small change to commented out debug code
2016-06-20 17:29:20 -07:00
Andrew Meadows
d64729372a
ShapeInfo name changes
2016-06-20 17:29:20 -07:00
Andrew Meadows
83b8ef8131
clean up stream formatting of vec3 and friends
2016-05-20 09:41:26 -07:00
Andrew Meadows
5a826d696a
cleanup after code review
2016-05-20 09:41:26 -07:00
Andrew Meadows
9fae1a7edd
tweak log format
2016-05-20 09:41:26 -07:00
Andrew Meadows
7866fcf78c
trim high-point convex hulls
2016-05-20 09:41:26 -07:00
Seth Alves
a0771f8ee5
use smart pointers for entity simulations
2016-05-07 09:14:33 -07:00
Andrew Meadows
dcf28937cf
cleanup cached Physics::sessionUUID
2016-04-14 11:18:10 -07:00
Andrew Meadows
ac5c055a1e
don't verify simulated bit when adding to delete list
2016-03-24 21:12:22 -07:00
Chris Collins
a4afa03fe5
Merge pull request #7077 from sethalves/clean-up-grab-signaling
...
Clean up grab signaling + various fixes
2016-02-11 10:20:56 -08:00
Seth Alves
6a646f1c24
put isMoving back and change all uses to isMovingRelativeToParent
2016-02-10 19:01:41 -08:00
Andrew Meadows
ac60917b54
sigh... protect againt null MotionStates
2016-02-10 17:58:38 -08:00
Andrew Meadows
84fb983da7
don't forget to remove from _outgoingChanges
2016-02-10 10:36:35 -08:00
Andrew Meadows
91a2f86482
update some comments
2016-02-04 13:26:06 -08:00
Andrew Meadows
e51edaa117
update some comments
2016-02-04 13:26:06 -08:00
Andrew Meadows
d8fb61e820
fix crash when deleting entities quickly
2016-01-22 10:25:10 -08:00
Andrew Meadows
e77189fb1b
keep reference to removed entity until next frame
2016-01-20 17:09:37 -08:00
Andrew Meadows
4f29156da1
fixing asserts for EntityItem delete pipeline
2016-01-07 10:19:46 -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
Andrew Meadows
f5d24a87ca
remove entities from physics before we delete them
2016-01-07 10:19:46 -08:00
Andrew Meadows
b34df211df
cleanup API for removal from EntitySimulation
2016-01-07 10:19:46 -08:00
Andrew Meadows
ff83f8fc37
fix crash mode when leaving domain with handgun
2015-12-16 15:11:47 -08:00
Brad Davis
9b81842850
Merge branch 'master' into homer
...
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
2015-09-11 16:31:18 -07:00
Brad Davis
2a15726aaf
More PR comments
2015-09-10 22:29:40 -07:00
Brad Davis
aa989c3687
Fixing some entity race condition crashes
2015-09-10 20:53:17 -07:00
Seth Alves
31fcd55d47
octree uses shared pointers
2015-09-08 11:59:48 -07:00
Seth Alves
6db0442fda
allow for asynchronous building of collision shape
2015-08-21 10:48:26 -07:00
Seth Alves
c539d9f233
allow for removal and readdition of an action in one time-slice without asserting
2015-06-29 12:22:06 -07:00
Seth Alves
1326791502
add sanity check to PhysicalEntitySimulation::addAction
2015-06-26 16:55:16 -07:00
Seth Alves
55975fd611
don't add an action of we're about to remove it
2015-06-22 13:11:42 -07:00
Seth Alves
c14276145d
lock when reading or writing _actionsToAdd or _actionsToRemove
2015-06-22 07:19:40 -07:00
Seth Alves
3dcc6c9b8c
make action-factory interface and subclass it in Interface. this allows an action to use avatar data. the login the AvatarActionHold is still bogus.
2015-06-10 12:04:44 -07:00
Seth Alves
ccb2f17b33
grab.js rotation sort-of works now
2015-06-09 11:21:13 -07:00
Seth Alves
1e858d8bc5
start on spring action
2015-06-08 14:16:03 -07:00
Seth Alves
b425cc6491
merge from upstream
2015-06-05 11:56:33 -07:00