Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-12 21:27:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
16974 commits 25 branches 0 tags 1.1 GiB
Commit graph

1645 commits

Author SHA1 Message Date
Andrew Meadows
66158cb8a2 fix capsule-vs-capule collision test 2014-07-17 09:19:17 -07:00
wangyix
6764ace8eb droppable silent packets are added for dropped packets; 
_currentJitterBufferFrames replaced with moving average of frames
available.  Downstream framesAvailable stat now includes the frames in
QAudioOutput as well as the ringbuffer.
 2014-07-16 14:41:24 -07:00
Andrew Meadows
922912b784 merge upstream/master into andrew/ragdoll 
Conflicts:
	interface/src/Menu.h
 2014-07-16 09:00:36 -07:00
Andrzej Kapolka
469e31cc05 Script bindings for QColor. 2014-07-15 16:44:02 -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
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
Andrew Meadows
c5a5f8c5d4 bug fix: bad logic in capsule-vs-capsule 2014-07-11 10:54:16 -07:00
Andrew Meadows
7c8f5e2c12 Remove some old TODO comments 2014-07-11 10:54:03 -07:00
wangyix
25f4f63a1e added window PacketStreamStats to AudioStreamStats 2014-07-10 16:42:23 -07: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
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
ZappoMan
c449ba27a9 more virtual entity work 2014-07-03 15:18:17 -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
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
106e5b578b Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager 2014-07-02 16:06:41 -07:00
Clément Brisset
1f92d57230 Merge pull request #3103 from AlericInglewood/19827 
Code Review for Job #19827
 2014-07-02 15:53:57 -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
Aleric Inglewood
f13bbdfae6 Compile fix for non-standard Qt5 install. 
When Qt5 5.2.1 is compiled from source, configured with
-developer-build, and used without being installed;
then compiling interface results in the following compile error:

libraries/shared/src/RegisteredMetaTypes.h:17:34: fatal error: QtScript/QScriptEngine: No such file or directory

This commit fixes this by explicitely adding the include
directory for QtScript/QScriptEngine to libraries/shared/CMakeLists.txt

Likewise we get the compile error:

In file included from /opt/highfidelity/hifi/hifi/animation-server/../libraries/voxels/src/VoxelEditPacketSender.h:18:0,
                 from /opt/highfidelity/hifi/hifi/animation-server/src/AnimationServer.cpp:26:
 /opt/highfidelity/hifi/hifi/animation-server/../libraries/voxels/src/VoxelDetail.h:15:34:
 fatal error: QtScript/QScriptEngine: No such file or directory

which is fixed by added the include directory for QtScript/QScriptEngine
to animation-server/CMakeLists.txt

Finally, compile errors like

In file included from /opt/highfidelity/hifi/hifi/libraries/audio/src/AudioInjectorOptions.h:20:0,
                 from /opt/highfidelity/hifi/hifi/libraries/audio/src/AudioInjector.h:21,
                 from /opt/highfidelity/hifi/hifi/libraries/audio/src/AudioInjector.cpp:22:
/opt/highfidelity/hifi/hifi/assignment-client/../libraries/shared/src/RegisteredMetaTypes.h:17:34: fatal error: QtScript/QScriptEngine: No such file or directory

that requires to do the same in libraries/audio/CMakeLists.txt
 2014-06-30 02:06:44 +02:00
Andrew Meadows
552efa3e91 remove warning: unused variables 2014-06-25 09:01:49 -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
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
Andrew Meadows
2453e9c36a build ragdoll constraints again 2014-06-19 10:31:55 -07:00
Andrew Meadows
5e74ee8c05 VerletPoint has position, lastPosition, and mass 2014-06-19 09:54:32 -07:00
Andrew Meadows
d3a78c9fc2 simulation step stubbed out 2014-06-19 09:14:36 -07:00
Andrew Meadows
a8c2003fe6 namechange SimulationEngine --> PhysicsSimulation 2014-06-19 08:34:12 -07:00
Andrew Meadows
7cd1f75282 PhysicalEntity gets backpointer to SimulationEngine 2014-06-18 20:47:57 -07:00
Andrew Meadows
c98631f820 merge upstream/master into andrew/ragdoll 2014-06-18 17:23:24 -07:00
Andrew Meadows
d4b5550cda Skeleton now creates VerletShape 2014-06-18 17:22:39 -07:00
ZappoMan
28c7c24399 Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel 
Conflicts:
	libraries/octree/src/AABox.h
 2014-06-18 15:27:36 -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
