Andrew Meadows
4946ec18b6
remove some TODO comments
2015-01-09 09:28:01 -08:00
Andrew Meadows
1d371a9627
merge upstream/master into andrew/inertia
2015-01-08 10:24:05 -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
d2bd95703a
use degrees/sec for EntityItem angular velocity
2015-01-07 14:04:22 -08:00
Andrew Meadows
0a8437a578
increasing default restitution to 0.5
2015-01-05 17:31:23 -08:00
Andrew Meadows
e2884c56f5
only predict remote transform for moving objects
2015-01-05 15:16:03 -08:00
Andrew Meadows
75a8faec86
purge support for voxels from PhysicsEngine
2015-01-05 15:02:18 -08:00
Andrew Meadows
244a8503ef
include damping in remote extrapolation model
2015-01-05 14:48:16 -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
30200ef7eb
add damping to ObjectMotionState
2015-01-05 09:17:46 -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
e43d7b7369
fix indentation in ctor init
2014-12-30 12:05:28 -08:00
Andrew Meadows
ce14c823a1
add comment about stubbed ObjectMotionState
...
for when Bullet lib is not found
2014-12-29 16:41:27 -08:00
Andrew Meadows
a97b8b0ea9
fix memory leak of EntityMotionState's
2014-12-29 16:33:41 -08:00
Andrew Meadows
8cb8092310
remove unused code
...
I forget what I was using UUIDHashKey for
2014-12-29 10:55:47 -08:00
Andrew Meadows
b078850c6a
remove personal TODO list from code file
2014-12-29 10:46:56 -08:00
Andrew Meadows
9b7e50858a
merge upstream/master into andrew/inertia
...
Conflicts:
libraries/avatars/CMakeLists.txt
libraries/entities/CMakeLists.txt
2014-12-29 09:15:49 -08:00
Andrew Meadows
25b00977be
fix cmake config for bullet after c++-11 changes
2014-12-18 17:34:39 -08:00
Stephen Birarda
114e3bb2ff
rename cmake macro to represent actual purpose
2014-12-18 16:51:20 -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
8de309a7a9
more correct _created and _lastEdited
2014-12-17 12:38:26 -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
11f1ad1d7f
move worldOffset into ObjectMotionState
...
add more methods for getting/clearing incoming/outgoing flags
2014-12-11 10:52:34 -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
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
d6c97be78e
using an infinite plane for the ground
2014-12-03 20:17:42 -08:00
Andrew Meadows
85e7c6166b
support for spherical entities
2014-12-03 12:10:26 -08:00
Andrew Meadows
3c67400e13
namechange CustomMotionState to ObjectMotionState
2014-12-03 11:12:04 -08:00
Andrew Meadows
8d49b694cc
ShapeManager doesn't support tiny and giant shapes
2014-12-03 10:08:26 -08:00
Andrew Meadows
64cdef42fe
simplified API of PositionHashKey
2014-12-03 07:23:14 -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
919214b7cb
split ShapeInfo into shared and physics parts
2014-12-02 10:44:40 -08:00
Andrew Meadows
e6a9081184
Moving ShapeInfo to shared lib
2014-12-01 16:47:55 -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
0e0eaea849
fix typo that broke the build
2014-11-24 11:36:17 -08:00
Andrew Meadows
37093cbd00
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/Application.cpp
2014-11-24 11:24:39 -08:00
Andrew Meadows
ec1f11c1a8
route more entity updates into physics engine
2014-11-24 11:21:40 -08:00
Atlante45
ae3bcc8f06
No more .f
2014-11-19 16:53:39 -08:00
Andrew Meadows
48164c9399
cleanup and moving things around
2014-11-19 15:31:17 -08:00
Andrew Meadows
388830c2a2
Merge branch 'bispinor' into inertia
...
Conflicts:
interface/src/entities/RenderableModelEntityItem.cpp
libraries/entities/src/BoxEntityItem.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityItem.h
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTree.h
libraries/entities/src/EntityTreeElement.cpp
2014-11-18 10:23:38 -08:00
Andrew Meadows
2d400e6ae0
rename PhysicsWorld to PhysicsEngine
2014-11-18 09:55:25 -08:00
Andrew Meadows
2f9a35412f
initial support for STATIC and KINEMATIC motion
2014-11-14 15:56:52 -08:00
Andrew Meadows
7fb7256a92
MotionState also ferries velocity
2014-11-14 09:02:22 -08:00
Andrew Meadows
14f49df44d
Application gets a ThreadSafePhysicsWorld
2014-11-13 10:02:36 -08:00
Andrew Meadows
0117233ed4
add ThreadSafeDynamicsWorld pure virtual interface
2014-11-12 15:19:33 -08:00
Andrew Meadows
9e5007a0a3
added a comment
2014-11-11 17:31:27 -08:00
Andrew Meadows
ccc3156587
PhysicsWorld::addEntity() doesn't need mass arg
2014-11-11 17:28:42 -08:00
Andrew Meadows
7c53c7a495
fix build to work when cmake does not fiind Bullet
2014-11-11 12:24:29 -08:00
Andrew Meadows
0d0f98f669
init and step physics simulation
2014-11-11 12:09:59 -08:00
Andrew Meadows
82d7b70ec9
add offset to physics simulation
2014-11-11 10:56:31 -08:00
Andrew Meadows
ed90bf00b9
add offset to physics simulation
...
we anticipate floating point error problems at distances far from origin
and we don't want the simulation to span a big space anyway
so world-frame objects are simulated in a local frame
and positions are translated back and forth as necessary
2014-11-07 08:51:57 -08:00
Andrew Meadows
053b16783c
initial impl of PhysicsWorld::addEntity()
2014-11-06 16:42:07 -08:00
Andrew Meadows
94b6d89b4e
namechange EntityMotionState to CustomMotionState
2014-11-06 10:59:04 -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
Andrew Meadows
8e90cca290
PhysicsWorld can add and remove voxels
2014-11-05 13:05:43 -08:00
Andrew Meadows
2734afcf9a
Adding BulletUtil.h with tests.
2014-11-04 16:43:50 -08:00
Andrew Meadows
57e972d876
ShapeKey now derives from DoubleHashKey
2014-11-04 14:54:35 -08:00
Andrew Meadows
f1bdd2ef7b
PhysicsWorld has a ShapeManager
2014-11-03 16:02:16 -08:00
Andrew Meadows
4a1133fbc2
moved ShapeInfo tests to their own file
2014-11-03 15:25:04 -08:00
Andrew Meadows
b1b6188bb8
ShapeManager has improved HashMap
2014-11-03 14:01:19 -08:00
Andrew Meadows
d26540b029
ShapeManager now under unit test
2014-10-31 17:13:17 -07:00
Andrew Meadows
50a97849bb
Add PhysicsWorld and ShapeManager classes
2014-10-30 10:42:44 -07:00
Andrew Meadows
29fd359385
fix typo in libraries/physics/CMakeLists.txt
2014-10-29 14:39:23 -07:00
Andrew Meadows
c18121756c
fixed path to file in comments
2014-10-29 14:33:11 -07:00
Andrew Meadows
c9450bba02
Adding Bullet as non-required dependency
2014-10-28 17:32:34 -07:00
Andrew Meadows
4c3cdf5b7a
move stuff out of shared and into physics library
2014-10-28 13:51:45 -07:00