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
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
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
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
Stephen Birarda
fa26957b23
more CMakeLists cleanup for sub-dependencies
2014-08-08 13:17:52 -07:00
Stephen Birarda
33e5826842
remove animation server, bubble up qt modules
2014-08-08 13:17:52 -07:00
Stephen Birarda
9a50532b1f
bubble up sub dependencies to link_hifi_library
2014-08-08 13:17:52 -07:00
Philip Rosedale
96a795eea4
Merge pull request #3263 from AndrewMeadows/ragdoll
...
Ragdoll Part 9:
2014-08-07 22:12:31 -07:00
ZappoMan
84f3ede32f
small change to force rebuild
2014-08-07 15:09:24 -07:00
Andrew Meadows
bb33266635
merge upstream/master into andrew/ragdoll
2014-08-07 14:37:10 -07:00
Andrew Meadows
94da63006c
VerletPoint::_mass is now private
...
We set the mass of other avatars artificially high
so they are less movable.
2014-08-07 14:35:32 -07:00
Andrew Meadows
0f784a9cc5
add other ragdolls to simulation
2014-08-07 13:09:05 -07:00
Andrew Meadows
87350ad2d0
ragdoll simulation now in model-relative frame
...
(same rotation as world-frame, but translated to MyAvatar origin)
2014-08-07 11:45:06 -07:00
Andrew Meadows
27b876e84c
namechange _frame --> _frameCount
2014-08-07 09:02:31 -07:00
AndrewMeadows
2653b33b67
Merge pull request #3257 from Atlante45/referentials
...
Referentials
2014-08-06 14:12:18 -07:00
Andrew Meadows
cb8c0792b2
make main ragdoll and entity special
...
also addded some logic (unused) to add ragdolls of other avatars
2014-08-06 10:43:56 -07:00
Andrew Meadows
a1fccdb177
remove dangling shape pointers from PhysicsSimulation
2014-08-05 08:32:14 -07:00
Andrew Meadows
39d3deee90
merge upstream/master into andrew/ragdoll
2014-08-04 17:37:28 -07:00
Andrew Meadows
f126ce299a
ContactPoint = set of assymetric distance consraints
2014-08-04 17:34:24 -07:00
Andrew Meadows
4beee3fecf
add Shape::getVerletPoints()
2014-08-04 17:33:24 -07:00
Andrew Meadows
d1b2ba4a43
fix bug: false positive capsuleCapsule() collision
...
for capsules with parallel axes and negative pojection of
center-to-center separation
also replace fabs() with fabsf()
2014-08-04 17:30:23 -07:00
Stephen Birarda
9fc545001c
look for a config.json file by default in resources
2014-08-04 15:40:45 -07:00
Atlante45
d9dde06c14
Various tweaks to referentials
2014-08-04 14:59:15 -07:00
Andrew Meadows
1ec6ee05f3
Rename ContactConstraint to ContactPoint
2014-08-01 15:08:21 -07:00