maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix surface init on Android

Browse Source
This commit is contained in:
Nick Fisher
2023-09-27 14:21:53 +08:00
parent 908c76d6c3
commit 93cb9a1307
3 changed files with 126 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
android/src/main/cpp/FilamentAndroid.cpp
View File

@@ -3,24 +3,11 @@
extern "C" { extern "C" {
#include "PolyvoxFilamentApi.h" void* get_native_window_from_surface(
const void* create_filament_viewer_android(
jobject surface, JNIEnv* env, ResourceLoaderWrapper* loaderWrapper
) {
ANativeWindow* window = ANativeWindow_fromSurface(env, surface);
return create_filament_viewer(window,loaderWrapper);
}
void create_swap_chain_android(
const void* const viewer,
jobject surface, jobject surface,
JNIEnv* env, JNIEnv* env
uint32_t width,
uint32_t height
) { ) {
ANativeWindow* window = ANativeWindow_fromSurface(env, surface); return ANativeWindow_fromSurface(env, surface);
create_swap_chain(viewer, window, width, height);
} }
} }

12
android/src/main/kotlin/app/polyvox/filament/FilamentInterop.kt
View File

@@ -26,15 +26,9 @@ interface FreeResourceFromOwner : Callback {
} }
interface FilamentInterop : Library { interface FilamentInterop : Library {
fun create_filament_viewer(context:Pointer, loader:Pointer) : Pointer;
fun create_swap_chain(viewer: Pointer, window:Pointer?, width:Int, height:Int); fun create_swap_chain(viewer: Pointer, window:Pointer?, width:Int, height:Int);
fun get_native_window_from_surface(surface:Object, env:JNIEnv) : Pointer;
fun create_swap_chain_android(viewer: Pointer, surface:Object,
env:JNIEnv, width:Int, height:Int);
fun create_filament_viewer_android(
surface:Object,
env:JNIEnv,
resourceLoader:Pointer
) : Pointer;
fun delete_filament_viewer(viewer: Any?) fun delete_filament_viewer(viewer: Any?)
fun get_asset_manager(viewer: Any?): Any? fun get_asset_manager(viewer: Any?): Any?
fun create_render_target(viewer: Any?, texture_id: Int, width: Int, height: Int) fun create_render_target(viewer: Any?, texture_id: Int, width: Int, height: Int)
@@ -95,8 +89,6 @@ fun set_camera_focus_distance(viewer: Any?, focus_distance: Float)
fun hide_mesh(asset_manager: Any?, asset: EntityId, mesh_name: String): Int fun hide_mesh(asset_manager: Any?, asset: EntityId, mesh_name: String): Int
fun reveal_mesh(asset_manager: Any?, asset: EntityId, mesh_name: String): Int fun reveal_mesh(asset_manager: Any?, asset: EntityId, mesh_name: String): Int
fun ios_dummy() fun ios_dummy()
fun create_filament_viewer(context:Long, loader:Pointer) : Pointer;
fun make_resource_loader(loadResourceFromOwner: LoadResourceFromOwner, freeResource: FreeResourceFromOwner, owner:Pointer?) : Pointer; fun make_resource_loader(loadResourceFromOwner: LoadResourceFromOwner, freeResource: FreeResourceFromOwner, owner:Pointer?) : Pointer;
} }

240
android/src/main/kotlin/app/polyvox/filament/PolyvoxFilamentPlugin.kt
View File

