Andrew Meadows
|
27d6d9f720
|
add Bullet profiling hooks for physics simulation
|
2015-04-02 15:20:16 -07:00 |
|
Andrew Meadows
|
94c1cf12f5
|
deleting _dynamicsWorld doesn't crash on shutdown
|
2015-03-30 17:12:19 -07:00 |
|
Philip Rosedale
|
f116ac131d
|
Merge pull request #4532 from AndrewMeadows/inertia
fix crash in PhysicsEngine on shutdown
|
2015-03-30 16:31:34 -07:00 |
|
Andrew Meadows
|
c6b34df06c
|
unlock after character is properly updated
|
2015-03-30 16:07:56 -07:00 |
|
Seth Alves
|
ee7247a5b4
|
fix a couple of crashes
|
2015-03-30 15:56:01 -07:00 |
|
Andrew Meadows
|
9b13f186e3
|
remove character from PhysicsEngine on shutdown
|
2015-03-30 15:51:58 -07:00 |
|
Seth Alves
|
7137b41375
|
free these so it's easier to see other leaks in valgrind
|
2015-03-30 09:30:37 -07:00 |
|
Andrew Meadows
|
430158c109
|
updateShapeIfNecessary() is a more correct name
|
2015-03-24 23:35:09 -07:00 |
|
Andrew Meadows
|
44eca08fa4
|
PhysicsEngine doesn't need AvatarData
MyAvatar now owns its CharacterController
fix for bug of phantom collision obj when avatar's physics are disabled
|
2015-03-24 17:38:35 -07:00 |
|
Andrew Meadows
|
6454149536
|
formatting and comments
|
2015-03-20 12:45:29 -07:00 |
|
Andrew Meadows
|
90a8844738
|
merge upstream/master into andrew/bispinor
Conflicts:
libraries/physics/src/PhysicsEngine.cpp
|
2015-03-19 16:18:52 -07:00 |
|
Brad Davis
|
91906d619f
|
Removing unmatched QReadWriteLock::unlock() call
|
2015-03-18 22:32:06 -07:00 |
|
Andrew Meadows
|
c032b29633
|
proper shape management for ConvexHull shapes
|
2015-03-18 16:29:57 -07:00 |
|
Seth Alves
|
dd97b54e52
|
quiet physics log spam
|
2015-03-18 13:22:29 -07:00 |
|
Seth Alves
|
2dd75fef2c
|
remove some unneeded Q_OBJECT macros, diff minimization
|
2015-03-17 19:12:26 -07:00 |
|
Seth Alves
|
b76103edb0
|
clean up debugging spew
|
2015-03-16 16:44:29 -07:00 |
|
Andrew Meadows
|
78b614f855
|
move avatar details into CharacterController
|
2015-03-16 16:24:32 -07:00 |
|
Seth Alves
|
59e4efa651
|
debugging prints around a deadlock
|
2015-03-15 07:10:43 -07:00 |
|
Seth Alves
|
250567e315
|
formatting, diff minimization
|
2015-03-14 12:09:23 -07:00 |
|
Seth Alves
|
b815c365eb
|
formatting
|
2015-03-13 18:57:27 -07:00 |
|
Seth Alves
|
87cc710efc
|
more merge madness, calculate 2nd PhysicsEngine hash with qChecksum if url is set
|
2015-03-13 18:43:24 -07:00 |
|
Seth Alves
|
50798398ff
|
merge from upstream
|
2015-03-13 18:04:55 -07:00 |
|
Seth Alves
|
2368e6e5b7
|
collision with a hull sort of works. there is a new memory corruption problem
|
2015-03-13 15:41:57 -07:00 |
|
Andrew Meadows
|
99e2d799c5
|
correct math for capsule halfHeight
|
2015-03-13 09:40:32 -07:00 |
|
Seth Alves
|
89b58e2681
|
trying to get loaded callback for model hooked up to PhysicsEngine
|
2015-03-13 09:11:15 -07:00 |
|
Seth Alves
|
a945421d9d
|
still trying to make PhysicsEngine::addEntityInternal be async
|
2015-03-12 16:38:55 -07:00 |
|
Andrew Meadows
|
a1a12465da
|
able to update avatar controller in PhysicsEngine
|
2015-03-12 16:36:41 -07:00 |
|
Seth Alves
|
2cf0e1ab25
|
break PhysicsEngine::addEntityInternal in half, making the 2nd part asynch. This is to allow a ModelEntityItem time to download its collision hull before the 2nd part runs
|
2015-03-12 15:58:09 -07:00 |
|
Andrew Meadows
|
3d531e8304
|
add f at end of float literal
|
2015-03-10 14:24:49 -07:00 |
|
Andrew Meadows
|
fd76eda383
|
slightly better hardcoded size for avatar capsule
we'll be measuring avatar dimensions more correctly soon
|
2015-03-09 17:59:45 -07:00 |
|
Andrew Meadows
|
3c05d685d7
|
avoid assert for zero-length character velocity
|
2015-03-09 17:37:34 -07:00 |
|
Seth Alves
|
ab8784f1b4
|
add comment about character capsule being hard-coded
|
2015-03-09 13:51:08 -07:00 |
|
Seth Alves
|
b2cfed8bca
|
removed unused blob of code
|
2015-03-08 09:04:00 -07:00 |
|
Seth Alves
|
ac0c4e8512
|
cap max speed at MAX_WALKING_SPEED
|
2015-03-04 19:57:06 -08:00 |
|
Seth Alves
|
a8b688d540
|
move _velocity into base class. walking on a cube works
|
2015-03-04 15:26:02 -08:00 |
|
Seth Alves
|
b4998e9c53
|
falling onto an object works
|
2015-03-04 08:48:48 -08:00 |
|
Seth Alves
|
8eec66c066
|
merge upstream, avatar can now fall onto a cube
|
2015-03-03 18:37:16 -08:00 |
|
Seth Alves
|
7e4b597ca3
|
keep physics specific code in PhysicsEngine
|
2015-03-03 15:45:10 -08:00 |
|
Andrew Meadows
|
5776df1012
|
load dynamic obj as inactive when not moving
|
2015-02-25 12:07:19 -08:00 |
|
Andrew Meadows
|
b4da2ddd52
|
fix physics crash on disconnect from domainserver
|
2015-02-05 09:13:32 -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 |
|
Andrew Meadows
|
d5c0c200de
|
optimization for when physics engine doesn't step
|
2015-01-27 15:54:32 -08:00 |
|
Andrew Meadows
|
1ad5f9c7db
|
merge upstream/master into andrew/isentropic
Conflicts:
libraries/physics/src/ObjectMotionState.cpp
|
2015-01-23 14:04:26 -08:00 |
|
Andrew Meadows
|
b34189115d
|
Merge branch andrew/isentropic
|
2015-01-23 13:21:45 -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
|
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 |
|