Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 15:32:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
87201 commits 67 branches 56 tags 1.2 GiB
Commit graph

1356 commits

Author SHA1 Message Date
ZappoMan
3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
 2014-08-04 12:01:23 -07:00
wangyix
d394c203b6 improved re-sync handling of SequenceNumberStats 
removed "duplicate" category since it's not 100% accurate
 2014-08-04 11:09:20 -07:00
Philip Rosedale
69558dc574 Merge pull request #3245 from wangyix/inbound_audio_stream 
Improved SequenceNumberStats
 2014-08-04 07:49:31 -07:00
wangyix
1d74ae8197 code cleanup 2014-08-01 16:49:21 -07:00
wangyix
f9ec7b6c18 redesiged SequenceNumberStats child instance handling 2014-08-01 16:13:52 -07:00
ZappoMan
66d45d3544 tweak format of report 2014-08-01 15:25:03 -07:00
ZappoMan
cb02ac16b6 tweak format of report 2014-08-01 15:23:52 -07:00
ZappoMan
ce46e8b812 tweak format of report 2014-08-01 15:14:43 -07:00
ZappoMan
34ca5ded72 add reporting interval 2014-08-01 15:09:11 -07:00
ZappoMan
60899d2a00 oops 2014-08-01 14:55:14 -07:00
ZappoMan
ca4bca7042 more windows headaches memset instead of bzero 2014-08-01 14:11:24 -07:00
ZappoMan
36f635ed8d change stats to display difference between gap and expected gap 2014-08-01 14:07:14 -07:00
ZappoMan
8db66e4322 use our ported version of usecTimestampNow cause windows sucks 2014-08-01 13:58:38 -07:00
ZappoMan
48b73e3f0e windows build 2014-08-01 13:42:37 -07:00
ZappoMan
e0946838f3 windows build 2014-08-01 13:34:01 -07:00
ZappoMan
ad4dd9404d windows build 2014-08-01 13:26:56 -07:00
ZappoMan
ddfdfc9242 windows build 2014-08-01 13:21:46 -07:00
ZappoMan
8c14f948f2 handle first packet stats better 2014-08-01 13:15:57 -07:00
ZappoMan
8359ebb82f use c std version of usecTimestampNow() 2014-08-01 13:12:37 -07:00
ZappoMan
68074cb22a added a simple udp send/receive jitter test tool 2014-08-01 12:59:10 -07:00
wangyix
cdcc6ece04 fixed compile errors caused by SequenceNumberStats changes 2014-08-01 10:34:19 -07:00
ZappoMan
77e1867b11 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	assignment-client/src/Agent.h
	examples/editModels.js
	interface/src/Application.h
 2014-07-31 10:34:23 -07:00
Stephen Birarda
2796f71419 library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
ZappoMan
1eb472c43a Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-15 10:05:06 -07:00
ZappoMan
2baac96665 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/sit.js
	interface/src/Application.cpp
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
 2014-07-15 10:04:40 -07:00
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
ZappoMan
780532bfd8 more model to entity renaming, adding AABox:clamp() and AACube::clamp() fix AddEntity to support adding an entity that extends over bounds of universe 2014-07-10 13:42:49 -07: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
ZappoMan
e800d5457b Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 2014-07-08 13:02:31 -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
ZappoMan
3145d150f3 more work on virtual entities, unit tests passing woot 2014-07-07 12:56:32 -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
ZappoMan
29e02f2681 more hacking on virtualizing entities 2014-07-07 09:36:31 -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
ZappoMan
ec0c350f60 Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 
Conflicts:
	interface/src/Application.cpp
	interface/src/DatagramProcessor.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-03 14:20:40 -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
ZappoMan
2c5209d1e7 virtual entities checkpoint 2014-07-03 09:07:11 -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
ZappoMan
865566414c Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities 
Conflicts:
	interface/src/entities/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTreeElement.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
 2014-07-01 16:32:47 -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
ZappoMan
c4fe36b13d more Models->Entities renaming 2014-06-26 17:01:07 -07:00
ZappoMan
ccc9eabd33 first cut at renaming Models to Entities 2014-06-26 16:39:52 -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
ZappoMan
5d4ce73499 added deleteModels() unit test 2014-06-25 16:46:20 -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
ZappoMan
bf0171700a tweaks to unit tests 2014-06-25 15:35:52 -07:00
ZappoMan
154f203541 add deleteModel unit test 2014-06-25 15:08:08 -07:00
ZappoMan
34fad16dcf tweaks 2014-06-25 14:12:03 -07:00
ZappoMan
311d8154bd added bestFit support for testing add 2014-06-25 14:06:28 -07:00
ZappoMan
0f18e4971c added more debug 2014-06-25 12:03:40 -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
142fc02ec5 octree tests tweaks 
Conflicts:
	tests/octree/src/ModelTests.cpp
	tests/octree/src/main.cpp
 2014-06-25 11:38:18 -07:00