3791b4712b adding some documentation about the VerletShapes 2014-06-18 14:17:12 -07:00
Andrew Meadows
96eebec0fc unit tests for VerletShapes 2014-06-18 14:06:00 -07:00
Stephen Birarda
5878b4af59 setup listener unattenuated zones for source ring buffers 2014-06-18 12:50:16 -07:00
Brad Hefta-Gaub
c49ff59725 Merge pull request #3037 from wangyix/edit_nack_pull 
Edit nack pull
 2014-06-18 11:43:25 -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
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
Andrew Meadows
ecbf5043d7 code out of Model into base and derived classes 
PhysicalEntity (base class) gets some shape management stuff
SkeletonModel (derived class) gets some boundary shape and
joint-shape stuff
 2014-06-17 16:22:18 -07:00
Andrew Meadows
b6cecf3cfd Add SphereShape.cpp to project 2014-06-17 12:50:49 -07:00
Andrew Meadows
f18864bd72 Moved findRayIntersection() to the Shape classes 2014-06-17 12:36:36 -07:00
Andrew Meadows
018ba52b1c merge upstream/master with andrew/inertia 2014-06-17 10:50:49 -07:00
Andrew Meadows
ab3d582d79 Add ray intersection tests against most shapes. 2014-06-17 10:49:14 -07:00
Andrew Meadows
e75340f8ce Add PlaneShape::getNormal() method. 2014-06-17 10:48:29 -07:00
Andrew Meadows
118717d96a Shapes moved from Model into PhysicalEntity 2014-06-16 14:51:58 -07:00
Kai Ludwig
d08b63b247 changed 2000 into a constant defined inline 2014-06-16 23:30:28 +02:00
Andrew Meadows
1496e6c8b2 add VirletSphereShape and VirletCapsuleShape 2014-06-16 12:29:41 -07:00
Andrew Meadows
3a2f322ca3 SphereShape, CapsuleShape support derived classes 2014-06-16 12:23:18 -07:00
wangyix
2b20720f51 added sendNackPackets() to OctreeInboundPacketProcessor 
added rollover handling in _missingSequenceNumbers pruning; added
EditNack packet types; added getMyEditNackType() to OctreeServer
subclasses; added code to randomly skip edit packet sequence numbers for
testing in OctreeEditPacketSender
 2014-06-16 09:57:05 -07:00
Andrew Meadows
3fd4ee02ff Shape uses "center" instead of "position" 2014-06-16 08:55:08 -07:00
Andrew Meadows
92159a7ed5 Shape::get/setCenter() instead of get/setPosition() 2014-06-16 08:43:27 -07:00
Andrew Meadows
d7a28e1441 enable shape collisions for MyAvatar skeleton 
also some stubbery for main simulation loop
 2014-06-15 18:07:47 -07:00
Andrew Meadows
6f4a4ace0d add API stubs to RagDoll for SimulationEngine stepForward 2014-06-15 17:58:27 -07:00
Andrew Meadows
6d27987226 Add shape vs list-of-shapes collision method 
and list-of-shapes vs list-of-shapes
 2014-06-15 17:56:02 -07:00
Kai Ludwig
3fbde70f96 Added functions to test usleep, msleep and sleep for accuracy. 2014-06-15 21:05:23 +02:00
Andrew Meadows
158c7de76e Ragdoll not an Entity. SkeletonModel is a Ragdoll 2014-06-13 12:27:58 -07:00
Andrew Meadows
5bd37acdb8 Changed RagDoll to Ragdoll 2014-06-13 11:55:39 -07:00
Andrew Meadows
417a7def07 SimulationEngine::enforceConstraints() takes args 
...for limiting simulation costs
 2014-06-13 11:10:32 -07:00
Andrew Meadows
fb7f5707c8 add SimulationEngine, MyAvatar has one. 2014-06-12 18:15:20 -07:00
John Grosen
f0cb49ef5c added space between expressions in ternary operator 2014-06-12 17:24:56 -07:00
John Grosen
8e74398ed7 Fixed command line args parsing bug 2014-06-12 17:06:59 -07:00
Andrew Meadows
5be470bcbc add PhysicalEntity class 
Model and RagDoll derive from PhysicalEntity
Shape gets back pointer to its Entity (shape sharing not possible)
CollisionInfo gets backpointers the shapes involved
 2014-06-12 13:13:00 -07:00
