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
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
a8c2003fe6
namechange SimulationEngine --> PhysicsSimulation
2014-06-19 08:34:12 -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
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
5878b4af59
setup listener unattenuated zones for source ring buffers
2014-06-18 12:50:16 -07:00
Brad Hefta-Gaub
c49ff59725
Merge pull request #3037 from wangyix/edit_nack_pull
...
Edit nack pull
2014-06-18 11:43:25 -07:00
Andrew Meadows
9e839f0980
Shape::getCenter() -> Shape::getTranslation()
2014-06-18 08:55:48 -07:00
Andrew Meadows
b9d4545aef
merge upstream/master into andrew/ragdoll
...
Conflicts:
libraries/shared/src/Shape.h
libraries/shared/src/ShapeCollider.h
2014-06-17 17:03:16 -07:00
Andrew Meadows
ecbf5043d7
code out of Model into base and derived classes
...
PhysicalEntity (base class) gets some shape management stuff
SkeletonModel (derived class) gets some boundary shape and
joint-shape stuff
2014-06-17 16:22:18 -07:00
Andrew Meadows
b6cecf3cfd
Add SphereShape.cpp to project
2014-06-17 12:50:49 -07:00
Andrew Meadows
f18864bd72
Moved findRayIntersection() to the Shape classes
2014-06-17 12:36:36 -07:00
Andrew Meadows
018ba52b1c
merge upstream/master with andrew/inertia
2014-06-17 10:50:49 -07:00
Andrew Meadows
ab3d582d79
Add ray intersection tests against most shapes.
2014-06-17 10:49:14 -07:00
Andrew Meadows
e75340f8ce
Add PlaneShape::getNormal() method.
2014-06-17 10:48:29 -07:00
Andrew Meadows
118717d96a
Shapes moved from Model into PhysicalEntity
2014-06-16 14:51:58 -07:00
Kai Ludwig
d08b63b247
changed 2000 into a constant defined inline
2014-06-16 23:30:28 +02:00
Andrew Meadows
1496e6c8b2
add VirletSphereShape and VirletCapsuleShape
2014-06-16 12:29:41 -07:00
Andrew Meadows
3a2f322ca3
SphereShape, CapsuleShape support derived classes
2014-06-16 12:23:18 -07:00
wangyix
2b20720f51
added sendNackPackets() to OctreeInboundPacketProcessor
...
added rollover handling in _missingSequenceNumbers pruning; added
EditNack packet types; added getMyEditNackType() to OctreeServer
subclasses; added code to randomly skip edit packet sequence numbers for
testing in OctreeEditPacketSender
2014-06-16 09:57:05 -07:00
Andrew Meadows
3fd4ee02ff
Shape uses "center" instead of "position"
2014-06-16 08:55:08 -07:00
Andrew Meadows
92159a7ed5
Shape::get/setCenter() instead of get/setPosition()
2014-06-16 08:43:27 -07:00
Andrew Meadows
d7a28e1441
enable shape collisions for MyAvatar skeleton
...
also some stubbery for main simulation loop
2014-06-15 18:07:47 -07:00
Andrew Meadows
6f4a4ace0d
add API stubs to RagDoll for SimulationEngine stepForward
2014-06-15 17:58:27 -07:00
Andrew Meadows
6d27987226
Add shape vs list-of-shapes collision method
...
and list-of-shapes vs list-of-shapes
2014-06-15 17:56:02 -07:00
Kai Ludwig
3fbde70f96
Added functions to test usleep, msleep and sleep for accuracy.
2014-06-15 21:05:23 +02:00
Andrew Meadows
158c7de76e
Ragdoll not an Entity. SkeletonModel is a Ragdoll
2014-06-13 12:27:58 -07:00
Andrew Meadows
5bd37acdb8
Changed RagDoll to Ragdoll
2014-06-13 11:55:39 -07:00
Andrew Meadows
417a7def07
SimulationEngine::enforceConstraints() takes args
...
...for limiting simulation costs
2014-06-13 11:10:32 -07:00
Andrew Meadows
fb7f5707c8
add SimulationEngine, MyAvatar has one.
2014-06-12 18:15:20 -07:00
John Grosen
f0cb49ef5c
added space between expressions in ternary operator
2014-06-12 17:24:56 -07:00
John Grosen
8e74398ed7
Fixed command line args parsing bug
2014-06-12 17:06:59 -07:00
