Commit graph

14679 commits

Author SHA1 Message Date
wangyix
1047ec7c87 merge with upstream 2014-07-14 16:25:26 -07:00
AndrewMeadows
4e6b194444 Merge pull request #3168 from AlericInglewood/master
Type fix. That that even compiled :/
2014-07-14 13:26:00 -07:00
Aleric Inglewood
935f28aa35 Type fix. That that even compiled :/ 2014-07-14 21:18:37 +02:00
AndrewMeadows
64ff5f6ecf Merge pull request #3165 from AlericInglewood/master
Compiler warnings fixes.
2014-07-14 11:10:48 -07:00
AndrewMeadows
8ff5c0757a Merge pull request #3164 from PhilipRosedale/master
Moved Hair object to separate class
2014-07-14 11:08:03 -07:00
wangyix
a37e24aeb4 updated domain page stats to use formated usec time strings 2014-07-14 11:08:00 -07:00
wangyix
cb5a9bf668 moved some const defs to avoid redefinition 2014-07-14 10:43:02 -07:00
wangyix
a59cef3197 removed debug code in AudioMixer 2014-07-14 10:05:37 -07:00
Philip Rosedale
4b7ba08932 code review fix 2014-07-14 08:53:10 -07:00
Philip Rosedale
2d4194cae5 fixes per review, clap animation requires double-tap to start 2014-07-13 23:33:02 -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
Aleric Inglewood
13c2c69d06 Fix another typo in previous commit 2014-07-13 20:54:27 +02:00
Aleric Inglewood
961eca4327 Fix typo in previous commit 2014-07-13 20:51:19 +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
Aleric Inglewood
bd212c26d0 Fix initializer list order (avoiding compiler warning).
This patch fixes the compiler warning:

In file included from /opt/highfidelity/hifi/hifi/interface/src/Application.h:45:0,
                 from /opt/highfidelity/hifi/hifi/interface/src/Audio.cpp:42:
/opt/highfidelity/hifi/hifi/interface/src/Audio.h: In constructor ‘Audio::Audio(int16_t, QObject*)’:
/opt/highfidelity/hifi/hifi/interface/src/Audio.h:268:30: warning: ‘Audio::_interframeTimeGapStats’ will be initialized after [-Wreorder]
/opt/highfidelity/hifi/hifi/interface/src/Audio.h:259:9: warning:   ‘int Audio::_starveCount’ [-Wreorder]
/opt/highfidelity/hifi/hifi/interface/src/Audio.cpp:63:1: warning:   when initialized here [-Wreorder]

by fixing the initializer list of class Audio.

