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
|
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
|
c37c1515ba
|
EntitySimulation is lockable
also DeleteEntityOperator just removes the entities
and EntityTree does the actual delete
(after properly locking its _simulation)
|
2015-01-08 10:22:25 -08:00 |
|
Andrew Meadows
|
75a8faec86
|
purge support for voxels from PhysicsEngine
|
2015-01-05 15:02:18 -08:00 |
|
Andrew Meadows
|
3b7770f405
|
change meaning of damping to agree with bullet
0 = no damping
1 = 100% damping
The new formula is: velocity *= (1 - damping)^dt
|
2015-01-05 11:23:01 -08:00 |
|
Andrew Meadows
|
a97b8b0ea9
|
fix memory leak of EntityMotionState's
|
2014-12-29 16:33:41 -08:00 |
|
Andrew Meadows
|
b078850c6a
|
remove personal TODO list from code file
|
2014-12-29 10:46:56 -08:00 |
|
Andrew Meadows
|
c6afa0f7e1
|
remove test hack for higher than normal ground
|
2014-12-17 14:17:30 -08:00 |
|
Andrew Meadows
|
6ea766b48d
|
merge andrew/thermonuclear into andrew/inertia
Conflicts:
interface/src/Application.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTypes.cpp
|
2014-12-17 13:21:00 -08:00 |
|
Andrew Meadows
|
905d7f50eb
|
comments on TODO list
|
2014-12-17 12:39:48 -08:00 |
|
Andrew Meadows
|
31486a81c1
|
updated TODO notes
|
2014-12-15 14:41:04 -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
|
c3f8f8ab98
|
init PhysicsEngine with an EntityEditPacketSender
|
2014-12-11 13:29:29 -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
|
cc0e82b97f
|
incoming changes is now QSet<ObjectMotionState*>
|
2014-12-11 10:56:22 -08:00 |
|
Andrew Meadows
|
d9f183458a
|
_entityMotionStates is Qset of EntityMotionState*
|
2014-12-11 08:43:01 -08:00 |
|
Andrew Meadows
|
f9ba4d355c
|
implement EntitySimulation API in PhysicsEngine
|
2014-12-10 17:01:20 -08:00 |
|
Andrew Meadows
|
b0cc3a8509
|
add logic for when to update moving entity
|
2014-12-08 17:18:07 -08:00 |
|
Andrew Meadows
|
d6c97be78e
|
using an infinite plane for the ground
|
2014-12-03 20:17:42 -08:00 |
|
Andrew Meadows
|
3c67400e13
|
namechange CustomMotionState to ObjectMotionState
|
2014-12-03 11:12:04 -08:00 |
|
Andrew Meadows
|
29d0d10103
|
track entities added to PhysicsEngine
also fix for RigidBody's not going dynamic
and a fix for changed entities staying on changed list
|
2014-12-02 17:47:48 -08:00 |
|
Andrew Meadows
|
9f11121df2
|
oops, forgot to add entities to Bullet simulation
|
2014-12-02 15:44:07 -08:00 |
|
Andrew Meadows
|
c9ea6885c1
|
PhysicsEngine is now an EntitySimulation
|
2014-12-02 15:29:41 -08:00 |
|
Andrew Meadows
|
8aba2a06e0
|
Splitting Bullet stuff out of ShapeInfo
|
2014-12-01 16:47:33 -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
|
1c569dcf33
|
remove some cruft
|
2014-11-24 15:05:09 -08:00 |
|
Andrew Meadows
|
ec1f11c1a8
|
route more entity updates into physics engine
|
2014-11-24 11:21:40 -08:00 |
|
Andrew Meadows
|
48164c9399
|
cleanup and moving things around
|
2014-11-19 15:31:17 -08:00 |
|
Andrew Meadows
|
2d400e6ae0
|
rename PhysicsWorld to PhysicsEngine
|
2014-11-18 09:55:25 -08:00 |
|