From 36907c32447111006bdc23301b8c84ea4591f729 Mon Sep 17 00:00:00 2001 From: ButterscotchVanilla Date: Wed, 1 Dec 2021 20:21:55 -0500 Subject: [PATCH] Add closeOutput for specific stream --- .../java/dev/slimevr/posestreamer/BVHFileStream.java | 4 ++-- .../java/dev/slimevr/posestreamer/PoseStreamer.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java b/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java index 9556ccbd6..294d5adfa 100644 --- a/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java +++ b/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java @@ -156,14 +156,14 @@ public class BVHFileStream extends PoseDataStream { } private void writeNodeHierarchyRotation(TransformNodeWrapper node, Quaternion inverseRootRot) throws IOException { - rotBuf = node.localTransform.getRotation(rotBuf); + rotBuf = node.worldTransform.getRotation(rotBuf); // Adjust to local rotation if (inverseRootRot != null) { rotBuf = node.calculateLocalRotationInverse(inverseRootRot, rotBuf); } - // Yaw, roll, pitch + // Yaw (Z), roll (X), pitch (Y) angleBuf = rotBuf.toAngles(angleBuf); // Output in order of Z, X, Y writer.write(Float.toString(angleBuf[2] * FastMath.RAD_TO_DEG) + " " + Float.toString(angleBuf[0] * FastMath.RAD_TO_DEG) + " " + Float.toString(-angleBuf[1] * FastMath.RAD_TO_DEG)); diff --git a/src/main/java/dev/slimevr/posestreamer/PoseStreamer.java b/src/main/java/dev/slimevr/posestreamer/PoseStreamer.java index e339be4e9..a95fb066e 100644 --- a/src/main/java/dev/slimevr/posestreamer/PoseStreamer.java +++ b/src/main/java/dev/slimevr/posestreamer/PoseStreamer.java @@ -102,9 +102,15 @@ public class PoseStreamer { PoseDataStream poseFileStream = this.poseFileStream; if (poseFileStream != null) { - poseFileStream.writeFooter(skeleton); - poseFileStream.close(); + closeOutput(poseFileStream); this.poseFileStream = null; } } + + public synchronized void closeOutput(PoseDataStream poseFileStream) throws IOException { + if (poseFileStream != null) { + poseFileStream.writeFooter(skeleton); + poseFileStream.close(); + } + } }