Revision 28a76c5 by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 9, 2021, 15:49 (GMT) |
Merge branch 'master' into temp-asset-browser-catalogs |
Revision 865fe33 by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 6, 2021, 15:57 (GMT) |
Fix compile error of asset library test on Windows The `filesystem::path::c_str()` function returns the path in the native string format, which is `wchar` on Windows. Instead use the one that does a conversion to `std::string` if needed. |
Revision f08aeab by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 6, 2021, 13:44 (GMT) |
Correct name of catalog-tree item child container alias This used to be a set, now it's a map. |
Revision d0b68f9 by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 6, 2021, 13:44 (GMT) |
Avoid unnecessary allocations in unit test |
Revision e8eb5d8 by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 2, 2021, 13:23 (GMT) |
Add tests for catalog tree Removes the printing of the catalog tree. Also adds and tests a function to get the full catalog path from a tree item. |
Revision ead9a15 by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 2, 2021, 10:29 (GMT) |
Simplify catalog tree creation using std::map By using std::map with the catalog-component name as key simplifies creation quite a bit. Generally it seems like the most appropriate container for storing children in the tree. |
Revision d76863c by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 1, 2021, 17:41 (GMT) |
Merge branch 'master' into temp-asset-browser-catalogs |
Revision 0cf37ba by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) September 1, 2021, 17:36 (GMT) |
Revision c0c605d by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) August 31, 2021, 14:55 (GMT) |
Use `ghc::filesystem` as platform compatible replacement for `std::filesystem` Previous commit merged the `temp-cpp-ghc-filesystem` branch into this, now we can actually use this replacment. This way the branch can be compiled on macOS. |
Revision 8c81ff5 by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) August 31, 2021, 14:51 (GMT) |
Merge branch 'temp-cpp-ghc-filesystem' into temp-asset-browser-catalogs |
Revision 5d1fa2e by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename, temp-cpp-ghc-filesystem) August 31, 2021, 14:49 (GMT) |
Dependencies: Drop-in replacement for std::filesystem (in extern/) Introduces the ghc::filesystem library as a (leight weight, header only) drop-in replacement for std::filesystem. The latter can't be used on the minimum macOS version we support. Once that changes, we can switch to using std::filesystem directly. Part of T90379. * Add ghc::filesystem to extern/ as platform compatible replacement for std::filesystem. * Add Windows specific code to avoid issues with including Windows.h. * Add blender::bli::filesystem as alias for ghc::filesystem. That should make the ghc -> std transition easier later on since we can just change this alias. Also makes it easy to switch between the two at compile time. |
Revision 1a20b3d by Julian Eisel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) August 31, 2021, 14:29 (GMT) |
Merge branch 'master' into temp-asset-browser-catalogs |
Revision ab98982 by Jacques Lucke (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) August 17, 2021, 09:22 (GMT) |
Merge branch 'master' into temp-asset-browser-catalogs |
Revision ca70b80 by Sybren A. Stüvel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) August 11, 2021, 13:52 (GMT) |
Asset Catalogs: change default catalog definition file name Change the default catalog definition file name from "single_catalog_definition_file.cats.txt" to "blender_assets.cats.txt". |
Revision 0a7e49f by Sybren A. Stüvel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) August 11, 2021, 13:36 (GMT) |
Cleanup: use same parameter name in declaration & definition |
Revision 6214763 by Sybren A. Stüvel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) August 11, 2021, 12:48 (GMT) |
Asset Catalogs: clean up catalog paths before using them Clean up paths by trimming whitespace and separators `/path/to/something ` ? `path/to/something`. |
Revision ed1fd86 by Sybren A. Stüvel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) August 11, 2021, 11:59 (GMT) |
Asset Catalogs: allow adding new catalogs New catalogs can be added with `AssetCatalogService::create_catalog()`. It only requires the catalog path, and convert that into a suitable catalog ID itself. It is intended that artists won't have to bother with assigning catalog IDs, and that editing those is more of an advanced feature. Adding a catalog will automatically save the catalog definition file to disk. |
Revision 7083e8c by Sybren A. Stüvel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) August 11, 2021, 11:35 (GMT) |
Asset Catalogs: gracefully handle catalog IDs without path Ignore lines in a catalog definition file when it only contains the catalog ID, and not the catalog path. |
Revision 09316c8 by Sybren A. Stüvel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) August 11, 2021, 10:21 (GMT) |
Cleanup: asset catalogs, use doxygen comments Use `/**` instead of `/*` for some function documentation comments. No functional changes. |
Revision 9655cbf by Sybren A. Stüvel (temp-asset-browser-catalogs, temp-asset-browser-catalogs-ui, temp-assetlib-plus-uuid-rename) August 11, 2021, 10:21 (GMT) |
Asset Catalogs: pass root dir of asset library to AssetCatalogService Pass the root directory of the asset library to the `AssetCatalogService` constructor. This makes it possible for newly created catalogs to be saved somewhere. No functional changes. |
|