Howard Stearns
8cf71f285d
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-01 16:03:40 -07:00
Seth Alves
92b5fe3457
fix thinko -- if the changes didn't happen, put them back on the list and don't clear their dirty flags
2015-08-28 10:31:28 -07:00
Howard Stearns
8e3d8cd31c
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-08-26 16:08:42 -07:00
Howard Stearns
475331a97d
Sprinkle locks everywhere.
2015-08-26 16:08:07 -07:00
Seth Alves
696e34b996
Merge branch 'linux-memory-debugger' of github.com:sethalves/hifi into polyvox
2015-08-26 11:11:41 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Seth Alves
caafea6e3b
allow compound collision shapes with less than 2 sub-shapes
2015-08-25 11:46:34 -07:00
Seth Alves
dc31c7e233
back out previous attempt at theading polyvox code. lay groundwork for threading that can be reasoned about
2015-08-23 08:14:05 -07:00
Seth Alves
6db0442fda
allow for asynchronous building of collision shape
2015-08-21 10:48:26 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Andrew Meadows
9ee49c3e1e
Merge pull request #5551 from sethalves/quiet-compiler
...
Quiet compiler
2015-08-18 09:54:29 -07:00
Seth Alves
b25f6df7af
quiet compiler
2015-08-11 10:22:56 -07:00
Bradley Austin Davis
1db4162371
Merge branch 'master' into plugins
2015-07-23 13:42:03 -04:00
Andrew Meadows
bf3ff8daea
fix crash for convex hull of co-planar points
2015-07-22 15:06:10 -07:00
Brad Davis
5744200f64
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/MyAvatar.h
2015-07-20 19:21:02 -07:00
Stephen Birarda
8b5026a817
cleanup some warnings
2015-07-15 11:20:55 -07:00
Anthony J. Thibault
aa66691a73
Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers
2015-07-14 12:37:09 -07:00
Anthony J. Thibault
dbc18ce51f
merge with plugins
2015-07-14 12:30:47 -07:00
Stephen Birarda
821c16cbc4
resolve conflicts on merge with uptream/master
2015-07-14 09:52:20 -07:00
Anthony J. Thibault
158c1c6aa8
Removed some debugging prints and drawing
2015-07-13 20:41:19 -07:00
Seth Alves
848e5bcebf
this code can be called for hold actions if they end up in an svo save. revert a line from a previous commit
2015-07-12 13:43:21 -07:00
Andrew Meadows
9ce9c541de
fix activation of object when action changes
2015-07-10 18:45:40 -07:00
Andrew Meadows
294c1ba367
always serialize ACTION_TYPE_SPRING
2015-07-10 12:25:11 -07:00
Andrew Meadows
56f00a526d
cleanup of ObjectActionSpring
2015-07-10 12:25:11 -07:00
Andrew Meadows
90ae1fea8b
handle case where action params are missing
2015-07-10 12:25:11 -07:00
Seth Alves
85f206d49d
if an action is updating its own arguments, cause updates to go out over network
2015-07-09 14:13:01 -07:00
Stephen Birarda
1b4e333c49
Merge pull request #3 from birarda/atp
...
initial networking API changes for new protocol
2015-07-09 16:51:37 -04:00
Andrew Meadows
55207a8fb1
enforce coding standards
2015-07-09 11:59:28 -07:00
Andrew Meadows
ccf14b2e50
fix syntax error typo
2015-07-09 11:43:57 -07:00
Andrew Meadows
612e9649d8
fix update logic of ObjectActionOffset
2015-07-09 11:35:54 -07:00
Andrew Meadows
46bca30698
MotionState reports zero velocity for slow objects
...
This reduces the number of updates for an Entity that is effectively
at rest due to a balance between some spring action and gravity, but
nevertheless has a slight non-zero velocity at the end of each
simulation step.
2015-07-09 11:34:27 -07:00
Stephen Birarda
da3502eb6c
resolve conflicts on merge with upstream/master
2015-07-08 18:41:48 -07:00
Andrew Meadows
58c32dbf20
remove whitespace from end of lines
2015-07-08 11:30:04 -07:00
Stephen Birarda
74940a2132
replace lingering PacketTypes in old format
2015-07-08 10:18:13 -07:00
Andrew Meadows
a0a1b01ea9
coalesce dupe action data members: _id and _type
2015-07-07 17:50:08 -07:00
Andrew Meadows
e9df8cacc7
make some arguments const, cleanup some #includes
2015-07-07 17:50:08 -07:00
Andrew Meadows
77bd7b2821
some ObjectAction methods should be const
2015-07-07 17:50:08 -07:00
Sam Gondelman
f69b755166
merge with hifi/plugins
2015-07-06 17:41:45 -07:00
Anthony J. Thibault
f0d8916d8a
First crack at room scale tracking from vive HMD.
...
* modifed openvr plugin to return different eye pose matrices.
* avatar position and physics body now follow the head.
* orientation also follows head direction
2015-07-02 09:47:08 -07:00
Seth Alves
e8a6acd65b
responses to code review
2015-07-01 10:42:04 -07:00
Seth Alves
5e2f7204b4
responses to code review
2015-07-01 10:29:42 -07:00
Seth Alves
a356cbf620
remove commented code
2015-07-01 07:33:46 -07:00
Seth Alves
6e7973f5b9
coding-standard / code-review
2015-06-30 19:28:22 -07:00
Seth Alves
505332c367
include action data among physics initiated network updates from interface to entity-server
2015-06-30 10:19:03 -07:00
Seth Alves
c3747ab8aa
initialize some variables
2015-06-29 19:40:57 -07:00
Seth Alves
88fc74374b
if a hold action is edited by a local script, mark it as 'mine'. if it's not 'mine', let the spring action handle the wire protocol
2015-06-29 19:27:10 -07:00
Seth Alves
fbede0a23f
guard against feeding bullet a NaN
2015-06-29 15:54:24 -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
1d122060a6
merge andrew's sim-ownership branch
2015-06-29 09:50:38 -07:00
Seth Alves
0970f010a4
provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are
2015-06-27 13:31:00 -07:00
Seth Alves
c0c1116c69
attempt some clean-ups in edge/unexpected situations
2015-06-27 11:09:28 -07:00
Seth Alves
30be515a94
remove unneeded lock around action-data in entity item. Actions now use a weak pointer to keep track of owner entity
2015-06-27 08:53:27 -07:00
Andrew Meadows
4d4b97fe59
add priority promotion to reduce volunteer races
...
also fix priority inheritance from chained collisions
2015-06-26 22:30:06 -07:00
Andrew Meadows
e18506c77f
promote volunteer priority
...
also remove some cruft
change uint8_t to be quint8
2015-06-26 22:00:43 -07:00
Andrew Meadows
d6c69e8fe6
pack terse update parameters near each other
...
also don't constantly resend ownership data
2015-06-26 22:00:43 -07:00
Andrew Meadows
40f6ecd936
fix crash for dereference null pointer
2015-06-26 21:58:40 -07:00
Andrew Meadows
44d3074561
remove debug code
2015-06-26 21:58:03 -07:00
Andrew Meadows
12fc18092b
SimulationOwner as one property
2015-06-26 21:58:03 -07:00
Andrew Meadows
cf74dbe1dc
partial progress toward sim ownership negotiations
...
works well for just a few objects but fails for piles
committing some debug stuff that will have to be torn out later
2015-06-26 21:57:04 -07:00
Andrew Meadows
a33c350385
improved forcing of simulator ownership bid
2015-06-26 21:57:04 -07:00
Andrew Meadows
8510110324
increase sim priority when flagged for ownership
2015-06-26 21:57:04 -07:00
Andrew Meadows
2579247c34
claim ownership faster for scripted manipulations
2015-06-26 21:57:04 -07:00
Andrew Meadows
7c793c6397
accept simulation release from entity-server
2015-06-26 21:57:04 -07:00
Andrew Meadows
d0ac3e4514
more work on simulator priority
...
scripts that edit terse update data try to assert priority
physics simulation tries to assert "volunteer" priority
max priority rules are applied in entity server
2015-06-26 21:57:04 -07:00
Seth Alves
1326791502
add sanity check to PhysicalEntitySimulation::addAction
2015-06-26 16:55:16 -07:00
Seth Alves
31a3ca641d
clean up left-over action if it's re-added
2015-06-26 16:54:46 -07:00
Seth Alves
c95db5672a
include argument-packing version in serialized argument data
2015-06-26 10:01:45 -07:00
Seth Alves
f5f1d0829c
Merge branch 'physics-lock-entity-tree' of github.com:sethalves/hifi into actions-over-wire
2015-06-26 07:20:51 -07:00
Seth Alves
015498a6e0
move function up so this builds in non-debug mode
2015-06-26 07:20:22 -07:00
Seth Alves
2682c4720d
fix alt-branch of ifdef
2015-06-26 07:04:10 -07:00
Seth Alves
a0d77c061c
lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does
2015-06-26 07:00:28 -07:00
Seth Alves
4849e2922e
quiet valgrind
2015-06-22 14:21:25 -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
5381e6e9bb
entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion
2015-06-19 16:20:07 -07:00
Seth Alves
32cf669d8b
moving toward sending actions over wire
2015-06-18 17:51:41 -07:00
Philip Rosedale
2f080a8e29
Merge pull request #5147 from sethalves/more-actions
...
offset action
2015-06-18 17:35:50 -07:00
Seth Alves
5e80868fe0
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-18 16:31:07 -07:00
Seth Alves
3c90c851e9
start on code to de/serialize actions
2015-06-18 15:01:34 -07:00
Philip Rosedale
61a2196a30
Reduce error tolerances for ballistic prediction that trigger updating the server
2015-06-18 13:21:37 -07:00
Seth Alves
15f156fcd2
Merge branch 'fix-build' of github.com:sethalves/hifi into actions-over-wire
2015-06-17 15:18:39 -07:00
Seth Alves
fbfa73af2d
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-17 15:18:17 -07:00
Seth Alves
68df6b662d
fix ifdefs around asserts
2015-06-17 15:03:09 -07:00
Seth Alves
44bb220130
fix debug build
2015-06-17 14:54:13 -07:00
ZappoMan
f2ba91383c
fix some warnings
2015-06-17 14:26:36 -07:00
Seth Alves
85564199c6
git rid if pull-to-point action (spring handles this). add new action which tries to maintain an entity's distance from a given point
2015-06-17 11:22:10 -07:00
Seth Alves
4216308b9b
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-10 19:05:25 -07:00
Seth Alves
45c7cd4929
respond to code review, add a simple hold-a-stick script
2015-06-10 18:48:51 -07:00
Seth Alves
eccf4eb8a8
hold action works
2015-06-10 17:05:49 -07:00
Andrew Meadows
8d41960cc3
reset simulation bid counters on object activation
2015-06-10 12:40:14 -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
b1a209b9db
pull some common code out of subclasses and into ObjectAction
2015-06-09 16:17:48 -07:00
Seth Alves
23dab530f9
fix some glitchy behavior during rotation
2015-06-09 14:11:01 -07:00
Seth Alves
ccb2f17b33
grab.js rotation sort-of works now
2015-06-09 11:21:13 -07:00
Seth Alves
14a45e8349
convert grab.js to use spring action. rotation doesn't work right, yet
2015-06-08 18:25:58 -07:00
Seth Alves
b3bc9c3ef0
first attempt at getting spring-action to handle rotation
2015-06-08 17:10: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
Seth Alves
b0480af040
Merge pull request #5053 from AndrewMeadows/isothermal
...
fix crash during bogus reconnect on login
2015-06-05 11:38:23 -07:00
Seth Alves
28c034698f
Merge branch 'master' of github.com:highfidelity/hifi into actions
2015-06-05 10:41:20 -07:00
Seth Alves
c5143cdfa0
Merge pull request #5027 from AndrewMeadows/isentropic
...
cleanup around sending all "terse update" data whenever some of it changes
2015-06-05 10:41:06 -07:00
Seth Alves
4e10c28b41
merge from upstream
2015-06-05 10:31:13 -07:00
Seth Alves
edb3622c85
Merge pull request #5037 from AndrewMeadows/inertia
...
collision groups for physical objects
2015-06-05 10:26:28 -07:00
Seth Alves
51f5730e68
formatting
2015-06-05 10:05:11 -07:00
Seth Alves
b2db5f7fee
update grab.js to use pull-to-point action, various other fixes
2015-06-05 07:10:44 -07:00
Seth Alves
ba42b0dcc4
updateAction and deleteAction
2015-06-04 17:51:59 -07:00
Andrew Meadows
911baee8b8
fix for crash during bogus reconnect on login
2015-06-04 16:57:29 -07:00
Andrew Meadows
cd6bf9d461
cleanup comments
2015-06-04 16:56:14 -07:00
Howard Stearns
5cbb5dadca
More perspicacious zero.
2015-06-04 14:21:12 -07:00
Seth Alves
5e5bc497d9
remove debugging prints
2015-06-04 12:44:08 -07:00
Seth Alves
66ab3d455f
use shared pointers to keep track of action objects
2015-06-04 12:29:05 -07:00
Seth Alves
8f19bad97d
pull argument extracting code into EntityActionInterface
2015-06-04 11:39:15 -07:00
Andrew Meadows
6b03e671d8
remove comment cruft
2015-06-04 11:28:07 -07:00
Seth Alves
14026667f5
script interface for creating an action now takes an action-type name rather than having a different call for each action
2015-06-04 10:55:32 -07:00
Andrew Meadows
6ea4c58319
material changes are an "easy" property to update
2015-06-04 10:22:01 -07:00
Seth Alves
57d85cece0
get rid of simulation back-pointer in actions
2015-06-04 09:41:32 -07:00
Seth Alves
d634663bb1
simple action is working. destructor sequense is still suspicous
2015-06-03 17:33:55 -07:00
Andrew Meadows
b0ca2df3aa
move API from PhysicsEngine to ObjectMotionState
2015-06-03 14:56:04 -07:00
Andrew Meadows
8e61a10bcf
compute collision group for entity
2015-06-03 14:22:48 -07:00
Andrew Meadows
ec0b4a956a
move collision group consts to shared lib
2015-06-03 14:13:51 -07:00
Andrew Meadows
7b6cc59d30
basic support for collision groups
2015-06-03 11:40:48 -07:00
Seth Alves
c8ab22c517
hook up entity-scripting-interface to actions
2015-06-03 11:19:45 -07:00
Howard Stearns
c036b5fd4b
Actually commit the changes this time!
2015-06-03 10:19:28 -07:00
Seth Alves
1d0d002222
clear out action change lists after applying them
2015-06-03 09:10:42 -07:00
Seth Alves
a31a5a1554
main actions interface is in EntityItem. changes in actions are queued up and applied before simulation step
2015-06-02 19:40:20 -07:00
Seth Alves
d6549948d0
first pass at entity interface to actions
2015-06-02 16:06:27 -07:00
Seth Alves
100248c4e8
beginnings of ObjectAction class
2015-06-02 13:19:07 -07:00
Seth Alves
b24cd82b80
beginnings of ObjectAction class
2015-06-02 13:18:49 -07:00
Andrew Meadows
2400f5c000
update ALL parameters of remote physics simulation
2015-06-01 09:02:59 -07:00
Andrew Meadows
4e073c77b3
Merge pull request #4978 from sethalves/fix-4973
...
recreate PR #4973 with some additional changes -- removed const keywo…
2015-05-27 21:11:28 -07:00
Andrew Meadows
aba539928d
fix grab glitches and failure to own simulation
2015-05-27 18:05:59 -07:00
Seth Alves
bfa0e9c234
recreate PR #4973 with some additional changes -- removed const keyword from qinvokables for avatar getter methods such as getVelocity
2015-05-27 14:44:23 -07:00
andrew
2a6955ce12
fix windows build
2015-05-27 09:14:11 -07:00
Andrew Meadows
39d8244255
use highfideltiy style for class data member names
2015-05-26 22:59:29 -07:00
Andrew Meadows
708203089c
replace tabs with spaces
2015-05-26 22:53:57 -07:00
Andrew Meadows
efbb9b0238
rewritten MassProperties with complete unit tests
2015-05-26 22:48:45 -07:00
Andrew Meadows
16e5710325
Merge pull request #4954 from ZappoMan/entitysmartpointers
...
EnitityItem smart pointers
2015-05-26 14:05:03 -07:00
ZappoMan
8b78fc4190
EnitityItem smart pointers
2015-05-22 17:57:50 -07:00
Andrew Meadows
461d08c0a9
merge upstream/master into andrew/bispinor
2015-05-22 11:35:02 -07:00
Andrew Meadows
bf225e4886
fix bug masking physics shape changes
2015-05-22 11:33:45 -07:00
Andrew Meadows
0431e8da36
put avatar body in right spot, and give it mass
2015-05-22 11:08:56 -07:00
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
Seth Alves
4a59dc24c5
split entity-add and entity-edit messages
2015-05-20 14:52:03 -07:00
Seth Alves
a769cfdaf2
client decides on new entity-ids, keep EntityItemID class
2015-05-20 10:42:19 -07:00
Seth Alves
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -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
Seth Alves
82828f0b93
print when bullet and local octree don't agree on position of an entity
2015-05-05 13:52:10 -07:00
Seth Alves
1cd93b9ec8
pull andrew's branch, add back in visual indicator of an entity being active in bullet
2015-05-05 13:14:22 -07:00
Andrew Meadows
813d702fc5
fix infinite loop in while
2015-05-05 11:00:25 -07:00
Andrew Meadows
aa5a59c3dc
merge upstream/master into andrew/nova
...
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/physics/src/PhysicsEngine.cpp
2015-05-05 10:24:17 -07:00
Andrew Meadows
6be3cc6efb
remove debug stuff
2015-05-05 10:18:03 -07:00
Andrew Meadows
cfad016ba3
woops, forgot to these changes in last commit
2015-05-05 10:14:19 -07:00
