Skip to content

Read bytes more efficiently #2137

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
stephengold merged 7 commits into from
Nov 17, 2023
Merged

Read bytes more efficiently #2137

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4fe0b4b
Read bytes more efficiently
tonihele Oct 29, 2023
9fe71f9
Read straight to the buffer
tonihele Nov 1, 2023
e4b9049
Epsilon as final
tonihele Nov 1, 2023
3c4af6f
Simple assert for reading malformed stream
tonihele Nov 1, 2023
28c2421
Stream might not have reached the end even if it doesn't return reque…
tonihele Nov 4, 2023
eafb19a
Stream might not have reached the end even if it doesn't return reque…
tonihele Nov 4, 2023
f8f884f
Refactor to method
tonihele Nov 4, 2023
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
56 changes: 34 additions & 22 deletions jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/GltfUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,19 +425,37 @@ private static void populateByteArray(byte[] array, LittleEndien stream, int cou
int stride = Math.max(dataLength, byteStride);
int end = count * stride + byteOffset;
stream.skipBytes(byteOffset);

if (dataLength == stride) {
read(stream, array, end - index);

return;
}

int arrayIndex = 0;
byte[] buffer = new byte[numComponents];
while (index < end) {
for (int i = 0; i < numComponents; i++) {
array[arrayIndex] = stream.readByte();
arrayIndex++;
}
read(stream, buffer, numComponents);
System.arraycopy(buffer, 0, array, arrayIndex, numComponents);
arrayIndex += numComponents;
if (dataLength < stride) {
stream.skipBytes(stride - dataLength);
}
index += stride;
}
}

private static void read(LittleEndien stream, byte[] buffer, int length) throws IOException {
int n = 0;
while (n < length) {
int cnt = stream.read(buffer, n, length - n);
if (cnt < 0) {
throw new AssetLoadException("Data ended prematurely");
}
n += cnt;
}
}

private static void populateShortArray(short[] array, LittleEndien stream, int count, int byteOffset, int byteStride, int numComponents, VertexBuffer.Format format) throws IOException {
int componentSize = format.getComponentSize();
int index = byteOffset;
Expand Down Expand Up @@ -737,30 +755,24 @@ public static void assertNotNull(Object o, String errorMessage) {
}
}

// public static boolean equalBindAndLocalTransforms(Joint b) {
// return equalsEpsilon(b.getBindPosition(), b.getLocalPosition())
// && equalsEpsilon(b.getBindRotation(), b.getLocalRotation())
// && equalsEpsilon(b.getBindScale(), b.getLocalScale());
// }

private static float epsilon = 0.0001f;
private static final float EPSILON = 0.0001f;

public static boolean equalsEpsilon(Vector3f v1, Vector3f v2) {
return FastMath.abs(v1.x - v2.x) < epsilon
&& FastMath.abs(v1.y - v2.y) < epsilon
&& FastMath.abs(v1.z - v2.z) < epsilon;
return FastMath.abs(v1.x - v2.x) < EPSILON
&& FastMath.abs(v1.y - v2.y) < EPSILON
&& FastMath.abs(v1.z - v2.z) < EPSILON;
}

public static boolean equalsEpsilon(Quaternion q1, Quaternion q2) {
return (FastMath.abs(q1.getX() - q2.getX()) < epsilon
&& FastMath.abs(q1.getY() - q2.getY()) < epsilon
&& FastMath.abs(q1.getZ() - q2.getZ()) < epsilon
&& FastMath.abs(q1.getW() - q2.getW()) < epsilon)
return (FastMath.abs(q1.getX() - q2.getX()) < EPSILON
&& FastMath.abs(q1.getY() - q2.getY()) < EPSILON
&& FastMath.abs(q1.getZ() - q2.getZ()) < EPSILON
&& FastMath.abs(q1.getW() - q2.getW()) < EPSILON)
||
(FastMath.abs(q1.getX() + q2.getX()) < epsilon
&& FastMath.abs(q1.getY() + q2.getY()) < epsilon
&& FastMath.abs(q1.getZ() + q2.getZ()) < epsilon
&& FastMath.abs(q1.getW() + q2.getW()) < epsilon);
(FastMath.abs(q1.getX() + q2.getX()) < EPSILON
&& FastMath.abs(q1.getY() + q2.getY()) < EPSILON
&& FastMath.abs(q1.getZ() + q2.getZ()) < EPSILON
&& FastMath.abs(q1.getW() + q2.getW()) < EPSILON);
}


Expand Down