Andrew Meadows
466af03fa9
support for ShapeInfo::offset
2015-05-21 16:25:05 -07:00
Andrew Meadows
f6721aa6eb
moved ShapeInfoUtil to be ShapeFactory
2015-05-21 15:53:16 -07:00
Andrew Meadows
2e3973dfdd
impl AvatarMotionState::set/getWorldTransform()
2015-05-21 15:34:30 -07:00
Andrew Meadows
67f5d0773d
some list management of AvatarMotionStates
2015-05-21 14:40:47 -07:00
Andrew Meadows
f86c419988
stubbery for collidable avatars
2015-05-19 14:15:26 -07:00
Andrew Meadows
7a47e04b9c
adjust margin for hulls with small dimensions
2015-05-14 14:57:18 -07:00
Andrew Meadows
81d06e0dc3
Merge upstream/master into andrew/nova
...
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityItemProperties.cpp
2015-05-14 10:09:55 -07:00
Andrew Meadows
c631f85bf9
cleanup of simulation ownership/update logic
2015-05-14 08:43:54 -07:00
Seth Alves
711752bff1
rather than call setMargin, clench in all the points of a collision-hull toward the center of the hull by the margin amount
2015-05-13 13:54:24 -07:00
Seth Alves
2ec660bd42
try out smaller collision margins
2015-05-13 13:00:57 -07:00
Andrew Meadows
fb34a5ba84
renaming and cleanup
2015-05-13 08:44:10 -07:00
Andrew Meadows
7e9e223b3e
merge upstream/master into andrew/nova
2015-05-12 21:48:55 -07:00
Andrew Meadows
4872a565c9
bid for simulation ownership
2015-05-12 21:46:52 -07:00
Andrew Meadows
e89471e7d6
enable non-moving update when obj is active
2015-05-08 15:41:00 -07:00
Andrew Meadows
a2ffc1029b
clear MotionState pointer in body on delete
2015-05-08 14:18:44 -07:00
Andrew Meadows
603afefaab
silence verbose no-very-helpful log message
2015-05-08 14:16:38 -07:00
Andrew Meadows
ada48bcb70
fix for glitchy physics updates
2015-05-08 09:06:31 -07:00
Andrew Meadows
e7e4d80be5
always remove from _pendingAdds just in case
2015-05-07 15:22:58 -07:00
Andrew Meadows
1879a67804
cleanup
2015-05-07 14:42:09 -07:00
Seth Alves
0347af9682
minor cleanup
2015-05-07 14:03:50 -07:00
Andrew Meadows
f0618501dd
fix non-physical kinematic motion
...
also can set objects collisionless again
2015-05-07 11:29:42 -07:00
Andrew Meadows
47f978b86e
merge
2015-05-07 10:31:27 -07:00
Andrew Meadows
070140440d
fix crash bug when invalid entity ptr accessed
2015-05-07 10:30:22 -07:00
Andrew Meadows
fe5cfdf495
fix crash bug
...
when obj deleted but dangling pointer still on _pendingAdd
which would not be removed during getObjectsToDelete()
because backpointers had been disconnected
2015-05-07 10:28:38 -07:00
Seth Alves
867fe18472
put some code back now that entity-server is doing simple simulation again. don't draw blue physics-enabled dot unless debug menu-item is checked
2015-05-07 10:11:36 -07:00
Seth Alves
fe14202f51
add getName passthrough to ObjecdtMotionState, don't compute model shapes until the model has been simulated
2015-05-07 09:53:39 -07:00
Seth Alves
5ac8558168
flash yellow box when transmitting an edit packet
2015-05-06 17:03:27 -07:00
Seth Alves
cc5f2ee451
in isMovingVsServer look at entity velocity only
2015-05-06 16:26:27 -07:00
Seth Alves
ba6f6d19cc
disable updateServerPhysicsVariables
2015-05-06 16:20:16 -07:00
Seth Alves
630f1ce9d9
isMovingVsServer function
2015-05-06 16:13:07 -07:00
Seth Alves
e73503a53d
Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1
2015-05-06 16:05:13 -07:00
Seth Alves
b0ccabe38e
update a motionstate's idea of what the entity-server thinks when an incoming update packet arrives
2015-05-06 16:05:05 -07:00
Andrew Meadows
452e84d43f
only update physics when proper flags are set
2015-05-06 16:02:03 -07:00
Andrew Meadows
7b1886a285
harvest outgoing changes for non-NULL entities
2015-05-06 16:01:25 -07:00
Seth Alves
4c3cbea261
don't auto-remove simulation owner unless the Node is gone. put back code that causes interfaces to give up ownership
2015-05-06 15:32:02 -07:00
Seth Alves
86ec12b22c
don't increase moving-without-simulator counter unless the thing is moving enough
2015-05-06 14:30:45 -07:00
Seth Alves
fe308c0189
only do infection during collisions if one of the objects is being simulated by this interface
2015-05-06 13:50:14 -07:00
Seth Alves
96a44314c9
don't have interface give up ownership
2015-05-06 13:29:54 -07:00
Andrew Meadows
326d17072e
merge seth/dice-on-table-1 into andrew/nova
2015-05-06 11:50:12 -07:00
Andrew Meadows
c97b11a6e9
no ownership of kinematic objects on collision
2015-05-06 11:48:31 -07:00
Andrew Meadows
f0c778a802
fix bug preventing taking of simulation ownership
2015-05-06 11:46:42 -07:00
Andrew Meadows
646661d037
update body gravity when proper dirty bits are set
2015-05-06 11:46:25 -07:00
Seth Alves
129a3a82da
clear incoming flags after adding an entity to simulation. If an entity has a shape-type of none, don't keep asking it for a shape
2015-05-06 11:20:39 -07:00
Andrew Meadows
14f925b48e
merge seth/dice-on-table-1 into andrew/nova
...
Conflicts:
libraries/physics/src/EntityMotionState.cpp
libraries/physics/src/ObjectMotionState.h
2015-05-05 16:54:53 -07:00
Andrew Meadows
50f73602f6
cleanup PhysicalEntitySimulation::_outgoingChanges
2015-05-05 16:51:07 -07:00
Andrew Meadows
d4701b4310
namechange getIncomingDF --> getAndClearIncomingDF
2015-05-05 16:49:41 -07:00
Seth Alves
c35edd8eb4
some debugging on Andrew's refactor
2015-05-05 16:40:10 -07:00
Seth Alves
c9f97b9d42
Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1
2015-05-05 15:50:24 -07:00
Andrew Meadows
2668ff6d0a
check for DIRTY_ROTATION bit when copying rotation
2015-05-05 15:34:50 -07:00
Andrew Meadows
8523a96e2b
implement setShouldClaimSimulationOwnership()
2015-05-05 15:34:26 -07:00