Andrew Meadows
a3b26582ba
fix for nan in sphereVsAACubeHelper()
2014-09-03 15:39:26 -07:00
Andrew Meadows
4270c4d989
merge upstream/master into andrew/ragdoll
2014-09-03 14:42:17 -07:00
Andrew Meadows
361d1e83b0
use PhysicsEntity::stepForward() in simulation loop
2014-09-03 13:18:35 -07:00
Andrew Meadows
6454fd2627
add PhysicsEntity::stepForward()
2014-09-03 13:18:12 -07:00
Andrew Meadows
06e1d4a8bc
init Shape::_mass in all ctors
2014-09-03 13:16:49 -07:00
Andrew Meadows
0cc6f559d4
add AACube::operator<() so they can be sorted
2014-09-03 13:13:54 -07:00
Andrew Meadows
7c04a25095
fix whitespace formatting of curly braces
2014-09-02 16:29:20 -07:00
Andrew Meadows
aeb355e3da
re-enabling legacy avatar-vs-voxel collisions
...
so that I don't break anything when this merges with upstream
2014-08-29 15:53:20 -07:00
Andrew Meadows
ebcc960ec7
merge upstream/master into andrew/ragdoll
2014-08-29 15:48:40 -07:00
Andrew Meadows
a0eb13f6db
collision logic for capsule-side-vs-cube-face
...
with unit tests
2014-08-29 14:23:00 -07:00
Andrew Meadows
00913d4422
fixes for capsuleVsAACube() with unit tests
2014-08-28 16:51:16 -07:00
Andrew Meadows
921c8cfec3
fix broken build for using unititialized const float
2014-08-27 12:21:15 -07:00
Andrew Meadows
e133a696f5
merge andrew/ragdoll into some ShapeCollider work
2014-08-27 12:12:08 -07:00
Andrew Meadows
c6253bb51a
AACube vs Sphere and Capsule collision tests
...
Sphere is unit tested.
Also removed the shape collision query against Octree
2014-08-27 12:09:41 -07:00
Craig Hansen-Sturm
e941e58626
merge HEAD with PR-3281
2014-08-26 18:25:40 -07:00
Andrew Meadows
7a5c4fdb16
remove commented out #includes
2014-08-25 15:25:46 -07:00
Andrew Meadows
681c526fe1
exploit symmetry of collision pairings
2014-08-25 08:52:45 -07:00
Andrew Meadows
f684608d1f
Added AACubeShape with stubbed collision functions
2014-08-25 08:24:44 -07:00
Andrew Meadows
1bd7734ec1
sometimes swap order of shapes for simpler code
2014-08-22 18:07:11 -07:00
Andrew Meadows
1be922f986
add shapeVsList etc to dispatch table
...
renamed some functions for more readability
2014-08-22 11:20:53 -07:00
Andrew Meadows
3ebd8c1969
use dispatchTable for shape-vs-shape collisions
2014-08-21 16:40:25 -07:00
Andrew Meadows
f511fe2657
Ragdoll cannot assume skeleton's rootIndex is 0
...
some Models have extra "joints" not part of the normal skeleton
2014-08-19 11:31:50 -07:00
Andrew Meadows
543bf5224c
add VerletPoint::shift()
2014-08-18 12:54:26 -07:00
Andrew Meadows
7e7978de1a
compute and store Ragdoll::_accumulatedMovement
2014-08-18 12:53:04 -07:00
Andrew Meadows
fe5f9f8fe5
use relative mass when enforcing ContactPoint
2014-08-18 12:49:47 -07:00
Andrew Meadows
54851c5ced
add Ragdoll::_accumulatedMovement
2014-08-18 12:49:12 -07:00
Andrew Meadows
432c14408c
removed hackery from ContactPoint enforcement
2014-08-14 15:29:57 -07:00
Andrew Meadows
98d27ad2b5
more correct names for ContactPoint API
...
renamed (and disabled) the useless enforce() to applyFriction()
changed the buildConstraints() method to more correct name: enforce()
will eventually change how ContactPoint actually works, but later
2014-08-14 15:17:03 -07:00
Andrew Meadows
60d411ead5
cleanup Ragdoll API (less "ragdoll" qualifiers)
2014-08-14 14:41:51 -07:00
Andrew Meadows
46c91052c9
split SkeletonModel and Ragdoll classes apart
2014-08-14 14:29:03 -07:00
Andrew Meadows
ee0d0a1566
remove ragdoll from simulation in dtor
2014-08-14 09:20:53 -07:00
wangyix
81fa5ed41f
readPendingDatagrams stats printed and sent to domain page
...
jittertester now prints out send or receive error msgs
2014-08-13 16:48:06 -07:00
Andrew Meadows
f66398d366
adding comment about parameter's purpose
2014-08-13 15:06:34 -07:00
Andrew Meadows
7852321152
merge upstream/master into andrew/ragdoll
2014-08-13 14:52:14 -07:00
Andrew Meadows
b177686f74
minor tweak to how ContactPoint is updated
2014-08-13 14:50:25 -07:00
Andrew Meadows
2f1a56a87c
ContactPoint tries to help maintain collisions
...
so that collision events will continue to update the contact
2014-08-13 13:48:04 -07:00
wangyix
b17c9102c9
added stats for readPendingDatagrams in audiomixer
2014-08-13 13:30:02 -07:00
Andrew Meadows
bc432aa8e8
use relative masses for ContactPoint contsrtaint
2014-08-13 11:29:54 -07:00
Andrew Meadows
4de43b7cbe
cleanup and reordering of code
2014-08-13 11:19:32 -07:00
wangyix
db0fbcab97
merge with upstream
2014-08-13 11:09:55 -07:00
Stephen Birarda
d5b1bee13c
resolve conflicts on merge with upstream master
2014-08-08 13:48:32 -07:00
Stephen Birarda
6eb2c73624
add assert include to SharedUtil
2014-08-08 13:23:54 -07:00
Stephen Birarda
b1310c065c
remove TARGET_NAME from cmake macros where it is not required
2014-08-08 13:17:54 -07:00
Stephen Birarda
27419b7b6b
fix some build blockers in test directory
2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62
add macro to link shared dependencies to target
2014-08-08 13:17:54 -07:00
Stephen Birarda
c9f8433a2d
tweak setup_hifi_library to bubble up full path of Qt modules
2014-08-08 13:17:54 -07:00
Stephen Birarda
87cf262b9e
get to successful cmake after library link macro changes
2014-08-08 13:17:53 -07:00
Stephen Birarda
0378fb3049
break glm helpers out of SharedUtil
2014-08-08 13:17:53 -07:00
Stephen Birarda
892e30c5e1
get past assignment-client build after cmake auditing
2014-08-08 13:17:53 -07:00
Stephen Birarda
b5c8a4d2c6
fix requirement of networking in audio library
2014-08-08 13:17:52 -07:00