zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-09-12 19:47:27 +00:00
Code Activity

refactor: fix x64 compilation for ObjLoading

Browse Source
This commit is contained in:
Jan
2025-04-26 10:11:28 +01:00
committed by Jan Laupetin
parent ee4301952a
commit 5d0c94e430
34 changed files with 212 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ObjLoading/XModel/Gltf/GltfLoader.cpp
View File

@@ -258,7 +258,7 @@ namespace
VerifyAccessorVertexCount("WEIGHTS_0", weightsAccessor, vertexCount);
// clang-format on
const auto vertexOffset = common.m_vertices.size();
const auto vertexOffset = static_cast<unsigned>(common.m_vertices.size());
common.m_vertices.reserve(vertexOffset + vertexCount);
common.m_vertex_bone_weights.reserve(vertexOffset + vertexCount);
for (auto vertexIndex = 0u; vertexIndex < vertexCount; vertexIndex++)
@@ -300,6 +300,7 @@ namespace
}
m_vertex_offset_for_accessors.emplace(accessorsForVertex, vertexOffset);
return vertexOffset;
}
@@ -499,7 +500,7 @@ namespace
const auto boneInSkin = std::ranges::find(skin.joints, nodeIndex);
if (boneInSkin == skin.joints.end())
throw GltfLoadException("Bone node is not part of skin");
const auto boneIndexInSkin = std::distance(skin.joints.begin(), boneInSkin);
const auto boneIndexInSkin = static_cast<unsigned>(std::distance(skin.joints.begin(), boneInSkin));
const auto commonBoneOffset = skinBoneOffset + boneIndexInSkin;
auto& bone = common.m_bones[commonBoneOffset];
@@ -548,7 +549,7 @@ namespace
return false;
const auto rootNode = GetRootNodeForSkin(jRoot, skin).value_or(skin.joints[0]);
const auto skinBoneOffset = common.m_bones.size();
const auto skinBoneOffset = static_cast<unsigned>(common.m_bones.size());
common.m_bones.resize(skinBoneOffset + skin.joints.size());
constexpr float defaultTranslation[3]{0.0f, 0.0f, 0.0f};

2
src/ObjLoading/XModel/PartClassificationState.cpp
View File

@@ -72,7 +72,7 @@ bool PartClassificationState::LoadRow(const char** hitLocStart, const char** hit
return false;
}
const auto hitLocNum = std::distance(hitLocStart, foundHitLoc);
const auto hitLocNum = static_cast<unsigned>(std::distance(hitLocStart, foundHitLoc));
m_part_classifications.emplace(row[0], hitLocNum);
return true;

4
src/ObjLoading/XModel/TangentData.cpp
View File

@@ -11,11 +11,11 @@ void TangentData::CreateTangentData(const XModelCommon& common)
m_tangents.resize(vertexCount);
m_binormals.resize(vertexCount);
auto triCount = 0u;
auto triCount = 0uz;
for (const auto& object : common.m_objects)
triCount += object.m_faces.size();
std::vector<uint16_t> indices(triCount * 3u);
std::vector<uint16_t> indices(triCount * 3uz);
auto triOffset = 0u;
for (const auto& object : common.m_objects)
{