Andrzej Kapolka
469e31cc05
Script bindings for QColor.
2014-07-15 16:44:02 -07:00
wangyix
1047ec7c87
merge with upstream
2014-07-14 16:25:26 -07:00
Aleric Inglewood
935f28aa35
Type fix. That that even compiled :/
2014-07-14 21:18:37 +02:00
wangyix
cb5a9bf668
moved some const defs to avoid redefinition
2014-07-14 10:43:02 -07:00
Aleric Inglewood
13c2c69d06
Fix another typo in previous commit
2014-07-13 20:54:27 +02:00
Aleric Inglewood
ea98b58b40
Debug support: allow printing of glm types to QDebug.
...
This adds support for serialization to QDebug of
glm::vec3, glm::quat and glm::mat4.
Output example:
qDebug().nospace() << "Calling PhysicsEntity::findRayIntersection(" << origin << ", " << direction << ", &distance) const; numShapes = " << numShapes;
leads to:
[2014-07-13T20:24:47] Calling PhysicsEntity::findRayIntersection({type='glm::vec3', x=5222.45, y=2159.05, z=6527.79}, {type='glm::vec3', x=0, y=-0.119145, z=-0.992877}, &distance) const; numShapes = 0
Note that we explicitly don't return dbg.space() because
we want to be able to print these things comma separated
as follows: {...}, {...}, ... as opposed to {...} , {...} etc.
I changed the already existing operator<< for Box to
the more general case, where it just prints its members
and doesn't mess with the internals of its members.
The result is more verbose, but also more recognizable when
in the future everything will look the same, allowing
for speed reading the debug output.
The constructor of Box needed to made explicit because
it was too annoying that when one forgets to #include "StreamUtils.h"
that writing a glm::vec3 resulted in printing out a Box,
implicitly converted from the vector.
2014-07-13 20:43:02 +02:00
wangyix
82e9aa8bb7
made stats easier to read; reverted injected stream deletion conditions
2014-07-11 16:08:15 -07:00
wangyix
25f4f63a1e
added window PacketStreamStats to AudioStreamStats
2014-07-10 16:42:23 -07:00
wangyix
35419eb939
Merge remote-tracking branch 'upstream/master' into quick_audio_PR
2014-07-10 11:56:35 -07:00
wangyix
a955a17472
changed RingBufferHistory to use qvector instead of raw array
2014-07-10 11:55:19 -07:00
wangyix
0b213f9616
streamlined AudioStreamStats packing; added #include <limits>
2014-07-10 10:44:33 -07:00
wangyix
35e4b253c2
added typename keyword in MovingMinMaxAvg.h
2014-07-10 10:35:29 -07:00
wangyix
763cc26fa9
added operator= to RingBufferHistory<T>::Iterator
2014-07-10 10:21:03 -07:00
wangyix
37b60a63b2
removed spaces
2014-07-10 10:01:32 -07:00
wangyix
0d83b9a6f6
tidied up code
2014-07-10 09:51:01 -07:00
wangyix
01f10024ae
all stats added, needs testing; created PacketStreamStats struct
2014-07-09 18:13:33 -07:00
wangyix
81e168f657
added RingBufferHistory template class, used it in SentPacketHistory and MovingMinMaxAvg
2014-07-09 15:38:03 -07:00
Andrew Meadows
9ce6844e9d
fix accidental broken class definition
2014-07-09 14:39:08 -07:00
Andrew Meadows
63bcee0229
fix whitespace formatting
2014-07-09 14:33:09 -07:00
wangyix
d03d3ef817
new auidostreamstats displayed in interface, domain page stats updated
2014-07-09 11:59:50 -07:00
Andrew Meadows
d26585728b
Improved stat accumulation and context names
2014-07-09 11:53:53 -07:00
Andrew Meadows
d214998d1a
enforce coding standard: explicit casts
2014-07-09 11:53:09 -07:00
wangyix
54e8ed5e11
added MovingMinMaxAvg and unit test; added additional stats to AudioStreamStats struct
2014-07-09 09:41:49 -07:00
Andrew Meadows
8c8a29f477
merge upstream/master into andrew/ragdoll
2014-07-03 09:27:52 -07:00
Andrew Meadows
356a29c2fb
add AngularConstraint::softClamp() for hands
2014-07-03 08:40:34 -07:00
Atlante45
6e02561d96
Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager
2014-07-02 14:08:57 -07:00
Andrew Meadows
f5debdb930
merge upstream/master into andrew/bispinor
2014-07-02 11:23:42 -07:00
Atlante45
15b37ec3d1
Switched ResourceCache to NetworkAccessManager
2014-07-02 11:21:07 -07:00
Andrew Meadows
5934ee5b22
added tests for ConeRollerConstraint
2014-07-01 09:35:47 -07:00
Andrew Meadows
9ca1bfdfe5
add AngularConstraint.* with some unit tests
...
more unit tests to follow
2014-06-30 18:05:22 -07:00
Andrew Meadows
552efa3e91
remove warning: unused variables
2014-06-25 09:01:49 -07:00
Andrew Meadows
df740dd82a
Fix bad static const inside class.
2014-06-23 14:07:09 -07:00
Andrew Meadows
e2204ab78e
friend foo --> friend class foo
2014-06-23 13:59:44 -07:00
Andrew Meadows
3e0673418f
more complete physics iteration for stability
2014-06-23 12:32:23 -07:00
Andrew Meadows
5e4d757e4e
merge upstream/master into andrew/ragdoll
2014-06-23 10:43:40 -07:00
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
Andrzej Kapolka
de0c45a919
Spanner mutation in test.
2014-06-20 18:09:51 -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