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
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
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
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
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
wangyix
69005242b9
forgot to multiply rates by 100% for domain stats page
2014-07-10 17:18:54 -07:00
TonyPeng
df7f3073dc
2 local lights as default
2014-07-10 17:18:49 -07:00
wangyix
ae1d91b21d
improved domain page stats string a bit
2014-07-10 17:11:15 -07:00
wangyix
6c85caaa54
updated Stats for new AudioStreamStats format
2014-07-10 17:03:53 -07:00
barnold1953
4bf74c1b65
Fixed more ubuntu compiler warnings
2014-07-10 16:59:57 -07:00
barnold1953
e658ce8fb9
Fixed ubuntu compiler warning
2014-07-10 16:57:46 -07:00
barnold1953
71634b4c8d
Fixed windows compiler warning
2014-07-10 16:56:04 -07:00
wangyix
a7ef7647ed
application stats tracking and packing updated;
2014-07-10 16:54:26 -07:00
barnold1953
18c5ebce9e
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK
2014-07-10 16:42:36 -07:00
wangyix
25f4f63a1e
added window PacketStreamStats to AudioStreamStats
2014-07-10 16:42:23 -07:00
barnold1953
4bfd393d02
Proper scaling for oculus UI using avatar scale
2014-07-10 16:42:00 -07:00
Andrzej Kapolka
d858e20af2
For now, tie the metavoxel LOD threshold to the avatar LOD parameter.
2014-07-10 16:02:53 -07:00
Andrzej Kapolka
817b50c7b8
Show upload/download stats for all reliable messages, not just reliable delta
...
downloads.
2014-07-10 15:34:45 -07:00
wangyix
ce0101aa2a
fixed octreeEditPacketSender seq numbers errors; untested
2014-07-10 14:53:29 -07:00
Andrzej Kapolka
e55a0fbc9c
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-07-10 14:39:42 -07:00
barnold1953
8bc9214445
Added helper scaling function to Avatar.
2014-07-10 14:37:04 -07:00
barnold1953
fc21f7bbac
Removed outdated and incorrect getFingerTipPosition()
2014-07-10 14:21:17 -07:00
wangyix
b4c9e51011
Audio now periodically sends downstream audio stats to audiomixer
2014-07-10 14:14:29 -07:00
AndrewMeadows
afa0f19995
Merge pull request #3152 from AlericInglewood/19854
...
Code Review for Job #19854
2014-07-10 12:57:05 -07:00
Brad Hefta-Gaub
fb357ae04c
Merge pull request #3155 from AndrewMeadows/bispinor
...
fix bad FPS for crowds of avatars
2014-07-10 12:06:43 -07:00
barnold1953
45421ffb0e
Made palm ball and disk properly use avatar scale
2014-07-10 12:06:36 -07:00
wangyix
35419eb939
Merge remote-tracking branch 'upstream/master' into quick_audio_PR
2014-07-10 11:56:35 -07:00
