Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 20:36:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

playback recording back through the standard inputs

Browse source
This commit is contained in:
Dante Ruiz 2017-06-01 18:51:24 +01:00
parent a1e0737928
commit e52765b641
3 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/controllers/src/controllers/UserInputMapper.cpp
View file

@ -332,7 +332,7 @@ QString UserInputMapper::getActionName(Action action) const {
QString UserInputMapper::getStandardPoseName(uint16_t pose) { QString UserInputMapper::getStandardPoseName(uint16_t pose) {
Locker locker(_lock); Locker locker(_lock);
for (auto posePair : getStandardInputs()) { for (auto posePair : getStandardInputs()) {
if (posePair.first.channel == pose) { if (posePair.first.channel == pose && posePair.first.getType() == ChannelType::POSE) {
return posePair.second; return posePair.second;
} }
} }

3
libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.cpp
View file

@ -36,9 +36,6 @@ void ActionEndpoint::apply(const Pose& value, const Pointer& source) {
auto userInputMapper = DependencyManager::get<UserInputMapper>(); auto userInputMapper = DependencyManager::get<UserInputMapper>();
QString actionName = userInputMapper->getActionName(Action(_input.getChannel())); QString actionName = userInputMapper->getActionName(Action(_input.getChannel()));
inputRecorder->setActionState(actionName, _currentPose); inputRecorder->setActionState(actionName, _currentPose);
if (inputRecorder->isPlayingback()) {
//_currentPose = inputRecorder->getPoseState(actionName);
}
if (!_currentPose.isValid()) { if (!_currentPose.isValid()) {
return; return;

1
libraries/controllers/src/controllers/impl/endpoints/StandardEndpoint.h
View file

@ -49,7 +49,6 @@ public:
if (inputRecorder->isPlayingback()) { if (inputRecorder->isPlayingback()) {
auto userInputMapper = DependencyManager::get<UserInputMapper>(); auto userInputMapper = DependencyManager::get<UserInputMapper>();
QString actionName = userInputMapper->getStandardPoseName(_input.getChannel()); QString actionName = userInputMapper->getStandardPoseName(_input.getChannel());
qDebug() << actionName;
return inputRecorder->getPoseState(actionName); return inputRecorder->getPoseState(actionName);
} }
return VirtualEndpoint::pose(); return VirtualEndpoint::pose();