Andrew Meadows
5f5ffff23c merge 2014-06-10 15:25:25 -07:00
Andrew Meadows
3c51ce76fc Add simulationID to Model Shape and CollisionInfo 2014-06-10 15:24:17 -07:00
ZappoMan
c5647addf4 Merge branch 'master' of https://github.com/worklist/hifi into octreeWireformatImprovements 2014-06-09 14:10:47 -07:00
Andrew Meadows
5a76a9b4b1 RagDoll keeps a pointer to list of shapes 2014-06-09 11:04:20 -07:00
ZappoMan
8834da60b9 aded encoded length to property flags 2014-06-09 10:41:11 -07:00
ZappoMan
6943b3f763 remove debugging 2014-06-09 10:40:29 -07:00
Andrew Meadows
90c55ad06c fix some comments 2014-06-06 16:09:21 -07:00
Andrew Meadows
131a2c27b8 move RagDoll to libraries/shared 2014-06-06 15:51:50 -07:00
Andrew Meadows
0addf3bae4 cleaup: remove some unused collision code 
remove CollisionInfo::_type
remove unused Avatar collision response stuff
comment out some code that works but will probably be replaced
 2014-06-06 14:36:05 -07:00
Andrew Meadows
ca77eb9d1e cleanup of avatar collisions, prep for more ragdoll collisions 
removal of paddle hands
particles use general sphere collision path against avatars
temp removal of skeleton self collision
 2014-06-06 10:51:22 -07:00
Andrew Meadows
e8724b02f3 add CapsuleShape::setEndPoints() 2014-06-06 08:50:57 -07:00
ZappoMan
751c27041b add additional assert to guard proper usage of ByteCountCoding 2014-06-05 16:01:58 -07:00
ZappoMan
2a73a91775 first cut at ByteCountCoding template, additional features in PropertyFlags template 2014-06-05 12:52:03 -07:00
Philip Rosedale
3cc67f5229 Merge pull request #2984 from ZappoMan/octreeWireformatImprovements 
Octree wireformat improvements checkpoint
 2014-06-04 21:58:08 -07:00
ZappoMan
c7a502e2c9 removed empty file 2014-06-04 15:18:11 -07:00
ZappoMan
2066dbcec7 cleanup 2014-06-04 15:16:51 -07:00
wangyix
5251057ed6 MovingPercentile moved else to same line as } 2014-06-04 15:13:16 -07:00
ZappoMan
10f7eae7a0 implemented decode 2014-06-04 14:56:13 -07:00
wangyix
0da6374e19 MovingPercentile .size() consistency 2014-06-04 14:31:58 -07:00
wangyix
e2d3fcc518 changed MovingPercentile to use QList 2014-06-04 14:24:23 -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
wangyix
25e2f28b02 more cleanup 2014-06-04 11:30:35 -07:00
wangyix
b452d08495 cleaned up debug statements 
also reorganized MovingPercentile a little bit
 2014-06-04 11:20:29 -07:00
wangyix
12ac6105f1 changed MovingMedian to MovingPercentile 2014-06-04 10:59:32 -07:00
ZappoMan
b48c70a7f7 first cut at PropertyFlags template class 2014-06-04 10:23:50 -07:00
wangyix
c851edd0ef added MovingMedian class, but not using it 
added packet type/time data collection to DatagramProcessor and
post-execution prints of that info.
 2014-06-03 16:18:40 -07:00
ZappoMan
e6966c2155 add improved detailed rendering and FPS debugging stats 2014-05-29 12:12:23 -07:00
barnold1953
5013c8c2fa Fixed script editor crash when script calls Script.stop(). Also made the 
processEraseMessage wait until it can lock to ensure particles are
deleted.
 2014-05-22 12:45:36 -07:00
Stephen Birarda
981f9df6b3 add option to pass data server username and password to DS 2014-05-21 09:53:09 -07:00
Stephen Birarda
8e9defad3e send an updated address to data-server with domain (when changed) 2014-05-15 12:18:24 -07:00
Brad Hefta-Gaub
e088c3d115 Merge pull request #2834 from AndrewMeadows/thermonuclear 
remove leap fingers
 2014-05-13 08:04:40 -07:00
