blender
/
blender
137
409
Fork 592
Code Issues 6.3k Pull Requests 770 Projects 19 Wiki Activity

#99807: Add support for exporting to USDZ - ultimate fixes #105185

Merged
Bastien Montagne merged 12 commits from mont29/blender:usdz_export_fixes into main 2023-02-26 16:37:02 +01:00
Conversation 5 Commits 12 Files Changed 7 +27 -12
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d6574cf22d - Show all commits

17
source/blender/io/usd/intern/usd_capi_export.cc
View File

@ -49,13 +49,9 @@ struct ExportJobData {
bool export_ok;
timeit::TimePoint start_time;
const bool targets_usdz() const
bool targets_usdz() const
{
if (usdz_filepath) {
return usdz_filepath[0];
}
return false;
return usdz_filepath[0] != '\0';
}
const char *export_filepath() const
@ -92,8 +88,13 @@ static bool perform_usdz_conversion(const ExportJobData *data)
char usdz_file[FILE_MAX];
BLI_split_file_part(data->usdz_filepath, usdz_file, FILE_MAX);
char original_working_dir[FILE_MAX];
BLI_current_working_dir(original_working_dir, FILE_MAX);
char original_working_dir_buff[FILE_MAX];
char *original_working_dir = BLI_current_working_dir(original_working_dir_buff,
sizeof(original_working_dir_buff));
/* Buffer is expected to be returned by #BLI_current_working_dir, although in theory other
* returns are possible on some platforms, this is not handled by this code. */
BLI_assert(original_working_dir == original_working_dir_buff);
BLI_change_working_dir(usdc_temp_dir);
pxr::UsdUtilsCreateNewUsdzPackage(pxr::SdfAssetPath(usdc_file), usdz_file);

22
source/blender/io/usd/tests/usd_usdz_export_test.cc
View File

@ -55,9 +55,6 @@ class UsdUsdzExportTest : public BlendfileLoadingBaseTest {
FAIL();
}
char original_wd[FILE_MAX];
BLI_current_working_dir(original_wd, FILE_MAX);
BKE_tempdir_init(nullptr);
const char *temp_base_dir = BKE_tempdir_base();
@ -92,6 +89,14 @@ TEST_F(UsdUsdzExportTest, usdz_export)
ASSERT_EQ(BLI_listbase_count(&bfile->main->objects), 4)
<< "Blender scene should have 4 objects.";
char original_cwd_buff[FILE_MAX];
char *original_cwd = BLI_current_working_dir(original_cwd_buff, sizeof(original_cwd_buff));
/* Buffer is expected to be returned by #BLI_current_working_dir, although in theory other
* returns are possible on some platforms, this is not handled by this code. */
ASSERT_EQ(original_cwd, original_cwd_buff)
<< "BLI_current_working_dir is not expected to return a different value than the given char "
"buffer.";
USDExportParams params{};
bool result = USD_export(context, output_filename, &params, false);
@ -115,6 +120,15 @@ TEST_F(UsdUsdzExportTest, usdz_export)
prim_name = pxr::TfMakeValidIdentifier("Sphere");
test_prim = stage->GetPrimAtPath(pxr::SdfPath("/Sphere/" + prim_name));
EXPECT_TRUE(bool(test_prim)) << "Sphere prim should exist in exported usdz file.";
char final_cwd_buff[FILE_MAX];
char *final_cwd = BLI_current_working_dir(final_cwd_buff, sizeof(final_cwd_buff));
/* Buffer is expected to be returned by #BLI_current_working_dir, although in theory other
* returns are possible on some platforms, this is not handled by this code. */
ASSERT_EQ(final_cwd, final_cwd_buff) << "BLI_current_working_dir is not expected to return "
"a different value than the given char buffer.";
EXPECT_TRUE(STREQ(original_cwd, final_cwd))
<< "Final CWD should be the same as the original one.";
}
} // namespace blender::io::usd
} // namespace blender::io::usd