ZappoMan
9e0f010edd seed random generator to make tests reproducable 2014-06-25 11:14:15 -07:00
ZappoMan
47c0e2266f added more timing details to model tests 
Conflicts:
	tests/octree/src/ModelTests.cpp
 2014-06-25 11:09:41 -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
ZappoMan
8a1a19b91b added some more tests 2014-06-24 16:20:04 -07:00
ZappoMan
a019b70e58 Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel 
Conflicts:
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
	tests/octree/src/main.cpp
 2014-06-24 15:59:17 -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
ZappoMan
52b61ebab8 added addModel() performance test 2014-06-23 14:48:12 -07:00
ZappoMan
d42ec973d2 added some performance tests 
Conflicts:
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
	tests/octree/src/ModelTests.h
	tests/octree/src/main.cpp
 2014-06-23 14:21:06 -07:00
ZappoMan
48e779cf8e added some performance tests 2014-06-23 14:08:47 -07:00
Andrzej Kapolka
e72429171f Working on congestion tests. 2014-06-23 12:01:49 -07:00
Andrew Meadows
5e4d757e4e merge upstream/master into andrew/ragdoll 2014-06-23 10:43:40 -07:00
Andrzej Kapolka
626bd42b7b Use randomColorValue, since we have it. 2014-06-20 18:22:36 -07:00
Andrzej Kapolka
de0c45a919 Spanner mutation in test. 2014-06-20 18:09:51 -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
Andrzej Kapolka
ce778f47b1 More work on stream testing, fixed bug with differently-ordered edits. 2014-06-20 14:08:39 -07:00
Andrzej Kapolka
24f535e02d Working on metavoxel streaming tests. 2014-06-19 18:15:17 -07:00
Andrzej Kapolka
7a9c0f0e6a Working on tests for metavoxel streaming. 2014-06-19 14:50:19 -07:00
ZappoMan
fd966b49b2 added some unit tests for ModelTree 2014-06-19 10:41:00 -07:00
ZappoMan
618f538be5 mostly working, but some blinking when setting glow 2014-06-19 10:40:38 -07:00
Andrew Meadows
c98631f820 merge upstream/master into andrew/ragdoll 2014-06-18 17:23:24 -07:00
ZappoMan
c54bdb3e8d Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel 2014-06-18 15:20:08 -07:00
Andrew Meadows
715cc3467d forgot to add the test files 2014-06-18 14:47:39 -07:00
Andrew Meadows
96eebec0fc unit tests for VerletShapes 2014-06-18 14:06:00 -07:00
Andrzej Kapolka
26159a05d9 Fix for sporadic test failure due to hash ordering. 2014-06-18 13:09:45 -07:00
Andrew Meadows
9e839f0980 Shape::getCenter() -> Shape::getTranslation() 2014-06-18 08:55:48 -07:00
ZappoMan
5a246fab26 Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel 
Conflicts:
	tests/octree/src/main.cpp
 2014-06-17 17:45:06 -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
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
Brad Hefta-Gaub
6fc05d66c8 Merge pull request #3030 from AndrewMeadows/inertia 
raycasts against Shapes
 2014-06-17 16:10:36 -07:00
