Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 04:03:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
14150 commits 76 branches 59 tags 1.2 GiB
Commit graph

124 commits

Author SHA1 Message Date
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
ZappoMan
5d4ce73499 added deleteModels() unit test 2014-06-25 16:46:20 -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
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
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
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