Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-01 06:02:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
28454 commits 71 branches 56 tags 1.2 GiB
Commit graph

146 commits

Author SHA1 Message Date
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
ZappoMan
eda7432868 remove audio reflector 2014-12-10 15:37:48 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
Andrzej Kapolka
1e93137e6b Fix for overflow when computing metavoxel stats. 2014-12-03 12:24:58 -08:00
Philip Rosedale
7737994399 Merge pull request #3865 from ctrlaltdavid/20197 
CR for Job #20197 - Bug: Initial ping stats mis-reported
 2014-11-26 08:08:50 -08:00
David Rowe
01867e2459 Display "--" for ping values if not yet valid 2014-11-24 18:32:47 -08:00
ZappoMan
08772bbae0 remove spatial audio menu items 2014-11-24 13:07:22 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Stephen Birarda
2f66e56e46 update Stats to new tbb node iteration 2014-11-06 15:23:30 -08:00
Stephen Birarda
63c5dacdd0 final changes to use new hash from LimitedNodeList 2014-11-05 15:12:42 -08:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
ZappoMan
d1f263ecc5 group materials together when rendering models 2014-10-16 14:05:35 -07:00
ZappoMan
bf77adc4bc add support for LOD occulsion for too small meshes in Model::render() 2014-10-16 00:30:24 -07:00
ZappoMan
8a83511942 first cut at separating opaque from transparent meshes 2014-10-15 14:40:42 -07:00
ZappoMan
c8db8855cc move tallyAllTimerRecords out of conditional so they don't pile up 2014-10-15 14:23:29 -07:00
ZappoMan
3a6715c0bc improve timing stats display 2014-10-15 14:00:56 -07:00
ZappoMan
eab96587fe add stats for entity rendering details 2014-10-15 09:24:58 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
samcake
9f0936de53 Improve the TextRenderer::draw(), first step 
- Introduce a managed Buffer for data to be used on the GPU. THis is the first type of resource (second will be texture) that we plan to    use in the graphics engine in the long term. this is an api agnostic replacement to QGLBuggerObject
  It's in the new file gpu/Resource.h(.cpp)

- Add two gpu::Buffers in the TextRenderer that collect all the glyph vertices (coords + texcoords + color) during the for loop on the string characters of the TextRenderer::draw(). Right now the text glyphs are then drawn in one draw call (and not one per character) at the end of the function.

THe step 2 plan is to keep on collecting all the glyphs from all the TextRenderer::Draw() issued during one frame and to draw all of them in a single drawcall. We decided to split the task in 2 so it's easier to review.
 2014-10-09 10:17:50 -07:00
Andrzej Kapolka
1ef9126482 Migrating to device-independent coordinates. 2014-09-08 13:59:19 -07:00
Andrzej Kapolka
7f6b3d3649 Dimension fixes for Retina displays. 2014-09-05 16:44:45 -07:00
Philip Rosedale
8fe1457776 removed unneeded audio and light stats from main stats screen 2014-08-19 10:14:13 -07:00
Brad Hefta-Gaub
d6e6cfd585 Merge pull request #3216 from wangyix/inbound_audio_stream 
Audio ringbuffer classes refactored into subclasses of InboundAudioStream
 2014-07-30 18:00:17 -07:00
Andrzej Kapolka
3ac4bb6ddd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-28 16:24:43 -07:00
wangyix
145b7f8a0e got Preferences jitter buffer frames override working 2014-07-28 14:05:17 -07:00
Andrzej Kapolka
27f88e9f80 Progress on threading. 2014-07-23 18:20:00 -07:00
wangyix
a36c9e872e merged with upstream 2014-07-23 15:36:37 -07:00
wangyix
5eaa57b3ad removed more warnings about unused vars 2014-07-23 12:10:25 -07:00
Andrzej Kapolka
d4904f976a Missed the local light stats. 2014-07-22 15:50:08 -07:00
wangyix
c8ac1732ec removed audio stats from old location 2014-07-22 14:53:45 -07:00
wangyix
f6ef61e76a fixed some typos 2014-07-21 17:15:08 -07:00
wangyix
621f0725cc added input ring buffer stats to interface 2014-07-21 15:39:33 -07:00
wangyix
603974c8a2 separated ringbuffer and outputbuffer avg framesAvailable stats in interface 2014-07-21 14:27:09 -07:00
wangyix
a70eb12245 made Audio::_ringbuffer 10 frames for nonWindows; 
fixed/separated framesAvailable stats for _ringBuffer and _audioOutput;
made QAudioOutput overflow check disabled by default
 2014-07-21 13:21:31 -07:00
