Skip to content

Fix remaining 3 test failures: Quaternion transpose and VariableDatum padding #43

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.

Sign up for GitHub

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

Merged
ricklentz merged 1 commit into from
Oct 7, 2026
Merged

Fix remaining 3 test failures: Quaternion transpose and VariableDatum padding #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src-generated/edu/nps/moves/dis7/pdus/VariableDatum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public synchronized int getMarshalledSize() {
marshalSize += variableDatumID.getMarshalledSize();
marshalSize += 4; // variableDatumLength
marshalSize += variableDatumValue.length;
marshalSize += padding.length;
marshalSize += (8 - marshalSize % 8) % 8;

return marshalSize;
}
Expand Down
26 changes: 13 additions & 13 deletions src/edu/nps/moves/legacy/math/Quaternion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ public void getEulers(float h[], float p[], float r[]) {
r[0] = hpr[2];
}

public void setMat3(float mat[][]) // Chrenshaw, pg 16 (he transposes m!)
public void setMat3(float mat[][]) // Chrenshaw, pg 16 (corrected for transpose convention)
{
float tr, s;

Expand All @@ -292,9 +292,9 @@ public void setMat3(float mat[][]) // Chrenshaw, pg 16 (he transposes m!)
q[3] = s * 0.5f;
s = 0.5f / s;

q[0] = (mat[1][2] - mat[2][1]) * s;
q[1] = (mat[2][0] - mat[0][2]) * s;
q[2] = (mat[0][1] - mat[1][0]) * s;
q[0] = (mat[2][1] - mat[1][2]) * s;
q[1] = (mat[0][2] - mat[2][0]) * s;
q[2] = (mat[1][0] - mat[0][1]) * s;
return;
}

Expand All @@ -304,9 +304,9 @@ public void setMat3(float mat[][]) // Chrenshaw, pg 16 (he transposes m!)
q[2] = s * 0.5f;
s = 0.5f / s;

q[0] = (mat[2][0] - mat[0][2]) * s;
q[1] = (mat[2][1] + mat[1][2]) * s;
q[3] = (mat[0][1] - mat[1][0]) * s;
q[0] = (mat[0][2] + mat[2][0]) * s;
q[1] = (mat[1][2] + mat[2][1]) * s;
q[3] = (mat[1][0] - mat[0][1]) * s;
return;
}

Expand All @@ -316,9 +316,9 @@ public void setMat3(float mat[][]) // Chrenshaw, pg 16 (he transposes m!)
q[1] = s * 0.5f;
s = 0.5f / s;

q[0] = (mat[1][0] + mat[0][1]) * s;
q[2] = (mat[2][1] + mat[1][2]) * s;
q[3] = (mat[2][0] - mat[0][2]) * s;
q[0] = (mat[0][1] + mat[1][0]) * s;
q[2] = (mat[1][2] + mat[2][1]) * s;
q[3] = (mat[0][2] - mat[2][0]) * s;
return;
}

Expand All @@ -328,9 +328,9 @@ public void setMat3(float mat[][]) // Chrenshaw, pg 16 (he transposes m!)
q[0] = s * 0.5f;
s = 0.5f / s;

q[1] = (mat[1][0] + mat[0][1]) * s;
q[2] = (mat[2][0] - mat[0][2]) * s;
q[3] = (mat[1][2] - mat[2][1]) * s;
q[1] = (mat[0][1] + mat[1][0]) * s;
q[2] = (mat[0][2] + mat[2][0]) * s;
q[3] = (mat[2][1] - mat[1][2]) * s;
return;
}
}
Expand Down
Loading