zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-19 15:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: update code style of gltf writer

Browse Source
This commit is contained in:
Jan 2025-01-23 17:23:33 +00:00
parent 80fa61b45c
commit 708e759f8c
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ObjWriting/XModel/Gltf/GltfWriter.cpp
View File

@ -8,6 +8,7 @@
#include <Eigen> #include <Eigen>
#pragma warning(pop) #pragma warning(pop)
#include <algorithm>
#include <format> #include <format>
using namespace gltf; using namespace gltf;
@ -131,8 +132,7 @@ namespace
{ {
JsonMeshPrimitives primitives; JsonMeshPrimitives primitives;
if (object.materialIndex >= 0) primitives.material = object.materialIndex;
primitives.material = static_cast<unsigned>(object.materialIndex);
primitives.attributes.POSITION = m_position_accessor; primitives.attributes.POSITION = m_position_accessor;
primitives.attributes.NORMAL = m_normal_accessor; primitives.attributes.NORMAL = m_normal_accessor;
@ -466,18 +466,12 @@ namespace
vertex->coordinates[1] = commonVertex.coordinates[2]; vertex->coordinates[1] = commonVertex.coordinates[2];
vertex->coordinates[2] = -commonVertex.coordinates[1]; vertex->coordinates[2] = -commonVertex.coordinates[1];
if (minPosition[0] > vertex->coordinates[0]) minPosition[0] = std::min(minPosition[0], vertex->coordinates[0]);
minPosition[0] = vertex->coordinates[0]; minPosition[1] = std::min(minPosition[1], vertex->coordinates[1]);
if (minPosition[1] > vertex->coordinates[1]) minPosition[2] = std::min(minPosition[2], vertex->coordinates[2]);
minPosition[1] = vertex->coordinates[1]; maxPosition[0] = std::max(maxPosition[0], vertex->coordinates[0]);
if (minPosition[2] > vertex->coordinates[2]) maxPosition[1] = std::max(maxPosition[1], vertex->coordinates[1]);
minPosition[2] = vertex->coordinates[2]; maxPosition[2] = std::max(maxPosition[2], vertex->coordinates[2]);
if (maxPosition[0] < vertex->coordinates[0])
maxPosition[0] = vertex->coordinates[0];
if (maxPosition[1] < vertex->coordinates[1])
maxPosition[1] = vertex->coordinates[1];
if (maxPosition[2] < vertex->coordinates[2])
maxPosition[2] = vertex->coordinates[2];
vertex->normal[0] = commonVertex.normal[0]; vertex->normal[0] = commonVertex.normal[0];
vertex->normal[1] = commonVertex.normal[2]; vertex->normal[1] = commonVertex.normal[2];
@ -499,7 +493,7 @@ namespace
{ {
assert(xmodel.m_vertex_bone_weights.size() == xmodel.m_vertices.size()); assert(xmodel.m_vertex_bone_weights.size() == xmodel.m_vertices.size());
auto* joints = reinterpret_cast<uint8_t*>(&bufferData[currentBufferOffset]); auto* joints = &bufferData[currentBufferOffset];
auto* weights = reinterpret_cast<float*>(&bufferData[currentBufferOffset + sizeof(uint8_t) * 4u * xmodel.m_vertex_bone_weights.size()]); auto* weights = reinterpret_cast<float*>(&bufferData[currentBufferOffset + sizeof(uint8_t) * 4u * xmodel.m_vertex_bone_weights.size()]);
for (const auto& commonVertexWeights : xmodel.m_vertex_bone_weights) for (const auto& commonVertexWeights : xmodel.m_vertex_bone_weights)
{ {