Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,7 @@ if(MOMENTUM_BUILD_TESTING)
character_test_helpers
io_skeleton
io_test_helper
character_test_helpers_gtest
)

mt_test(
Expand Down
2 changes: 2 additions & 0 deletions cmake/build_variables.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,7 @@ io_skeleton_public_headers = [
"io/skeleton/parameter_limits_io.h",
"io/skeleton/parameter_transform_io.h",
"io/skeleton/parameters_io.h",
"io/skeleton/utility.h",
]

io_skeleton_sources = [
Expand All @@ -392,6 +393,7 @@ io_skeleton_sources = [
"io/skeleton/parameter_limits_io.cpp",
"io/skeleton/parameter_transform_io.cpp",
"io/skeleton/parameters_io.cpp",
"io/skeleton/utility.cpp",
]

io_skeleton_test_sources = [
Expand Down
32 changes: 27 additions & 5 deletions momentum/io/skeleton/parameter_limits_io.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#include "momentum/character/parameter_transform.h"
#include "momentum/character/skeleton.h"
#include "momentum/common/log.h"
#include "momentum/common/string.h"
#include "momentum/io/skeleton/utility.h"
#include "momentum/math/constants.h"
#include "momentum/math/utility.h"

Expand Down Expand Up @@ -609,23 +611,30 @@ void parseEllipsoid(const std::string& jointName, ParameterLimits& pl, Tokenizer

} // namespace

// Internal overload that accepts SectionContent
ParameterLimits parseParameterLimits(
const std::string& data,
const io_detail::SectionContent& content,
const Skeleton& skeleton,
const ParameterTransform& parameterTransform) {
ParameterLimits pl;

std::istringstream f(data);
auto iterator = content.begin();
std::string line;
size_t lineIndex = 0;
while (std::getline(f, line)) {
++lineIndex;
while (iterator.getline(line)) {
const size_t lineIndex = iterator.currentLine();

// erase all comments
line = line.substr(0, line.find_first_of('#'));

// Skip empty lines
if (trim(line).empty()) {
continue;
}

// ignore everything but limits
if (line.find("limit") != 0) {
MT_LOGW(
"Ignoring invalid line under [ParameterLimits] section at line {}: {}", lineIndex, line);
continue;
}

Expand Down Expand Up @@ -672,6 +681,19 @@ ParameterLimits parseParameterLimits(
return pl;
}

// Public API wrapper for backward compatibility
ParameterLimits parseParameterLimits(
const std::string& data,
const Skeleton& skeleton,
const ParameterTransform& parameterTransform,
size_t lineOffset) {
io_detail::SectionContent content;
if (!data.empty()) {
content.addSegment(data, lineOffset);
}
return parseParameterLimits(content, skeleton, parameterTransform);
}

namespace {

std::string vecToString(Eigen::Ref<const Eigen::VectorXf> vec) {
Expand Down
15 changes: 14 additions & 1 deletion momentum/io/skeleton/parameter_limits_io.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,24 @@

namespace momentum {

namespace io_detail {
// Forward declaration
class SectionContent;
} // namespace io_detail

// Internal overload for use within momentum parsing
ParameterLimits parseParameterLimits(
const std::string& data,
const io_detail::SectionContent& content,
const Skeleton& skeleton,
const ParameterTransform& parameterTransform);

// Public API for external use
ParameterLimits parseParameterLimits(
const std::string& data,
const Skeleton& skeleton,
const ParameterTransform& parameterTransform,
size_t lineOffset = 0);

std::string writeParameterLimits(
const ParameterLimits& parameterLimits,
const Skeleton& skeleton,
Expand Down
Loading
Loading