mirrors/linux-wallpaperengine
1
0
Fork 0
mirror of https://github.com/Almamu/linux-wallpaperengine.git synced 2025-07-15 22:02:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
438 Commits 3 Branches 0 Tags 12 MiB
02fd7effbb
Commit Graph

438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
IceCryptonym
52fc0ffbac Forgot to change key parameter to correct value 2020-03-24 20:31:31 +10:00
IceCryptonym
7baa77ef7e Missed a few replacements of content.find 2020-03-24 19:04:44 +10:00
IceCryptonym
5122206d83 Renames jsonFindValueRequired to jsonFindRequired 2020-03-24 15:38:56 +10:00
IceCryptonym
e30f62d7a1 Clean up json.find(...) calls 2020-03-24 15:32:27 +10:00
Alexis Maiquez
1a6bfac3ee Merge branch 'data-separation' of github.com:Almamu/linux-wallpaperengine into data-separation 2020-03-24 01:00:58 +01:00
Alexis Maiquez
274bb08e4f ~ fix images being rendered fliped horizontally 
+ added support for arrays in shaders

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2020-03-24 01:00:33 +01:00
Alexis Maiquez
59fa9544e6
Merge pull request #11 from IceCryptonym/data-separation 
Removes duplicate code in CContext.cpp
 2020-03-17 10:56:57 +01:00
IceCryptonym
96839dd61b Use backBuffer parameter in drawScene 2020-03-17 10:34:55 +10:00
IceCryptonym
d57ad95ab4 Fix code style 2020-03-17 09:19:28 +10:00
IceCryptonym
67be40032a Removed duplicate code 2020-03-17 09:15:19 +10:00
Alexis Maiquez
8d2f2adcfa ~ added proper texture input/output 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-11 15:52:51 +02:00
Alexis Maiquez
cbe79b535b ~ changed wrong class name crom CPassess to CPass 
+ added parsing of bind section for shader passes
~ various new classes to properly handle texture targets, shader passes and materials

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-11 15:32:57 +02:00
Alexis Maiquez
5e94fc7bab + added parsing of dependencies for objects 
+ added fbos parsing from effect files
~ cleaned up effect parsing code
~ support for texture target parsing in materials for texture render targets
~ changed way of modifying textures from passes to a more abstracted way
~ moved shader constants to it's own namespace

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-11 09:15:50 +02:00
Alexis Maiquez
e32bc4d6f1 ~ effect parsing now takes into account combos and assigns the shader constants to the proper shader pass 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-10 15:28:59 +02:00
Alexis Maiquez
318a99d5ca + added vector3 support for shader constants (looks like strings were vector3 after all) 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-10 15:01:59 +02:00
Alexis Maiquez
4358e7c173 - removed shader string constants, shaders do not have any, for future reference, these might be vectors or colors 
+ shader constants now should be correctly applied as values for variables whenever possible

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-10 14:54:49 +02:00
Alexis Maiquez
dc36adb200 + added mouse input handling and mouse position variable to shaders 
+ added vector2 pointer class for shader parameters

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-10 13:55:12 +02:00
Alexis Maiquez
d7cf8af7ca + created global variable storage for shaders 
+ added g_Time to global variable storage
- removed global g_Time from main
~ changed "shader parameters" to "shader variables" as it's a more apt naming

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-10 13:27:18 +02:00
Alexis Maiquez
d03edb7c1e ~ cleaned up main function and moved initialization functions to a more proper place 
~ check for SDL initialization before playing audio to prevent error messages when there is not really any error
~ changed a missed iterator to auto on CSound

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-10 12:55:45 +02:00
Alexis Maiquez
ce67c0bf64 ~ moved file resolution to the Irrlicht Context class 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-10 11:32:15 +02:00
Alexis Maiquez
3587fdec1e ~ changed all iterators to auto 
~ changed most pointers to const references to prevent modification, specially from the background parser

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-10 11:02:45 +02:00
Alexis Maiquez
3371e10b01 ~ fixed segmentation fault when creating a scene 
+ added check for texture rendering on startup
~ fixed possibly wrong texture size for passes
~ changed camera position

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-09 16:06:28 +02:00
Alexis Maiquez
f7be32eed3 ~ moved OnRegisterSceneNode to CObject as this function should barely change 
+ support for sounds added

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-09 10:13:06 +02:00
Alexis Maiquez
e285b313e0 ~ use clearcolor from scene instead of using black 
~ camera should use it's own getters, not access the m_camera object directly

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-09 09:46:29 +02:00
Alexis Maiquez
d13ad3fdca ~ moved passes counter to the correct place 
~ generated unique name for pass textures

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-09 09:20:27 +02:00
Alexis Maiquez
7ab533aaab + Support for multi-passes materials added 
Take in mind that this feature is still in development, so the result most likely will be very different from the actual wallpaper engine
  The final approach might be different from what's currently in use, but It's just a nice proof of concept approach

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-09 02:30:29 +02:00
Alexis Maiquez
32a6a7af65 + Added parsing of shader constants for effects 
~ Improved Shader Compiler parameter list to a better approach
+ Added support for one-pass effects with shaders (only first shader/pass will be applied)

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-08 21:09:19 +02:00
Alexis Maiquez
fc8778ab64 ~ More changes to the new parser to properly load object passes from JSON (combos, elements missing, shader, etc) 
+ Added camera for new renderization code
+ Added scene for new renderization code
+ Added object for new renderization code
+ Added image for new renderization code
  WARNING: THIS IS A REGRESSION AS IN SHADERS ARE NOT AS COMPLETE AS IN THE MASTER BRANCH
