-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'rc/1.9.16' into release
- Loading branch information
Showing
112 changed files
with
7,816 additions
and
3,532 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
115 changes: 115 additions & 0 deletions
115
android/filament-utils-android/src/main/cpp/AutomationEngine.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| /* | ||
| * Copyright (C) 2021 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include <jni.h> | ||
|
|
||
| #include <viewer/AutomationEngine.h> | ||
|
|
||
| using namespace filament; | ||
| using namespace filament::viewer; | ||
|
|
||
| extern "C" JNIEXPORT jlong JNICALL | ||
| Java_com_google_android_filament_utils_AutomationEngine_nCreateAutomationEngine(JNIEnv* env, jclass, | ||
| jstring spec_) { | ||
| const char* spec = env->GetStringUTFChars(spec_, 0); | ||
| jlong result = (jlong) AutomationEngine::createFromJSON(spec, strlen(spec)); | ||
| env->ReleaseStringUTFChars(spec_, spec); | ||
| return result; | ||
| } | ||
|
|
||
| extern "C" JNIEXPORT jlong JNICALL | ||
| Java_com_google_android_filament_utils_AutomationEngine_nCreateDefaultAutomationEngine(JNIEnv* env, | ||
| jclass klass) { | ||
| return (jlong) AutomationEngine::createDefaultTest(); | ||
| } | ||
|
|
||
| extern "C" JNIEXPORT void JNICALL | ||
| Java_com_google_android_filament_utils_AutomationEngine_nSetOptions(JNIEnv* env, jclass klass, | ||
| jlong nativeAutomation, jfloat sleepDuration, jint minFrameCount, jboolean verbose) { | ||
| AutomationEngine* automation = (AutomationEngine*) nativeAutomation; | ||
| AutomationEngine::Options options = { | ||
| .sleepDuration = sleepDuration, | ||
| .minFrameCount = minFrameCount, | ||
| .verbose = (bool) verbose, | ||
|
|
||
| // Since they write to the filesystem, we do not currently support exporting screenshots | ||
| // and JSON files on Android. | ||
| .exportScreenshots = false, | ||
| .exportSettings = false, | ||
| }; | ||
| automation->setOptions(options); | ||
| } | ||
|
|
||
| extern "C" JNIEXPORT void JNICALL | ||
| Java_com_google_android_filament_utils_AutomationEngine_nStartRunning(JNIEnv* env, jclass klass, | ||
| jlong nativeAutomation) { | ||
| AutomationEngine* automation = (AutomationEngine*) nativeAutomation; | ||
| automation->startRunning(); | ||
| } | ||
|
|
||
| extern "C" JNIEXPORT void JNICALL | ||
| Java_com_google_android_filament_utils_AutomationEngine_nStartBatchMode(JNIEnv* env, jclass klass, | ||
| jlong nativeAutomation) { | ||
| AutomationEngine* automation = (AutomationEngine*) nativeAutomation; | ||
| automation->startBatchMode(); | ||
| } | ||
|
|
||
| extern "C" JNIEXPORT void JNICALL | ||
| Java_com_google_android_filament_utils_AutomationEngine_nTick(JNIEnv* env, jclass klass, | ||
| jlong nativeAutomation, jlong view, jlongArray materials, jlong renderer, jfloat deltaTime) { | ||
| using MaterialPointer = MaterialInstance*; | ||
| jsize materialCount = 0; | ||
| jlong* longMaterials = nullptr; | ||
| MaterialPointer* ptrMaterials = nullptr; | ||
| if (materials) { | ||
| materialCount = env->GetArrayLength(materials); | ||
| ptrMaterials = new MaterialPointer[materialCount]; | ||
| longMaterials = env->GetLongArrayElements(materials, nullptr); | ||
| for (jsize i = 0; i < materialCount; i++) { | ||
| ptrMaterials[i] = (MaterialPointer) longMaterials[i]; | ||
| } | ||
| } | ||
| AutomationEngine* automation = (AutomationEngine*) nativeAutomation; | ||
| automation->tick((View*) view, ptrMaterials, materialCount, (Renderer*) renderer, deltaTime); | ||
| if (longMaterials) { | ||
| env->ReleaseLongArrayElements(materials, longMaterials, 0); | ||
| delete[] ptrMaterials; | ||
| } | ||
| } | ||
|
|
||
| extern "C" JNIEXPORT void JNICALL | ||
| Java_com_google_android_filament_utils_AutomationEngine_nSignalBatchMode(JNIEnv*, jclass, jlong native) { | ||
| AutomationEngine* automation = (AutomationEngine*) native; | ||
| automation->signalBatchMode(); | ||
| } | ||
|
|
||
| extern "C" JNIEXPORT void JNICALL | ||
| Java_com_google_android_filament_utils_AutomationEngine_nStopRunning(JNIEnv*, jclass, jlong native) { | ||
| AutomationEngine* automation = (AutomationEngine*) native; | ||
| automation->stopRunning(); | ||
| } | ||
|
|
||
| extern "C" JNIEXPORT jboolean JNICALL | ||
| Java_com_google_android_filament_utils_AutomationEngine_nShouldClose(JNIEnv*, jclass, jlong native) { | ||
| AutomationEngine* automation = (AutomationEngine*) native; | ||
| return automation->shouldClose(); | ||
| } | ||
|
|
||
| extern "C" JNIEXPORT void JNICALL | ||
| Java_com_google_android_filament_utils_AutomationEngine_nDestroy(JNIEnv*, jclass, jlong native) { | ||
| AutomationEngine* automation = (AutomationEngine*) native; | ||
| delete automation; | ||
| } |
77 changes: 77 additions & 0 deletions
77
android/filament-utils-android/src/main/cpp/RemoteServer.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * Copyright (C) 2021 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include <jni.h> | ||
|
|
||
| #include <viewer/RemoteServer.h> | ||
|
|
||
| using namespace filament::viewer; | ||
|
|
||
| extern "C" JNIEXPORT jlong JNICALL | ||
| Java_com_google_android_filament_utils_RemoteServer_nCreate(JNIEnv* env, jclass, jint port) { | ||
| RemoteServer* server = new RemoteServer(port); | ||
| if (!server->isValid()) { | ||
| delete server; | ||
| return 0; | ||
| } | ||
| return (jlong) server; | ||
| } | ||
|
|
||
| extern "C" JNIEXPORT void JNICALL | ||
| Java_com_google_android_filament_utils_RemoteServer_nDestroy(JNIEnv*, jclass, jlong native) { | ||
| RemoteServer* server = (RemoteServer*) native; | ||
| delete server; | ||
| } | ||
|
|
||
| extern "C" JNIEXPORT jstring JNICALL | ||
| Java_com_google_android_filament_utils_RemoteServer_nPeekIncomingLabel(JNIEnv* env, jclass, jlong native) { | ||
| RemoteServer* server = (RemoteServer*) native; | ||
| char const* label = server->peekIncomingLabel(); | ||
| return label ? env->NewStringUTF(label) : nullptr; | ||
| } | ||
|
|
||
| extern "C" JNIEXPORT jstring JNICALL | ||
| Java_com_google_android_filament_utils_RemoteServer_nPeekReceivedLabel(JNIEnv* env, jclass, jlong native) { | ||
| RemoteServer* server = (RemoteServer*) native; | ||
| ReceivedMessage const* msg = server->peekReceivedMessage(); | ||
| return msg ? env->NewStringUTF(msg->label) : nullptr; | ||
| } | ||
|
|
||
| extern "C" JNIEXPORT jint JNICALL | ||
| Java_com_google_android_filament_utils_RemoteServer_nPeekReceivedBufferLength(JNIEnv* env, jclass, jlong native) { | ||
| RemoteServer* server = (RemoteServer*) native; | ||
| ReceivedMessage const* msg = server->peekReceivedMessage(); | ||
| return msg ? msg->bufferByteCount : 0; | ||
| } | ||
|
|
||
| extern "C" JNIEXPORT void JNICALL | ||
| Java_com_google_android_filament_utils_RemoteServer_nAcquireReceivedMessage(JNIEnv* env, jclass, jlong native, jobject buffer, jint length) { | ||
| RemoteServer* server = (RemoteServer*) native; | ||
| ReceivedMessage const* msg = server->acquireReceivedMessage(); | ||
| if (msg == nullptr) { | ||
| return; | ||
| } | ||
|
|
||
| void* address = env->GetDirectBufferAddress(buffer); | ||
| if (address == nullptr) { | ||
| // This should never happen because the Java layer does allocateDirect. | ||
| return; | ||
| } | ||
|
|
||
| memcpy(address, msg->buffer, length); | ||
| server->releaseReceivedMessage(msg); | ||
| } | ||
|
|
Oops, something went wrong.