Commit graph

14718 commits

Author SHA1 Message Date
Andrzej Kapolka
60e8c12d4b Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-15 09:25:36 -07:00
Brad Hefta-Gaub
12f8cfbb67 Merge pull request #3167 from Atlante45/typed_arrays
Typed arrays
2014-07-15 08:31:02 -07:00
Brad Hefta-Gaub
dcd3110266 Merge pull request #3166 from wangyix/quick_audio_PR
Made audio timegap stats more readable with varying units; Fixed AudioMixer NaN error on WIndows;
2014-07-15 08:28:48 -07:00
Clément Brisset
529fa50025 Merge pull request #3169 from murillodigital/master
Adding place/user go to logging
2014-07-14 16:41:44 -07:00
wangyix
1047ec7c87 merge with upstream 2014-07-14 16:25:26 -07:00
Andrzej Kapolka
e32bab5b04 Beginnings of some metavoxel scriptability, to create some test landscapes. 2014-07-14 14:32:55 -07:00
Leonardo Murillo
6bf06989db Adding place/user go to logging 2014-07-14 15:24:47 -06: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
Atlante45
afa43a9d7e Fix win build fail 2014-07-14 11:06:10 -07:00
Andrzej Kapolka
eab0fa4c27 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-14 10:58:01 -07:00
wangyix
cb5a9bf668 moved some const defs to avoid redefinition 2014-07-14 10:43:02 -07:00
Atlante45
30fd4e27d0 pre-CR cleanup 2014-07-14 10:43:01 -07:00
wangyix
a59cef3197 removed debug code in AudioMixer 2014-07-14 10:05:37 -07:00
Atlante45
8b50fbad92 Merge branch 'master' of https://github.com/highfidelity/hifi into typed_arrays 2014-07-14 09:57:17 -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
Atlante45
aa65084ae1 Code cleanup 2014-07-11 23:08:41 -07:00
Atlante45
6d4bb0f4fd Added Uint8ClampedArray 2014-07-11 18:27:26 -07: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
Atlante45
5a8569fcd5 Handling NaN values for floats 2014-07-11 17:46:07 -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
Atlante45
75573a4c06 Added exception checking to unit tests 2014-07-11 16:23:50 -07:00
Atlante45
b9fe5b2ef1 Added JS exceptions + fixed up floating precision mess up 2014-07-11 16:23:19 -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
Andrzej Kapolka
5e34bcc423 Some additional comments. 2014-07-11 15:51:36 -07:00
Andrzej Kapolka
ff28b9c871 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-11 15:38:48 -07:00
Andrzej Kapolka
38623e108a Delete persister when its thread finishes, copy metavoxel nodes on subdivision
so that we'll know that they changed.
2014-07-11 15:37:59 -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
Atlante45
d456adff1d Merge branch 'master' of https://github.com/highfidelity/hifi into typed_arrays 2014-07-11 12:44:53 -07:00
Andrzej Kapolka
21a1f4772c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-11 12:42:25 -07:00