blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

refactor collada: Added utility functions bc_string_before() and bc_string_after()

This commit is contained in:
Gaia Clary 2019-06-02 19:02:38 +02:00
parent 820e4d4303
commit 0731b88ddb
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/collada/BCAnimationCurve.cpp
View File

@ -132,7 +132,31 @@ const bool BCAnimationCurve::is_of_animation_type(BC_animation_type type) const
const std::string BCAnimationCurve::get_channel_target() const
{
const std::string path = curve_key.get_path();
return bc_string_after(path, '.');
if (bc_startswith(path, "pose.bones")) {
return bc_string_after(path, "pose.bones");
}
return bc_string_after(path, ".");
}
const std::string BCAnimationCurve::get_channel_type() const
{
const std::string channel = get_channel_target();
return bc_string_after(channel, ".");
}
const std::string BCAnimationCurve::get_channel_posebone() const
{
const std::string channel = get_channel_target();
std::string pose_bone_name = bc_string_before(channel, ".");
if (pose_bone_name == channel) {
pose_bone_name = "";
}
else {
pose_bone_name = bc_string_after(pose_bone_name, "\"[");
pose_bone_name = bc_string_before(pose_bone_name, "]\"");
}
return pose_bone_name;
}
const std::string BCAnimationCurve::get_animation_name(Object *ob) const

23
source/blender/collada/collada_utils.h
View File

@ -160,11 +160,20 @@ extern int bc_get_active_UVLayer(Object *ob);
std::string bc_find_bonename_in_path(std::string path, std::string probe);
inline std::string bc_string_after(const std::string &s, const char c)
inline std::string bc_string_after(const std::string &s, const std::string probe)
{
size_t i = s.rfind(c, s.length());
size_t i = s.rfind(probe);
if (i != std::string::npos) {
return (s.substr(i + 1, s.length() - i));
return (s.substr(i + probe.length(), s.length() - i));
}
return (s);
}
inline std::string bc_string_before(const std::string &s, const std::string probe)
{
size_t i = s.find(probe);
if (i != std::string::npos) {
return s.substr(0, i);
}
return (s);
}
@ -177,6 +186,14 @@ inline bool bc_startswith(std::string const &value, std::string const &starting)
return (value.substr(0, starting.size()) == starting);
}
inline bool bc_endswith(const std::string &value, const std::string &ending)
{
if (ending.size() > value.size())
return false;
return value.compare(value.size() - ending.size(), ending.size(), ending) == 0;
}
#if 0 /* UNUSED */
inline bool bc_endswith(std::string const &value, std::string const &ending)
{