Commit Graph

718 Commits

Author SHA1 Message Date
Alessandro Toia
d855dc6691 Also change delimiter for media_player_order to + 2020-11-24 19:55:47 -08:00
Alessandro Toia
6ee6663fb6 Change delimiter for cpu and gpu load change and color to + 2020-11-24 19:48:38 -08:00
Alessandro Toia
e4fe24a051 Use "+" as a delimiter for param blacklist 2020-11-18 18:46:54 -08:00
Alessandro Toia
221c355f15 Check if item exits before adding to blacklist 2020-11-18 17:07:43 -08:00
Alessandro Toia
ef05ab2f20 Parse blacklist with parse_str_tokenize 2020-11-18 16:19:00 -08:00
Alessandro Toia
7c80dc53ef Allow users to add a new item to the blacklist from config file 2020-11-17 19:35:05 -08:00
jackun
0474c93800
Change change_on_load_temp's current param to unsigned 2020-11-17 20:25:20 +02:00
jackun
1e8487c991
Move color conversion to HudElements; move some overlay related functions back to overlay.cpp 2020-11-17 20:23:33 +02:00
FlightlessMango
44d5546ba5 Add param table_columns 2020-11-17 15:09:15 +01:00
flightlessmango
ce6a87823b
Merge pull request #388 from flgx16/cpu_power
Add cpu_power
2020-11-17 14:48:27 +01:00
flightlessmango
f91e4f9a33
Merge pull request #395 from gort818/no_ms
Add param to enable/disable fps milliseconds text
2020-11-17 14:43:29 +01:00
FlightlessMango
7e93453a77 Changed fps_limit's delimiter to + 2020-11-17 14:31:45 +01:00
Alessandro Toia
92146c5833 Add frametime param to enable/disable frametime data next to fps 2020-11-16 15:44:19 -08:00
jackun
7a2a2eafc9
Clear already parsed HUD elements when using legacy layout 2020-11-16 23:38:58 +02:00
FlightlessMango
e5015283a8 cellpadding_y param 2020-11-16 12:53:38 +01:00
jackun
60ffab4350
Add no_small_font option for unified font size 2020-11-16 13:12:43 +02:00
Lukáš Horáček
02a34ba890 Fix cpu_mhz when core_load is disabled 2020-11-12 23:50:49 +02:00
Lukáš Horáček
3726c90c7a
Add cpu_power 2020-11-12 22:27:35 +01:00
FlightlessMango
00c9841ff6 Histogram option for all graphs 2020-11-12 03:35:01 +01:00
FlightlessMango
553bf50e6a Added cpu_mhz param 2020-11-11 23:11:21 +01:00
jackun
3c75cc6c60
rm -fr whitespace around __gnu_linux__ 2020-11-10 09:32:24 +02:00
FlightlessMango
366de9a9dd Legacy elements 2020-11-09 19:38:43 +01:00
FlightlessMango
0c57171497 Make sure gpu_temp is being logged 2020-11-09 19:37:38 +01:00
FlightlessMango
8ebc56d4f7 CPU/GPU Temp graphs 2020-11-09 19:37:38 +01:00
FlightlessMango
cc38924997 Added graphs 2020-11-09 19:37:37 +01:00
FlightlessMango
6e7747c73c Add sorting for env var 2020-11-09 19:35:45 +01:00
jackun
dbfbd05ecf Add media_player to HudElements 2020-11-09 19:35:44 +01:00
FlightlessMango
ee7f7058c2 No need to use HudElements object in sort_elements 2020-11-09 19:35:21 +01:00
FlightlessMango
aebd3353ab Move most hud elements into HudElement functions 2020-11-09 19:35:20 +01:00
FlightlessMango
378cc1e089 Push params to HudElements options 2020-11-09 19:26:46 +01:00
jackun
7471d42cac
Fix dbus for GCC 5 2020-11-09 20:11:16 +02:00
flightlessmango
46a239855b
Merge pull request #380 from gort818/gradual_colors
Gradual colors for gpu & cpu load
2020-11-09 13:33:21 +01:00
flightlessmango
65b85e86b2
Merge pull request #376 from flgx16/fps-limit-fix
Fix for FPS limit breaking
2020-11-07 15:06:01 +01:00
FlightlessMango
fde20cac81 Collect total vram for Nvidia 2020-11-06 22:04:10 +01:00
Lukáš Horáček
06f8641363
Fix for FPS limit breaking
Fixes #127
2020-11-04 11:35:29 +01:00
Alessandro Toia
466fc1a008 If load is high set the defined high color 2020-11-03 10:14:47 -08:00
Alessandro Toia
2496ab3541 After parsing load colors make sure it has a size of 3 2020-11-03 10:14:47 -08:00
FlightlessMango
0a12632679 Gradual color change 2020-11-03 10:14:37 -08:00
Alessandro Toia
b75f2944a1 Add struct for gpu color change data 2020-11-03 10:12:52 -08:00
FlightlessMango
b9b20d1117 Remove render_mango as it's no longer needed 2020-11-02 13:56:52 +01:00
flightlessmango
e3354433ce
Merge pull request #358 from gort818/load_color
Change color depending on load
2020-10-22 05:45:02 +02:00
Alessandro Toia
ec322b556e Formatting fixes, remove commented code 2020-10-20 21:14:04 -07:00
Alessandro Toia
76c2129ae2 Remove more unused variables 2020-10-20 20:46:35 -07:00
Alessandro Toia
3e446f7c11 Remove unused variables 2020-10-20 20:42:57 -07:00
Alessandro Toia
c53939587a Consolidate gpu/cpu load value config 2020-10-19 22:11:26 -07:00
Alessandro Toia
daa23d49db Consolidate cpu load color config 2020-10-19 21:06:10 -07:00
Alessandro Toia
e1269a18ff Consolidate gpu load color config 2020-10-19 20:41:39 -07:00
Alessandro Toia
5e486df67f Fix spacing 2020-10-06 16:59:47 -07:00
Alessandro Toia
17ae055161 Disable cpu/gpu load change from full param output 2020-10-06 16:53:27 -07:00
Alessandro Toia
dc0b3a9955 Set param defaults for load color change 2020-10-06 16:44:46 -07:00
Alessandro Toia
6b71c9c6e3 Remove duplicate code 2020-10-06 16:19:17 -07:00
Alessandro Toia
1c0a5af001 Implement cpu load color change 2020-10-05 16:41:59 -07:00
Alessandro Toia
11d9c3aa97 remove param gpu_load_low as it is not needed 2020-10-04 15:54:44 -07:00
jackun
891a3944f3
[OpenGL] Default and limit GLSL version to 1.20 if OpenGL < 3.0. Not using anything fancy for now anyway. 2020-10-04 21:49:20 +03:00
Alessandro Toia
e7db65d4cd add function to return high/low/med, add switch for gpu load change 2020-10-01 19:26:14 -07:00
Alessandro Toia
8605d2a7dd Add spaces 2020-09-29 15:43:26 -07:00
Alessandro Toia
d7f04deb56 Implement gpu load color change 2020-09-28 21:24:26 -07:00
Alessandro Toia
144e9a5917 Add color option to right_aligned_text 2020-09-28 18:19:58 -07:00
FlightlessMango
cb8d992bfe Use real_font_size for padding 2020-09-23 12:23:29 +02:00
FlightlessMango
8b4df2a9a3 Put time and version inside imgui table 2020-09-22 11:18:48 +02:00
jackun
6dbb1c2aa8
Rename last_f3_press to more generic toggle_fps_limit_press 2020-09-19 13:53:24 +03:00
jackun
0bc9949af9
Default toggle FPS limit to Shift_L+F1, update README and config file 2020-09-19 13:21:07 +03:00
ZakMcKrack3n
73e6e31301
toggle fps limiter via hotkey, fps_limit may be set to multiple values
(e.g. 0,30,60).
fps toggle toggles between entries where zero means unlimited
2020-09-19 12:45:59 +03:00
FlightlessMango
d86a05d3a0 Don't log twice if interval is 0 2020-09-17 18:37:02 +02:00
FlightlessMango
e25ffbafe0 Scale cellpadding based on font_size 2020-09-17 17:48:36 +02:00
jackun
c15133b82f
Add checkNvidia for nvml/xnvctrl/nvapi checks, for header cleanup 2020-09-09 11:24:24 +03:00
jackun
a6dc259ea4
Remove unused sysinfo header 2020-09-09 10:43:24 +03:00
jackun
3ef4cf5453
win32: load correct NVAPI dll by checking _WIN64 2020-09-09 10:39:42 +03:00
FlightlessMango
84e64c80b5 Win32 d3d11 make sure we don't update hud unnecessarily 2020-09-07 08:29:44 +02:00
FlightlessMango
ac821df7fa Win32 basic d3d11 present hook 2020-09-07 07:49:14 +02:00
FlightlessMango
86703ee364 Win32 keybinds 2020-09-07 07:26:53 +02:00
FlightlessMango
dd741cdda3 Assume MangoHud.conf in C:\ root on win32 2020-09-07 07:10:34 +02:00
FlightlessMango
2f55f52011 Allow blacklist for unix too 2020-09-07 06:37:27 +02:00
FlightlessMango
ab90abe4d4 De-linuxify vulkan 2020-09-07 06:36:35 +02:00
FlightlessMango
ab469dee78 Win32 dxgi cleaning up debugging 2020-09-07 04:40:30 +02:00
FlightlessMango
bf9132bba1 Win32 nvapi gpu usage 2020-09-07 04:38:55 +02:00
FlightlessMango
7dd6792772 Win32 nvapi gpu usage 2020-09-07 04:38:35 +02:00
FlightlessMango
2ebb381166 Win32 d3d_shared 2020-09-06 13:55:02 +02:00
FlightlessMango
cbd87585b4 Win32 cpu usage 2020-09-06 13:52:18 +02:00
FlightlessMango
ff5d85a4a5 Win32 overlay_params 2020-09-06 13:44:19 +02:00
FlightlessMango
ed466d3c9d Fix some more linux vs win compatability 2020-09-06 11:41:31 +02:00
FlightlessMango
21e8d8c402 Move calc benchmark into overlay 2020-09-06 10:58:16 +02:00
FlightlessMango
785b37534d win32 file_utils 2020-09-06 10:56:24 +02:00
FlightlessMango
c3fc0f10b0 Start separating vulkan, keybinds, overlay and font 2020-09-06 10:30:57 +02:00
FlightlessMango
1c5baef992 Move try_log into update_hud() and fix formatting 2020-09-06 07:56:29 +02:00
FlightlessMango
968f3ab20c Cleaning up d3d12 hook 2020-09-06 07:54:10 +02:00
FlightlessMango
896a6117a2 Actually use minhook for kiero 2020-09-06 07:53:51 +02:00
FlightlessMango
1263b8d954 Build with windows_deps 2020-09-06 07:50:31 +02:00
FlightlessMango
9391822da5 Basic d3d12 present hook 2020-09-05 11:16:20 +02:00
FlightlessMango
8d3e8b5205 Add kiero to win 2020-09-05 08:09:42 +02:00
FlightlessMango
3ffa1bed7a Windows attach dll 2020-09-05 07:51:36 +02:00
FlightlessMango
b7aa6a997b Separate unix and windows in meson 2020-09-05 07:42:39 +02:00
FlightlessMango
c337fddc58 Move try_log() into render_imgui 2020-09-02 09:44:39 +02:00
FlightlessMango
c4a7d3002b Moved try_log() outside of no_display 2020-09-02 07:52:28 +02:00
FlightlessMango
d0c9176d6d Log frametime as nanoseconds 2020-09-02 07:50:56 +02:00
FlightlessMango
9ddd075b18 Get actual frametime for logs 2020-09-02 07:50:26 +02:00
jackun
cec98369ae
Include array, explicitly 2020-08-25 07:58:56 +03:00
FlightlessMango
3dc3c82522 Add frametime to log 2020-08-21 20:16:00 +02:00
FlightlessMango
c1a255260f Add recording circle to render_mango 2020-08-20 01:14:20 +02:00
jackun
60940e5a02
[OpenGL] Just "refcount" by glXCreate/DestroyContext calls; recreate "lost" objects 2020-08-18 19:16:15 +03:00
FlightlessMango
0230efee8b Small adjustments to render_mango 2020-08-17 20:57:15 +02:00
jackun
ba6346110c
[OpenGL] Enable color mask
Maybe previous state needs to be restored afterwards?
2020-08-17 20:39:39 +03:00
jackun
e56b7ded15
Use setenvinstead as putenv makes Lutris' wine crash for some reason (threading?) 2020-08-16 19:54:20 +03:00
FlightlessMango
4f64e1403a Deprecation message for output_file 2020-08-16 15:11:53 +02:00
FlightlessMango
500fba7f6c Fix for memory leak in source 1 games 2020-08-16 15:03:00 +02:00
Alessandro Toia
632f1e7000
Add wine and wine colors to overlay 2020-08-16 14:57:35 +03:00
FlightlessMango
a8b874cd2d [NVML] Only get pci info once 2020-08-15 16:35:04 +02:00
FlightlessMango
ac85815d82 Changed output_file to output_folder 2020-08-15 15:14:55 +02:00
FlightlessMango
8a39043a13 Merge branch 'master' into develop 2020-08-15 14:04:30 +02:00
jackun
443271f0b5
Convert hud color params to linear for sRGB image formats 2020-08-13 18:20:45 +03:00
jackun
6f176a3f3b
Fix cpu usage formatting (float parsed as int) 2020-08-12 22:50:49 +03:00
jackun
c75232389b
A little more "atomic" cpu temp update for hud renderer; whitespace 2020-08-11 21:47:49 +03:00
FlightlessMango
759c4aeed1 No need to 0 cpu temp every tick 2020-08-11 20:40:18 +02:00
FlightlessMango
ce80203ee6 Minimal hud for recording 2020-08-09 08:39:49 +02:00
jackun
fcefc07966
Load libnvidia-ml and libXNVCtrl on demand 2020-08-04 21:43:09 +03:00
jackun
a173989b1c
Make build.sh compatible with \$LIB 2020-08-04 19:51:00 +03:00
Stephan Lachnit
d712d35aaf
simplify cross arch preloading
This commit does a couple of things. In the mangohud launch script, the library will be found using $LIB with ld, so the correct path is selected depending on the cpu arch. The same is done for mangohud.json (vulkan layer). In addition some now unused files have been deleted.

Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
2020-08-04 18:36:16 +03:00
jackun
6ee225ed66
Clear cpu temp hwmon path if no supported sensor is found 2020-08-03 20:37:32 +03:00
FlightlessMango
a06e01c7ef Merge branch 'develop' 2020-08-02 08:28:24 +02:00
FlightlessMango
4fd1c5f3e7 Fixed some basic errors 2020-08-02 08:25:04 +02:00
FlightlessMango
9445ab4acc Warning that permit_upload = 0 2020-08-02 01:19:25 +02:00
FlightlessMango
6a443f35ac Upload multiple logs 2020-08-02 01:10:21 +02:00
jackun
b07db5d3ef
[dbus] Don't clear metadata when reloading config file 2020-07-31 23:05:50 +03:00
jackun
fc62624b7b
Recalculate right alignment offset if font scale changes 2020-07-31 22:51:55 +03:00
flightlessmango
c046c250d8
Merge branch 'develop' into benchmark-percentages 2020-07-23 11:16:59 +00:00
jackun
5ce6bcb79c
Set target frametime only if fps_limit > 0 2020-07-17 01:14:09 +03:00
jackun
55430d7571
Initialized fps limiter or wait for 300 years 2020-07-17 00:41:09 +03:00
jackun
bb50e6a637
[dbus] Use "xesam:url" to force metadata update
If file has no other metadata, clear old metadata by using
"xesam:url" to detect new file being played.
2020-07-16 14:24:03 +03:00
jackun
f74b4bccd9
[dbus] always update metadata if no forced player
Otherwise it stays in "paused" state if resuming play.
2020-07-16 14:22:00 +03:00
jackun
d581a9ce2b
Merge pull request #264 from larskraemer/media_player_autodetect
Media Player autodetect
2020-07-16 14:02:32 +03:00
Stephan Lachnit
acf2d88fbc Import Dear ImGui files as subproject
Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
2020-07-09 00:55:10 +03:00
Lars Krämer
a393c05829 Fix auto-switching bug
Debug output under ifdef NDEBUG
2020-07-07 01:29:37 +02:00
Lars Krämer
6dd08c89bc Use fallback only if no player was requested;
Request no player by default
2020-07-07 01:29:37 +02:00
Lars Krämer
9a34b55498 Move interactions with main_metadata into separate functions
More tidying up of the helper classes
2020-07-07 01:29:35 +02:00
Lars Krämer
7cc76142f1 Tidy up DBus helper classes
make sure metadata is up-tp-date when switching players (WIP)
2020-07-07 01:28:04 +02:00
Lars Krämer
72b86b4371 Fix some weird behaviour with non-spotify media players
Add DBusMessage_wrap to wrap/hide some dbus_message_* calls
2020-07-07 01:28:04 +02:00
Lars Krämer
6484e09f01 Implement wrapper class for DBusMessageIter
Implement for_each-style helpers for common constructions
Reimplement most of the DBus message parsing in terms of these
2020-07-07 01:28:04 +02:00
Lars Krämer
4bf7a3f2f0 Make DBus signal handling more event-based 2020-07-07 01:28:04 +02:00
Lars Krämer
5850643db4 Change the media player functionality to allow changing active media
player
2020-07-07 01:27:46 +02:00
larskraemer
a28931ef6b
General cleanup (#272)
* Cleanup unused struct fields, use uniform include guards
2020-07-06 20:31:40 +03:00
flightlessmango
eafa62356b
Merge branch 'develop' into benchmark-percentages 2020-06-30 04:39:08 +02:00
jackun
8eba5e2ed2
[OpenGL] Use GL_R8 for font textures
Randomly getting squares with GL_ALPHA for some reason
2020-06-30 02:06:01 +03:00
Lars Krämer
0b29a7ea06 Remove conflict in render_imgui 2020-06-29 16:43:25 +02:00
Lars Krämer
329725c134 Move Log uploading; Cleanup 2020-06-29 16:33:21 +02:00
Lars Krämer
4101237fdd Move logging functionality into a class 2020-06-29 16:33:17 +02:00
jackun
5fe5ac5f3d
Build script and fixes for Steam Runtime SDK 2020-06-29 17:30:45 +03:00
jackun
c63037efb5
Use 1-channel font textures; glyph ranges support; vulkan image descriptors and "helper" functions
* To save some memory, use just 1-channel alpha-only textures
* Add some sort of wider glyph ranges support
* Chop single-ish vulkan font image uploading function into separate reusable helper functions
* Use descriptor set for ImTextureID but probably use texture array and push constants for "fast-path" if need arises
2020-06-29 17:15:50 +03:00
jackun
e0832c7e02
Re-add config file watch in case of IN_DELETE_SELF 2020-06-29 14:38:47 +03:00
jackun
068157f3d8
Fix cpu fallback temp sensor logic
Break the for loop either way so `path` still points to sensor module's hwmon folder.
2020-06-25 17:29:26 +03:00
jackun
62efa4acc4
[OpenGL] Simplify if check 2020-06-25 16:51:24 +03:00