Note that I omitted _audioMixerAvatarStreamAudioStats() - which is a default constructor
that is called anyway (it's the default!) and therefore doesn't belong in the initializer list.
2014-07-13 17:10:39 +02:00
Aleric Inglewood
27cdcd9ada Fix compiler warnings for g++ 4.7.
This fixes nine compiler warnings like:

/opt/highfidelity/hifi/hifi/libraries/particles/src/Particle.cpp:371:43:
warning: comparison between signed and unsigned integer expressions
[-Wsign-compare]

The best way to avoid this (without using an ugly (int) cast) is to
bring everything to one side and compare with zero, which results
in the same assembly code after optimization (it's the same to the
compiler).
2014-07-13 17:03:38 +02:00
Philip Rosedale
b0e44be1c0 merge fix 2014-07-11 20:26:58 -05:00
Philip Rosedale
d493b92d7b tweaked defaults 2014-07-11 20:23:59 -05:00
Philip Rosedale
0b3e41a541 remove wind from hair, fix gravity 2014-07-11 19:58:13 -05:00
Clément Brisset
43ac86897c Merge pull request #3162 from AndrewMeadows/bispinor
re-enable menu config of expanded stats
2014-07-11 17:52:47 -07:00
Clément Brisset
473c411204 Merge pull request #3163 from ZappoMan/fixeParticleServerCrash
more guards to prevent crashing in bad particle edit packets
2014-07-11 17:46:38 -07:00
Philip Rosedale
b86890033c Moved hair to separate class 2014-07-11 19:35:17 -05:00
ZappoMan
9939c00a40 more guards to prevent crashing in bad particle edit packets 2014-07-11 16:57:08 -07:00
Andrew Meadows
9b7fc9de95 merge upstream/master into andrew/bispinor 2014-07-11 16:09:22 -07:00
Andrew Meadows
d832f5bec8 fix menu config of visible stats 2014-07-11 16:08:37 -07:00
wangyix
82e9aa8bb7 made stats easier to read; reverted injected stream deletion conditions 2014-07-11 16:08:15 -07:00
Clément Brisset
a7b6879bea Merge pull request #3159 from ey6es/metavoxels
Basic placeholder metavoxel save/load, added some stats on server and client, tie metavoxel LOD to avatars', spanner streaming fix.
2014-07-11 15:22:04 -07:00
wangyix
90c931ea45 removed Audio.cpp initialization list warning; updated Injector removal conditions 2014-07-11 15:07:50 -07:00
wangyix
3a98ea0d56 Merge remote-tracking branch 'upstream/master' into quick_audio_PR 2014-07-11 13:26:14 -07:00
wangyix
d369435240 added dirty fix for NaN _nextOutputTrailingLoudness 2014-07-11 13:25:47 -07:00
Andrzej Kapolka
21a1f4772c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-11 12:42:25 -07:00
Clément Brisset
a5222c7bbd Merge pull request #3161 from ZappoMan/fixeParticleServerCrash
fix crash in particle and model server from attempting to edit items that dont exist in the server
2014-07-11 11:51:53 -07:00
Brad Hefta-Gaub
56a6cb9184 Merge pull request #3160 from Atlante45/sitting_improvments
Sitting improvments
2014-07-11 11:48:42 -07:00
Brad Hefta-Gaub
a94e077a75 Merge pull request #3153 from wangyix/quick_audio_PR
Added more stats to AudioStreamStats; Added template classes RingBufferHistory and MovingMinMaxAvg
2014-07-11 11:42:55 -07:00
Atlante45
7ad90ac7bb When visible is false, don't render billboards/models overlays 2014-07-11 11:29:58 -07:00
ZappoMan
4c3a1d192e fix crash in particle and model server from attempting to edit items that dont exist in the server 2014-07-11 11:29:32 -07:00
Andrzej Kapolka
7af4e4e261 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-11 11:25:15 -07:00
Andrzej Kapolka
222869bf53 Merge pull request #3157 from wdings23/master
2 local lights as default
2014-07-11 11:24:48 -07:00
Atlante45
e067a013a0 Made sitting point more consistant 2014-07-11 11:22:38 -07:00
AndrewMeadows
f108f99cc4 Merge pull request #3156 from Barnold1953/OculusSDK
Oculus UI 2.0
2014-07-11 11:22:23 -07:00
Atlante45
22bcb7d7e7 Billboard overlays disply grey square while image is loading 2014-07-11 11:22:06 -07:00
Atlante45
a9ceec4627 Switched sit.js spheres to billboards 2014-07-11 10:50:46 -07:00
Atlante45
bd7b17a787 Added subimage to Billboards overlays 2014-07-11 10:50:11 -07:00
Atlante45
2347bd7eed Sitting position persists between sessions 2014-07-11 10:47:48 -07:00
wangyix
c5e0da0477 Merge remote-tracking branch 'upstream/master' into quick_audio_PR 2014-07-11 10:18:49 -07:00
Brad Hefta-Gaub
dbca97c71b Merge pull request #3158 from wangyix/master
worklist 19807: Fixed bug in OctreeEditPacketSender where there was one outgoing seq number for all nodes.
2014-07-10 18:48:11 -07:00
Andrzej Kapolka
af3af15084 Comment, formatting fix. 2014-07-10 18:11:51 -07:00
barnold1953
97165cadcc Removed unneeded variable 2014-07-10 17:34:10 -07:00
barnold1953
1781a2d125 fixed unused variable warning 2014-07-10 17:30:43 -07:00
Andrzej Kapolka
d121c8e07a Fix for starting with empty spanners (due to LOD), then adding. 2014-07-10 17:21:05 -07:00