소스 검색

chore: fix regression on parsing some user values

Almamu 1 년 전
부모
커밋
804298012d
2개의 변경된 파일과 6개의 추가작업 그리고 6개의 파일을 삭제
  1. 3 3
      src/WallpaperEngine/Data/Model/Wallpaper.h
  2. 3 3
      src/WallpaperEngine/Data/Parsers/WallpaperParser.cpp

+ 3 - 3
src/WallpaperEngine/Data/Model/Wallpaper.h

@@ -79,9 +79,9 @@ struct SceneData {
          */
         struct {
             UserSettingUniquePtr enabled;
-            float amplitude;
-            float roughness;
-            float speed;
+            UserSettingUniquePtr amplitude;
+            UserSettingUniquePtr roughness;
+            UserSettingUniquePtr speed;
         } shake;
 
         /**

+ 3 - 3
src/WallpaperEngine/Data/Parsers/WallpaperParser.cpp

@@ -58,9 +58,9 @@ SceneUniquePtr WallpaperParser::parseScene (const JSON& file, Project& project)
                 },
                 .shake = {
                     .enabled = general.user ("camerashake", properties, false),
-                    .amplitude = general.optional ("camerashakeamplitude", 0.0f),
-                    .roughness = general.optional ("camerashakeroughness", 0.0f),
-                    .speed = general.optional ("camerashakespeed", 0.0f),
+                    .amplitude = general.user ("camerashakeamplitude", properties, 0.0f),
+                    .roughness = general.user ("camerashakeroughness", properties, 0.0f),
+                    .speed = general.user ("camerashakespeed", properties, 0.0f),
                 },
                 .configuration = {
                     .center = camera.require <glm::vec3> ("center", "Camera must have a center position"),