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
Clément Brisset
1992f624ad
Merge pull request #3054 from huffman/19723
...
Code Review for Job #19723
2014-06-22 16:37:02 -07:00
Clément Brisset
5b95eafa9b
Merge pull request #3053 from ey6es/metavoxels
...
Added basic tests for metavoxel streaming.
2014-06-22 16:35:49 -07:00
Andrzej Kapolka
626bd42b7b
Use randomColorValue, since we have it.
2014-06-20 18:22:36 -07:00
Andrzej Kapolka
811815e61f
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-20 18:12:29 -07:00
Andrzej Kapolka
49f1d427ec
Removed incremental streaming stubs.
2014-06-20 18:12:08 -07:00
Andrzej Kapolka
de0c45a919
Spanner mutation in test.
2014-06-20 18:09:51 -07:00
wangyix
6b72b161d3
fixed typo with frames/samples confusion.
2014-06-20 17:52:46 -07:00
wangyix
124fba35db
fixed minor comment typo
2014-06-20 17:39:05 -07:00
wangyix
cb6681f6f8
completed code for dynamicly resizing jitter buffer
2014-06-20 17:13:42 -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
Ryan Huffman
0e6abe3359
Update inactive chat window opacity to 0.8
2014-06-20 16:31:22 -07:00
wangyix
a5457eb86b
fixed bug in Audio.cpp where numSilentSamples was written to wrong place in packet
...
added more debug stuff, other minor changes and fixes
2014-06-20 14:43:18 -07:00
Andrzej Kapolka
ce778f47b1
More work on stream testing, fixed bug with differently-ordered edits.
2014-06-20 14:08:39 -07:00
David Rowe
633746ab16
Different fullscreen shortcuts for Mac and Windows
...
Revert to the original Mac OSX key combination and provide alternative for Windows.
2014-06-20 13:30:04 -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
Ryan Huffman
0c87f0aabc
Update chat window behavior
...
Lower opacity when inactive
Move focus to main window when pressing escape, instead of hiding
2014-06-19 19:45:43 -07:00
Brad Hefta-Gaub
4ab30aae2b
Merge pull request #3052 from Atlante45/misc_fixes
...
Misc fixes
2014-06-19 18:19:45 -07:00
Andrzej Kapolka
24f535e02d
Working on metavoxel streaming tests.
2014-06-19 18:15:17 -07:00
Atlante45
4561a6e326
Fixed voxel being deleted even though voxel tool is not selected
2014-06-19 18:10:06 -07:00
Atlante45
266dc6be3e
fixed tooltip not disapearing when deleting model
2014-06-19 18:09:17 -07:00
wangyix
435b5094a0
moved time gap history to PositionalAudioRingBuffer, untested
...
removed hard-coded jitter buffer length.
2014-06-19 17:58:38 -07:00
Andrew Meadows
4a0ce7a9ae
support disabling collisions btw adjacent joints
2014-06-19 17:39:50 -07:00
wangyix
100bc022ec
fixed a for loop that erased elements while iterating
2014-06-19 16:42:51 -07:00
Andrew Meadows
f0c2417206
Split PhysicsSimulation::stepForward() into parts
2014-06-19 15:50:16 -07:00
wangyix
77c377711a
removed debug code
2014-06-19 15:39:54 -07:00
wangyix
8176aa1292
added debug code for testing time gap history
2014-06-19 14:54:22 -07:00
Andrzej Kapolka
7a9c0f0e6a
Working on tests for metavoxel streaming.
2014-06-19 14:50:19 -07:00
wangyix
aa3602f0fb
added InterframeTimeGapHistory and frameReceived() calls
2014-06-19 14:35:02 -07:00
Brad Hefta-Gaub
d7782a2365
Merge pull request #3051 from Atlante45/dont_glow_if_out_of_range
...
Don't glow models if you can't grab it
2014-06-19 12:37:33 -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
Andrzej Kapolka
07e54b5162
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-19 11:38:14 -07:00
Atlante45
4a4efb0bfa
Don't glow models if you can't grab it
2014-06-19 11:11:08 -07:00
David Rowe
2dbf8d7daf
Fix fullscreen toggle shortcut
...
Remove the "Meta" modifier so that the shortcut works on Windows.
2014-06-19 11:08:21 -07:00
Brad Hefta-Gaub
45a640d4b2
Merge pull request #3049 from Atlante45/make_selection_range_infinite
...
Make selection range infinite
2014-06-19 10:54:13 -07:00
Atlante45
676141024a
Added angular size limit to hydras too.
2014-06-19 10:46:06 -07:00
Atlante45
641b9e8253
Set minimum angular size too model selection
2014-06-19 10:43:25 -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
