Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-30 13:31:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
21853 commits 71 branches 59 tags 1.2 GiB
Commit graph

314 commits

Author SHA1 Message Date
Andrzej Kapolka
bd4738d2c2 Reliable delta fix. 2014-10-21 15:48:53 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
Leonardo Murillo
0b7ff18970 Changes in non-Js code 2014-10-06 11:24:10 -06:00
ZappoMan
4b52fddffd collions with voxels and avatars 2014-09-24 17:37:56 -07:00
ZappoMan
f43ba4a68b first cut at getting entities to collide 2014-09-24 15:28:04 -07:00
Andrew Meadows
0539246089 merge upstream/master into andrew/ragdoll 2014-09-15 13:56:51 -07:00
ZappoMan
d10bd6857d add use of missingSet in release build to silence warning 2014-09-13 08:02:38 -07:00
Andrew Meadows
f2882618be merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-09-12 17:50:26 -07:00
Andrew Meadows
c475d5db36 unit tests for ray-vs-AACubeShape and PlaneShape 2014-09-12 08:41:28 -07:00
Andrew Meadows
08e5dbadfd added validation of RayIntersectionInfo::_hitShape 2014-09-11 09:44:41 -07:00
Andrew Meadows
0494ffcf38 implement Ray-vs-Capsule and Ray-vs-AACube 2014-09-10 17:01:51 -07:00
Andrew Meadows
4da1ca22ba Add RayIntersectionInfo and use for shape-vs-ray 2014-09-09 17:35:06 -07:00
ZappoMan
b78b8ccbb0 first cut at replacing radius with dimensions 2014-09-09 13:33:05 -07:00
Andrew Meadows
526d998924 removed warnigs about ill-formed narrowing conversion 2014-09-05 17:21:15 -07:00
AndrewMeadows
bd55da4a83 Merge pull request #3335 from ZappoMan/virtualEntities 
Model Server to Entity Server Refactoring
 2014-09-03 15:48:58 -07:00
Clément Brisset
72af7617fa Merge pull request #3332 from AndrewMeadows/ragdoll 
add AACubeShape to ShapeCollider
 2014-09-03 14:34:32 -07:00
MarcelEdward
95cab15864 the command: 
cmake . -GXcode

creates a CMakeFiles direcory in the test directory, causing the creation of the xcode files to fail with an the source directory does not contain a CMakeList.txt file.

This patch updates the CMakeList.txt file in the test directory to ignore that created dir.
 2014-09-03 16:34:23 +02:00
Andrew Meadows
ebcc960ec7 merge upstream/master into andrew/ragdoll 2014-08-29 15:48:40 -07:00
Andrew Meadows
a0eb13f6db collision logic for capsule-side-vs-cube-face 
with unit tests
 2014-08-29 14:23:00 -07:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-08-28 21:19:56 -07:00
Andrew Meadows
00913d4422 fixes for capsuleVsAACube() with unit tests 2014-08-28 16:51:16 -07:00
Andrew Meadows
f1ae0ce992 moved some functions around 2014-08-27 12:21:03 -07:00
Andrew Meadows
c6253bb51a AACube vs Sphere and Capsule collision tests 
Sphere is unit tested.
Also removed the shape collision query against Octree
 2014-08-27 12:09:41 -07:00
Craig Hansen-Sturm
e941e58626 merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00
Andrew Meadows
1bd7734ec1 sometimes swap order of shapes for simpler code 2014-08-22 18:07:11 -07:00
Andrew Meadows
de0ebf2f57 make sure all test errors have newline at end 2014-08-22 17:33:31 -07:00
Andrew Meadows
5d39efea82 make sure each test error has a newline at end 2014-08-22 17:26:19 -07:00
Andrew Meadows
1be922f986 add shapeVsList etc to dispatch table 
renamed some functions for more readability
 2014-08-22 11:20:53 -07:00
Andrew Meadows
3ebd8c1969 use dispatchTable for shape-vs-shape collisions 2014-08-21 16:40:25 -07:00
ZappoMan
daffb00bf2 build issues fixed after merge 2014-08-18 15:41:20 -07:00
ZappoMan
32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
 2014-08-18 15:16:35 -07:00
ZappoMan
be94f98a91 fix warning 2014-08-17 14:10:42 -07:00
ZappoMan
cac4e5ba6c improved use of MovingMinMaxAvg<> for better performance, added execution timing stats 2014-08-17 14:08:07 -07:00
wangyix
029ef962b7 made JitterTester work on windows 2014-08-14 11:31:31 -07:00
wangyix
81fa5ed41f readPendingDatagrams stats printed and sent to domain page 
jittertester now prints out send or receive error msgs
 2014-08-13 16:48:06 -07:00
wangyix
db0fbcab97 merge with upstream 2014-08-13 11:09:55 -07:00
wangyix
737228e7bb another newline 2014-08-12 15:40:58 -07:00
wangyix
3c73fd5e0b forgot newline 2014-08-12 15:39:03 -07:00
wangyix
53d6cdd67c forgot more lines 2014-08-12 15:36:51 -07:00
wangyix
d43c39fd57 forgot a line 2014-08-12 15:28:36 -07:00
wangyix
dc46d6b80f added stdev to jitter tester 2014-08-12 15:27:17 -07:00
wangyix
184e4b8bde sestets added to jitter tester 2014-08-12 14:38:28 -07:00
wangyix
406be72f41 per-report stats added to jitter tests 2014-08-12 13:46:55 -07:00
wangyix
4ec84b32b0 updated AudioRingBuffer bytes vs samples returns 2014-08-08 17:00:39 -07:00
ZappoMan
027b1d58cc Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	interface/src/entities/EntityTreeRenderer.h
	interface/src/models/ModelTreeRenderer.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.h
 2014-08-08 14:26:56 -07:00
Stephen Birarda
2fda95ae8f repair build of various tools 2014-08-08 13:17:54 -07:00
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
27419b7b6b fix some build blockers in test directory 2014-08-08 13:17:54 -07:00
Stephen Birarda
e4d01d269c use shared dependency linking macro in hifi projects 2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62 add macro to link shared dependencies to target 2014-08-08 13:17:54 -07:00
Stephen Birarda
c9f8433a2d tweak setup_hifi_library to bubble up full path of Qt modules 2014-08-08 13:17:54 -07:00
Stephen Birarda
1f0a722d0d remove antequated windows libraries that have been replaced by Qt usage 2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4 remove ssize_t and replace with size_t or int where appropriate 2014-08-08 13:17:53 -07:00
Stephen Birarda
87cf262b9e get to successful cmake after library link macro changes 2014-08-08 13:17:53 -07:00
ZappoMan
d50a607bc7 started support for new entity base class properties like velocity, gravity, damping, and lifetime 2014-08-08 11:38:03 -07:00
ZappoMan
6f479a1026 convert IDs to UUIDs 2014-08-07 17:02:11 -07:00
wangyix
357ba92181 working towards more dials for InboundAdioStream 2014-08-07 12:41:09 -07:00
Philip Rosedale
d552b7ca97 Merge pull request #3246 from wangyix/inbound_audio_stream 
Improved SequenceNumberStats handling of out-of-sync seq nums
 2014-08-04 14:30:45 -07:00
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