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.

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

[APP-21970] Fix local reference table overflow #10

Open
wants to merge 1 commit into
base: feature/avatar
Choose a base branch
from
Open

[APP-21970] Fix local reference table overflow #10

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
28 changes: 28 additions & 0 deletions android/gltfio-android/src/main/cpp/FilamentAsset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,3 +223,31 @@ Java_com_google_android_filament_gltfio_FilamentAsset_nReleaseSourceData(JNIEnv*
FilamentAsset* asset = (FilamentAsset*) nativeAsset;
asset->releaseSourceData();
}


extern "C" JNIEXPORT jstring JNICALL
Java_com_google_android_filament_gltfio_FilamentAsset_nGetResourceUri(JNIEnv* env, jclass,
jlong nativeAsset,
jint index) {
FilamentAsset* asset = (FilamentAsset*) nativeAsset;
int n_index = (int)index;
if (n_index>=0 && n_index< asset->getResourceUriCount()) {
auto resourceUris = asset->getResourceUris();
return env->NewStringUTF(resourceUris[n_index]);
}
return nullptr;
}

extern "C" JNIEXPORT void JNICALL
Java_com_google_android_filament_gltfio_FilamentAsset_nGetResourceUrisBySize(JNIEnv* env, jclass,
jlong nativeAsset,
jobjectArray result,
jint index, jint size) {
FilamentAsset* asset = (FilamentAsset*) nativeAsset;
auto resourceUris = asset->getResourceUris();
int n_index = (int)index;
int n_size = (int)size;
for (int i = n_index, j = 0; i < asset->getResourceUriCount() && j < n_size; ++i,++j) {
env->SetObjectArrayElement(result, (jsize) i, env->NewStringUTF(resourceUris[i]));
}
}
14 changes: 12 additions & 2 deletions android/gltfio-android/src/main/java/com/google/android/filament/gltfio/FilamentAsset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,15 @@ public String getName(@Entity int entity) {
* Gets resource URIs for all externally-referenced buffers.
*/
public @NonNull String[] getResourceUris() {
String[] uris = new String[nGetResourceUriCount(mNativeObject)];
nGetResourceUris(mNativeObject, uris);
int count = nGetResourceUriCount(mNativeObject);
String[] uris = new String[count];
int MAX_SIZE = 200;
for (int i = 0; i < count; ) {
int size = count - i;
if (size > MAX_SIZE) size = MAX_SIZE;
nGetResourceUrisBySize(mNativeObject, uris, i, size);
i += size;
}
return uris;
}

Expand Down Expand Up @@ -256,4 +263,7 @@ void clearNativeObject() {
private static native int nGetResourceUriCount(long nativeAsset);
private static native void nGetResourceUris(long nativeAsset, String[] result);
private static native void nReleaseSourceData(long nativeAsset);

private static native String nGetResourceUri(long nativeAsset, int index);
private static native void nGetResourceUrisBySize(long nativeAsset, String[] result, int index, int size);
}