BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-14 16:09:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

initialize assets cache from starter

Browse Source
This commit is contained in:
Matvey Cherevko
2018-12-05 19:12:56 +07:00
parent aaf943038d
commit 1494688a60
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
headers/enduro2d/high/_high.hpp
View File

@@ -19,6 +19,7 @@ namespace e2d
class binary_asset;
class shader_asset;
class texture_asset;
class material_asset;
template < typename T >
class asset_cache;

10
sources/enduro2d/high/starter.cpp
View File

@@ -6,6 +6,7 @@
#include <enduro2d/high/starter.hpp>
#include <enduro2d/high/assets.hpp>
#include <enduro2d/high/library.hpp>
namespace
@@ -61,7 +62,16 @@ namespace e2d
starter::starter(int argc, char *argv[], const parameters& params) {
safe_module_initialize<engine>(argc, argv, params.engine_params());
safe_module_initialize<library>(params.library_root());
safe_module_initialize<asset_cache<text_asset>>(the<library>());
safe_module_initialize<asset_cache<mesh_asset>>(the<library>());
safe_module_initialize<asset_cache<image_asset>>(the<library>());
safe_module_initialize<asset_cache<binary_asset>>(the<library>());
safe_module_initialize<asset_cache<shader_asset>>(the<library>());
safe_module_initialize<asset_cache<texture_asset>>(the<library>());
safe_module_initialize<asset_cache<material_asset>>(the<library>());
}
starter::~starter() noexcept = default;

3
toolset/model_converter/sources/main.cpp
View File

@@ -15,6 +15,7 @@
#include <iostream>
#include <iterator>
#include <exception>
#include <stdexcept>
#include <algorithm>
#include <assimp/Importer.hpp>
@@ -130,7 +131,7 @@ namespace
return data_size;
}
return 0;
};
}
bool validate_mesh(const mesh& mesh) noexcept {
if ( mesh.vertices.empty() ) {