~ New renderization code in place

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-06 15:54:41 +02:00
Alexis Maiquez
a40a83006e Merge branch 'master' of https://github.com/Almamu/linux-wallpaperengine into data-separation 
# Conflicts:
#	main.cpp

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-06 14:41:41 +02:00
Alexis Maiquez
75fd581eac Merge branch 'data-separation' of https://github.com/Almamu/linux-wallpaperengine into data-separation 
# Conflicts:
#	main.cpp
#	src/WallpaperEngine/video/renderer.cpp

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-05 17:26:58 +02:00
Alexis Maiquez
b8b3c2899d ~ Removed static variables in namespace WallpaperEngine::Irrlicht and moved to a context approach 
This includes changes to old code to be compatible, the externs won't be used once the renderer is rewritten and the old code removed

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-05 17:24:16 +02:00
Alexis Maiquez
0ecc8b6e61 ~ Fixed getopt string not being correct 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-05 03:05:51 +02:00
Alexis Maiquez
ec29beca90 + Added FPS capping option for laptops 
~ Changed default FPS cap to 30 FPS
~ Fixed bug where the windowed mode wasn't rendering anything

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-05 03:05:15 +02:00
Alexis Maiquez
eb60ea9029 Merge branch 'master' of github.com:Almamu/linux-wallpaperengine into data-separation 
# Conflicts:
#	CMakeLists.txt
#	main.cpp
#	src/WallpaperEngine/video/renderer.cpp

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-04 23:04:01 +02:00
Alexis Maiquez
ce23ca53b1 ~ Reorganized viewport detection for screens and added proper checks for XRandr extension 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-04 22:23:47 +02:00
Alexis Maiquez
be68fe209f Merge branch 'master' of github.com:Almamu/linux-wallpaperengine 2019-09-04 22:08:49 +02:00
Alexis Maiquez
82c187fa76 ~ Support for displaying on background of specific screens instead of displaying on top, please carefuly read the README.md before using 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-04 22:08:32 +02:00
Alexis Maiquez
1c50095ead ~ Changed FileSystem/utils.h to FileSystem/FileSystem.h following the same criteria used in Core namespace 
~ Updated #include directives to include full paths to files
~ Re-organized folder structure for the project

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-04 09:18:33 +02:00
Alexis Maiquez
b0a3993d9f ~ Renamed utils file to a more proper name 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-03 15:15:11 +02:00
Alexis Maiquez
06ecbcdd65 + Added property parsing (color parsing for now only) 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-03 15:05:45 +02:00
Alexis Maiquez
5c56e0860b ~ Moved Shader compiler to the proper, new namespace 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-02 12:19:42 +02:00
Alexis Maiquez
db89bf2e17 Merge branch 'master' of https://github.com/Almamu/linux-wallpaperengine into data-separation 
# Conflicts:
#	main.cpp

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-09-02 11:50:07 +02:00
Alexis Maiquez
43b7b75076
Merge pull request #7 from knightpp/master 
fix path argument
 2019-09-02 11:47:30 +02:00
Daniel
47fc550357
+ fix path argument 2019-09-01 19:31:46 +03:00
Alexis Maiquez
dfbedb6419 ~ Fixed FileSystem path in includes 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-16 15:02:20 +02:00
Alexis Maiquez
69724adfdc ~ More class name changes and namespace modifictions (fs and irr) 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-16 14:56:16 +02:00
Alexis Maiquez
654918904a ~ Changed namespace names for wp::core and wp to a more suited name 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-15 01:53:40 +02:00
Alexis Maiquez
b201cc2a79 ~ Added CMAkeLists.txt missing in last commit 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-15 00:55:19 +02:00
Alexis Maiquez
217daa1dd4 ~ Changed class names to something more sensible for the long run 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-15 00:54:57 +02:00
Alexis Maiquez
b85b12d4a1 ~ Material's passes do not have textures everytime 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-14 17:07:07 +02:00