diff options
author | Julian Eisel <julian@blender.org> | 2021-07-20 22:09:03 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2021-07-20 22:30:03 +0300 |
commit | e99801390c7a2b947fb447715409278d366f176a (patch) | |
tree | 5a4e28a7d68c1204768d2a734af4592b51a1e545 | |
parent | 5a1b1c0ed2e6d085c93b8afd699407f92cc2d07d (diff) |
Cleanup: Move asset-handle functions to own file
Keeps files minimal and focused. I much prefer that over having all
kinds of stuff in general files like `asset_edit.cc`.
-rw-r--r-- | source/blender/editors/asset/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/editors/asset/asset_edit.cc | 40 | ||||
-rw-r--r-- | source/blender/editors/asset/intern/asset_handle.cc | 72 |
3 files changed, 73 insertions, 40 deletions
diff --git a/source/blender/editors/asset/CMakeLists.txt b/source/blender/editors/asset/CMakeLists.txt index fb727e686fc..e0195f78cad 100644 --- a/source/blender/editors/asset/CMakeLists.txt +++ b/source/blender/editors/asset/CMakeLists.txt @@ -34,6 +34,7 @@ set(SRC asset_list.cc asset_ops.cc asset_temp_id_consumer.cc + intern/asset_handle.cc intern/asset_library_reference.cc intern/asset_library_reference.hh diff --git a/source/blender/editors/asset/asset_edit.cc b/source/blender/editors/asset/asset_edit.cc index c44960f3b5a..16fd71b4340 100644 --- a/source/blender/editors/asset/asset_edit.cc +++ b/source/blender/editors/asset/asset_edit.cc @@ -133,43 +133,3 @@ AssetLibraryReference ED_asset_library_reference_from_enum_value(int value) } return library; } - -const char *ED_asset_handle_get_name(const AssetHandle *asset) -{ - return asset->file_data->name; -} - -AssetMetaData *ED_asset_handle_get_metadata(const AssetHandle *asset) -{ - return asset->file_data->asset_data; -} - -ID *ED_asset_handle_get_local_id(const AssetHandle *asset) -{ - return asset->file_data->id; -} - -ID_Type ED_asset_handle_get_id_type(const AssetHandle *asset) -{ - return static_cast<ID_Type>(asset->file_data->blentype); -} - -int ED_asset_handle_get_preview_icon_id(const AssetHandle *asset) -{ - return asset->file_data->preview_icon_id; -} - -void ED_asset_handle_get_full_library_path(const bContext *C, - const AssetLibraryReference *asset_library, - const AssetHandle *asset, - char r_full_lib_path[FILE_MAX_LIBEXTRA]) -{ - *r_full_lib_path = '\0'; - - std::string asset_path = ED_assetlist_asset_filepath_get(C, *asset_library, *asset); - if (asset_path.empty()) { - return; - } - - BLO_library_path_explode(asset_path.c_str(), r_full_lib_path, nullptr, nullptr); -} diff --git a/source/blender/editors/asset/intern/asset_handle.cc b/source/blender/editors/asset/intern/asset_handle.cc new file mode 100644 index 00000000000..428fa62d130 --- /dev/null +++ b/source/blender/editors/asset/intern/asset_handle.cc @@ -0,0 +1,72 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** \file + * \ingroup edasset + * + * Asset-handle is a temporary design, not part of the core asset system design. + * + * Currently asset-list items are just file directory items (#FileDirEntry). So an asset-handle is + * just wraps a pointer to this. We try to abstract away the fact that it's just a file entry, + * although that doesn't always work (see #rna_def_asset_handle()). + */ + +#include "DNA_asset_types.h" +#include "DNA_space_types.h" + +#include "BLO_readfile.h" + +#include "ED_asset.h" + +const char *ED_asset_handle_get_name(const AssetHandle *asset) +{ + return asset->file_data->name; +} + +AssetMetaData *ED_asset_handle_get_metadata(const AssetHandle *asset) +{ + return asset->file_data->asset_data; +} + +ID *ED_asset_handle_get_local_id(const AssetHandle *asset) +{ + return asset->file_data->id; +} + +ID_Type ED_asset_handle_get_id_type(const AssetHandle *asset) +{ + return static_cast<ID_Type>(asset->file_data->blentype); +} + +int ED_asset_handle_get_preview_icon_id(const AssetHandle *asset) +{ + return asset->file_data->preview_icon_id; +} + +void ED_asset_handle_get_full_library_path(const bContext *C, + const AssetLibraryReference *asset_library, + const AssetHandle *asset, + char r_full_lib_path[FILE_MAX_LIBEXTRA]) +{ + *r_full_lib_path = '\0'; + + std::string asset_path = ED_assetlist_asset_filepath_get(C, *asset_library, *asset); + if (asset_path.empty()) { + return; + } + + BLO_library_path_explode(asset_path.c_str(), r_full_lib_path, nullptr, nullptr); +} |