mirrors/linux-wallpaperengine
1
0
Fork 0
mirror of https://github.com/Almamu/linux-wallpaperengine.git synced 2025-09-14 05:46:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: more fixes for visibility + camerashake can be a user setting

Browse Source
This commit is contained in:
Almamu 2025-08-20 01:12:28 +02:00
parent ce51cd23fa
commit cf3774c481
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/WallpaperEngine/Data/Model/Wallpaper.h
View File

@ -80,7 +80,7 @@ struct SceneData {
* Shake effect configuration
*/
struct {
bool enabled;
UserSettingUniquePtr enabled;
float amplitude;
float roughness;
float speed;

2
src/WallpaperEngine/Data/Parsers/WallpaperParser.cpp
View File

@ -56,7 +56,7 @@ SceneUniquePtr WallpaperParser::parseScene (const JSON& file, Project& project)
.mouseInfluence = general.optional ("cameraparallaxmouseinfluence", 1.0f),
},
.shake = {
.enabled = general.optional ("camerashake", false),
.enabled = general.user ("camerashake", properties, false),
.amplitude = general.optional ("camerashakeamplitude", 0.0f),
.roughness = general.optional ("camerashakeroughness", 0.0f),
.speed = general.optional ("camerashakespeed", 0.0f),

30
src/WallpaperEngine/Render/Objects/CImage.cpp
View File

@ -230,24 +230,38 @@ CImage::CImage (Wallpapers::CScene& scene, const Image& image) :
void CImage::setup () {
// do not double-init stuff, that's bad!
if (this->m_initialized)
if (this->m_initialized) {
return;
}
// TODO: SETUP RECALCULATION OF THINGS WHEN A VISIBILITY VALUE CHANGES!!
if (!this->m_image.visible->value->getBool ()) {
return;
}
// TODO: SUPPORT PASSTHROUGH (IT'S A SHADER)
// passthrough images without effects are bad, do not draw them
if (this->m_image.model->passthrough && this->m_image.effects.empty ())
if (this->m_image.model->passthrough && this->m_image.effects.empty ()) {
return;
}
// add blendmode to the combos
for (const auto& cur : this->getImage ().model->material->passes)
// copy pass to the composite layer
for (const auto& cur : this->getImage ().model->material->passes) {
this->m_passes.push_back (
new CPass (*this, std::make_shared<CFBOProvider>(this), *cur, std::nullopt, std::nullopt, std::nullopt)
new CPass (*this, std::make_shared<CFBOProvider> (this), *cur, std::nullopt, std::nullopt, std::nullopt)
);
}
// prepare the passes list
if (!this->getImage ().effects.empty ()) {
// generate the effects used by this material
for (const auto& cur : this->m_image.effects) {
// do not add non-visible effects, this might need some adjustements tho as some effects might not be visible
// but affect the output of the image...
if (!cur->visible->value->getBool ()) {
continue;
}
auto fboProvider = std::make_shared<CFBOProvider> (this);
// create all the fbos for this effect
@ -325,6 +339,7 @@ void CImage::setup () {
}
}
// extra render pass if there's any blending to be done
if (this->m_image.colorBlendMode > 0) {
this->m_materials.colorBlending.material = MaterialParser::load (this->getScene ().getScene ().project, "materials/util/effectpassthrough.json");
this->m_materials.colorBlending.override = std::make_unique<ImageEffectPassOverride> (ImageEffectPassOverride {
@ -360,8 +375,9 @@ void CImage::setup () {
// calculate full animation time (if any)
this->m_animationTime = 0.0f;
for (const auto& cur : this->getTexture ()->getFrames ())
for (const auto& cur : this->getTexture ()->getFrames ()) {
this->m_animationTime += cur->frametime;
}
this->setupPasses ();
this->m_initialized = true;
@ -379,6 +395,8 @@ void CImage::setupPasses () {
for (; cur != end; ++cur) {
// TODO: PROPERLY CHECK EFFECT'S VISIBILITY AND TAKE IT INTO ACCOUNT
// TODO: THIS REQUIRES ON-THE-FLY EVALUATION OF EFFECTS VISIBILITY TO FIGURE OUT
// TODO: WHICH ONE IS THE LAST + A FEW OTHER THINGS
Effects::CPass* pass = *cur;
std::shared_ptr<const CFBO> prevDrawTo = drawTo;
GLuint spacePosition = (first) ? this->getCopySpacePosition () : this->getPassSpacePosition ();