Andrew Meadows
|
3997b916c1
|
remove ground collision hack for physics testing
|
2015-01-22 09:17:51 -08:00 |
|
Andrew Meadows
|
77c4362991
|
fix typo
|
2015-01-21 18:14:24 -08:00 |
|
Andrew Meadows
|
b2e79a0157
|
don't process results when no simulation
|
2015-01-21 18:06:19 -08:00 |
|
Andrew Meadows
|
2751fab2c3
|
don't send collision events for inactive pairs
also throttle collision events to 30/sec
|
2015-01-21 18:02:13 -08:00 |
|
Andrew Meadows
|
1c38b08e8f
|
remane emitEntityCollision... to entityCollision...
|
2015-01-21 14:07:23 -08:00 |
|
Andrew Meadows
|
6840daa0b5
|
removing tabs from formatting
|
2015-01-21 11:55:28 -08:00 |
|
Andrew Meadows
|
e49c76656f
|
merge upstream/master into andrew/isentropic
Conflicts:
libraries/physics/src/PhysicsEngine.cpp
|
2015-01-21 11:35:36 -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
|
5da38834e2
|
introduce notion of NumSteps vs NumSubsteps
|
2015-01-20 11:16:40 -08:00 |
|
Andrew Meadows
|
0154c613d0
|
change FrameCount to NumSubsteps for more accuracy
|
2015-01-20 11:02:48 -08:00 |
|
Andrew Meadows
|
549e3fac5f
|
store backpointer to MotionState in btRigidBody
|
2015-01-20 10:45:58 -08:00 |
|
Andrew Meadows
|
e4f29412d5
|
cheaper failure adding entity to physics engine
|
2015-01-19 18:11:14 -08:00 |
|
Andrew Meadows
|
171fead347
|
remove log about failure to add to physics engine
|
2015-01-19 15:55:53 -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
|
2427fa68cd
|
remove unnecessary Bullet #include
|
2015-01-16 10:06:39 -08:00 |
|
Andrew Meadows
|
3fed38793e
|
merge andrew/origin/inertia to andrew/local/inertia
|
2015-01-15 17:55:51 -08:00 |
|
Andrew Meadows
|
4c1cd991f4
|
remove pessimistic send of object updates
we have not yet seen the headache of packetloss and unreliable messages
|
2015-01-15 17:53:37 -08:00 |
|
Andrew Meadows
|
250fd98fee
|
support for simple kinematic motion
|
2015-01-15 17:51:01 -08:00 |
|
Andrew Meadows
|
51cc9d6d9a
|
alt method for repressing unused var warnings
|
2015-01-15 10:46:09 -08:00 |
|
Andrew Meadows
|
9eb4d66327
|
remove warnings
|
2015-01-15 10:36:17 -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
|
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 |
|