GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into stl_exporter

Browse Source
This commit is contained in:
Vladyslav_Baranovskyi_EXT
2025-02-11 10:31:05 +01:00
parent 3d1be5dfed c41acb47c2
commit 561e4b2846
18 changed files with 238 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
openVulkanoCpp/Scene/Export/MeshWriter.cpp
View File

@@ -130,18 +130,18 @@ namespace OpenVulkano::Scene
std::stringstream objContents;
WriteObjContents(geometry, DEFAULT_OBJ_MATERIAL_NAME, objContents);
std::string objContentsStr = objContents.str();
FileDescription objDesc = FileDescription::MakeDescriptionForFile("model.obj", objContentsStr.size());
FileDescription objDesc = FileDescription::MkFile("model.obj", objContentsStr.size());
zipWriter.AddFile(objDesc, objContentsStr.data());
}
{
FileDescription mtlDesc = FileDescription::MakeDescriptionForFile("material.mtl", DEFAULT_OBJ_MATERIAL_CONTENTS.size());
FileDescription mtlDesc = FileDescription::MkFile("material.mtl", DEFAULT_OBJ_MATERIAL_CONTENTS.size());
zipWriter.AddFile(mtlDesc, DEFAULT_OBJ_MATERIAL_CONTENTS.data());
}
if (!texturePath.empty() && std::filesystem::exists(texturePath))
{
MemMappedFile textureFile(texturePath);
FileDescription texDesc = FileDescription::MakeDescriptionForFile("texture.png", textureFile.Size());
FileDescription texDesc = FileDescription::MkFile("texture.png", textureFile.Size());
zipWriter.AddFile(texDesc, textureFile.Data());
}
}
@@ -154,14 +154,14 @@ namespace OpenVulkano::Scene
std::stringstream usdFile;
WriteUsdContents(usdFile, geometry);
std::string usdFileStr = usdFile.str();
FileDescription usdDesc = FileDescription::MakeDescriptionForFile("geometry.usda", usdFileStr.size());
FileDescription usdDesc = FileDescription::MkFile("geometry.usda", usdFileStr.size());
zipWriter.AddFile(usdDesc, usdFileStr.data());
}
if (!texturePath.empty() && std::filesystem::exists(texturePath))
{
MemMappedFile textureFile(texturePath);
FileDescription texDesc = FileDescription::MakeDescriptionForFile("texture.png", textureFile.Size());
FileDescription texDesc = FileDescription::MkFile("texture.png", textureFile.Size());
zipWriter.AddFile(texDesc, textureFile.Data());
}
}
@@ -232,4 +232,4 @@ namespace OpenVulkano::Scene
throw std::runtime_error("Unable to convert the scene to FBX: Assimp is not available!");
#endif
}
}
}