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

Hardcoded material name, capitalized constants

Browse Source
This commit is contained in:
Vladyslav Baranovskyi
2024-11-28 22:01:43 +02:00
parent ba9d37cc6f
commit 7a214397a1
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
openVulkanoCpp/Scene/MeshWriter.cpp
View File

@@ -42,18 +42,15 @@ namespace OpenVulkano::Scene
{
OpenVulkano::ArchiveWriter zipWriter(zipPath.c_str());
const char* materialName = "Material0";
{
std::stringstream objContents;
WriteObjContents(geometry, materialName, objContents);
WriteObjContents(geometry, DEFAULT_OBJ_MATERIAL_NAME, objContents);
auto objContentsStr = objContents.str();
auto objDesc = OpenVulkano::FileDescription::MakeDescriptionForFile("model.obj", objContentsStr.size());
zipWriter.AddFile(objDesc, objContentsStr.data());
}
{
std::stringstream mtlContents;
mtlContents << "newmtl " << materialName << "\n" << ObjMaterialContents;
auto mtlContentsStr = mtlContents.str();
auto mtlContentsStr = DEFAULT_OBJ_MATERIAL_CONTENTS;
auto mtlDesc = OpenVulkano::FileDescription::MakeDescriptionForFile("material.mtl", mtlContentsStr.size());
zipWriter.AddFile(mtlDesc, mtlContentsStr.data());
}

5
openVulkanoCpp/Scene/ObjEncoder.hpp
View File

@@ -14,7 +14,8 @@
namespace OpenVulkano::Scene
{
static constexpr std::string_view ObjMaterialContents = R"(
static constexpr std::string_view DEFAULT_OBJ_MATERIAL_NAME = "Material0";
static constexpr std::string_view DEFAULT_OBJ_MATERIAL_CONTENTS = R"(newmtl Material0
Ka 1.000 1.000 1.000
Kd 1.000 1.000 1.000
Ks 0.000 0.000 0.000
@@ -22,7 +23,7 @@ map_Ka texture.png
map_Kd texture.png
)";
void WriteObjContents(Geometry* geometry, const std::string& materialName, std::ostream& objContent)
void WriteObjContents(Geometry* geometry, const std::string_view& materialName, std::ostream& objContent)
{
objContent << "# OBJ file generated by OpenVulkanoCpp\n";