|
@@ -34,9 +34,8 @@ namespace engine {
|
|
|
graphics::object to_object(Json::Value const & json) {
|
|
graphics::object to_object(Json::Value const & json) {
|
|
|
flyweight<graphics::material> mat = to_material(json["material"]);
|
|
flyweight<graphics::material> mat = to_material(json["material"]);
|
|
|
auto frame_size = to_vec2(json["frameSize"]);
|
|
auto frame_size = to_vec2(json["frameSize"]);
|
|
|
- return {{to_vec2(json["position"]), mat.actual().size() * frame_size},
|
|
|
|
|
- {},
|
|
|
|
|
- mat,
|
|
|
|
|
- {{}, frame_size}};
|
|
|
|
|
|
|
+ math::dim2::rectangle pos = {to_vec2(json["position"]),
|
|
|
|
|
+ mat.actual().size() * frame_size};
|
|
|
|
|
+ return {pos, pos, mat, {{{0, 0}}, frame_size}};
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|