From 01e1efabc1e468ca16a98008b981b66f071c987f Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Fri, 9 Sep 2022 13:00:19 +1000 Subject: [PATCH] add clamp option to android bindings and allow resource paths starting with file:// --- .../src/main/kotlin/app/polyvox/filament/FilamentInterop.kt | 2 +- .../kotlin/app/polyvox/filament/PolyvoxFilamentPlugin.kt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/android/src/main/kotlin/app/polyvox/filament/FilamentInterop.kt b/android/src/main/kotlin/app/polyvox/filament/FilamentInterop.kt index e46b9a43..5bce684b 100644 --- a/android/src/main/kotlin/app/polyvox/filament/FilamentInterop.kt +++ b/android/src/main/kotlin/app/polyvox/filament/FilamentInterop.kt @@ -85,7 +85,7 @@ interface FilamentInterop : Library { fun clear_lights(viewer:Pointer); fun set_background_image(viewer:Pointer, path:String); - fun set_background_image_position(viewer:Pointer, x:Float, y:Float); + fun set_background_image_position(viewer:Pointer, x:Float, y:Float, clamp:Boolean); fun load_texture(asset:Pointer, path:String, renderableIndex:Int); fun set_texture(asset:Pointer); diff --git a/android/src/main/kotlin/app/polyvox/filament/PolyvoxFilamentPlugin.kt b/android/src/main/kotlin/app/polyvox/filament/PolyvoxFilamentPlugin.kt index 0b8eafa7..bdd79c9d 100644 --- a/android/src/main/kotlin/app/polyvox/filament/PolyvoxFilamentPlugin.kt +++ b/android/src/main/kotlin/app/polyvox/filament/PolyvoxFilamentPlugin.kt @@ -156,6 +156,10 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware { } fun getAssetPath(path:String) : String { + if(path.startsWith("file://")) { + return path + } + val loader = FlutterInjector.instance().flutterLoader() val key = loader.getLookupKeyForAsset(path) val hotReloadPath = HotReloadPathHelper.getAssetPath(key, activity.getPackageName()) @@ -240,7 +244,7 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware { "setBackgroundImagePosition" -> { executor.execute { val args = call.arguments as ArrayList - _lib.set_background_image_position(_viewer!!, (args[0] as Double).toFloat(), (args[1] as Double).toFloat()) + _lib.set_background_image_position(_viewer!!, (args[0] as Double).toFloat(), (args[1] as Double).toFloat(), (args[2] as Boolean)) result.success("OK"); } }