Seth Alves
|
08d300afcd
|
use a flag to indicate that simulation ownership should be grabbed
|
2015-04-20 11:49:10 -07:00 |
|
Seth Alves
|
fbff3627dc
|
attempt to claim simulation ownership of entities the avatar crashes with
|
2015-04-20 11:13:51 -07:00 |
|
Seth Alves
|
dac57c44da
|
if measured acceleration is close to zero, send zero to entity server, else send gravity
|
2015-04-17 15:05:47 -07:00 |
|
Seth Alves
|
292ba20cf3
|
pull andrew's measure-acceleration branch
|
2015-04-17 11:35:12 -07:00 |
|
Seth Alves
|
62a45ccebb
|
re-enable code that gives up simulation ownership
|
2015-04-16 17:00:36 -07:00 |
|
Seth Alves
|
faf5e7415d
|
don't explicitly release simulator status
|
2015-04-16 16:32:51 -07:00 |
|
Seth Alves
|
ec26b4595a
|
adjust comment
|
2015-04-16 16:27:30 -07:00 |
|
Seth Alves
|
f48f9caea4
|
cut back on debuging prints
|
2015-04-16 16:18:13 -07:00 |
|
Seth Alves
|
ea8dcfa5b5
|
read UUIDs as UUIDs rather than as strings. more debugging prints
|
2015-04-16 15:33:43 -07:00 |
|
Seth Alves
|
d7881f1891
|
adjust logic for releasing ownership of simulation
|
2015-04-16 15:15:28 -07:00 |
|
Seth Alves
|
d7059d8f2d
|
add code for uuids in wire protocol. some debugging prints
|
2015-04-16 14:46:38 -07:00 |
|
Andrew Meadows
|
619d1ba191
|
rename to measureAcceleration
|
2015-04-16 14:09:33 -07:00 |
|
Andrew Meadows
|
5180e7e715
|
measure linear velocity of moving objects
|
2015-04-16 13:44:17 -07:00 |
|
Seth Alves
|
c87dca5ba0
|
remove debug print
|
2015-04-15 11:58:12 -07:00 |
|
Seth Alves
|
51ac44a9b7
|
try to increase chances the interface gives up simulation ownership
|
2015-04-15 11:34:42 -07:00 |
|
Seth Alves
|
b21cc357e4
|
undo stop-sending hack
|
2015-04-14 16:08:53 -07:00 |
|
Seth Alves
|
2a87eb9ce1
|
pull from andrew's branch
|
2015-04-14 15:44:53 -07:00 |
|
Seth Alves
|
e25590f00e
|
don't give up ownership of simulation until the last packet is sent
|
2015-04-14 13:37:57 -07:00 |
|
Seth Alves
|
3cf31ff701
|
fix to allow modelEntityItems with shape of box into physicsengine. ignore entity updates echoed back to us. stop broadcasting after 3 non-moving updates
|
2015-04-14 13:32:02 -07:00 |
|
Seth Alves
|
d330319ed9
|
when a script creates and object, set the local Node as the simulation owner
|
2015-04-14 09:56:39 -07:00 |
|
Seth Alves
|
de2e5ae718
|
adjust logic for when to claim or release simulator status
|
2015-04-14 09:00:48 -07:00 |
|
Seth Alves
|
05ef357854
|
debug prints
|
2015-04-13 16:47:06 -07:00 |
|
Seth Alves
|
256a7f5198
|
try different login for deciding when to update/clear simulatorID
|
2015-04-13 16:37:44 -07:00 |
|
Seth Alves
|
4677324a87
|
try different login for deciding when to update/clear simulatorID
|
2015-04-13 16:30:16 -07:00 |
|
Seth Alves
|
a30e807051
|
get rid of unneeded updateSimulatorID, set changed simulator id in properties so it gets included in outgoing packet
|
2015-04-13 16:20:30 -07:00 |
|
Seth Alves
|
396f6b1987
|
mess with debugging prints
|
2015-04-13 15:22:54 -07:00 |
|
Seth Alves
|
9c2fec36fd
|
adjust debugging, try a different DIRTY flag
|
2015-04-13 12:52:31 -07:00 |
|
Seth Alves
|
f42a43e180
|
cause changes to _simulatorID to be broadcast
|
2015-04-13 12:39:40 -07:00 |
|
Seth Alves
|
eace91e833
|
if an entity is being moved and has no sim-id, set sim-id to local node-id. if it has a sim-id, and it's not the same as the local node's, don't broadcast the change
|
2015-04-13 12:25:44 -07:00 |
|
Seth Alves
|
e2af93db5f
|
some debugging
|
2015-04-13 11:38:30 -07:00 |
|
Seth Alves
|
55bab2efd6
|
put physics into its own logging group
|
2015-04-06 18:09:45 -07:00 |
|
Seth Alves
|
1eeb2e89f8
|
remove some debug spam
|
2015-03-24 16:23:51 -07:00 |
|
Seth Alves
|
6e3be26013
|
attempting to figure out why physics motion object doesn't get updated when collision model url changes
|
2015-03-24 15:28:21 -07:00 |
|
Andrew Meadows
|
f5352333f0
|
entities use radians per second for angular velocity
|
2015-03-06 16:42:06 -08:00 |
|
Andrew Meadows
|
373be95297
|
entity cubes are in meters
|
2015-03-06 15:32:03 -08:00 |
|
Andrew Meadows
|
5776df1012
|
load dynamic obj as inactive when not moving
|
2015-02-25 12:07:19 -08:00 |
|
Andrew Meadows
|
23bd3f90d9
|
Bullet-style rotation integration for kinematics
and for dead reckoning after wire-transfer
|
2015-01-27 17:27:15 -08:00 |
|
ZappoMan
|
23892ab1e7
|
fixed comments
|
2015-01-27 11:38:14 -08:00 |
|
ZappoMan
|
b1586d4f90
|
move debug into ifdef
|
2015-01-27 11:29:17 -08:00 |
|
ZappoMan
|
45dbff67f8
|
more hacking
|
2015-01-27 11:15:33 -08:00 |
|
ZappoMan
|
83d1cc911a
|
hacking
|
2015-01-26 19:38:24 -08:00 |
|
ZappoMan
|
81185cfe56
|
removed some debugging
|
2015-01-26 12:46:22 -08:00 |
|
ZappoMan
|
08fbcbaf40
|
tweaks for debugging
|
2015-01-26 12:38:02 -08:00 |
|
ZappoMan
|
a1ec44b8e0
|
add developer menu item to disable sending physics updates
|
2015-01-26 12:05:57 -08:00 |
|
ZappoMan
|
73b9c06ec0
|
added some debugging
|
2015-01-26 11:13:30 -08:00 |
|
ZappoMan
|
f85774c687
|
adding some debugging
|
2015-01-26 09:45:33 -08:00 |
|
ZappoMan
|
9cc61e90f7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixGlitches
Conflicts:
libraries/entities/src/EntityItem.cpp
|
2015-01-23 15:01:35 -08:00 |
|
ZappoMan
|
c01d2d657c
|
added comment
|
2015-01-23 13:55:12 -08:00 |
|
Andrew Meadows
|
f2bcdfa2b4
|
update _lastSimulated for kinematic motion
|
2015-01-23 13:10:41 -08:00 |
|
Andrew Meadows
|
d173afaa70
|
add support for non-physical kinematic movement
|
2015-01-23 11:01:46 -08:00 |
|
ZappoMan
|
6a9a6968f2
|
debugging stutter
|
2015-01-22 13:32:57 -08:00 |
|
ZappoMan
|
c6ad1462e6
|
debugging stutter
|
2015-01-22 13:31:59 -08:00 |
|
ZappoMan
|
838a549abe
|
debugging stutter
|
2015-01-22 13:31:09 -08:00 |
|
ZappoMan
|
14c7dc8eb9
|
debugging stutter
|
2015-01-22 13:13:18 -08:00 |
|
Andrew Meadows
|
86583f3f3f
|
physics collisions emit script collision events
|
2015-01-21 11:27:32 -08:00 |
|
Andrew Meadows
|
840acecbe6
|
merge upstream/master into andrew/bispinor
Conflicts:
libraries/physics/src/EntityMotionState.cpp
|
2015-01-16 15:22:06 -08:00 |
|
Andrew Meadows
|
d5efc375d9
|
Merge pull request #4128 from ZappoMan/master
fix double targets and freezing bullets
|
2015-01-16 14:37:22 -08:00 |
|
Andrew Meadows
|
d5119b3532
|
merge upstream/master into andrew/bispinor
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/physics/src/EntityMotionState.h
libraries/physics/src/ObjectMotionState.cpp
libraries/physics/src/PhysicsEngine.cpp
libraries/physics/src/PhysicsEngine.h
|
2015-01-16 14:36:27 -08:00 |
|
ZappoMan
|
9a60896a40
|
fix double targets and freezing bullets
|
2015-01-16 14:24:50 -08:00 |
|
Andrew Meadows
|
7c9419aa4e
|
fix non-bullet build
|
2015-01-16 10:34:52 -08:00 |
|
Andrew Meadows
|
3fed38793e
|
merge andrew/origin/inertia to andrew/local/inertia
|
2015-01-15 17:55:51 -08:00 |
|
Andrew Meadows
|
250fd98fee
|
support for simple kinematic motion
|
2015-01-15 17:51:01 -08:00 |
|
Andrew Meadows
|
ff171a5782
|
Bullet is now required dependency
|
2015-01-15 10:27:43 -08:00 |
|
Andrew Meadows
|
03b8badd81
|
EntityItem stores density rather than mass.
|
2015-01-14 15:00:57 -08:00 |
|
Andrew Meadows
|
dcca5d532a
|
fix for glitchy physics updates
The main problem was: ObjectMotionState::_sentPosition and friends
were not being updated when the EntityServer update arrives.
|
2015-01-13 14:00:37 -08:00 |
|
Andrew Meadows
|
d2bd95703a
|
use degrees/sec for EntityItem angular velocity
|
2015-01-07 14:04:22 -08:00 |
|
Andrew Meadows
|
6f72d4ad81
|
easier to read Bullet to GLM conversions and back
|
2014-12-30 13:15:57 -08:00 |
|
Andrew Meadows
|
5e2246625b
|
fix layout to abide by the coding standard
|
2014-12-30 12:09:22 -08:00 |
|
Andrew Meadows
|
a97b8b0ea9
|
fix memory leak of EntityMotionState's
|
2014-12-29 16:33:41 -08:00 |
|
Andrew Meadows
|
8de309a7a9
|
more correct _created and _lastEdited
|
2014-12-17 12:38:26 -08:00 |
|
Andrew Meadows
|
b3731e9530
|
hack for "reliable" packet send when objects stop moving
|
2014-12-15 14:36:27 -08:00 |
|
Andrew Meadows
|
fd8e3f6169
|
add moved entities to lists for sorting
and also for outgoing packet updates
|
2014-12-12 13:28:12 -08:00 |
|
Andrew Meadows
|
ad7641c7e0
|
repairs to build when Bullet not found
|
2014-12-11 16:05:45 -08:00 |
|
Andrew Meadows
|
4977bfb708
|
ObjectMotionState puts self on outgoing queue
|
2014-12-11 12:40:43 -08:00 |
|
Andrew Meadows
|
572ceb75a4
|
clarification of what outgoing flags are about
|
2014-12-11 12:07:53 -08:00 |
|
Andrew Meadows
|
11f1ad1d7f
|
move worldOffset into ObjectMotionState
add more methods for getting/clearing incoming/outgoing flags
|
2014-12-11 10:52:34 -08:00 |
|
Andrew Meadows
|
ab75150175
|
moved position/velocity send history to base class
|
2014-12-10 17:00:23 -08:00 |
|
Andrew Meadows
|
b0cc3a8509
|
add logic for when to update moving entity
|
2014-12-08 17:18:07 -08:00 |
|
Andrew Meadows
|
85e7c6166b
|
support for spherical entities
|
2014-12-03 12:10:26 -08:00 |
|
Andrew Meadows
|
919214b7cb
|
split ShapeInfo into shared and physics parts
|
2014-12-02 10:44:40 -08:00 |
|
Andrew Meadows
|
1df6c32a4e
|
moving Shape* back into shared lib
removing dependency of entities lib on physics lib
physics lib now depends on entities lib
|
2014-12-01 16:03:14 -08:00 |
|
Andrew Meadows
|
01b76af9d0
|
moved EntityMotionState.* to CustomMotionState.*
|
2014-11-06 10:58:04 -08:00 |
|
Andrew Meadows
|
1097e7f1f2
|
stubbery for EntityMotionState
|
2014-11-05 16:35:06 -08:00 |
|