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

Code style changes, minor reorderings

Browse Source
This commit is contained in:
Vladyslav Baranovskyi
2024-09-09 21:52:17 +03:00
parent fa3a7a7fb7
commit 83c3a775ee
2 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
openVulkanoCpp/Scene/MeshWriter.cpp
View File

@@ -7,12 +7,12 @@
#include "MeshWriter.hpp"
#include "Scene/Geometry.hpp"
#include "Scene/Vertex.hpp"
#include <fmt/core.h>
#include <fstream>
#include "tinyusdz.hh"
#include "pprinter.hh"
#include "prim-pprint.hh"
#include "value-pprint.hh"
#include <fmt/core.h>
#include <tinyusdz.hh>
#include <pprinter.hh>
#include <prim-pprint.hh>
#include <value-pprint.hh>
namespace
{
@@ -48,33 +48,40 @@ namespace OpenVulkano::Scene
if (!file.is_open())
throw std::runtime_error("Failed to open file '" + filePath + "' for writing!");
// Vertices
for (int i = 0; i < geometry->vertexCount; ++i)
{
OpenVulkano::Vertex v = geometry->vertices[i];
const OpenVulkano::Vertex& v = geometry->vertices[i];
std::string line;
line = fmt::format("v {} {} {}\n", v.position.x, v.position.y, v.position.z);
file << line;
line = fmt::format("vn {} {} {}\n", v.normal.x, v.normal.y, v.normal.z);
file << line;
line = fmt::format("vt {} {}\n", v.textureCoordinates.x, v.textureCoordinates.y);
file << line;
// NOTE(vb): There aren't specd way to encode colors...
}
// Normals
for (int i = 0; i < geometry->vertexCount; ++i)
{
const OpenVulkano::Vertex& v = geometry->vertices[i];
std::string line;
line = fmt::format("vn {} {} {}\n", v.normal.x, v.normal.y, v.normal.z);
file << line;
}
// TexCoords
for (int i = 0; i < geometry->vertexCount; ++i)
{
const OpenVulkano::Vertex& v = geometry->vertices[i];
std::string line;
line = fmt::format("vt {} {}\n", v.textureCoordinates.x, v.textureCoordinates.y);
file << line;
}
// Indices
for (int i = 0; i < geometry->indexCount; i += 3)
{
uint32_t i0 = GetIndexFromGeometry(geometry, i + 0) + 1;
uint32_t i1 = GetIndexFromGeometry(geometry, i + 1) + 1;
uint32_t i2 = GetIndexFromGeometry(geometry, i + 2) + 1;
std::string line = fmt::format("f {}/{}/{} {}/{}/{} {}/{}/{}\n",
i0, i0, i0,
i1, i1, i1,
i2, i2, i2
);
std::string line = fmt::format("f {0}/{0}/{0} {1}/{1}/{1} {2}/{2}/{2}\n", i0, i1, i2);
file << line;
}
@@ -95,23 +102,17 @@ namespace OpenVulkano::Scene
for (int i = 0; i < geometry->vertexCount; ++i)
{
Vertex v = geometry->vertices[i];
tinyusdz::value::point3f p;
p.x = v.position.x;
p.y = v.position.y;
p.z = v.position.z;
pts[i] = p;
const Vertex& v = geometry->vertices[i];
pts[i].x = v.position.x;
pts[i].y = v.position.y;
pts[i].z = v.position.z;
uvs[i] = { v.textureCoordinates.x, v.textureCoordinates.y };
}
mesh.points.set_value(pts);
uvAttr.set_value(uvs);
std::vector<int> counts;
for (int i = 0; i < geometry->indexCount / 3; ++i)
{
counts.push_back(3); // NOTE(vb): This value is kind of arbitrary, but the array must be in the mesh!
}
std::vector<int> counts(geometry->indexCount / 3, 3); // NOTE(vb): The value 3 is kind of arbitrary, but this array must be in the mesh!
mesh.faceVertexCounts.set_value(counts);
for (int i = 0; i < geometry->indexCount; ++i)