Brad Hefta-Gaub
6d211dd4e5
first cut at fixing the scene not stable bug
2016-03-08 14:52:21 -08:00
Zach Pomerantz
7804ee22d4
Consolidate stats for opaque/transparent/other
2016-02-23 12:14:00 -08:00
Howard Stearns
30b4eace95
Remove LOD PID-related preferences and the related toggling of preferences.
2016-02-19 11:52:07 -08:00
Anthony J. Thibault
c771c925c8
MyAvatar: copy body velocity + hmd follow velocity onto avatar
...
This was inadvertently removed in a previous PR.
https://github.com/highfidelity/hifi/pull/6895
Also, renamed Velocity stat to Speed.
2016-01-27 11:20:32 -08:00
Zach Pomerantz
2938829167
Add shadow items to stats
2016-01-13 17:49:37 -08:00
howard-stearns
09d4a06ad4
LODManager-centric stats and preferences.
2015-12-16 15:30:48 -08:00
howard-stearns
f47873bac3
stats checkpoint
2015-12-15 17:00:49 -08:00
howard-stearns
069199554c
checkpoint
2015-12-15 16:07:37 -08:00
Atlante45
ce51350b65
Fix warnings on windows 64bit
2015-12-11 15:42:15 -08:00
howard-stearns
0a9b42ad3c
Fix present rate stats display, which was counting (roughly) twice for 2D
...
display, and flickering.
2015-12-04 15:10:46 -08:00
Brad Davis
b9ace94ff1
Prototyping threaded present
2015-12-04 10:28:16 -08:00
howard-stearns
1ddcc62db9
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2
2015-11-20 14:05:40 -08:00
Howard Stearns
f6286201f4
cleanup
2015-11-19 11:55:22 -08:00
Stephen Birarda
c54dffac12
fix entity-server avg ping, remove debug
2015-11-18 10:32:35 -08:00
Stephen Birarda
0e3d3451d7
make keep alive pings the responsibility of NL
2015-11-18 10:24:10 -08:00
Howard Stearns
fee13d4375
Rebuild on a new branch after original stopped building.
2015-11-17 20:06:25 -08:00
Brad Hefta-Gaub
110adc5c22
fix model LOD behavior
2015-10-19 15:21:25 -07:00
Anthony J. Thibault
0cebeb7fe9
Separated AvatarMixer inbound and outbound bandwidth on stats overlay
...
Also, small bug fix to BandwidthRecorder. It would incorrectly
calculate outbound pps if the input pps was 0.
2015-10-07 15:32:10 -07:00
Atlante45
9827c90851
Rebase fixes
2015-10-06 13:56:24 -07:00
Atlante45
f55f146d1b
More code cleanup
2015-10-06 13:56:22 -07:00
Atlante45
cf3b33a96b
Replace Application::getInstance() with qApp
2015-10-06 13:56:19 -07:00
Thijs Wenker
14fc39ffa3
Added JS access to the variables
...
Stats.audioPacketlossUpstream
Stats.audioPacketlossDownstream
Which contain a floating point with the value between 0.0f and 1.0f which is the percentage of packet loss.
2015-09-26 02:36:01 +02:00
Thijs Wenker
6d4e4af0a5
ability to see Stats in JavaScript + example script which outputs the stats to the console/logviewer
2015-09-24 22:02:22 +02:00
Brad Hefta-Gaub
dc9c774eb5
merge model part quads and triangles together to reduce the number of draw calls
2015-09-21 13:09:43 -07:00
Howard Stearns
eb67254e54
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-08 16:54:14 -07:00
Ryan Huffman
aa7d8678e1
Merge branch 'protocol' of github.com:birarda/hifi into atp-server
2015-08-26 12:26:11 -07:00
Howard Stearns
0e18395fd0
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-08-26 12:04:28 -07:00
Ryan Huffman
dc5d5cbb63
Add asset server ping to stats
2015-08-25 15:06:40 -07:00
Stephen Birarda
6f14eb2206
fix for 0 entity avg ping
2015-08-25 12:35:34 -07:00
Howard Stearns
dc75b238a8
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
...
And update with current code.
2015-08-18 15:35:37 -07:00
Seth Alves
551f0aaba3
show how many times per second Application::idle is called
2015-08-18 01:41:17 -07:00
Brad Davis
359abd6474
Merge branch 'master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/GLCanvas.cpp
interface/src/GLCanvas.h
interface/src/devices/OculusManager.cpp
interface/src/devices/OculusManager.h
interface/src/devices/TV3DManager.cpp
interface/src/ui/overlays/LocalModelsOverlay.cpp
libraries/render-utils/src/OffscreenGlCanvas.cpp
libraries/render-utils/src/OffscreenGlCanvas.h
libraries/render-utils/src/text/EffectType.h
2015-07-20 13:33:24 -07:00
Brad Davis
35f7307f30
More header cleanup
2015-07-18 22:15:50 -07:00
Brad Davis
d68618e206
Removing GL headers from most files, and some naked GL from application.cpp
2015-07-18 00:46:09 -07:00
Brad Davis
2a1776303d
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/avatar/SkeletonModel.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
2015-07-03 06:17:35 -07:00
Brad Hefta-Gaub
2a03f62bf2
Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership
...
Actions over wire and improved simulation ownership
2015-07-02 14:57:27 -07:00
Bradley Austin Davis
54bbc841e2
Working on mac compilability
2015-07-01 23:03:33 -07:00
Seth Alves
5e2f7204b4
responses to code review
2015-07-01 10:29:42 -07:00
Brad Davis
cd63b8a49d
Fix inverted in/out mbps display on stats
2015-07-01 10:10:53 -07:00
Seth Alves
7c26641560
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-25 17:40:27 -07:00
Seth Alves
146f51faac
quiet compiler
2015-06-23 15:26:43 -07:00
Bradley Austin Davis
07dce3856a
Fixing some math functions
2015-06-22 20:10:21 -07:00
Seth Alves
bd1c9f0be5
quiet compiler
2015-06-22 19:56:14 -07:00
Brad Davis
99c217184b
Fixing the mic/camera buttons and the mirror UI buttons
2015-06-19 14:46:39 -07:00
Brad Davis
9bef5f011b
Reverting mirror functionality
2015-06-19 00:03:46 -07:00
Bradley Austin Davis
7bbaf026f3
use a monospace font on all platforms
2015-06-18 13:33:37 -07:00
Brad Davis
1e90aaf9c3
Working on overlays still, mirror rendering and overlay order
2015-06-17 11:35:30 -07:00
Brad Davis
2bf53b625e
Working on overlays and stats
2015-06-17 02:00:13 -07:00
Brad Davis
659fa2387c
Working on overlays / stats
2015-06-16 21:00:13 -07:00
ZappoMan
648f9bebdf
add LOD stats to the default stats
2015-06-12 15:58:26 -07:00
ZappoMan
87951ff7b3
quick hack to fix stats texture bleed through
2015-06-12 11:24:56 -07:00
Atlante45
93b44e6846
Collect stats on translucent/opaque mesh parts
2015-06-04 18:46:47 +02:00
Atlante45
a4340b17e9
Remove deprecated render stats
2015-06-04 14:47:04 +02:00
Atlante45
bbf1837796
Introduced RenderDetails/Stats don't pull details
...
- Regrouped everything stat in a struct
- Details are set into the stats
2015-06-03 16:14:23 +02:00
Atlante45
c6ce5e7680
PerformanceTimer deactivated when not in use
2015-05-22 18:54:40 +02:00
Brad Davis
302aa9db47
Removing access to the gl widget and display managers
2015-05-02 00:49:52 -07:00
ZappoMan
5c3c94a618
remove metavoxels
2015-03-02 17:21:43 -08:00
ZappoMan
9cc66f3da7
cleanup stats display behavior, reset default settings for timing details
2015-02-27 17:57:42 -08:00
ZappoMan
a89691fc66
switch GLCanvas back to being owned by Application
2015-02-25 12:11:35 -08:00
Seth Alves
a281695132
keep bandwidths stats visible even if stats are expanded
2015-02-11 11:35:52 -08:00
Seth Alves
62507721c7
put bandwidth stats in first overlay column rather than in their own
2015-02-11 11:05:44 -08:00
ZappoMan
ea33c66681
fix formating issue in performance stats
2015-02-09 15:04:43 -08:00
Stephen Birarda
219e78425b
resolve conflicts on merge with upstream master
2015-02-06 09:49:46 -08:00
Stephen Birarda
11f3161029
resolve conflicts on merge with upstream/master
2015-02-04 10:38:05 -08:00
Seth Alves
3d23446dcb
remove a couple more sprintfs
2015-02-03 17:21:41 -08:00
Seth Alves
c97eb20d69
avoid use of sprintf in overlay code
2015-02-03 17:11:10 -08:00
Seth Alves
0fa1273cc9
draw background behind bandwidth overlay stats
2015-02-03 10:51:20 -08:00
Stephen Birarda
e07ce23825
resolve conflicts on merge with upstream master
2015-02-03 10:25:17 -08:00
Stephen Birarda
bd0552618f
resolve conflicts on merge with upstream/master
2015-02-02 17:10:13 -08:00
Seth Alves
779a0086c4
BandwidthRecorder no longer knows about channel displays. cause overlay pps and Mbps to only update once per second
2015-02-02 11:56:50 -08:00
Seth Alves
c0a219678c
use DependencyManager to keep track of BandwidthRecorder
2015-02-02 08:55:55 -08:00
Seth Alves
b85456b1e9
refactoring, cause BandwidthDialog to only update numbers once per second
2015-02-02 05:28:28 -08:00
Seth Alves
fc07ecf83d
use BandwidthRecorder rather than recompute Mbps and pps in Application
2015-01-31 20:40:18 -08:00
Seth Alves
bee895ba0a
capture network bandwidth stats from NodeList rather than various places
2015-01-31 20:02:04 -08:00
Seth Alves
620efb2bbe
change display style of bandwidth detail dialog, include a totals line
2015-01-30 13:43:28 -08:00
Atlante45
4562c29be8
Merge branch 'master' of https://github.com/highfidelity/hifi into android
...
Conflicts:
interface/src/avatar/Hand.cpp
2015-01-30 12:02:11 -08:00
Seth Alves
2999a77f87
merge from master
2015-01-30 11:15:01 -08:00
Seth Alves
f0edba9a6b
Start on refactoring of bandwidth metrics
2015-01-30 11:11:17 -08:00
Atlante45
647a935eaa
Remove app->getAvatar
2015-01-29 15:16:40 -08:00
Atlante45
4ef87b9919
Merge branch 'master' of https://github.com/highfidelity/hifi into android
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/ui/PreferencesDialog.cpp
interface/src/ui/Stats.cpp
libraries/audio-client/src/AudioClient.cpp
libraries/audio-client/src/AudioClient.h
2015-01-28 13:13:32 -08:00
ZappoMan
4a6cc5c6f2
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
...
Conflicts:
interface/src/avatar/Hand.cpp
interface/src/ui/overlays/ImageOverlay.cpp
2015-01-27 16:44:11 -08:00
Atlante45
4fce5113dd
Use DM to access AvatarHashMap/Manager
2015-01-23 11:50:27 -08:00
Atlante45
1f31828e08
Moved last methog out of Menu
...
Also did a bit of Header cleanup
2015-01-18 07:14:52 -08:00
Atlante45
3fbc8c5d44
Moved Menu::shouldRenderMesh() to LODManager
2015-01-17 17:56:33 -08:00
Atlante45
a9047b7b15
LODManager class
...
Moved most LOD related members in menu to new Dependency
LODManager
Replaced all Menu::getInstance() call that accessed those
members by DM gets
2015-01-16 17:55:47 -08:00
ZappoMan
db94949649
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-01-14 17:55:03 -08:00
ZappoMan
e6388a65b9
rough pass at adding color to geometry cache
2015-01-13 20:53:05 -08:00
Atlante45
2a82ff9768
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
...
Conflicts:
assignment-client/src/voxels/VoxelServer.cpp
interface/src/Application.cpp
interface/src/Audio.cpp
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
libraries/networking/src/NodeList.cpp
libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
ZappoMan
5cef7d0e9d
more voxelEctomy
2014-12-30 20:24:27 -08:00
ZappoMan
27d8ccb51e
more voxelEctomy
2014-12-30 19:58:04 -08:00
ZappoMan
4ea9bbc309
first major pass at voxelEctomy
2014-12-30 18:08:58 -08:00
ZappoMan
14458ac8fd
first pass at removing immediate mode GL_QUADS
2014-12-22 13:47:18 -08:00
Atlante45
296c0025de
Switched to auto and changed macro
2014-12-18 15:42:38 -08:00
Stephen Birarda
9425ea2c17
Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo
2014-12-17 16:47:15 -08:00
Atlante45
0bd9ed469e
Changed NodeList::getInstance() calls to use the DM
2014-12-17 15:28:25 -08:00
Atlante45
c40e83c9e4
Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11
2014-12-16 15:42:40 -08:00
Atlante45
4d1529f77b
typedefs
2014-12-16 14:02:22 -08:00
Atlante45
e5e2eb4e8a
Moved GLCanvas in DM and DM to QSharedPointers
2014-12-15 16:20:52 -08:00
Stephen Birarda
8549e9cb53
resolve conflicts on merge with upstream master
2014-12-15 09:36:17 -08:00
ZappoMan
7f887ba75f
more spatial audio removal
2014-12-10 15:46:10 -08:00