ZappoMan
4413049302 fixed a bug in inside out ray casting returning the wrong face 2014-06-17 13:05:35 -07:00
Andrew Meadows
f18864bd72 Moved findRayIntersection() to the Shape classes 2014-06-17 12:36:36 -07:00
Andrzej Kapolka
7931173671 Working on tools to convert bitstreams to/from json. 2014-06-17 12:33:31 -07:00
Andrew Meadows
018ba52b1c merge upstream/master with andrew/inertia 2014-06-17 10:50:49 -07:00
Andrew Meadows
fa6aed3e01 Add unit tests for ray intersections with shapes. 2014-06-17 10:49:53 -07:00
Andrzej Kapolka
37c977af02 Tests working for reading JSON. 2014-06-16 19:12:21 -07:00
Andrew Meadows
92159a7ed5 Shape::get/setCenter() instead of get/setPosition() 2014-06-16 08:43:27 -07:00
Andrzej Kapolka
aac7459f42 More work on JSON encoding. 2014-06-13 18:32:57 -07:00
Andrzej Kapolka
9fc84d6358 Generics up and running. 2014-06-13 12:00:42 -07:00
ZappoMan
2e5e6e3f61 get model props spanning multiple packets 2014-06-12 13:03:37 -07:00
ZappoMan
2db897a00e Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements 2014-06-11 14:40:25 -07:00
Andrzej Kapolka
d1549b00ab Might as well include strings in the "simple" random script objects. 2014-06-09 17:22:44 -07:00
Andrzej Kapolka
3293ab788b Fix for script object deltas. 2014-06-09 17:19:36 -07:00
Andrzej Kapolka
590f045ed1 Script value streaming tests, fixes. 2014-06-09 16:51:41 -07:00
ZappoMan
c5647addf4 Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements 2014-06-09 14:10:47 -07:00
ZappoMan
89e24c4f21 add unit tests from new ModelItem serialization 2014-06-09 12:55:55 -07:00
ZappoMan
49a9f2046a more unit tests 2014-06-09 11:29:17 -07:00
ZappoMan
493ad6ae9e added test pass/fail counting to octree unit tests 2014-06-09 10:41:43 -07:00
ZappoMan
f3dd34ae54 tweak 2014-06-09 08:03:31 -07:00
Andrzej Kapolka
361461516c Check the delta-encoded objects, report bytes sent/received. 2014-06-06 14:26:20 -07:00
Andrzej Kapolka
56d9bc5215 Working on delta-streaming tests. 2014-06-06 11:37:45 -07:00
Andrzej Kapolka
0fc6354b6c Fix for streaming the same object. 2014-06-06 11:18:55 -07:00
Andrzej Kapolka
c333fb904f Working on tests for delta streaming. 2014-06-05 16:45:13 -07:00
ZappoMan
76731be8c0 added some extra libraries 2014-06-05 16:01:11 -07:00
Andrzej Kapolka
c44dba78cb Provide a reasonably painless way to stream enums that aren't object 
properties.
 2014-06-05 15:32:55 -07:00
ZappoMan
9d1106885d added tests for ByteCountCoding 2014-06-05 12:52:18 -07:00
Philip Rosedale
3cc67f5229 Merge pull request #2984 from ZappoMan/octreeWireformatImprovements 
Octree wireformat improvements checkpoint
 2014-06-04 21:58:08 -07:00
Philip Rosedale
b59b26d87b Merge pull request #2985 from ey6es/metavoxels 
Pulled in fixes for delta-encoding from "deltatars," added support for version-resilient streaming of Qt enums/flags.
 2014-06-04 21:23:46 -07:00
Andrzej Kapolka
54a5bc3a49 More enum stuff, with tests. 2014-06-04 17:24:43 -07:00
wangyix
124bd88b01 added tests for MovingPercentile 2014-06-04 17:23:44 -07:00
ZappoMan
b74676de0d add more tests for decode 2014-06-04 15:33:22 -07:00
ZappoMan
2066dbcec7 cleanup 2014-06-04 15:16:51 -07:00
ZappoMan
10f7eae7a0 implemented decode 2014-06-04 14:56:13 -07:00
ZappoMan
78d3f1454c more operators 2014-06-04 14:19:35 -07:00
ZappoMan
2b85145325 added test suite for PropertyFlags, latest work on PropertyFlags 2014-06-04 11:41:09 -07:00
Andrzej Kapolka
90e2145fc4 Working on enum streaming. 2014-06-03 17:17:02 -07:00
Andrzej Kapolka
ac7d23bf54 Working on support for streaming Qt enums/flags. 2014-06-02 19:00:48 -07:00
Andrew Meadows
1d64262067 whoops, committed wrong file. Rolling back. 2014-05-05 08:46:35 -07:00
Andrew Meadows
6cc8d53a6d fix sphere-cube collisions at edges 2014-05-04 22:14:05 -07:00
Andrew Meadows
c8e56a97cc fix sphere-cube collisions, with tests 2014-05-02 21:47:27 -07:00
Andrew Meadows
fe42f66cc9 change x.f to be x.0f as per the coding standard 2014-04-23 13:27:43 -07:00
Andrew Meadows
7cb6856415 Adding some collision tests for sphere-vs-AACube 2014-04-22 10:44:41 -07:00
Andrew Meadows
22d2f84cff merge upstream/master into andrew/scripting 2014-04-09 15:38:56 -07:00
Andrew Meadows
635f832dfe rename shapeShape() to be collideShapes() 
Also add collideShapesCoarse()
 2014-04-09 13:04:17 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Stephen Birarda
c9b58c0ee9 fix headers in h files in tests, fix Andrew's dates 2014-04-09 09:49:47 -07:00
Stephen Birarda
cb402e3eb3 run apache header script on tests 2014-04-09 09:46:43 -07:00
Andrzej Kapolka
cc5ea2a465 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-28 11:19:58 -07:00
Andrew Meadows
c383b69b61 merge upstream/master into enforce-standard 
Conflicts:
	interface/src/avatar/Hand.cpp
 2014-03-27 10:53:54 -07:00