@@ -99,114 +99,114 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Lo
Log.e("polyvox_filament", call.method, null) Log.e("polyvox_filament", call.method, null)
when (call.method) { when (call.method) {
"createTexture" -> { "createTexture" -> {
if(_glTextureId != 0) { // if(_glTextureId != 0) {
result.success(_glTextureId) // result.success(_glTextureId)
return // return
} // }
if(_glContext == null) { // if(_glContext == null) {
_glContext = EGL14.eglGetCurrentContext() // _glContext = EGL14.eglGetCurrentContext()
if (_glContext == EGL14.EGL_NO_CONTEXT) { // if (_glContext == EGL14.EGL_NO_CONTEXT) {
// if(surfaceTextureEntry != null) { // // if(surfaceTextureEntry != null) {
// result.error("ERR", "Surface texture already exists. Call destroyTexture before creating a new one", null); // // result.error("ERR", "Surface texture already exists. Call destroyTexture before creating a new one", null);
// } else { // // } else {
// surface = Surface(surfaceTextureEntry!!.surfaceTexture()) // // surface = Surface(surfaceTextureEntry!!.surfaceTexture())
// if(!surface!!.isValid) { // // if(!surface!!.isValid) {
// result.error("ERR", "Surface creation failed. ", null); // // result.error("ERR", "Surface creation failed. ", null);
// } else { // // } else {
// result.success(surfaceTextureEntry!!.id().toInt()) // // result.success(surfaceTextureEntry!!.id().toInt())
// } // // }
// } // // }
mEglDisplay = EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY) // mEglDisplay = EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY)
if (mEglDisplay == EGL14.EGL_NO_DISPLAY) { // if (mEglDisplay == EGL14.EGL_NO_DISPLAY) {
result.error("Err", "eglGetDisplay failed", null); // result.error("Err", "eglGetDisplay failed", null);
return; // return;
} // }
val version = IntArray(2) // val version = IntArray(2)
if (!EGL14.eglInitialize(mEglDisplay, version, 0, version, 1)) { // if (!EGL14.eglInitialize(mEglDisplay, version, 0, version, 1)) {
var error = EGL14.eglGetError(); // var error = EGL14.eglGetError();
Log.e("DISPLAY_FAILED", "NativeEngine: failed to init display %d"); // Log.e("DISPLAY_FAILED", "NativeEngine: failed to init display %d");
} // }
val attribs = intArrayOf( // val attribs = intArrayOf(
EGL14.EGL_RENDERABLE_TYPE, EGL15.EGL_OPENGL_ES3_BIT, // EGL14.EGL_RENDERABLE_TYPE, EGL15.EGL_OPENGL_ES3_BIT,
EGL14.EGL_SURFACE_TYPE, EGL14.EGL_WINDOW_BIT, // EGL14.EGL_SURFACE_TYPE, EGL14.EGL_WINDOW_BIT,
EGL14.EGL_BLUE_SIZE, 8, // EGL14.EGL_BLUE_SIZE, 8,
EGL14.EGL_GREEN_SIZE, 8, // EGL14.EGL_GREEN_SIZE, 8,
EGL14.EGL_RED_SIZE, 8, // EGL14.EGL_RED_SIZE, 8,
EGL14.EGL_DEPTH_SIZE, 16, // EGL14.EGL_DEPTH_SIZE, 16,
EGL14.EGL_NONE); // EGL14.EGL_NONE);
var numConfigs = intArrayOf(1) // var numConfigs = intArrayOf(1)
val configs: Array<android.opengl.EGLConfig?> = arrayOf<EGLConfig?>(null) // val configs: Array<android.opengl.EGLConfig?> = arrayOf<EGLConfig?>(null)
if(!EGL14.eglChooseConfig(mEglDisplay, attribs, 0, configs, 0, 1, numConfigs, 0)) { // if(!EGL14.eglChooseConfig(mEglDisplay, attribs, 0, configs, 0, 1, numConfigs, 0)) {
result.error("NO_GL_CONTEXT", "Failed to get matching EGLConfig", null); // result.error("NO_GL_CONTEXT", "Failed to get matching EGLConfig", null);
return; // return;
} // }
_glContext = EGL14.eglCreateContext(mEglDisplay, configs[0]!!, EGL14.EGL_NO_CONTEXT, intArrayOf(EGL14.EGL_CONTEXT_CLIENT_VERSION, 3, EGL14.EGL_NONE), 0); // _glContext = EGL14.eglCreateContext(mEglDisplay, configs[0]!!, EGL14.EGL_NO_CONTEXT, intArrayOf(EGL14.EGL_CONTEXT_CLIENT_VERSION, 3, EGL14.EGL_NONE), 0);
if (_glContext === EGL14.EGL_NO_CONTEXT || EGL14.eglMakeCurrent(mEglDisplay, EGL14.EGL_NO_SURFACE, EGL14.EGL_NO_SURFACE, _glContext) == false) { // if (_glContext === EGL14.EGL_NO_CONTEXT || EGL14.eglMakeCurrent(mEglDisplay, EGL14.EGL_NO_SURFACE, EGL14.EGL_NO_SURFACE, _glContext) == false) {
result.error("NO_GL_CONTEXT", "Failed to get current OpenGL context", null); // result.error("NO_GL_CONTEXT", "Failed to get current OpenGL context", null);
return; // return;
}; // };
Log.i("polyvox_filament", "Successfully created OpenGL context"); // Log.i("polyvox_filament", "Successfully created OpenGL context");
} // }
} // }
val args = call.arguments as List<*> val args = call.arguments as List<*>
val width = 256 //args[0] as Double val width = 256 //args[0] as Double
val height = 256// args[1] as Double val height = 256// args[1] as Double
if(width <1 || height < 1) { if(width <1 || height < 1) {
result.error("DIMENSION_MISMATCH","Both dimensions must be greater than zero", null); result.error("DIMENSION_MISMATCH","Both dimensions must be greater than zero", null);
return; return;
} }
Log.i("polyvox_filament", "Creating texture of size ${width}x${height}"); Log.i("polyvox_filament", "Creating texture of size ${width}x${height}");
val texture = IntArray(1) // val texture = IntArray(1)
GLES32.glGenTextures(1, texture, 0) // GLES32.glGenTextures(1, texture, 0)
_glTextureId = texture[0] // _glTextureId = texture[0]
GLES32.glBindTexture(GLES32.GL_TEXTURE_2D, _glTextureId) // GLES32.glBindTexture(GLES32.GL_TEXTURE_2D, _glTextureId)
GLES32.glTexParameteri(GLES32.GL_TEXTURE_2D, GLES32.GL_TEXTURE_MIN_FILTER, GLES32.GL_LINEAR) // GLES32.glTexParameteri(GLES32.GL_TEXTURE_2D, GLES32.GL_TEXTURE_MIN_FILTER, GLES32.GL_LINEAR)
GLES32.glTexParameteri(GLES32.GL_TEXTURE_2D, GLES32.GL_TEXTURE_MAG_FILTER, GLES32.GL_LINEAR) // GLES32.glTexParameteri(GLES32.GL_TEXTURE_2D, GLES32.GL_TEXTURE_MAG_FILTER, GLES32.GL_LINEAR)
GLES32.glTexParameteri(GLES32.GL_TEXTURE_2D, GLES32.GL_TEXTURE_WRAP_S, GLES32.GL_CLAMP_TO_EDGE) // GLES32.glTexParameteri(GLES32.GL_TEXTURE_2D, GLES32.GL_TEXTURE_WRAP_S, GLES32.GL_CLAMP_TO_EDGE)
GLES32.glTexParameteri(GLES32.GL_TEXTURE_2D, GLES32.GL_TEXTURE_WRAP_T, GLES32.GL_CLAMP_TO_EDGE) // GLES32.glTexParameteri(GLES32.GL_TEXTURE_2D, GLES32.GL_TEXTURE_WRAP_T, GLES32.GL_CLAMP_TO_EDGE)
GLES32.glTexImage2D( // GLES32.glTexImage2D(
GLES32.GL_TEXTURE_2D, // GLES32.GL_TEXTURE_2D,
0, // 0,
GLES32.GL_RGBA, // GLES32.GL_RGBA,
width.toInt(), // width.toInt(),
height.toInt(), // height.toInt(),
0, // 0,
GLES32.GL_RGBA, // GLES32.GL_RGBA,
GLES32.GL_UNSIGNED_BYTE, // GLES32.GL_UNSIGNED_BYTE,
null // null
) // )
if(_glTextureId == 0) { // if(_glTextureId == 0) {
result.error("GL_TEXTURE_CREATE_FAILED", "Failed to create OpenGL texture. Check logcat for details", null); // result.error("GL_TEXTURE_CREATE_FAILED", "Failed to create OpenGL texture. Check logcat for details", null);
return; // return;
} // }
_surfaceTexture = SurfaceTexture(_glTextureId) // _surfaceTexture = SurfaceTexture(_glTextureId)
_surfaceTexture!!.setDefaultBufferSize(width.toInt(), height.toInt())
_surfaceTexture!!.setOnFrameAvailableListener({
Log.i("TMP","FRAME AVAILABLE");
})
_surfaceTextureEntry = flutterPluginBinding.textureRegistry.registerSurfaceTexture(_surfaceTexture!!)
// _surfaceTextureEntry = flutterPluginBinding.textureRegistry.createSurfaceTexture() // _surfaceTexture!!.setOnFrameAvailableListener({
// _surfaceTexture = _surfaceTextureEntry!!.surfaceTexture(); // Log.i("TMP","FRAME AVAILABLE");
// })
// _surfaceTextureEntry = flutterPluginBinding.textureRegistry.registerSurfaceTexture(_surfaceTexture!!)
_surfaceTextureEntry = flutterPluginBinding.textureRegistry.createSurfaceTexture()
_surfaceTexture = _surfaceTextureEntry!!.surfaceTexture();
_surfaceTexture!!.setDefaultBufferSize(width.toInt(), height.toInt())
_surface = Surface(_surfaceTexture) _surface = Surface(_surfaceTexture)
val canvas = _surface!!.lockHardwareCanvas() // val canvas = _surface!!.lockHardwareCanvas()
canvas.drawColor(Color.GREEN) // canvas.drawColor(Color.GREEN)
_surface!!.unlockCanvasAndPost(canvas) // _surface!!.unlockCanvasAndPost(canvas)
// result.success(_surfaceTextureEntry!!.id()) result.success(_surfaceTextureEntry!!.id())
result.success(0)
} }
"destroyTexture" -> { "destroyTexture" -> {
if (_viewer != null) { if (_viewer != null) {
@@ -227,23 +227,22 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Lo
result.success(true) result.success(true)
} }
"resize" -> { "resize" -> {
result.success(null)
return
if (_viewer == null) { if (_viewer == null) {
result.error("VIEWER_NULL", "Error: cannot resize before a viewer has been created", null) result.error("VIEWER_NULL", "Error: cannot resize before a viewer has been created", null)
return return
} }
val wasRendering = _rendering;
_rendering = false _rendering = false
_lib.destroy_swap_chain(_viewer) _lib.destroy_swap_chain(_viewer)
val args = call.arguments as List<Any> val args = call.arguments as List<Any>
val width = args[0] as Int val width = 100 // args[0] as Int
val height = args[1] as Int val height = 100 // args[1] as Int
val scale = args[2] as Float val scale = 1.0 // args[2] as Float
_surfaceTexture!!.setDefaultBufferSize(width, height) _surfaceTexture!!.setDefaultBufferSize(width, height)
// _lib.create_swap_chain(Pointer.nativeValue(_viewer), Surface(_surfaceTexture), width, height) val nativeWindow = _lib.get_native_window_from_surface(_surface!! as Object, JNIEnv.CURRENT)
_lib.update_viewport_and_camera_projection(_viewer!!, width as UInt, height as UInt, scale); _lib.create_swap_chain(_viewer!!, nativeWindow, width, height)
_rendering = true _lib.update_viewport_and_camera_projection(_viewer!!, width as UInt, height as UInt, scale.toFloat())
_rendering = wasRendering;
Log.i(TAG, "Resized to ${args[0]}x${args[1]}") Log.i(TAG, "Resized to ${args[0]}x${args[1]}")
result.success(_surfaceTexture) result.success(_surfaceTexture)
} }
@@ -254,20 +253,22 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Lo
_viewer = null _viewer = null
} }
val resourceLoader = _lib.make_resource_loader(this, this, Pointer(0)) val resourceLoader = _lib.make_resource_loader(this, this, Pointer(0))
// _viewer = _lib.create_filament_viewer(0, resourceLoader); val nativeWindow = _lib.get_native_window_from_surface(_surface!! as Object, JNIEnv.CURRENT)
// _viewer = _lib.create_filament_viewer_android(_surface!! as Object, JNIEnv.CURRENT, resourceLoader); _viewer = _lib.create_filament_viewer(nativeWindow, resourceLoader);
//surface.
_viewer = _lib.create_filament_viewer( // _viewer = _lib.create_filament_viewer(
_glContext!!.nativeHandle, // _glContext!!.nativeHandle,
resourceLoader) // resourceLoader)
val args = call.arguments as List<Any> val args = call.arguments as List<Any>
// val width = args[0] as Double var width = 100.0 // args[0] as Double
// val height = args[1] as Double val height = 100.0 // args[1] as Double
val width = 200 // if(width < 1 || height < 1) {
val height = 200 // result.error("DIMENSION_MISMATCH","Both dimensions must be greater than zero", null);
// _lib.create_swap_chain_android(_viewer!!, _surface!! as Object, JNIEnv.CURRENT, width.toInt(), height.toInt()) // return;
_lib.create_swap_chain(_viewer!!, null, width.toInt(), height.toInt()) // }
_lib.create_render_target(_viewer, _glTextureId, width.toInt(),height.toInt()); _lib.create_swap_chain(_viewer!!, nativeWindow, width.toInt(), height.toInt())
// _lib.create_swap_chain(_viewer!!, null, width.toInt(), height.toInt())
// _lib.create_render_target(_viewer, _glTextureId, width.toInt(),height.toInt());
result.success(Pointer.nativeValue(_viewer!!)) result.success(Pointer.nativeValue(_viewer!!))
} }
@@ -380,9 +381,9 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Lo
result.success(true) result.success(true)
} }
"render" -> { "render" -> {
val canvas = _surface!!.lockHardwareCanvas() // val canvas = _surface!!.lockHardwareCanvas()
canvas.drawColor(Color.BLUE) // canvas.drawColor(Color.BLUE)
_surface!!.unlockCanvasAndPost(canvas) // _surface!!.unlockCanvasAndPost(canvas)
_lib.render(_viewer, 0) _lib.render(_viewer, 0)
// _surfaceTexture!!.updateTexImage() // _surfaceTexture!!.updateTexImage()
result.success(true) result.success(true)
@@ -402,7 +403,7 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Lo
val width = args[0] as Int val width = args[0] as Int
val height = args[1] as Int val height = args[1] as Int
val scaleFactor = args[2] as Double val scaleFactor = args[2] as Double
_lib.update_viewport_and_camera_projection(_viewer, width.toUInt(), height.toUInt(), scaleFactor.toFloat()) // _lib.update_viewport_and_camera_projection(_viewer, width.toUInt(), height.toUInt(), scaleFactor.toFloat())
result.success(true) result.success(true)
} }
"scrollBegin" -> { "scrollBegin" -> {
@@ -758,6 +759,7 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Lo
var _ptr:Pointer = Pointer(0) var _ptr:Pointer = Pointer(0)
override fun loadResourceFromOwner(path: String?, owner: Pointer?): ResourceBuffer { override fun loadResourceFromOwner(path: String?, owner: Pointer?): ResourceBuffer {
Log.i("Loading resource from path $path")
var data:ByteArray? = null var data:ByteArray? = null
if(path!!.startsWith("file://")) { if(path!!.startsWith("file://")) {
data = File(path!!.substring(6)).readBytes() data = File(path!!.substring(6)).readBytes()