Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Flavor] Add Alpha flavor #221

Merged
merged 16 commits into from
Mar 24, 2025
Merged
Changes from 1 commit
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
Prev Previous commit
[Flavor] FileCommand fixes and switching yaw and pitch in alpha
ScribbleTAS committed Mar 23, 2025
commit 97d5a131b64f1f6eab61cacdf9de27b960d7ef7d
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ public String[] getFileCommandNames() {
@Override
public PlaybackFileCommandContainer onSerialiseInlineComment(long tick, TickContainer tickContainer) {
PlaybackFileCommandContainer fileCommandContainer = new PlaybackFileCommandContainer();
if (label.get(tick).get("label") != null) {
if (label.size() != 0 && label.get(tick).get("label") != null) {
fileCommandContainer = label.get(tick);
}
return fileCommandContainer;
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ public String[] getFileCommandNames() {
@Override
public PlaybackFileCommandContainer onSerialiseInlineComment(long tick, TickContainer tickContainer) {
PlaybackFileCommandContainer fileCommandContainer = new PlaybackFileCommandContainer();
if (hud.get(tick).get("hud") != null) {
if (hud.size() != 0 && hud.get(tick).get("hud") != null) {
fileCommandContainer = hud.get(tick);
}
return fileCommandContainer;
Original file line number Diff line number Diff line change
@@ -232,7 +232,7 @@ protected List<String> serialiseCameraAngle(VirtualCameraAngle subticks) {
*/
float pitch = subticks.getPitch() == null ? 0f : subticks.getPitch();
float yaw = subticks.getYaw() == null ? 0f : subticks.getYaw();
out.add("Camera:" + yaw + ";" + pitch);
out.add("Camera:" + pitch + ";" + yaw);
return out;
}

@@ -261,7 +261,7 @@ protected String serialiseFileCommandsEndline(List<PlaybackFileCommand> fileComm
List<String> serialisedCommands = new ArrayList<>();
for (PlaybackFileCommand command : fileCommands) {
if ("desyncMonitor".equals(command.getName())) {
serialisedCommands.add(String.format("Monitoring:%s", String.join(" ", command.getArgs())));
serialisedCommands.add(String.format("Monitoring:%s 0", String.join(" ", command.getArgs())));
}
}
return String.join(" ", serialisedCommands);
@@ -508,8 +508,8 @@ protected VirtualCameraAngle deserialiseCameraAngle(List<String> cameraAngleStri
Matcher matcher = extract("Camera:(.+?);(.+)", line);

if (matcher.find()) {
String cameraYawString = matcher.group(1);
String cameraPitchString = matcher.group(2);
String cameraYawString = matcher.group(2);
String cameraPitchString = matcher.group(1);

Float cameraYaw = null;
Float cameraPitch = null;