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

add clamp option to android bindings and allow resource paths starting with file://

Browse Source
This commit is contained in:
Nick Fisher
2022-09-09 13:00:19 +10:00
parent 7b7fd09767
commit 30e1dbafcf
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ interface FilamentInterop : Library {
fun clear_lights(viewer:Pointer); fun clear_lights(viewer:Pointer);
fun set_background_image(viewer:Pointer, path:String); 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 load_texture(asset:Pointer, path:String, renderableIndex:Int);
fun set_texture(asset:Pointer); fun set_texture(asset:Pointer);

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

@@ -156,6 +156,10 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware {
} }
fun getAssetPath(path:String) : String { fun getAssetPath(path:String) : String {
if(path.startsWith("file://")) {
return path
}
val loader = FlutterInjector.instance().flutterLoader() val loader = FlutterInjector.instance().flutterLoader()
val key = loader.getLookupKeyForAsset(path) val key = loader.getLookupKeyForAsset(path)
val hotReloadPath = HotReloadPathHelper.getAssetPath(key, activity.getPackageName()) val hotReloadPath = HotReloadPathHelper.getAssetPath(key, activity.getPackageName())
@@ -240,7 +244,7 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware {
"setBackgroundImagePosition" -> { "setBackgroundImagePosition" -> {
executor.execute { executor.execute {
val args = call.arguments as ArrayList<Any?> val args = call.arguments as ArrayList<Any?>
_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"); result.success("OK");
} }
} }