Andrew Meadows
49dedb72c9 remove FingerData class and related cleanup 2014-05-12 11:09:12 -07:00
Andrzej Kapolka
363f545f7c After uploading, refresh the uploaded files so that they are immediately 
redownloaded.
 2014-05-09 17:50:08 -07:00
Andrew Meadows
8ec493e85b fix bad penetration depth for interior of cube 2014-05-07 12:39:20 -07:00
Andrew Meadows
9fc1c765d3 overhaul of CollisionInfo 
store Cube info for sphereAACube collisions
 2014-05-07 11:40:00 -07:00
Andrzej Kapolka
2a32700a30 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-05 17:03:31 -07:00
Andrew Meadows
5ffd307926 Merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.h
 2014-05-05 13:54:25 -07:00
Andrew Meadows
ddc9408a55 commit implementation of deleteLastCollision() 2014-05-05 12:32:23 -07:00
Andrew Meadows
f6b2b43376 forget collision for this failure case 2014-05-05 12:31:36 -07:00
Andrew Meadows
d2f858100e add CollisionList::deleteLastCollision() 2014-05-05 12:30:38 -07:00
Andrew Meadows
0cecef6441 fix "nearly but not quite" edge/corner collisions 2014-05-05 10:01:31 -07:00
Andrew Meadows
b097eed1aa fix sphere-cube collisions at edges (really) 2014-05-05 08:47:02 -07:00
Andrzej Kapolka
53a2760905 More attachment bits. 2014-05-04 16:24:23 -07:00
Andrew Meadows
0e3d66caf6 fix incorrect rescale of vec3 2014-05-02 22:27:52 -07:00
Andrew Meadows
c8e56a97cc fix sphere-cube collisions, with tests 2014-05-02 21:47:27 -07:00
Andrew Meadows
9ceda573cc sphere-cube: add the penetration don't subtract it 2014-05-02 10:39:27 -07:00
Andrzej Kapolka
322e12b9de Allow users to clear the head URL and have no separate head model. 2014-05-01 17:55:16 -07:00
Andrew Meadows
4e34d0339d set position in ctor that takes endpoints 
and some cleanup
 2014-04-29 15:15:53 -07:00
Atlante45
6595b29a4f More bug tracking 2014-04-29 10:55:30 -07:00
Andrew Meadows
b05a315b5a merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-25 14:52:44 -07:00
Atlante45
8b4a910040 Fix timestamp timer not fired 2014-04-25 12:19:18 -07:00
Andrew Meadows
73d0674565 expose MyAvatar.collisionGroups to JS 2014-04-24 11:19:08 -07:00
Andrzej Kapolka
4f8c1f9c65 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 16:09:23 -07:00
Clément Brisset
d441e6a453 Merge pull request #2717 from AndrewMeadows/inertia 
avatar bounding capsule collision against voxels
 2014-04-23 16:06:14 -07:00
Andrzej Kapolka
d38d3db224 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 12:25:43 -07:00
Andrew Meadows
7464ca0879 non-rounded collision solution in comments 2014-04-23 08:38:58 -07:00
Andrew Meadows
1986ac6be3 collisions with cube get rounded normals at edges 2014-04-22 20:53:12 -07:00
Andrew Meadows
f3fd81ca59 use glm::modf() for less code 2014-04-22 14:26:52 -07:00
Atlante45
fea0a262a6 Put back missing windows header 2014-04-22 12:35:50 -07:00
Atlante45
3eeb3a539d Fixed lack of resolution in usecTimestampNow() 2014-04-22 11:48:43 -07:00
Andrew Meadows
62121b1232 remove include of StreamUtils.h again 2014-04-22 11:46:15 -07:00
Andrew Meadows
65d3b4dc39 fix penetration direction for sphere-vs-AACube 2014-04-22 11:43:23 -07:00
Andrew Meadows
7537d240bb toward working avatar-vs-voxel collisions again 2014-04-22 10:48:42 -07:00
Andrew Meadows
a45bc6c110 remove const from CollisionList subscript operator 2014-04-22 10:48:05 -07:00
Andrew Meadows
63c02f2b04 add subscript operator for CollisionList 2014-04-21 18:22:34 -07:00
Andrew Meadows
1782e803c9 remove include StreamUtils.h 2014-04-21 18:21:39 -07:00
Andrew Meadows
8d6fa8f904 fix sphere-vs-axis-aligned-cube logic 2014-04-21 18:19:59 -07:00
Atlante45
fd20686f0f Removed Systime.h includes 2014-04-21 17:23:06 -07:00
Atlante45
be2db49e08 Last touch to removing gettimeofday 2014-04-21 16:44:21 -07:00
Atlante45
f7f30e118c More gettimeofday cleanup 2014-04-21 15:17:11 -07:00
Andrew Meadows
06784aa960 move AABox back to octree lib 
Fleshing out ShapeCollider::collideShapeWithAACube()
 2014-04-21 14:07:40 -07:00
