diff --git a/src/WallpaperEngine/Core/Objects/Effects/CFBO.cpp b/src/WallpaperEngine/Core/Objects/Effects/CFBO.cpp index f0d65f8..607f158 100644 --- a/src/WallpaperEngine/Core/Objects/Effects/CFBO.cpp +++ b/src/WallpaperEngine/Core/Objects/Effects/CFBO.cpp @@ -2,6 +2,7 @@ #include +using namespace WallpaperEngine::Core; using namespace WallpaperEngine::Core::Objects::Effects; CFBO::CFBO (std::string name, float scale, std::string format) : @@ -13,14 +14,14 @@ CFBO::CFBO (std::string name, float scale, std::string format) : CFBO* CFBO::fromJSON (json data) { - auto name_it = data.find ("name"); - auto scale_it = data.find ("scale"); - auto format_it = data.find ("format"); + auto name_it = jsonFindRequired (data, "name", "Name for an FBO is required"); + auto scale = jsonFindDefault (data, "scale", 1.0); + auto format = jsonFindDefault (data, "format", ""); return new CFBO ( *name_it, - *scale_it, - *format_it + scale, + format ); } diff --git a/src/WallpaperEngine/Core/Objects/Effects/CFBO.h b/src/WallpaperEngine/Core/Objects/Effects/CFBO.h index edb559c..f3e84c0 100644 --- a/src/WallpaperEngine/Core/Objects/Effects/CFBO.h +++ b/src/WallpaperEngine/Core/Objects/Effects/CFBO.h @@ -2,6 +2,7 @@ #include +#include "WallpaperEngine/Core/Core.h" #include namespace WallpaperEngine::Core::Objects::Effects