From 6be808e3016d8b17865c43b065c89e2b59c8d569 Mon Sep 17 00:00:00 2001 From: Alexei Dobrohotov Date: Wed, 7 Oct 2020 22:44:09 +0300 Subject: [PATCH] RigGeometry: convert some pairs to structs --- components/nifosg/nifloader.cpp | 8 ++--- components/sceneutil/riggeometry.cpp | 35 +++++++------------ components/sceneutil/riggeometry.hpp | 50 ++++++++++++++++++++++------ 3 files changed, 54 insertions(+), 39 deletions(-) diff --git a/components/nifosg/nifloader.cpp b/components/nifosg/nifloader.cpp index 61a276dc1..4a2dac36c 100644 --- a/components/nifosg/nifloader.cpp +++ b/components/nifosg/nifloader.cpp @@ -1239,15 +1239,13 @@ namespace NifOsg std::string boneName = Misc::StringUtils::lowerCase(bones[i].getPtr()->name); SceneUtil::RigGeometry::BoneInfluence influence; - const std::vector &weights = data->bones[i].weights; + const auto& weights = data->bones[i].weights; for(size_t j = 0;j < weights.size();j++) - { - influence.mWeights.emplace_back(weights[j].vertex, weights[j].weight); - } + influence.mWeights.push_back({weights[j].vertex, weights[j].weight}); influence.mInvBindMatrix = data->bones[i].trafo.toMatrix(); influence.mBoundSphere = osg::BoundingSpheref(data->bones[i].boundSphereCenter, data->bones[i].boundSphereRadius); - map->mData.emplace_back(boneName, influence); + map->mData.push_back({boneName, influence}); } rig->setInfluenceMap(map); diff --git a/components/sceneutil/riggeometry.cpp b/components/sceneutil/riggeometry.cpp index b9201fdf6..c6ad7e9de 100644 --- a/components/sceneutil/riggeometry.cpp +++ b/components/sceneutil/riggeometry.cpp @@ -137,14 +137,13 @@ bool RigGeometry::initFromParentSkeleton(osg::NodeVisitor* nv) } mBoneNodesVector.clear(); - for (auto& bonePair : mBoneSphereVector->mData) + for (auto& boundPair : mBoneSphereVector->mData) { - const std::string& boneName = bonePair.first; - Bone* bone = mSkeleton->getBone(boneName); + Bone* bone = mSkeleton->getBone(boundPair.name); if (!bone) { mBoneNodesVector.push_back(nullptr); - Log(Debug::Error) << "Error: RigGeometry did not find bone " << boneName; + Log(Debug::Error) << "Error: RigGeometry did not find bone " << boundPair.name; continue; } @@ -155,12 +154,11 @@ bool RigGeometry::initFromParentSkeleton(osg::NodeVisitor* nv) { for (auto &weight : pair.first) { - const std::string& boneName = weight.first.first; - Bone* bone = mSkeleton->getBone(boneName); + Bone* bone = mSkeleton->getBone(weight.boneName); if (!bone) { mBoneNodesVector.push_back(nullptr); - Log(Debug::Error) << "Error: RigGeometry did not find bone " << boneName; + Log(Debug::Error) << "Error: RigGeometry did not find bone " << weight.boneName; continue; } @@ -218,7 +216,7 @@ void RigGeometry::cull(osg::NodeVisitor* nv) if (bone == nullptr) continue; - accumulateMatrix(weight.first.second, bone->mMatrixInSkeletonSpace, weight.second, resultMat); + accumulateMatrix(weight.bindMatrix, bone->mMatrixInSkeletonSpace, weight.value, resultMat); index++; } @@ -281,7 +279,7 @@ void RigGeometry::updateBounds(osg::NodeVisitor *nv) continue; index++; - osg::BoundingSpheref bs = boundPair.second; + osg::BoundingSpheref bs = boundPair.sphere; if (mGeomToSkelMatrix) transformBoundingSphere(bone->mMatrixInSkeletonSpace * (*mGeomToSkelMatrix), bs); else @@ -337,30 +335,21 @@ void RigGeometry::setInfluenceMap(osg::ref_ptr influenceMap) { mInfluenceMap = influenceMap; - typedef std::map > Vertex2BoneMap; + using Vertex2BoneMap = std::map>; Vertex2BoneMap vertex2BoneMap; mBoneSphereVector = new BoneSphereVector; mBoneSphereVector->mData.reserve(mInfluenceMap->mData.size()); mBone2VertexVector = new Bone2VertexVector; - for (auto& influencePair : mInfluenceMap->mData) + for (const BoneData& bone : mInfluenceMap->mData) { - const std::string& boneName = influencePair.first; - const BoneInfluence& bi = influencePair.second; - mBoneSphereVector->mData.emplace_back(boneName, bi.mBoundSphere); - - for (auto& weightPair: bi.mWeights) - { - std::vector& vec = vertex2BoneMap[weightPair.first]; - - vec.emplace_back(std::make_pair(boneName, bi.mInvBindMatrix), weightPair.second); - } + mBoneSphereVector->mData.push_back({bone.name, bone.influence.mBoundSphere}); + for (auto& weight : bone.influence.mWeights) + vertex2BoneMap[weight.vertex].push_back({bone.name, bone.influence.mInvBindMatrix, weight.value}); } Bone2VertexMap bone2VertexMap; for (auto& vertexPair : vertex2BoneMap) - { bone2VertexMap[vertexPair.second].emplace_back(vertexPair.first); - } mBone2VertexVector->mData.reserve(bone2VertexMap.size()); mBone2VertexVector->mData.assign(bone2VertexMap.begin(), bone2VertexMap.end()); diff --git a/components/sceneutil/riggeometry.hpp b/components/sceneutil/riggeometry.hpp index 801c172b3..5f1decf5f 100644 --- a/components/sceneutil/riggeometry.hpp +++ b/components/sceneutil/riggeometry.hpp @@ -25,17 +25,32 @@ namespace SceneUtil // Currently empty as this is difficult to implement. Technically we would need to compile both internal geometries in separate frames but this method is only called once. Alternatively we could compile just the static parts of the model. virtual void compileGLObjects(osg::RenderInfo& renderInfo) const {} + struct VertexWeight + { + unsigned short vertex; + float value; + }; + struct BoneInfluence { osg::Matrixf mInvBindMatrix; osg::BoundingSpheref mBoundSphere; - // - std::vector> mWeights; + std::vector mWeights; + }; + + struct BoneData + { + std::string name; + BoneInfluence influence; + bool operator<(const BoneData& other) const + { + return name < other.name; + } }; struct InfluenceMap : public osg::Referenced { - std::vector> mData; + std::vector mData; }; void setInfluenceMap(osg::ref_ptr influenceMap); @@ -79,23 +94,36 @@ namespace SceneUtil osg::ref_ptr mInfluenceMap; - typedef std::pair BoneBindMatrixPair; + struct BoneWeight + { + std::string boneName; + osg::Matrixf bindMatrix; + float value; + bool operator<(const BoneWeight& other) const + { + return boneName < other.boneName; + } + }; - typedef std::pair BoneWeight; - - typedef std::vector VertexList; - - typedef std::map, VertexList> Bone2VertexMap; + using VertexList = std::vector; + using BoneWeightList = std::vector; + using Bone2VertexMap = std::map; struct Bone2VertexVector : public osg::Referenced { - std::vector, VertexList>> mData; + std::vector> mData; }; osg::ref_ptr mBone2VertexVector; + struct BoneSphere + { + std::string name; + osg::BoundingSpheref sphere; + }; + struct BoneSphereVector : public osg::Referenced { - std::vector> mData; + std::vector mData; }; osg::ref_ptr mBoneSphereVector; std::vector mBoneNodesVector;