Andrzej Kapolka
7f3977578e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-26 18:30:06 -07:00
Andrew Meadows
4c64c11144 making some type casts abide by coding standard 2014-03-26 16:58:47 -07:00
Andrew Meadows
06fbd49ffa Adding StreamUtils for common debug output 2014-03-25 15:29:22 -07:00
Andrzej Kapolka
d569802fbc More metadata fixes. 2014-03-17 17:21:46 -07:00
Andrzej Kapolka
eb95b01aa1 Fixes to, test for metadata streaming. 2014-03-17 16:10:30 -07:00
Andrzej Kapolka
b21247ca67 Optional hash/full metadata streaming for QObjects. 2014-03-16 17:29:30 -07:00
Andrew Meadows
ab84526a1b removing compile warnings 2014-03-14 16:12:32 -07:00
Andrzej Kapolka
e249b29b45 Merge pull request #2268 from AndrewMeadows/radians 
prefer radians over degrees
 2014-03-12 12:10:29 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Andrzej Kapolka
3b63424abd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-10 12:27:07 -07:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
Andrzej Kapolka
0448596e58 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/renderer/FBXReader.cpp
 2014-03-05 18:28:25 -08:00
Philip Rosedale
c2a63c4206 Merge pull request #2190 from AndrewMeadows/shapes 
Collision Shapes
 2014-03-05 17:59:42 -08:00
Andrzej Kapolka
d1747ed8d1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-05 17:12:37 -08:00
Stephen Birarda
231dc624ff replace deprecated qt5 macros in cmake with target_link_libraries 2014-03-04 12:41:24 -08:00
Andrew Meadows
d537b4118d Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 2014-03-04 11:40:59 -08:00
Andrzej Kapolka
cbfc60d017 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-04 11:18:54 -08:00
Andrew Meadows
ea0bc52e12 removing unused variables 2014-03-04 09:56:06 -08:00
Andrew Meadows
7ba5bc71ea Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 
Conflicts:
	interface/src/renderer/FBXReader.cpp
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
 2014-03-04 09:01:24 -08:00
Stephen Birarda
628f91cd73 complete quoting of varous Cmake commands, closes #1999 2014-03-03 12:15:05 -08:00
Andrzej Kapolka
949e40a10e Revert complicated system of "soft" pointers, instead use hard references in 
write mappings and listen for object destruction.
 2014-03-03 11:44:45 -08:00
Andrzej Kapolka
55dca45feb Working on tests for shared objects. 2014-03-03 10:20:50 -08:00
Andrew Meadows
da0276ac7e ShapeCollider takes CollisionList argument 
Also, adding first pass at ListShape
 2014-02-26 12:10:16 -08:00
Andrew Meadows
f0e1a6ccd3 more capsuleCapsule tests 2014-02-25 11:38:08 -08:00
Andrew Meadows
9a70a50bdb capsuleCapsule() collision with preliminary tests 2014-02-25 10:59:12 -08:00
Andrew Meadows
8a3640f016 Adding CapsuleSphere collisions with tests. 2014-02-24 11:38:27 -08:00
Andrew Meadows
0e28e0947c Adding ShapeColliderTests.* 2014-02-22 13:20:47 -08:00
Andrew Meadows
072369abfe Adding physics test framework 2014-02-21 16:27:44 -08:00
Andrzej Kapolka
bb56e2847f Global edits, edits use virtual function. 2014-02-12 20:00:07 -08:00
Andrzej Kapolka
f9b0ff0608 Various bits of streaming work: send delete messages for main channel on 
reliable channel, test messages on main channel.
 2014-02-12 12:33:40 -08:00
Andrzej Kapolka
36f1e59201 Working on support for sending messages through reliable channels. 2014-02-10 20:26:09 -08:00
Andrew Meadows
c8bb539a0c Theoretical fix for windows build of tests/metavoxels 2014-02-10 16:24:10 -08:00
Andrzej Kapolka
e9579feef5 Reordering testing. 2014-02-10 00:41:15 -08:00
Andrzej Kapolka
ee2984ce6d Streaming fixes. 2014-02-09 23:38:33 -08:00
Andrzej Kapolka
f81a9d9fe8 Circular buffer work. 2014-02-09 22:29:23 -08:00
Andrzej Kapolka
8c9f06ceec Fix/tests for streaming. 2014-02-09 17:43:18 -08:00
Andrzej Kapolka
524ceb4ed2 Working on tests for datagram sequencing, added autogenerated ==/!= operators 
to mtc.
 2014-02-09 16:26:53 -08:00