Brad Hefta-Gaub
437e3efbc2 Merge pull request #3179 from wangyix/quick_audio_PR 
Lost audio packets are replaced with silent frames in AudioMixer; AudioMixer silent-packet-dropping now enabled no matter what; Moving avg of audio frames available replaces _currentJitterBufferFrames
 2014-07-17 11:44:05 -07:00
wangyix
8763b39393 changed format label string a bit 2014-07-16 17:30:18 -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
TonyPeng
317a08fc60 Draw local light stats. 2014-07-16 09:44:05 -07:00
wangyix
1047ec7c87 merge with upstream 2014-07-14 16:25:26 -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
21a1f4772c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-07-11 12:42:25 -07:00
Andrzej Kapolka
af3af15084 Comment, formatting fix. 2014-07-10 18:11:51 -07:00
wangyix
6c85caaa54 updated Stats for new AudioStreamStats format 2014-07-10 17:03: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
b4c9e51011 Audio now periodically sends downstream audio stats to audiomixer 2014-07-10 14:14:29 -07:00
wangyix
35419eb939 Merge remote-tracking branch 'upstream/master' into quick_audio_PR 2014-07-10 11:56:35 -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
Andrzej Kapolka
dbd7ec18b0 Show some stats on the client (node counts under LOD, reliable delta download 
progress).
 2014-07-09 17:15:05 -07:00
wangyix
a8cf199256 added format labels in interface for new audio stats 2014-07-09 12:08:41 -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
wangyix
7a6b20fd84 added downstream audio stats to stats overlay 2014-06-30 17:01:22 -07:00
wangyix
f2dfa6b978 fixed warnings 2014-06-30 16:10:58 -07:00
wangyix
d2f86278b2 modified AudioStreamStats to per-stream with seq stats 
added AudioStreamStats info to interface overlay stats
 2014-06-30 12:31:58 -07:00
wangyix
de3c1ebf0f changed class name to AudioStreamStats, reverted ScriptEngine packing back to QDataStream 2014-06-30 09:42:22 -07:00
wangyix
c3f571745c removed more debug stuff 2014-06-27 17:42:22 -07:00
wangyix
ad05c53823 moved audiomixer jbuffer stats to expanded section 2014-06-26 11:33:54 -07:00
wangyix
1257e0595a moved jbufferstats class to PositionalAudioRingBuffers 2014-06-25 09:52:02 -07:00
wangyix
e1d28dfe73 removed debug code 2014-06-24 17:14:20 -07:00
wangyix
a4f5ce2215 added stats for audiomixer jitter buffers lengths in Application 2014-06-23 17:48:57 -07:00
ZappoMan
ac22cebde1 more performance stats debugging 2014-05-29 17:41:40 -07:00
ZappoMan
7e3ef34e6c CR feedback 2014-05-29 15:34:20 -07:00
ZappoMan
e6966c2155 add improved detailed rendering and FPS debugging stats 2014-05-29 12:12:23 -07:00
ZappoMan
aac42058ac first cut at modelserver 2014-04-30 09:25:52 -07:00
Atlante45
8a7a590602 Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool 
Conflicts:
	interface/src/ui/Stats.cpp
 2014-04-18 16:07:08 -07:00
Atlante45
aa73527157 Some code cleaning 2014-04-18 15:58:56 -07:00
ZappoMan
fa787adce2 added wet/dry mix, and alternate distance attenuation features 2014-04-18 08:55:32 -07:00
ZappoMan
4c6471caa4 fix typo 2014-04-16 16:43:01 -07:00
ZappoMan
2e0c5fc81b implement support for comb filter suppression window 2014-04-16 15:13:20 -07:00
ZappoMan
ba361b0f62 add local audio stats 2014-04-15 21:50:44 -07:00
ZappoMan
8a16986294 add sliders for reflection, diffusion, absorption 2014-04-15 09:58:35 -07:00
ZappoMan
1ed5512925 remove old mode, replaced by new mode 2014-04-14 21:02:09 -07:00
ZappoMan
0d308e7cb9 more cleanup add support for enable/disable rendering of paths 2014-04-14 11:58:49 -07:00
ZappoMan
d3a9c6940c some audio reflection cleanup 2014-04-14 10:12:08 -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
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Andrzej Kapolka
0011276b0b Added back the download stats, which got lost in a merge. 2014-04-07 14:19:17 -07:00
Lucas Crisman
9af1ddb37a Stats: fix for stats panels positioning when mirror is enabled 2014-03-24 15:27:17 -03:00
Lucas Crisman
e545c2ac65 Stats tweaks: fonts adjustments 2014-03-24 14:57:40 -03:00
Lucas Crisman
5fe59acb87 Stats variable width for panels 2014-03-21 14:10:00 -03:00