|
|
|
|
@ -130,9 +130,9 @@ slParseHexGrid(slSceneDoc* sd, hexgrid& hg, uint32& fill_color, uint32&selected_
|
|
|
|
|
hg.position.y = pos.y; |
|
|
|
|
hg.position.z = pos.z; |
|
|
|
|
std::string fill_color_str = json_grid["fill_color"].GetString(); |
|
|
|
|
hg.fill_color = std::stoul(fill_color_str, nullptr, 16); |
|
|
|
|
hg.fill_color = fill_color = std::stoul(fill_color_str, nullptr, 16); |
|
|
|
|
std::string selected_fill_color_str = json_grid["selected_fill_color"].GetString(); |
|
|
|
|
hg.selected_fill_color = std::stoul(selected_fill_color_str, nullptr, 16); |
|
|
|
|
hg.selected_fill_color = selected_fill_color = std::stoul(selected_fill_color_str, nullptr, 16); |
|
|
|
|
std::string orientation_str = json_grid["hexlib_orientation"].GetString(); |
|
|
|
|
hg.hexlib_orientation = (orientation_str == "layout_flat") ? layout_flat : layout_pointy; |
|
|
|
|
Layout lo(hg.hexlib_orientation, Point(hg.hex_size, hg.hex_size), Point(hg.position.x, hg.position.y)); |
|
|
|
|
|