Andrew Meadows
241df7a767 Move AABox from octree lib to shared lib 
Stubbed out Shape vs Octree collisions
 2014-04-21 10:27:20 -07:00
Andrzej Kapolka
e2558bdac0 Experimenting with tweaking the Euler angles so that z, rather than y, is in 
[-pi/2, pi/2].
 2014-04-18 17:16:20 -07:00
Andrzej Kapolka
58b063ee12 Make sure we call allReferencesCleared on the right thread. 2014-04-17 11:13:22 -07:00
Andrzej Kapolka
21fa833f19 Merge branch 'master' of https://github.com/highfidelity/hifi into animate 
Conflicts:
	interface/src/Application.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
 2014-04-17 10:58:34 -07:00
ZappoMan
836913f1f0 Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-16 15:21:15 -07:00
ZappoMan
bdf39186de Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-15 21:04:15 -07:00
ZappoMan
60c6b27ab2 cleanup code a bit, add support for diffusions even with no ray intersection 2014-04-15 11:38:11 -07:00
Stojce Slavkovski
1a3e6595c5 Allow users to set the destination of Snapshots 2014-04-15 19:36:02 +02:00
Andrzej Kapolka
a2dc58f7f9 Moved FBX code to its own library so that we can use it for bots. 2014-04-14 17:15:58 -07:00
Stephen Birarda
5904d19603 Merge pull request #2637 from birarda/authentication 
add optional DTLS option for domain-server to node communication
 2014-04-14 10:24:17 -07:00
ZappoMan
7a993939bf Merge branch 'master' of https://github.com/worklist/hifi into moonshot 
Conflicts:
	interface/interface_en.ts
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.h
	libraries/shared/src/SharedUtil.h
 2014-04-14 09:43:29 -07:00
ZappoMan
a37921c1d5 move isNaN() to shared utils 2014-04-13 19:09:07 -07:00
Andrew Meadows
508d4f216d fix #2656 avatar jumps very far away 
This was caused by a bad CapsuleShape::_radius when the default
CapsuleShape was used to create a default bounding capsule.  The
penetration against such a shape could be arbitrarily large.
 2014-04-11 15:55:18 -07:00
Andrzej Kapolka
873541dd7b Trying out basic pushback for other avatars. 2014-04-10 11:56:17 -07:00
Stephen Birarda
cfc2431a59 don't be a dummy and include Systime header from implementation 2014-04-10 11:37:09 -07:00
Stephen Birarda
00a826330e use GetSystemTimeAsFileTime with previous gettimeofday setup 2014-04-10 11:34:43 -07:00
Stephen Birarda
ea8f0df17d use extern C in Systime header 2014-04-10 11:30:20 -07:00
Stephen Birarda
885cee28c5 guard Systime against being included on UNIX/OS X 2014-04-10 11:28:22 -07:00
Stephen Birarda
1daaf561de don't include missing sys/time, declare gettimeofday in Systime header 2014-04-10 11:26:47 -07:00
Stephen Birarda
3651eff3d6 cleanup Systime to gettimeofday without lean and mean windows 2014-04-10 11:24:54 -07:00
Andrzej Kapolka
a12dd916fa More plane intersection bits. 2014-04-10 11:24:45 -07:00
Stephen Birarda
7c9e0927ab define WIN32_LEAN_AND_MEAN before include windows.h in Systime 2014-04-10 11:17:03 -07:00
Stephen Birarda
53aafd6897 rely on winsock2 for timeval declaration 2014-04-10 11:06:22 -07:00
Stephen Birarda
186c588d5a remove doubled timeval definition from SharedUtil 2014-04-10 10:48:50 -07:00