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

update Android interop

Browse Source
This commit is contained in:
Nick Fisher
2024-06-06 22:17:09 +08:00
parent ed2a1eb482
commit bc68c530ac
2 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
flutter_filament_federated/flutter_filament/android/src/main/kotlin/app/polyvox/filament/FilamentInterop.kt
View File

@@ -33,16 +33,7 @@ interface FilamentInterop : Library {
fun get_native_window_from_surface(surface:Object, env:JNIEnv) : Pointer?; fun get_native_window_from_surface(surface:Object, env:JNIEnv) : Pointer?;
fun make_render_callback_fn_pointer(renderCallback:RenderCallback) : Pointer fun make_render_callback_fn_pointer(renderCallback:RenderCallback) : Pointer
fun make_resource_loader(loadResourceFromOwner: LoadFilamentResourceFromOwner, freeResource: FreeFilamentResourceFromOwner, owner:Pointer?) : Pointer; fun make_resource_loader_wrapper_android(loadResourceFromOwner: LoadFilamentResourceFromOwner, freeResource: FreeFilamentResourceFromOwner, owner:Pointer?) : Pointer;
fun create_filament_viewer_ffi(context:Pointer, platform:Pointer, loader:Pointer, rc:Pointer, rco:Pointer) : Pointer;
fun create_swap_chain_ffi(vieer:Pointer?, surface:Pointer?, width:Int, height:Int)
fun set_background_color_ffi(viewer: Pointer?, r: Float, g: Float, b: Float, a: Float)
fun update_viewport_and_camera_projection_ffi(viewer: Pointer?, width: Int, height: Int, scale_factor: Float)
fun render_ffi(viewer: Pointer?)
fun create_filament_viewer(context:Pointer?, platform:Pointer?, loader:Pointer?) : Pointer;
fun create_swap_chain(vieer:Pointer?, surface:Pointer?, width:Int, height:Int)
fun set_background_color(viewer: Pointer?, r: Float, g: Float, b: Float, a: Float)
fun update_viewport_and_camera_projection(viewer: Pointer?, width: Int, height: Int, scale_factor: Float)
fun render(viewer: Pointer?, u:Long, a:Pointer?, b:Pointer?, c:Pointer?)
} }

29
flutter_filament_federated/flutter_filament/android/src/main/kotlin/app/polyvox/filament/FlutterFilamentPlugin.kt
View File

@@ -46,7 +46,7 @@ class RenderCallbackImpl(plugin:FlutterFilamentPlugin) : RenderCallback {
plugin.renderCallback(); plugin.renderCallback();
if(!plugin._surface!!.isValid) { if(!plugin._surface!!.isValid) {
Log.e("ERR", "ERR", null) Log.e("flutter_filament", "Error: surface is no longer valid")
} }
} }
} }
@@ -161,34 +161,37 @@ class FlutterFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Lo
return return
} }
val args = call.arguments as List<*> val args = call.arguments as List<*>
val width = args[0] as Double val width = args[0] as Int
val height = args[1] as Double val height = args[1] as Int
if(width <1 || height < 1) { if(width <1 || height < 1) {
result.error("DIMENSION_MISMATCH","Both dimensions must be greater than zero (you provided $width x $height)", null); result.error("DIMENSION_MISMATCH","Both dimensions must be greater than zero (you provided $width x $height)", null);
return; return;
} }
Log.i("flutter_filament", "Creating Surface Texture of size ${width}x${height}"); Log.i("flutter_filament", "Creating SurfaceTexture ${width}x${height}");
_surfaceTextureEntry = flutterPluginBinding.textureRegistry.createSurfaceTexture() _surfaceTextureEntry = flutterPluginBinding.textureRegistry.createSurfaceTexture()
_surfaceTexture = _surfaceTextureEntry!!.surfaceTexture(); _surfaceTexture = _surfaceTextureEntry!!.surfaceTexture();
_surfaceTexture!!.setDefaultBufferSize(width.toInt(), height.toInt()) _surfaceTexture!!.setDefaultBufferSize(width, height)
_surface = Surface(_surfaceTexture) _surface = Surface(_surfaceTexture)
if(!_surface!!.isValid) { if(!_surface!!.isValid) {
Log.e("ERR", "ERR", null) result.error("SURFACE_INVALID", "Failed to create valid surface", null)
} } else {
val nativeWindow = _lib.get_native_window_from_surface(_surface!! as Object, JNIEnv.CURRENT) val nativeWindow = _lib.get_native_window_from_surface(_surface!! as Object, JNIEnv.CURRENT)
result.success(listOf(_surfaceTextureEntry!!.id(), null, Pointer.nativeValue(nativeWindow)))
val resultList = listOf(_surfaceTextureEntry!!.id(), Pointer.nativeValue(nativeWindow), null, null ) }
result.success(resultList)
} }
"getResourceLoaderWrapper" -> { "getResourceLoaderWrapper" -> {
val resourceLoader = _lib.make_resource_loader(loadResourceWrapper, freeResourceWrapper, Pointer(0)) val resourceLoader = _lib.make_resource_loader_wrapper_android(loadResourceWrapper, freeResourceWrapper, Pointer(0))
result.success(Pointer.nativeValue(resourceLoader)) result.success(Pointer.nativeValue(resourceLoader))
} }
"getDriverPlatform" -> {
result.success(null)
}
"getSharedContext" -> {
result.success(null)
}
"getRenderCallback" -> { "getRenderCallback" -> {
val renderCallbackFnPointer = _lib.make_render_callback_fn_pointer(RenderCallbackImpl(this)) val renderCallbackFnPointer = _lib.make_render_callback_fn_pointer(RenderCallbackImpl(this))
result.success(listOf(Pointer.nativeValue(renderCallbackFnPointer), 0)) result.success(listOf(Pointer.nativeValue(renderCallbackFnPointer), 0))