From 7ef6b3cb62dbca3a5f60db3fe8b41f93837500e6 Mon Sep 17 00:00:00 2001 From: unelsson Date: Fri, 14 Oct 2022 14:32:20 +0300 Subject: [PATCH] automatic clang format --- components/resource/keyframemanager.cpp | 91 +++++++------------------ 1 file changed, 23 insertions(+), 68 deletions(-) diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp index b98ed5396b..8f35341334 100644 --- a/components/resource/keyframemanager.cpp +++ b/components/resource/keyframemanager.cpp @@ -31,104 +31,59 @@ namespace Resource , mVFS(vfs) { } - + bool RetrieveAnimationsVisitor::belongsToLeftUpperExtremity(const std::string& name) { const int bodypartCount = 25; - static const std::array boneNames = { - "bip01_l_clavicle", - "left_clavicle", - "bip01_l_upperarm", - "left_upper_arm", - "bip01_l_forearm", - "bip01_l_hand", - "left_hand", - "left_wrist", - "shield_bone", - "bip01_l_pinky1", - "bip01_l_pinky2", - "bip01_l_pinky3", - "bip01_l_ring1", - "bip01_l_ring2", - "bip01_l_ring3", - "bip01_l_middle1", - "bip01_l_middle2", - "bip01_l_middle3", - "bip01_l_pointer1", - "bip01_l_pointer2", - "bip01_l_pointer3", - "bip01_l_thumb1", - "bip01_l_thumb2", - "bip01_l_thumb3", - "left_forearm" - }; - + static const std::array boneNames + = { "bip01_l_clavicle", "left_clavicle", "bip01_l_upperarm", "left_upper_arm", "bip01_l_forearm", + "bip01_l_hand", "left_hand", "left_wrist", "shield_bone", "bip01_l_pinky1", "bip01_l_pinky2", + "bip01_l_pinky3", "bip01_l_ring1", "bip01_l_ring2", "bip01_l_ring3", "bip01_l_middle1", + "bip01_l_middle2", "bip01_l_middle3", "bip01_l_pointer1", "bip01_l_pointer2", "bip01_l_pointer3", + "bip01_l_thumb1", "bip01_l_thumb2", "bip01_l_thumb3", "left_forearm" }; + for (unsigned short int i = 0; i < bodypartCount; i++) { if (name == boneNames[i]) return true; } - + return false; } - + bool RetrieveAnimationsVisitor::belongsToRightUpperExtremity(const std::string& name) { const int bodypartCount = 25; - static const std::array boneNames = { - "bip01_r_clavicle", - "right_clavicle", - "bip01_r_upperarm", - "right_upper_arm", - "bip01_r_forearm", - "bip01_r_hand", - "right_hand", - "right_wrist", - "bip01_r_thumb1", - "bip01_r_thumb2", - "bip01_r_thumb3", - "weapon_bone", - "bip01_r_pinky1", - "bip01_r_pinky2", - "bip01_r_pinky3", - "bip01_r_ring1", - "bip01_r_ring2", - "bip01_r_ring3", - "bip01_r_middle1", - "bip01_r_middle2", - "bip01_r_middle3", - "bip01_r_pointer1", - "bip01_r_pointer2", - "bip01_r_pointer3", - "right_forearm" - }; - + static const std::array boneNames = { "bip01_r_clavicle", "right_clavicle", + "bip01_r_upperarm", "right_upper_arm", "bip01_r_forearm", "bip01_r_hand", "right_hand", "right_wrist", + "bip01_r_thumb1", "bip01_r_thumb2", "bip01_r_thumb3", "weapon_bone", "bip01_r_pinky1", "bip01_r_pinky2", + "bip01_r_pinky3", "bip01_r_ring1", "bip01_r_ring2", "bip01_r_ring3", "bip01_r_middle1", "bip01_r_middle2", + "bip01_r_middle3", "bip01_r_pointer1", "bip01_r_pointer2", "bip01_r_pointer3", "right_forearm" }; + for (unsigned short int i = 0; i < bodypartCount; i++) { if (name == boneNames[i]) return true; } - + return false; } bool RetrieveAnimationsVisitor::belongsToTorso(const std::string& name) { const int bodypartCount = 8; - static const std::array boneNames = { - "bip01_spine1", "bip01_spine2", "bip01_neck", "bip01_head", "head", "neck", "chest", "groin" - }; - + static const std::array boneNames + = { "bip01_spine1", "bip01_spine2", "bip01_neck", "bip01_head", "head", "neck", "chest", "groin" }; + for (unsigned short int i = 0; i < bodypartCount; i++) { if (name == boneNames[i]) return true; } - + return false; } - void RetrieveAnimationsVisitor::addKeyframeController(const std::string& name, const osg::Node& node) { osg::ref_ptr callback = new SceneUtil::OsgAnimationController(); @@ -155,7 +110,7 @@ namespace Resource const osgAnimation::ChannelList& channels = animation->getChannels(); for (const auto& channel : channels) - { + { if (name == "Bip01 R Clavicle") { if (!belongsToRightUpperExtremity(channel->getTargetName())) @@ -174,7 +129,7 @@ namespace Resource else if (belongsToRightUpperExtremity(channel->getTargetName()) || belongsToLeftUpperExtremity(channel->getTargetName()) || belongsToTorso(channel->getTargetName())) - continue; + continue; mergedAnimationTrack->addChannel(channel.get()->clone()); // is ->clone needed? }