reduce extra includes
This commit is contained in:
@@ -0,0 +1,27 @@
|
||||
#include "Weather.hpp"
|
||||
|
||||
#include "data/dv.hpp"
|
||||
|
||||
dv::value Weather::serialize() const {
|
||||
return dv::object({
|
||||
{"a", a.serialize()},
|
||||
{"b", b.serialize()},
|
||||
{"name-a", nameA},
|
||||
{"name-b", nameB},
|
||||
{"t", t},
|
||||
{"speed", speed},
|
||||
});
|
||||
}
|
||||
|
||||
void Weather::deserialize(const dv::value& src) {
|
||||
if (src.has("a")) {
|
||||
a.deserialize(src["a"]);
|
||||
}
|
||||
if (src.has("b")) {
|
||||
b.deserialize(src["b"]);
|
||||
}
|
||||
src.at("name-a").get(nameA);
|
||||
src.at("name-b").get(nameB);
|
||||
src.at("t").get(t);
|
||||
src.at("speed").get(speed);
|
||||
}
|
||||
+2
-19
@@ -45,23 +45,6 @@ struct Weather : Serializable {
|
||||
return b.thunderRate * t + a.thunderRate * (1.0f - t);
|
||||
}
|
||||
|
||||
dv::value serialize() const override {
|
||||
return dv::object({
|
||||
{"a", a.serialize()},
|
||||
{"b", b.serialize()},
|
||||
{"name-a", nameA},
|
||||
{"name-b", nameB},
|
||||
{"t", t},
|
||||
{"speed", speed},
|
||||
});
|
||||
}
|
||||
|
||||
void deserialize(const dv::value& src) override {
|
||||
a.deserializeOpt(src.at("a"));
|
||||
b.deserializeOpt(src.at("b"));
|
||||
src.at("name-a").get(nameA);
|
||||
src.at("name-b").get(nameB);
|
||||
src.at("t").get(t);
|
||||
src.at("speed").get(speed);
|
||||
}
|
||||
dv::value serialize() const override;
|
||||
void deserialize(const dv::value& src) override;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user