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

462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexis Maiquez
400a2c0c84 + Added support for alpharandom initializer 
~ Fixed wrong return type for getters on rotationrandom

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-14 17:03:36 +02:00
Alexis Maiquez
c2bc23414e + Added string to integer color conversion 
+ Added partial parsing of particles
+ Support for particle emitter parsing
+ Support for particle initializers parsing
+ Support for particle controlpoints parsing

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-14 16:55:15 +02:00
Alexis Maiquez
e80ce94331 + Support for null textures in material passes 
+ Basic parsing for object's effects (missing passes specified in the scene.json)

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-14 10:42:10 +02:00
Alexis Maiquez
5e5dd47154 + Added parsing of sounds 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-14 01:23:44 +02:00
Alexis Maiquez
2ba3498517 + Added parsing of images info and their materials 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-14 00:23:27 +02:00
Alexis Maiquez
7d2c4a76ed + Added parsing of general section of the JSON for the scene and the needed getters for the scene 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-13 18:03:24 +02:00
Alexis Maiquez
cc74debaad Started rewrite of the wallpaper interpreter to aim for a more separated approach, this way the whole JSON data can be parsed and kept separeted from the actual rendering logic 
# Implemented basic project file loading
  # Implemented basic camera settings loading

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-13 17:17:08 +02:00
Alexis Maiquez
bdf37b1952 + Added license 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-08 00:49:28 +02:00
Alexis Maiquez
85ada97786 ~ Fixed shaders not compiling properly when define values were used from the JSON, this should solve some backgrounds displaying a black background and nothing else 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-07 22:31:17 +02:00
Alexis Maiquez
c5797571f4 + Added help message and switch 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-07 22:29:59 +02:00
Alexis Maiquez
7410f238ac + Added SDL and SDL_Mixer to implement audio support 
+ Added support for sound objects
  Supported formats: MP3, FLAC, OGG

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-08-07 18:27:20 +02:00
Alexis Maiquez
4a221d0e9a + Added some default shader variables 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-05-17 01:03:29 +02:00
Alexis Maiquez
43263b6a72 + Support for loading combos settings directly from the JSON 
~ Fixed loading of uncompressed textures

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-05-17 00:03:18 +02:00
Alexis Maiquez
d05e751839 + Added support for parsing [COMBO] options to add proper define macros to the shader code 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-05-16 19:23:15 +02:00
Alexis Maiquez
8ebc8c8841 ~ Fixed oversight on texture loading when determining container format 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-05-16 01:16:15 +02:00
Alexis Maiquez
24cb34145d ~ Fixed pkg loading not working properly 
+ Added support for PKGV0001 pkgs (look to be identical to PKGV0002 format, but needs validation)
~ Fixed segfault on vertex variable loading

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-05-16 01:07:37 +02:00
Alexis Maiquez Murcia
6abd73e843 + Added support for constant shader values 
~ Fixed shader parameter setting that wasn't properly loading the values for the shader to use

Signed-off-by: Alexis Maiquez Murcia <almamu@almamu.com>
 2019-05-15 11:35:48 +02:00
Alexis Maiquez
374f53be6a + Support for shader parameters with default values (TODO: read values from the constantvalues list in the json files) 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-05-14 22:16:37 +02:00
Alexis Maiquez Murcia
e62ea3e2be + Updated .gitignore 
- Removed config class as It's no longer used
+ Added a small readme with all the documentation needed up to now
+ Changed the way the application starts to take into account execution switches to allow the users to select a background without recompiling the software

Signed-off-by: Alexis Maiquez Murcia <almamu@almamu.com>
 2019-04-05 16:41:33 +02:00
Alexis Maiquez Murcia
83caa05ebf ~ Fixed switched vertex and pixel shaders on effects. This effectively renders the water effect properly for the nier automata background 
~ Updated shader pre-compiler to use the irrlicht functions to read the shaders from

Signed-off-by: Alexis Maiquez Murcia <almamu@almamu.com>
 2019-04-05 10:01:17 +02:00
Alexis Maiquez
2be1bffb6f - Removed all the contents of the res folder as those weren't needed anymore 
+ Added basic, single-pass-effects parsing
- Removed duplicated code for effect parsing
+ Added support for shader loading and applying to materials (might not work with every shader, still needs some more investigation)
+ Added support for TEXB0001 containers to be able to load images from the wallpaperengine original files

Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-04-05 08:34:53 +02:00
Alexis Maiquez Murcia
9f9d44834b - Removed the whole "fileResolver" class in favour of using the actual irrlicht file-handling functions 
~ Added a small utils class to read full files to ram for the purpose of parsing json files
  Most of these files are really small, so there shouldn't really be any memory concerns
+ Added support for loading backgrounds directly from PKG files


Signed-off-by: Alexis Maiquez Murcia <almamu@almamu.com>
 2019-04-04 16:51:54 +02:00
Alexis Maiquez Murcia
e5affb470d + Added support for DXT1 and DXT5 (not tested yet) 
+ Added support for textures with normal images in them (bmp. png and jpg)

Signed-off-by: Alexis Maiquez Murcia <almamu@almamu.com>
 2019-04-03 16:58:23 +02:00
Alexis Maiquez
ae9665772a ~ Fixed black bars on textures that weren't power of two 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-04-02 22:27:43 +02:00
Alexis Maiquez
0b424ac5f4 ~ Fixed image color format and height scaling issue 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
 2019-04-02 22:24:49 +02:00
Alexis Maiquez Murcia
82682ecf02 + Added LZ4 lib to the compilation process 
+ Basic draft for the texture custom loader, only ARGB (partially) supported for now

Signed-off-by: Alexis Maiquez Murcia <almamu@almamu.com>
 2019-04-02 17:08:34 +02:00