Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-27 20:35:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

got input recording to work

Browse source
This commit is contained in:
Dante Ruiz 2017-04-24 19:57:38 +01:00
parent 64fcfd33a4
commit d057dfebf0
3 changed files with 86 additions and 14 deletions
interface
resources/qml/hifi/tablet
InputRecorder.qml
src
Application.cpp
libraries/controllers/src/controllers
InputRecorder.cpp

14
interface/resources/qml/hifi/tablet/InputRecorder.qml
View file

@ -110,6 +110,20 @@ Rectangle {
}
}
HifiControls.Button {
id: playBack
anchors.right: browse.left
anchors.top: selectedFile.bottom
anchors.topMargin: 10
text: "Playback"
color: hifi.buttons.black
enabled: true
onClicked: {
sendToScript({method: "playback"});
}
}
function getFileSelected(file) {
console.log("------------> file selected <----------------");

5
interface/src/Application.cpp
View file

@ -2740,7 +2740,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
offscreenUi->load("Browser.qml");
} else if (isOption) {
controller::InputRecorder* inputRecorder = controller::InputRecorder::getInstance();
inputRecorder->saveRecording();
inputRecorder->stopPlayback();
}
break;
@ -2939,9 +2939,6 @@ void Application::keyPressEvent(QKeyEvent* event) {
Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, !isFirstPersonChecked);
Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, isFirstPersonChecked);
cameraMenuChanged();
} else if (isOption) {
controller::InputRecorder* inputRecorder = controller::InputRecorder::getInstance();
inputRecorder->toggleRecording();
}
break;
}

81
libraries/controllers/src/controllers/InputRecorder.cpp
View file

@ -57,6 +57,36 @@ namespace controller {
return newPose;
}
Pose jsonObjectToPose(const QJsonObject object) {
Pose pose;
QJsonArray translation = object["translation"].toArray();
QJsonArray rotation = object["rotation"].toArray();
QJsonArray velocity = object["velocity"].toArray();
QJsonArray angularVelocity = object["angularVelocity"].toArray();
pose.valid = object["valid"].toBool();
pose.translation.x = translation[0].toDouble();
pose.translation.y = translation[1].toDouble();
pose.translation.z = translation[2].toDouble();
pose.rotation.x = rotation[0].toDouble();
pose.rotation.y = rotation[1].toDouble();
pose.rotation.z = rotation[2].toDouble();
pose.rotation.w = rotation[3].toDouble();
pose.velocity.x = velocity[0].toDouble();
pose.velocity.y = velocity[1].toDouble();
pose.velocity.z = velocity[2].toDouble();
pose.angularVelocity.x = angularVelocity[0].toDouble();
pose.angularVelocity.y = angularVelocity[1].toDouble();
pose.angularVelocity.z = angularVelocity[2].toDouble();
return pose;
}
void exportToFile(QJsonObject& object) {
if (!QDir(SAVE_DIRECTORY).exists()) {
QDir().mkdir(SAVE_DIRECTORY);
@ -65,6 +95,7 @@ namespace controller {
QString timeStamp = QDateTime::currentDateTime().toString(Qt::ISODate);
timeStamp.replace(":", "-");
QString fileName = SAVE_DIRECTORY + FILE_PREFIX_NAME + timeStamp + COMPRESS_EXTENSION;
qDebug() << fileName;
QFile saveFile (fileName);
if (!saveFile.open(QIODevice::WriteOnly)) {
qWarning() << "could not open file: " << fileName;
@ -75,16 +106,19 @@ namespace controller {
saveFile.write(compressedData);
}
bool openFile(const QString& file, QJsonObject& object) {
QJsonObject openFile(const QString& file, bool& status) {
QJsonObject object;
QFile openFile(file);
if (!openFile.open(QIODevice::ReadOnly)) {
qWarning() << "could not open file: " << file;
return false;
status = false;
return object;
}
QByteArray compressedData = qUncompress(openFile.readAll());
QJsonDocument jsonDoc = QJsonDocument::fromBinaryData(compressedData);
QJsonDocument jsonDoc = QJsonDocument::fromJson(compressedData);
object = jsonDoc.object();
return true;
status = true;
return object;
}
InputRecorder::InputRecorder() {}
@ -132,15 +166,42 @@ namespace controller {
}
void InputRecorder::loadRecording(const QString& path) {
QFileInfo info(path);
QString extension = info.suffix();
resetFrame();
_poseStateList.clear();
_actionStateList.clear();
QString filePath = path;
filePath.remove(0,8);
QFileInfo info(filePath);
QString extension = info.suffix();
if (extension != "gz") {
qWarning() << "Could not open file of that type";
qWarning() << "Could not open file of type " << extension;
return;
}
QJsonObject data;
bool success = openFile(path, data);
qDebug() << "-------------------> loading file -------------->";
bool success = false;
QJsonObject data = openFile(info.absoluteFilePath(), success);
int count = 0;
if (success) {
_framesRecorded = data["frameCount"].toInt();
QJsonArray actionArrayList = data["actionList"].toArray();
QJsonArray poseArrayList = data["poseList"].toArray();
for (int actionIndex = 0; actionIndex < actionArrayList.size(); actionIndex++) {
QJsonArray actionState = actionArrayList[actionIndex].toArray();
for (int index = 0; index < actionState.size(); index++) {
_currentFrameActions[index] = actionState[index].toInt();
}
_actionStateList.push_back(_currentFrameActions);
_currentFrameActions = ActionStates(toInt(Action::NUM_ACTIONS));
}
for (int poseIndex = 0; poseIndex < poseArrayList.size(); poseIndex++) {
QJsonArray poseState = poseArrayList[poseIndex].toArray();
for (int index = 0; index < poseState.size(); index++) {
_currentFramePoses[index] = jsonObjectToPose(poseState[index].toObject());
}
_poseStateList.push_back(_currentFramePoses);
_currentFramePoses = PoseStates(toInt(Action::NUM_ACTIONS));
}
}
}
void InputRecorder::stopRecording() {