move sky sprites to environment

src/world/Environment.cpp

@@ -5,12 +5,22 @@
 #include "data/dv_util.hpp"
 
 dv::value Environment::serialize() const {
+    auto skySpritesList = dv::list();
+    for (const auto& sprite : sky.sprites) {
+        skySpritesList.add(dv::object({
+            {"texture", sprite.texture},
+            {"phase", sprite.phase},
+            {"distance", sprite.distance},
+            {"emissive", sprite.emissive},
+            {"altitude", sprite.altitude},
+        }));
+    }
     return dv::object({
         {"sky", dv::object({
             {"mode", SkyModeMeta.getNameString(sky.mode)},
             {"stars", sky.stars},
             {"clouds", sky.clouds},
-            {"sprites", sky.sprites},
+            {"sprites", std::move(skySpritesList)},
         })},
     });
 }
@@ -20,6 +30,18 @@ void Environment::deserialize(const dv::value& src) {
         skyItem->at("mode").get(sky.mode, SkyModeMeta);
         skyItem->at("stars").get(sky.stars);
         skyItem->at("clouds").get(sky.clouds);
-        skyItem->at("sprites").get(sky.sprites);
+
+        if (auto skySpritesList = skyItem->at("sprites")) {
+            for (int i = 0; i < skySpritesList->size(); i++) {
+                SkySprite sprite;
+                const auto& item = (*skySpritesList.ptr)[i];
+                item.at("texture").get(sprite.texture);
+                item.at("phase").get(sprite.phase);
+                item.at("distance").get(sprite.distance);
+                item.at("emissive").get(sprite.emissive);
+                item.at("altitude").get(sprite.altitude);
+                sky.sprites.push_back(std::move(sprite));
+            }
+        }
     }
 }

src/world/Environment.hpp

@@ -3,6 +3,9 @@
 #include "interfaces/Serializable.hpp"
 #include "util/EnumMetadata.hpp"
 
+#include <vector>
+#include <glm/gtc/constants.hpp>
+
 enum class SkyMode {
     NONE, SOLID, BOX
 };
@@ -13,13 +16,44 @@ VC_ENUM_METADATA(SkyMode)
     {"box", SkyMode::BOX},
 VC_ENUM_END
 
+struct SkySprite {
+    std::string texture;
+    float phase;
+    float distance;
+    bool emissive;
+    float altitude;
+};
+
 class Environment : public Serializable {
 public:
     struct {
         SkyMode mode = SkyMode::BOX;
         bool stars = true;
         bool clouds = true;
-        bool sprites = true;
+        // TODO: move defaults to config file
+        std::vector<SkySprite> sprites {
+            SkySprite {
+                "misc/moon",
+                glm::pi<float>() * 0.5f,
+                4.0f,
+                false,
+                glm::pi<float>() * 0.25f,
+            },
+            SkySprite {
+                "misc/moon_flare",
+                glm::pi<float>() * 0.5f,
+                0.5f,
+                false,
+                glm::pi<float>() * 0.25f,
+            },
+            SkySprite {
+                "misc/sun",
+                glm::pi<float>() * 1.5f,
+                4.0f,
+                true,
+                glm::pi<float>() * 0.25f,
+            },
+        };
     } sky;
 
     Environment() = default;