eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

add missing replace_slashes in node triangles deserializer, vehicle picker changes, explicit filesystem::path to string conversion

Browse Source
This commit is contained in:
milek7
2019-07-31 21:11:29 +02:00
parent ee65ca77e3
commit d95986745c
4 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
launcher/vehicle_picker.h
View File

@@ -26,6 +26,9 @@ class deferred_image {
public:
deferred_image() = default;
deferred_image(const std::string &p) : path(p) { }
deferred_image(const deferred_image&) = delete;
deferred_image(deferred_image&&) = default;
deferred_image &operator=(deferred_image&&) = default;
GLuint get();
glm::ivec2 size();
@@ -65,7 +68,7 @@ class vehicles_bank {
public:
std::unordered_map<vehicle_type, deferred_image> category_icons;
std::map<std::filesystem::path, std::shared_ptr<vehicle_desc>> vehicles;
std::map<std::string, std::vector<std::shared_ptr<vehicle_desc>>> group_map;
std::map<std::string, std::set<std::shared_ptr<vehicle_desc>>> group_map;
void scan_textures();
private: