Commit Graph

323 Commits

Author SHA1 Message Date
Alexis Maiquez
f047bdd2d6 Fixed oversight on Video backgrounds not working on X11
Added unistd.h to fix compilation error on ubuntu

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-04-22 12:57:47 +02:00
Alexis Maiquez
f21a6e64a7 Wayland implementation cleanup
Removed wayland-display in favour of screen-root, it should automatically switch between X11 and Wayland implementations
Removed all the window-server-specific code from CWallpaperApplication
Moved COutput from CWallpaperApplication to each CVideoDriver as the output is tied to the driver
Moved CFullScreenDetector from CWallpaperApplication to each CVideoDriver as the detection is tied to the video driver
Applied the Driver treatment to the Input, this way CInputContext doesn't depend on the driver used
Updated CRenderContext to be aware of viewport-specific context updates
Viewport information is now held inside COutputViewport instead of being a simple map
Merged CLayerSurface and SWaylandOutput, inheriting from the new COutputViewport to standarize the minimum requirements of a viewport
  (makeCurrent and swapOutput are common requirements, X11 was the outlier not needing these per-viewport)
Moved all the viewport-specific code of Wayland from CWaylandOpenGLDriver to It's own class CWaylandOutputViewport
Fixed an issue under Wayland where sometimes the background surfaces wouldn't get anything drawn because the CWaylandOutput wasn't reset
Updated screenshot-taking code to be standard for all drivers again

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-04-22 11:31:50 +02:00
vaxerski
2b7367662f Fix multi-bg screenshots 2023-04-21 18:24:19 +01:00
vaxerski
031ed01c42 properly flip screenshots 2023-04-21 18:03:08 +01:00
vaxerski
723be5af70 ignore empty viewports in geom 2023-04-21 17:59:13 +01:00
vaxerski
280ef71448 calculate full size more reasonably part 2 2023-04-21 17:33:57 +01:00
vaxerski
8684c8d60f calculate full size more reasonably 2023-04-21 17:33:19 +01:00
vaxerski
a782fdd1f2 fix crash on 1 wp 2023-04-21 16:11:48 +01:00
vaxerski
ea15895916 remove newline after private 2023-04-21 15:25:13 +01:00
vaxerski
87b765e618 properly adhere to fps limits 2023-04-21 15:23:10 +01:00
vaxerski
997b9b8ec4 fix videos 2023-04-21 15:10:20 +01:00
Vaxry
8e1ae5e627
Merge branch 'Almamu:main' into main 2023-04-21 02:10:36 +01:00
Alexis Maiquez
0387ebc588 Catch readTexture exceptions on CTextureCache::resolve so multi-background setups can properly lookup files...
This might need further improvements to use a texture cache by background instead of globally...

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-04-21 03:09:18 +02:00
vaxerski
997f780f4c minor improvements to pointer handling 2023-04-21 02:07:27 +01:00
vaxerski
ee3f000ab1 multimon improvements part 1 2023-04-21 01:45:01 +01:00
vaxerski
c5b27cd3dc split mouse input by backend 2023-04-21 00:17:55 +01:00
vaxerski
bab0e7b65f ifdef mouse wayland impl 2023-04-20 23:05:13 +01:00
vaxerski
5c8992bafc better handling of monitors 2023-04-20 23:04:32 +01:00
Vaxry
90720fc948
Merge branch 'Almamu:main' into main 2023-04-20 22:55:17 +01:00
vaxerski
75bb8cc156 Mouse handling 2023-04-20 22:54:18 +01:00
Alexis Maiquez
a713ad001a Fixes #160, xray effects on full image layers weren't working properly. Should fix anything using the inverse matrix of modelViewProjection
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-04-20 23:40:16 +02:00
vaxerski
1f6cc8206f Merge remote-tracking branch 'upstream/main' 2023-04-20 22:11:54 +01:00
vaxerski
ebc80b28e1 fix minor oopsies with the ls move 2023-04-20 22:07:59 +01:00
vaxerski
ce2dc8395f move ls to a class 2023-04-20 22:02:47 +01:00
Alexis Maiquez
73ef4d6dbf Added support for g_Daytime in shaders
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-04-20 22:48:08 +02:00
Alexis Maiquez
96b931d931 Added g_ModelMatrix, g_NormalModelMatrix, g_ViewProjectionMatrix, g_LightAmbientColor and g_LightSkylightColor to shaders
Added support for specifying array variables for shaders

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-04-20 21:54:45 +02:00
vaxerski
d13918697a added protocol making 2023-04-20 14:11:56 +01:00
vaxerski
ffeec7f1dd make wayland impl optional 2023-04-20 13:52:25 +01:00
vaxerski
43409229a9 proper scaling + recalc on geom change 2023-04-20 13:28:36 +01:00
vaxerski
244722387b flip v in LS output 2023-04-20 13:00:03 +01:00
Vaxry
6838ca66cc
Merge branch 'Almamu:main' into main 2023-04-19 22:37:56 +01:00
Alexis Maiquez
37b40ec29f Do not block on calls to pa_mainloop_iterate for sound recorder, should improve #158
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-04-19 23:34:48 +02:00
vaxerski
e473516bb7 fix rendertime inaccuracy 2023-04-19 22:10:08 +01:00
vaxerski
b505db103c allow specifying outputs with a flag 2023-04-19 21:02:44 +01:00
vaxerski
5b1ea68164 fix egl config 2023-04-19 20:52:35 +01:00
vaxerski
d14442fd7f fix full size 2023-04-19 20:26:09 +01:00
vaxerski
fd810295d7 fix monitor geom 2023-04-19 20:24:15 +01:00
vaxerski
e5b447bdc9 initial impl 2023-04-19 20:18:20 +01:00
Alexis Maiquez
13e43bada7 Added parameter to configure fullscreen detection
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-04-18 06:56:25 +02:00
Alexis Maiquez
9a5913921c Hopefully properly support Fullscreen and Passthrough images
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-30 02:01:07 +02:00
Alexis Maiquez
ee5c2b6106 Fixed visible value for effects not being correct
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-29 22:12:56 +02:00
Alexis Maiquez
bf47510d0d Hopefully improved pa_stream_unref issues
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-29 22:10:10 +02:00
Alexis Maiquez
b70264e54a Fix for #155
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-29 20:03:43 +02:00
Alexis Maiquez
93380ae229 Added some window hints
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-27 01:36:01 +02:00
Alexis Maiquez
a89d8ebb22 Added basic support for audio processing so backgrounds can react to sound playing in the system
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-26 18:18:21 +02:00
Alexis Maiquez
ca471c04fc Placed audio detectors in the right folder
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-24 02:51:17 +01:00
Alexis Maiquez
45761fb858 Added sound muting when apps are fullscreen too
Finally closes #150 and #152

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-24 02:48:49 +01:00
Alexis Maiquez
978f56cdca Added sound playback detection to mute when something else plays audio
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-24 02:36:42 +01:00
Alexis Maiquez
cc7ec0561d Separated X11 fullscreen code detection from the output driver as they don't have to work at the same time
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-23 23:38:23 +01:00
Alexis Maiquez
84f6018e1a Added application state to keep track of enable/disable audio and volume changes when things go fullscreen
Removed .clang-format as it's not useful

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-23 09:10:51 +01:00
Alexis Maiquez
f499454957 Fixed identation problems
Added comments all over the codebase to explain things a bit better
Improved CApplicationContext to be a bit more self-explanatory
Abstracted CRenderContext access away into a helper that every render class should use

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-23 01:42:01 +01:00
Alexis Maiquez
92fa11b0a6 Take into account g_KeepRunning for the fullscreen detection mechanism
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-21 23:42:52 +01:00
Alexis Maiquez
6802511bb9 Added support for detecting full-screen windows on X11 output
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-21 23:41:46 +01:00
Alexis Maiquez
847cd56ddf Add GLFW error handler to show error messages, hopefully gives more descriptive errors (hopefully helps #149)
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-21 07:50:15 +01:00
Alexis Maiquez
6d5c5b7825 Hopefully addressed #148 while detecting the patches folder
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-21 07:35:41 +01:00
Alexis Maiquez
a0d1a7202f Fixed build of release versions
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-21 07:15:38 +01:00
Alexis Maiquez
b69ce8ba57 Added support for running multiple X11 backgrounds off the same instance
Window mode now has extra settings for setting the position and size
Fixed audio not muting when --silent was used

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-03-21 07:07:36 +01:00
Alexis Maiquez
e2d80a074c Add messages for [COMBO] types
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-11 05:51:35 +01:00
Alexis Maiquez
5e384d968d Fixed multiple defines of the same thing
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-11 05:34:35 +01:00
Alexis Maiquez
37631e9c40 Upgraded to shader version 330
Added support for shader patches
Removed useless DEBUG define in favour of NDEBUG

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-11 03:21:45 +01:00
Alexis Maiquez
4e0f02f64d Added support for using zcompat shaders, should fix audio bars shaders for the most part
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-10 22:33:48 +01:00
Alexis Maiquez
b16cc2fd3b Brought back some changes that were removed with previous revert
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-09 00:28:50 +01:00
Alexis Maiquez
64d9c2e4e6 Fix crash on effects parsing
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-09 00:22:48 +01:00
Alexis Maiquez
3d8452ee9a Revert "Properly clamp volume value"
This partially reverts commit 95713ae439.

# Conflicts:
#	src/WallpaperEngine/Application/CApplicationContext.cpp

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-08 23:59:39 +01:00
Alexis Maiquez
99a4935825 Add composelayer checks back until we figure out how they work
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-08 18:55:27 +01:00
Alexis Maiquez
732c60da46 More code cleanups
Update .clang-format

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-08 18:48:19 +01:00
Alexis Maiquez
48a91ff297 More code cleanup
Input is now handled by context

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-08 14:57:17 +01:00
Alexis Maiquez
a8ef45265c Fix build with old ffmpeg
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-08 14:34:22 +01:00
Alexis Maiquez
d2e82e72d8 Small code cleanups
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-08 14:27:41 +01:00
Alexis Maiquez
26f6156f34 MPV should respect volume levels now
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-07 11:29:57 +01:00
Alexis Maiquez
95713ae439 Properly clamp volume value
Removed all usages of std::make_pair

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-07 04:35:47 +01:00
Alexis Maiquez
55760aee4d More code cleanup:
- Separated program args parsing and validation from initialization code
 - Application's main body in it's own class

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-07 04:17:51 +01:00
Alexis Maiquez
476d45be0a Fix a possible crash when a packet was freed on audio playback
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-07 04:16:43 +01:00
Alexis Maiquez
490718c22b Fix missing #if body for number of out channels
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-07 00:45:44 +01:00
Alexis Maiquez
456dd531cf Cleanup and rewrite of the audio resampling code to use non-deprecated code when possible
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-07 00:40:51 +01:00
Alexis Maiquez
b79444cdd9 Fix typo in last commit
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-07 00:05:13 +01:00
Alexis Maiquez
3df27e289b Brought back deprecated code for older ffmpeg builds
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-07 00:03:51 +01:00
Alexis Maiquez
ecd8ff3757 Applied the same context-driver treatment to the audio subsystem (still needs some extra work to ensure all audio plays fine and a good cleanup)
Fixed README.md to properly reflect all dependencies in the command examples
Added support for audio looping

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-06 22:35:46 +01:00
Alexis Maiquez
97ddc91ff5 Hopefully solved #81, should be improved at least
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-05 06:52:44 +01:00
Alexis Maiquez
e888bb452d Fix bloom effect FBO's not using GL_LINEAR, no more blocky bloom
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-05 06:45:14 +01:00
Alexis Maiquez
30bb8d6d72 Small cleanup of pass initialization code
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-05 06:36:07 +01:00
Alexis Maiquez
9bb0a40bc5 Simplified usage of jsonFindUserConfig
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-05 06:29:01 +01:00
Alexis Maiquez
7079d12e2a Switched video backgrounds to mpv (should fix all the videos that weren't playing sound or had random issues)
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-05 06:11:04 +01:00
Alexis Maiquez
a24b1923f6 Cleanup of code:
- use of auto in some places (more of this to come)
 - use for loops instead of iterators for most of the loops
 - extracted glfw/glew code into it's own class
 - make usage of std::filesystem instead of checking things with old C libraries

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-03 18:41:51 +01:00
Alexis Maiquez
d370e028ff Renamed CContext to CRenderContext to allow for the introduction of CAudioContext in following iterations
Improved logging and error reporting to be a bit more flexible

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-03 00:00:17 +01:00
Alexis Maiquez
4dc3a4bc01 Added g_PointerPositionLast
Improved delay calculation for parallax (should prevent backgrounds from flickering with big delays)
Fixed g_TexelSize having the wrong value and g_TexelSizeHalf not being defined

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-01 18:40:38 +01:00
Alexis Maiquez
e1fe215398 Undid some assumptions on how visible works as they were not entirely right
Effect's visible behaves a little weirdly :/ need to properly understand it

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-01 03:31:40 +01:00
Alexis Maiquez
92bdde2bd1 Renamed CUserSettingColor to CUserSettingVector3 as it makes more sense
CUserSettingVector3 are initializable with just one float value
Objects' origin and scale are now UserSettings too

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-01 03:10:38 +01:00
Alexis Maiquez
885221d602 Removed a missed line in previous commit
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-01 02:38:45 +01:00
Alexis Maiquez
fdd5bcb0b5 Removed old jsonFindUserConfig and updated to a new version using the CUserSetting classes
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-01 02:36:29 +01:00
Alexis Maiquez
176470dad9 Image color and alpha can now be user-settings
Removed old Color structures not useful anymore

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-01 02:08:05 +01:00
Alexis Maiquez
cd40950ade Fixed some shaders not getting properly compiled (missing part of the content)
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-02-01 01:07:09 +01:00
Alexis Maiquez
9cddb56f60 Added support for setting values to properties from command-line to modify how backgrounds look
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-01-31 22:07:59 +01:00
Alexis Maiquez
cf37fe388c Added support for usersettings in the bloom
Added casting for integer to double in json loading
Added support for dumping all available properties

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-01-31 21:37:38 +01:00
Alexis Maiquez
fc150576eb Object and effect visibility can now be compared to project's properties
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-01-30 13:34:02 +01:00
Alexis Maiquez
62af627ffa Added some missing texture formats to the definition
Added some extra settings for debugging

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2023-01-29 21:15:26 +01:00
Alexis Maiquez
6f570be911 g_ModelViewProjectionMatrix should now have the right values for passes (fixes sun not displaying properly in 2882477794)
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2022-11-11 17:09:47 +01:00
Alexis Maiquez
f4ccf40e14 Fixed background scaling (should improve #81)
Added some more debug information for renderdoc

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2022-11-06 12:48:55 +01:00
Alexis Maiquez
fa67fa5b00 Fixed bloom effect not being properly applied
Added support for userparameter on the clearcolor of the scene
Scenes should draw into the full framebuffer

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2022-11-05 10:50:55 +01:00
Alexis Maiquez
56ebb78287 Fix videos being flipped vertically (missed from last commit)
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
2022-11-04 19:09:29 +01:00