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

solve issue #1933 (unsupported operation in FbxNode) #1936

Merged
merged 1 commit into from
Jan 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
71 changes: 70 additions & 1 deletion jme3-core/src/main/java/com/jme3/math/Matrix4f.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009-2022 jMonkeyEngine
* Copyright (c) 2009-2023 jMonkeyEngine
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -2460,6 +2460,75 @@ public void multLocal(Quaternion rotation) {
multLocal(matrix4f);
}

/**
* Tests for approximate equality with the specified matrix, using the
* specified tolerance. If {@code other} is null, false is returned. Either
* way, the current instance is unaffected.
*
* @param other the matrix to compare (unaffected) or null for none
* @param epsilon the tolerance for each element
* @return true if all 16 elements are within tolerance, otherwise false
*/
public boolean isSimilar(Matrix4f other, float epsilon) {
if (other == null) {
return false;
}

if (Float.compare(Math.abs(other.m00 - m00), epsilon) > 0) {
return false;
}
if (Float.compare(Math.abs(other.m01 - m01), epsilon) > 0) {
return false;
}
if (Float.compare(Math.abs(other.m02 - m02), epsilon) > 0) {
return false;
}
if (Float.compare(Math.abs(other.m03 - m03), epsilon) > 0) {
return false;
}

if (Float.compare(Math.abs(other.m10 - m10), epsilon) > 0) {
return false;
}
if (Float.compare(Math.abs(other.m11 - m11), epsilon) > 0) {
return false;
}
if (Float.compare(Math.abs(other.m12 - m12), epsilon) > 0) {
return false;
}
if (Float.compare(Math.abs(other.m13 - m13), epsilon) > 0) {
return false;
}

if (Float.compare(Math.abs(other.m20 - m20), epsilon) > 0) {
return false;
}
if (Float.compare(Math.abs(other.m21 - m21), epsilon) > 0) {
return false;
}
if (Float.compare(Math.abs(other.m22 - m22), epsilon) > 0) {
return false;
}
if (Float.compare(Math.abs(other.m23 - m23), epsilon) > 0) {
return false;
}

if (Float.compare(Math.abs(other.m30 - m30), epsilon) > 0) {
return false;
}
if (Float.compare(Math.abs(other.m31 - m31), epsilon) > 0) {
return false;
}
if (Float.compare(Math.abs(other.m32 - m32), epsilon) > 0) {
return false;
}
if (Float.compare(Math.abs(other.m33 - m33), epsilon) > 0) {
return false;
}

return true;
}

/**
* Creates a copy. The current instance is unaffected.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009-2021 jMonkeyEngine
* Copyright (c) 2009-2023 jMonkeyEngine
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -159,7 +159,7 @@ public Transform computeFbxLocalTransform() {

public void setWorldBindPose(Matrix4f worldBindPose) {
if (cachedWorldBindPose != null) {
if (!cachedWorldBindPose.equals(worldBindPose)) {
if (!cachedWorldBindPose.isSimilar(worldBindPose, 1e-6f)) {
throw new UnsupportedOperationException("Bind poses don't match");
}
}
Expand Down