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
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
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
Andrzej Kapolka
6ec562931f
Some additional comments for DatagramSequencer.
2014-06-18 14:44:11 -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
29723d0ef3
changed octree data nacks to repeatedly nack missing seq nums
2014-06-18 13:36:54 -07:00
Stephen Birarda
5878b4af59
setup listener unattenuated zones for source ring buffers
2014-06-18 12:50:16 -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
Brad Hefta-Gaub
c49ff59725
Merge pull request #3037 from wangyix/edit_nack_pull
...
Edit nack pull
2014-06-18 11:43:25 -07:00
Andrzej Kapolka
b74e69e359
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-18 11:33:41 -07:00
Brad Hefta-Gaub
f04e5c0a73
Merge pull request #3041 from kitely/vs2013
...
Allow the project to compile in Visual Studio 2013
2014-06-18 11:33:06 -07:00
Andrzej Kapolka
52de729d60
Add virtual destructor to get rid of Xcode warning.
2014-06-18 11:31:58 -07:00
ZappoMan
26075d9d26
add support for changing the model URL of a model
2014-06-18 11:29:56 -07:00
wangyix
7cef5eeeec
replaced UINT16_MAX at 2 other places
2014-06-18 10:27:02 -07:00
wangyix
54f32d331e
replaced UINT16_MAX with std::numeric_limits<uint16_t>::max
2014-06-18 10:20:19 -07:00
wangyix
b63c88f42c
removed more spaces
2014-06-18 09:38:39 -07:00
wangyix
8c4e365958
added forgotten i++ in sendNackPackets()
...
plus minor style fixes
2014-06-18 09:28:42 -07:00
Andrew Meadows
9e839f0980
Shape::getCenter() -> Shape::getTranslation()
2014-06-18 08:55:48 -07:00
Oren Hurvitz
98b4d6f697
Allow the project to compile using Visual Studio 2013
2014-06-18 10:27:57 +03:00
Andrzej Kapolka
c65af33a6c
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-17 19:15:47 -07:00
Andrzej Kapolka
b8e6660e19
More commentation.
2014-06-17 19:15:29 -07:00
Andrzej Kapolka
5e0cab59ea
Some comments.
2014-06-17 18:12:06 -07:00
Brad Hefta-Gaub
cee6f1be6a
Merge pull request #3031 from stojce/19755
...
Code Review for Job #19755
2014-06-17 17:28:55 -07:00
Andrzej Kapolka
9ded9b0696
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-17 17:07:38 -07:00
Andrzej Kapolka
758beff3d9
Make sure to use same enum streamer for the ones registered by type and the
...
ones registered by scope/name.
2014-06-17 17:06:28 -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
wangyix
7f4cf3719e
added rollover handling to OctreeSceneStats
2014-06-17 16:40:08 -07:00
Brad Hefta-Gaub
df27de3c73
Merge pull request #3036 from huffman/19788
...
Code Review for Job #19788
2014-06-17 16:28:03 -07:00
Brad Hefta-Gaub
ba72410add
Merge pull request #3029 from thoys/interface-balance-display-fix
...
interface balance display fix
2014-06-17 16:25:07 -07:00
Brad Hefta-Gaub
41b3e3e4ea
Merge pull request #3023 from ey6es/metavoxels
...
Refactored type/object streaming, added support for reading into/writing from "generic" containers that don't require the original classes/types.
2014-06-17 16:24:22 -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
Andrzej Kapolka
c3090dd223
Tweak to the way streamers are written to JSON.
2014-06-17 16:12:06 -07:00
