eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 17:29:18 +02:00
Code Issues 123 Wiki Activity

work

Browse Source
This commit is contained in:
milek7
2019-08-15 15:08:17 +02:00
parent 7f0dfa708e
commit 878b8621f0
3 changed files with 3 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/scenery_list.h
View File

@@ -15,5 +15,7 @@ class scenerylist_panel : public ui_panel
private: private:
scenery_scanner scanner; scenery_scanner scanner;
scenery_desc const *selected_scenery = nullptr; scenery_desc const *selected_scenery = nullptr;
vehicles_bank &bank;
}; };
} // namespace ui } // namespace ui

34
launcher/textures_scanner.cpp
View File

@@ -1,41 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "textures_scanner.h" #include "textures_scanner.h"
#include "renderer.h"
#include "utilities.h" #include "utilities.h"
GLuint ui::deferred_image::get() const
{
if (!path.empty()) {
image = GfxRenderer.Fetch_Texture(path, true);
path.clear();
}
if (image != null_handle) {
opengl_texture &tex = GfxRenderer.Texture(image);
tex.create();
if (tex.is_ready)
return tex.id;
}
return -1;
}
ui::deferred_image::operator bool() const
{
return image != null_handle || !path.empty();
}
glm::ivec2 ui::deferred_image::size() const
{
if (image != null_handle) {
opengl_texture &tex = GfxRenderer.Texture(image);
return glm::ivec2(tex.width(), tex.height());
}
return glm::ivec2();
}
void ui::vehicles_bank::scan_textures() void ui::vehicles_bank::scan_textures()
{ {
for (auto &f : std::filesystem::recursive_directory_iterator("dynamic")) { for (auto &f : std::filesystem::recursive_directory_iterator("dynamic")) {

19
launcher/textures_scanner.h
View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Texture.h" #include "deferred_image.h"
namespace ui { namespace ui {
enum class vehicle_type { enum class vehicle_type {
@@ -22,23 +22,6 @@ enum class vehicle_type {
unknown unknown
}; };
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;
operator bool() const;
GLuint get() const;
glm::ivec2 size() const;
private:
mutable std::string path;
mutable texture_handle image = 0;
};
struct skin_set { struct skin_set {
std::vector<std::filesystem::path> skins; std::vector<std::filesystem::path> skins;
deferred_image mini; deferred_image mini;