Commit graph

1530 commits

Author SHA1 Message Date
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
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
Andrew Meadows
3305f5edf9 merge upstream/master into andrew/ragdoll 2014-08-01 11:13:18 -07:00
Andrew Meadows
789eeed760 limit action of ContactConstraint to penetration 2014-08-01 11:11:41 -07:00
Andrew Meadows
9d2744296e update physics stats names 2014-07-31 13:33:46 -07:00
Andrew Meadows
fc1d805d54 add ContactConstraint and use to impede muscles 2014-07-31 13:16:06 -07:00
Andrew Meadows
0f82236f2c minor cleanup 2014-07-31 13:09:10 -07:00
Andrew Meadows
0b9f246661 set the shape ID in the ctor's NOT the dtor 2014-07-31 13:08:27 -07:00
Brad Hefta-Gaub
d4d4069f11 Merge pull request #3225 from birarda/master
cmake file cleanup to suppress warnings on cmake 3.0
2014-07-30 19:20:18 -07:00
Brad Hefta-Gaub
d6e6cfd585 Merge pull request #3216 from wangyix/inbound_audio_stream
Audio ringbuffer classes refactored into subclasses of InboundAudioStream
2014-07-30 18:00:17 -07:00
Stephen Birarda
2796f71419 library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
Andrew Meadows
f579d2a0e2 add CollisionInfo::getShapePairKey() 2014-07-30 13:11:45 -07:00
Andrew Meadows
176d8d157d remove unused Constraint::_type 2014-07-30 13:07:32 -07:00
Andrew Meadows
7b76753daf add PhysicsSimulation::_frame 2014-07-30 11:45:53 -07:00
Andrew Meadows
c0689f3784 fix old bug: rotation of CapsuleShape not updated
when setting endpoints directly
2014-07-30 11:30:08 -07:00
Andrew Meadows
53db6dec13 fix old copy-n-paste typo 2014-07-30 11:29:43 -07:00
Andrew Meadows
917833d92a namechange for Shape::_id 2014-07-30 11:29:07 -07:00
Andrew Meadows
dde0cbddcc add Shape::_id 2014-07-30 11:09:19 -07:00
Andrew Meadows
81ba686fdf more perfstats for ragdoll simulation 2014-07-30 11:02:47 -07:00
Andrew Meadows
67b9c185eb formatting and minor tweaks to constraint strengths 2014-07-29 16:48:34 -07:00
wangyix
71c23eac1e added TimeWeightedAvg to InboundAudioStream
_maxFramesOverDesired hardcoded right now
2014-07-29 13:51:46 -07:00
Atlante45
03031c4c04 Outdated link 2014-07-28 16:36:12 -07:00
wangyix
9bbd055404 added stdev method of jitter calc to InboundAudioStream 2014-07-28 11:41:08 -07:00
Andrew Meadows
60612f6397 implement VerletPoint::integrateForward() 2014-07-25 15:23:12 -07:00
Andrew Meadows
b2c2cfec79 implement base Ragdoll::stepRagdollForward() 2014-07-25 15:22:25 -07:00
Andrew Meadows
2ddca4fbf9 split independent classes out of Ragdoll files 2014-07-24 09:50:16 -07:00
Andrew Meadows
b62f04e9fe check for nan's coming out of rotationBetween() 2014-07-23 16:51:53 -07:00
Andrew Meadows
c0e02107c5 minor cleanup 2014-07-23 16:51:26 -07:00
Philip Rosedale
1b265f3adb Merge pull request #3180 from AndrewMeadows/ragdoll
Ragdoll Part4: ragdoll shapes follow target joints, visible joints follow ragdoll shapes
2014-07-17 16:00:02 -07:00
Brad Hefta-Gaub
437e3efbc2 Merge pull request #3179 from wangyix/quick_audio_PR
Lost audio packets are replaced with silent frames in AudioMixer; AudioMixer silent-packet-dropping now enabled no matter what; Moving avg of audio frames available replaces _currentJitterBufferFrames
2014-07-17 11:44:05 -07:00
Andrew Meadows
b22652f441 merge upstream/master into andrew/ragdoll 2014-07-17 10:52:27 -07:00
Andrew Meadows
66158cb8a2 fix capsule-vs-capule collision test 2014-07-17 09:19:17 -07:00