Aleric Inglewood
147a4119cb
Fix linker problem
...
This fixes the linker problem:
/usr/bin/ld: error: ../../libraries/shared/libshared.a(StreamUtils.cpp.o): multiple
definition of 'operator<<(std::ostream&, glm::detail::tvec3<float, (glm::precision)0> const&)'
/usr/bin/ld: CMakeFiles/physics-tests.dir/src/PhysicsTestUtil.cpp.o: previous definition here
/usr/bin/ld: error: ../../libraries/shared/libshared.a(StreamUtils.cpp.o): multiple
definition of 'operator<<(std::ostream&, glm::detail::tquat<float, (glm::precision)0> const&)'
/usr/bin/ld: CMakeFiles/physics-tests.dir/src/PhysicsTestUtil.cpp.o: previous definition here
/usr/bin/ld: error: ../../libraries/shared/libshared.a(StreamUtils.cpp.o): multiple
definition of 'operator<<(std::ostream&, glm::detail::tmat4x4<float, (glm::precision)0> const&)'
/usr/bin/ld: CMakeFiles/physics-tests.dir/src/PhysicsTestUtil.cpp.o: previous definition here
collect2: error: ld returned 1 exit status
Note these are the serializers to std::ostream that were already there, not the ones
that I added (which are to QDebug). This bug was already there, I only got these errors
now after adding some debug code.
The reason is obvious: they are already defined in libshared.a (through StreamUtils.cpp).
No need to define them again in ./tests/physics/src/PhysicsTestUtil.cpp
2014-07-13 21:59:45 +02:00
wangyix
35419eb939
Merge remote-tracking branch 'upstream/master' into quick_audio_PR
2014-07-10 11:56:35 -07:00
wangyix
81e168f657
added RingBufferHistory template class, used it in SentPacketHistory and MovingMinMaxAvg
2014-07-09 15:38:03 -07:00
wangyix
d03d3ef817
new auidostreamstats displayed in interface, domain page stats updated
2014-07-09 11:59:50 -07:00
wangyix
54e8ed5e11
added MovingMinMaxAvg and unit test; added additional stats to AudioStreamStats struct
2014-07-09 09:41:49 -07:00
Andrzej Kapolka
b6570dc4ee
Use congestion control on server.
2014-07-08 15:10:05 -07:00
Andrzej Kapolka
02cf1f006e
Change tests to reflect transmission changes and fixed issue with reprocessing
...
already-handled reliable delta.
2014-07-08 13:41:42 -07:00
Andrzej Kapolka
69e7a17f47
Rather than backing out when we find that the delta is too big, we can just
...
write the whole thing and copy it over (with some mapping fiddlery) if it
turns out to be too big.
2014-07-07 16:07:04 -07:00
Andrzej Kapolka
fb64d22171
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-07 11:09:17 -07:00
Andrzej Kapolka
e15f003639
Bring reliable delta streaming code over from test.
2014-07-07 11:08:43 -07:00
Andrzej Kapolka
da32c6e89b
Push persistent mappings into reliable delta channel before sending and pull
...
transient mappings out after sending.
2014-07-03 17:29:10 -07:00
Brad Hefta-Gaub
dbdce32b68
Merge pull request #3107 from wangyix/master
...
prune missing sequence numbers before sending NACK; AudioRingBuffer frame length can now be specified;
2014-07-03 13:32:31 -07:00
wangyix
94c0c15c76
fixed more small bugs with AudioRingBuffer constructor
2014-07-03 12:06:18 -07:00
Andrzej Kapolka
38383effcc
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-03 11:33:22 -07:00
wangyix
059628c26a
fixed bug in SequenceNumberStats and its unit test; test passes now
2014-07-03 10:37:09 -07:00
Andrew Meadows
356a29c2fb
add AngularConstraint::softClamp() for hands
2014-07-03 08:40:34 -07:00
Andrzej Kapolka
282c62a083
Handle LODs correctly (?) for reliable deltas.
2014-07-02 18:49:40 -07:00
Andrzej Kapolka
154eb04336
Working on sending large deltas as reliable messages.
2014-07-02 17:13:39 -07:00
Andrew Meadows
f5debdb930
merge upstream/master into andrew/bispinor
2014-07-02 11:23:42 -07:00
Andrew Meadows
c3f7d9d155
delete AngularConstraints at end of tests
2014-07-02 11:20:14 -07:00
Andrew Meadows
ed78855eb6
remove warnings about signed/unsigned comparisons
2014-07-02 10:49:37 -07:00
wangyix
a5943e3608
made AudioRingBuffer frames capacity variable
2014-07-01 16:24:31 -07:00
Brad Hefta-Gaub
df51d26625
Merge pull request #3094 from wangyix/seqNumberStats
...
Fixed bugs and improved overflow handling in AudioRingBuffer; Added audio stream stats packets; Added seq numbers and tracking to audio packets;
2014-07-01 10:54:35 -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
wangyix
f2dfa6b978
fixed warnings
2014-06-30 16:10:58 -07:00
wangyix
c789f3c6b9
merge with upstream
2014-06-30 14:13:34 -07:00
Andrzej Kapolka
73a1e759a4
Include an additional bit with the objects that says whether what follows is
...
a delta. The clients may be retaining references to the objects, so we can't
rely on their having been deleted.
2014-06-30 12:35:34 -07:00
Andrzej Kapolka
b623276fde
Increase the LOD threshold for now to get around spanner issue.
2014-06-27 17:39:51 -07:00
Andrzej Kapolka
f2bdacd5a8
Fix for shared object reference tracking.
2014-06-27 16:19:18 -07:00
wangyix
0ae58bd7f9
added senderUUID arg to seq stats
2014-06-27 15:39:11 -07:00
Andrzej Kapolka
d4470c04d6
Modify tests to use Endpoint base class.
2014-06-27 12:34:56 -07:00
Andrzej Kapolka
4b2d122f3d
Working on factoring out the common metavoxel endpoint/client code.
2014-06-26 16:12:11 -07:00
wangyix
2ec04fb756
replaced old seqnum tracking code with SequenceNumberStats
2014-06-25 17:20:57 -07:00
Andrzej Kapolka
5effcd24ff
Only increase/decrease rate when we want to send more/have sent more than the
...
minimum, respectively.
2014-06-25 16:56:02 -07:00
wangyix
b220b092f4
added SequenceNumberStats and unit test
2014-06-25 16:35:08 -07:00
Andrzej Kapolka
705445ce62
Basic congestion control using TCP-esque strategy.
2014-06-25 15:48:46 -07:00
Andrzej Kapolka
8999fcef17
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-25 11:42:55 -07:00
ZappoMan
a7f2d150a4
what's this cmake defines ssize_t???
2014-06-24 20:15:34 -07:00
ZappoMan
fd3916e662
another hack attempt to fix unit tests on windows
2014-06-24 20:10:06 -07:00
ZappoMan
1001ea5f87
fixed some windows warnings
2014-06-24 20:07:47 -07:00
Andrzej Kapolka
e7db355c95
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-06-24 19:11:43 -07:00
Andrzej Kapolka
65e50f32e4
Tests, fixes for SpanList.
2014-06-24 19:10:52 -07:00
ZappoMan
fdb0cf9386
change order of headers
2014-06-24 18:53:20 -07:00
ZappoMan
773e1b0522
try to get tests to build
2014-06-24 18:02:35 -07:00
wangyix
d098edcdf0
Merge remote-tracking branch 'upstream/master'
2014-06-24 17:39:13 -07:00
ZappoMan
3da18ec1c0
try to disable model tests
2014-06-24 17:23:09 -07:00
wangyix
52f00769d4
merged with upstream
2014-06-24 17:22:30 -07:00
wangyix
5fd1d0a87c
added AudioRingBuffer unit test
...
fixed bug with _endOfLastWrite not rolling over in addSilentFrame
2014-06-24 16:51:51 -07:00
Brad Hefta-Gaub
6d77d438ab
Merge pull request #3057 from AndrewMeadows/ragdoll
...
Ragdoll Part3: avatar shapes self collide (but don't yet affect the joint positions of MyAvatar)
2014-06-24 15:47:18 -07:00
