Andrew Meadows
|
8d41960cc3
|
reset simulation bid counters on object activation
|
2015-06-10 12:40:14 -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
|
edb3622c85
|
Merge pull request #5037 from AndrewMeadows/inertia
collision groups for physical objects
|
2015-06-05 10:26:28 -07:00 |
|
Andrew Meadows
|
6ea4c58319
|
material changes are an "easy" property to update
|
2015-06-04 10:22:01 -07:00 |
|
Andrew Meadows
|
b0ca2df3aa
|
move API from PhysicsEngine to ObjectMotionState
|
2015-06-03 14:56:04 -07:00 |
|
Andrew Meadows
|
7b6cc59d30
|
basic support for collision groups
|
2015-06-03 11:40:48 -07:00 |
|
Howard Stearns
|
c036b5fd4b
|
Actually commit the changes this time!
|
2015-06-03 10:19:28 -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 Meadows
|
0431e8da36
|
put avatar body in right spot, and give it mass
|
2015-05-22 11:08:56 -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
|
c631f85bf9
|
cleanup of simulation ownership/update logic
|
2015-05-14 08:43:54 -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 |
|
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
|
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 |
|
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 |
|
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
|
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 |
|
Andrew Meadows
|
cb37b884d2
|
add ObjectMotionState::getObjectID()
|
2015-05-03 09:26:49 -07:00 |
|
Andrew Meadows
|
42ec39c578
|
add ObjectMotionType::bump(), use in PhysicsEngine
|
2015-05-01 14:39:33 -07:00 |
|
Andrew Meadows
|
b023fe582a
|
make things compile
|
2015-05-01 10:44:50 -07:00 |
|
Andrew Meadows
|
4cb469dd79
|
cleanup how MotionStates are deleted from physics
also fixed some compile errors
removed cruft
|
2015-05-01 08:28:32 -07:00 |
|
Andrew Meadows
|
9f8b266a03
|
fix some compile problems
|
2015-04-30 13:56:37 -07:00 |
|
Andrew Meadows
|
c3901939e6
|
make some things compile after reorganization
|
2015-04-30 13:02:18 -07:00 |
|
Andrew Meadows
|
31ab16ac62
|
move stuff into ObjectMotionState
|
2015-04-29 16:16:44 -07:00 |
|
Andrew Meadows
|
ab38572620
|
new PhysicsEngine API is mostly in place
doesn't compile, of course
large code movements are done
non-physical kinematics have been lost --
will readd in PhysicalEntitySimuation class
|
2015-04-29 09:48:02 -07:00 |
|
Andrew Meadows
|
31e5758422
|
namechange updateObjectEasy()-->updateBodyEasy()
|
2015-04-27 13:04:59 -07:00 |
|
Andrew Meadows
|
e3d29d74af
|
name changes and preparation for more cleanup
|
2015-04-26 15:24:30 -07:00 |
|
Andrew Meadows
|
3ecf959b3e
|
removed cached copies of damping and restitution
|
2015-04-24 14:50:37 -07:00 |
|
Seth Alves
|
2ca592de8b
|
fix logic with infectious simulation ownership
|
2015-04-23 10:02:29 -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 |
|
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
|
b21cc357e4
|
undo stop-sending hack
|
2015-04-14 16:08:53 -07:00 |
|
Andrew Meadows
|
5776df1012
|
load dynamic obj as inactive when not moving
|
2015-02-25 12:07:19 -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 |
|
Andrew Meadows
|
86583f3f3f
|
physics collisions emit script collision events
|
2015-01-21 11:27:32 -08:00 |
|
Andrew Meadows
|
790d07d346
|
track known contacts and generate collision events
|
2015-01-20 14:18:10 -08:00 |
|
Andrew Meadows
|
549e3fac5f
|
store backpointer to MotionState in btRigidBody
|
2015-01-20 10:45:58 -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 |
|
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
|
4946ec18b6
|
remove some TODO comments
|
2015-01-09 09:28:01 -08:00 |
|
Andrew Meadows
|
244a8503ef
|
include damping in remote extrapolation model
|
2015-01-05 14:48:16 -08:00 |
|
Andrew Meadows
|
30200ef7eb
|
add damping to ObjectMotionState
|
2015-01-05 09:17:46 -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
|
3c67400e13
|
namechange CustomMotionState to ObjectMotionState
|
2014-12-03 11:12:04 -08:00 |
|