Andrew Meadows
b50bf09c93
findPlaneCollisions() works in theory, not used
2014-06-23 10:39:50 -07:00
Andrew Meadows
8986be5f1c
remove old collideAgaintsOurself() code
2014-06-23 10:36:31 -07:00
Andrew Meadows
eba03ddb8a
re-enable some basic avatar collisions
2014-06-23 10:05:51 -07:00
Andrew Meadows
8b24e9cd67
Update SkeletonModel::_boundingShape position
2014-06-23 09:39:14 -07:00
Andrew Meadows
c1c2df5933
remove debug include
2014-06-23 08:53:58 -07:00
Andrew Meadows
b2ea8c0bf9
Compute more correct masses for ragdoll parts
...
also pin root ragdoll shape at the local-frame origin
for stability
2014-06-23 08:37:11 -07:00
Andrew Meadows
ea83a97b75
Add getVolume() method to Shape
2014-06-23 08:36:45 -07:00
Andrew Meadows
dcd9d8871d
re-enabling some temporary debug stuff
2014-06-20 16:36:44 -07:00
Andrew Meadows
c17b8fdb60
collisions update shapes
...
VerletShapes keep pointers to VerletPoints (rather than to glm::vec3's)
VerletShapes compute lagrangian coefficients
VerletShapes send their movement accumulations to their VerletPoints
2014-06-20 16:31:39 -07:00
Andrew Meadows
c7ad3da47d
stubbery for processing collisions
...
PhysicsSimulation tells CollisionInfos to apply() themselves
CollisionInfo knows how to apply() itself to affected shapes
Shape gets _mass and some stubbed methods for accumulating movement
VerletPoint gets movement accumulator
2014-06-20 10:55:57 -07:00
Andrew Meadows
4a0ce7a9ae
support disabling collisions btw adjacent joints
2014-06-19 17:39:50 -07:00
Andrew Meadows
f0c2417206
Split PhysicsSimulation::stepForward() into parts
2014-06-19 15:50:16 -07:00
Andrew Meadows
716ae3e479
add MyAvatar's skeleton to its PhysicsSimulation
2014-06-19 12:32:17 -07:00
Andrew Meadows
828c365b25
more dtor cleanup of back pointers
2014-06-19 11:57:32 -07:00
Andrew Meadows
9950c5b209
remove entities in PhysicsSimulation dtor
2014-06-19 11:52:44 -07:00
Andrew Meadows
fbafcb6fd8
Fix distance constraint lengths
2014-06-19 11:46:09 -07:00
Andrew Meadows
2453e9c36a
build ragdoll constraints again
2014-06-19 10:31:55 -07:00
Andrew Meadows
5e74ee8c05
VerletPoint has position, lastPosition, and mass
2014-06-19 09:54:32 -07:00
Andrew Meadows
d3a78c9fc2
simulation step stubbed out
2014-06-19 09:14:36 -07:00
Andrew Meadows
10ee307752
merge upstream/master into andrew/ragdoll
2014-06-19 08:35:29 -07:00
Andrew Meadows
a8c2003fe6
namechange SimulationEngine --> PhysicsSimulation
2014-06-19 08:34:12 -07:00
Brad Hefta-Gaub
5801ea2011
Merge pull request #3048 from ctrlaltdavid/fix_hydra_crash
...
Fix startup crash where Hydra controllers are not properly plugged in
2014-06-19 08:21:22 -07:00
David Rowe
afab5f1cbf
Fix startup crash where Hydra controllers are not properly plugged in
...
Crash occurs if the left controller is plugged in but right one isn't.
2014-06-18 20:52:17 -07:00
Andrew Meadows
7cd1f75282
PhysicalEntity gets backpointer to SimulationEngine
2014-06-18 20:47:57 -07:00
Andrew Meadows
c98631f820
merge upstream/master into andrew/ragdoll
2014-06-18 17:23:24 -07:00
Andrew Meadows
d4b5550cda
Skeleton now creates VerletShape
2014-06-18 17:22:39 -07:00
Brad Hefta-Gaub
c7b1b504b4
Merge pull request #3047 from birarda/master
...
allow a payload to define a zone of unattenuated audio
2014-06-18 15:25:41 -07:00
Stephen Birarda
dd5d59208e
fix a crash when grabbing AABox from buffer
2014-06-18 15:05:38 -07:00
Brad Hefta-Gaub
4699a8011c
Merge pull request #3046 from Atlante45/more_intuitive_rotation_UI
...
More intuitive rotation UI
2014-06-18 15:04:34 -07:00
Brad Hefta-Gaub
f2b2784fa9
Merge pull request #3045 from wangyix/edit_nack_pull
...
Changed octree data NACK handling to repeatedly NACK missing seq numbers, like edit NACKs
2014-06-18 15:02:40 -07:00
Andrew Meadows
715cc3467d
forgot to add the test files
2014-06-18 14:47:39 -07:00
AndrewMeadows
71bbbac1c0
Merge pull request #3038 from ey6es/metavoxels
...
Support for writing to and reading from a JSON format that mirrors the bitstream format, with tools to convert between them (using generics so as not to require the original classes).
2014-06-18 14:47:11 -07:00
Andrzej Kapolka
6ec562931f
Some additional comments for DatagramSequencer.
2014-06-18 14:44:11 -07:00
Atlante45
900024eefe
More intuitive rotation UI
2014-06-18 14:22:46 -07:00
Stephen Birarda
1228bd4a1e
handle addition of samples for an unattenuated listener
2014-06-18 14:18:39 -07:00
Andrew Meadows
3791b4712b
adding some documentation about the VerletShapes
2014-06-18 14:17:12 -07:00
Andrew Meadows
96eebec0fc
unit tests for VerletShapes
2014-06-18 14:06:00 -07:00
Stephen Birarda
db1031144b
fix passing of unattenuated zones to buffers
2014-06-18 13:46:03 -07:00
wangyix
f76b4dc1ab
made getMissingSequenceNumbers() inline
2014-06-18 13:39:49 -07:00
wangyix
c7788b793c
removed erroneous call updateNodeWithDataFromPacket for octree data nacks
2014-06-18 13:36:54 -07:00
wangyix
29723d0ef3
changed octree data nacks to repeatedly nack missing seq nums
2014-06-18 13:36:54 -07:00
Andrzej Kapolka
530852a756
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-18 13:10:11 -07:00
Andrzej Kapolka
26159a05d9
Fix for sporadic test failure due to hash ordering.
2014-06-18 13:09:45 -07:00
Stephen Birarda
5878b4af59
setup listener unattenuated zones for source ring buffers
2014-06-18 12:50:16 -07:00
Andrzej Kapolka
eea45e98d7
Fix to include GLM.
2014-06-18 12:22:45 -07:00
Brad Hefta-Gaub
8206c8d709
Merge pull request #3044 from ZappoMan/master
...
fix bug
2014-06-18 12:19:22 -07:00
ZappoMan
ed32ca721a
fix bug
2014-06-18 12:19:01 -07:00
Andrzej Kapolka
e0689b1484
Fixed compile error on Xcode.
2014-06-18 12:04:41 -07:00
Andrzej Kapolka
49ab3d6b43
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-18 11:59:04 -07:00
Clément Brisset
7597191081
Merge pull request #3042 from ZappoMan/editModelFeatures
...
add support for changing the model URL of a model
2014-06-18 11:52:01 -07:00
