From 8b9e6a2b3a3782205790d3355c9729640de636c8 Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Thu, 26 Oct 2023 14:05:03 +1100 Subject: [PATCH] rename plugin from PolyvoxFilament to FlutterFilament rename plugin from PolyvoxFilament to FlutterFilament --- README.md | 2 +- android/.cxx/abi_configuration_3f421w4c.json | 8 + android/.cxx/abi_configuration_3f421w4c.log | 1 + .../.cxx/abi_configuration_3f421w4c_key.json | 20 + android/.cxx/ndk_locator_record_1q1i3ah3.json | 11 + android/.cxx/ndk_locator_record_1q1i3ah3.log | 22 + .../.cxx/ndk_locator_record_1q1i3ah3_key.json | 17 + android/CMakeLists.txt | 8 +- android/settings.gradle | 2 +- android/src/main/cpp/FilamentAndroid.cpp | 2 +- ...mentPlugin.kt => FlutterFilamentPlugin.kt} | 26 +- .../polyvox/filament/HotReloadPathHelper.kt | 6 +- example/README.md | 4 +- example/android/app/build.gradle | 2 +- .../android/app/src/main/AndroidManifest.xml | 4 +- .../MainActivity.kt | 2 +- .../plugin_integration_test.dart | 2 +- example/ios/Podfile.lock | 10 +- example/ios/RunnerTests/RunnerTests.swift | 4 +- example/lib/main.dart | 12 +- example/linux/CMakeLists.txt | 4 +- .../flutter/generated_plugin_registrant.cc | 8 +- example/linux/flutter/generated_plugins.cmake | 2 +- example/linux/my_application.cc | 4 +- .../Flutter/GeneratedPluginRegistrant.swift | 4 +- example/macos/Podfile.lock | 10 +- example/pubspec.lock | 14 +- example/pubspec.yaml | 6 +- example/test/widget_test.dart | 2 +- example/web/index.html | 6 +- example/web/manifest.json | 6 +- example/windows/CMakeLists.txt | 4 +- .../flutter/generated_plugin_registrant.cc | 6 +- .../windows/flutter/generated_plugins.cmake | 2 +- example/windows/runner/Runner.rc | 8 +- example/windows/runner/main.cpp | 2 +- ios/Classes/PolyvoxFilamentPlugin.h | 2 +- ios/Classes/PolyvoxFilamentPlugin.m | 14 +- ios/Classes/SwiftPolyvoxFilamentPlugin.swift | 10 +- ...ament.podspec => flutter_filament.podspec} | 14 +- ...yvoxFilamentApi.h => FlutterFilamentApi.h} | 4 +- ...lamentFFIApi.h => FlutterFilamentFFIApi.h} | 12 +- ios/include/FlutterFilamentPlugin.h | 4 + ios/include/Log.hpp | 6 +- ios/include/PolyvoxFilamentPlugin.h | 4 - ios/include/SceneAsset.hpp | 2 +- ...iftFlutterFilamentPlugin-Bridging-Header.h | 8 + ...iftPolyvoxFilamentPlugin-Bridging-Header.h | 8 - ios/include/ThreadPool.hpp | 2 +- ...FilamentApi.cpp => FlutterFilamentApi.cpp} | 2 +- ...ntFFIApi.cpp => FlutterFilamentFFIApi.cpp} | 2 +- ...Web.dart => FlutterFilamentPluginWeb.dart} | 8 +- lib/animations/animation_builder.dart | 2 +- lib/filament_controller.dart | 2 +- lib/filament_controller_ffi.dart | 12 +- lib/filament_controller_method_channel.dart | 8 +- lib/generated_bindings.dart | 4 +- lib/widgets/filament_gesture_detector.dart | 4 +- lib/widgets/filament_widget.dart | 2 +- linux/CMakeLists.txt | 10 +- linux/filament_pb_texture.cc | 2 +- linux/filament_texture.cc | 2 +- ...t_plugin.cc => flutter_filament_plugin.cc} | 138 +-- ...te.h => flutter_filament_plugin_private.h} | 2 +- .../filament_pb_texture.h | 0 .../filament_texture.h | 0 .../flutter_filament_plugin.h | 27 + .../resource_loader.hpp | 4 +- .../polyvox_filament_plugin.h | 27 - linux/test/polyvox_filament_plugin_test.cc | 10 +- .../Classes/SwiftPolyvoxFilamentPlugin.swift | 10 +- ...ament.podspec => flutter_filament.podspec} | 10 +- macos/include/Log.hpp | 6 +- macos/include/PolyvoxFilamentApi.h | 4 +- macos/include/PolyvoxFilamentFFIApi.h | 12 +- macos/include/PolyvoxFilamentPlugin.h | 2 +- macos/include/SceneAsset.hpp | 2 +- ...iftPolyvoxFilamentPlugin-Bridging-Header.h | 8 +- macos/include/ThreadPool.hpp | 2 +- macos/src/PolyvoxFilamentApi.cpp | 2 +- macos/src/PolyvoxFilamentFFIApi.cpp | 2 +- pubspec.yaml | 18 +- web/CMakeLists.txt | 6 +- web/build_old/CMakeCache.txt | 18 +- .../CMakeFiles/CMakeConfigureLog.yaml | 40 +- .../CMakeDirectoryInformation.cmake | 4 +- .../FILAMENT_SHADERS.dir/DependInfo.cmake | 4 +- .../FILAMENT_SHADERS.dir/build.make | 60 +- .../FILAMENT_SHADERS.dir/cmake_clean.cmake | 8 +- .../compiler_depend.internal | 8 +- .../FILAMENT_SHADERS.dir/compiler_depend.make | 8 +- .../FILAMENT_SHADERS.dir/flags.make | 2 +- .../CMakeFiles/FILAMENT_SHADERS.dir/link.txt | 2 +- web/build_old/CMakeFiles/Makefile.cmake | 4 +- web/build_old/CMakeFiles/Makefile2 | 46 +- .../CMakeFiles/TargetDirectories.txt | 8 +- .../DependInfo.cmake | 10 +- .../polyvox_filament_plugin.dir/build.make | 234 ++--- .../cmake_clean.cmake | 26 +- .../compiler_depend.internal | 588 ++++++------- .../compiler_depend.make | 810 +++++++++--------- .../compiler_depend.ts | 2 +- .../polyvox_filament_plugin.dir/depend.make | 2 +- .../polyvox_filament_plugin.dir/flags.make | 4 +- .../polyvox_filament_plugin.dir/link.txt | 2 +- web/build_old/Makefile | 276 +++--- web/build_old/cmake_install.cmake | 4 +- windows/CMakeLists.txt | 18 +- windows/backing_window.cpp | 4 +- windows/backing_window.h | 2 +- windows/egl_context.cpp | 2 +- windows/egl_context.h | 2 +- windows/flutter_angle_texture.cpp | 4 +- windows/flutter_angle_texture.h | 2 +- ...plugin.cpp => flutter_filament_plugin.cpp} | 36 +- ...ent_plugin.h => flutter_filament_plugin.h} | 22 +- ....cpp => flutter_filament_plugin_c_api.cpp} | 8 +- windows/flutter_render_context.h | 2 +- windows/flutter_texture_buffer.h | 2 +- .../flutter_filament_plugin_c_api.h} | 8 +- windows/opengl_texture_buffer.cpp | 4 +- windows/opengl_texture_buffer.h | 2 +- ...t.cpp => flutter_filament_plugin_test.cpp} | 10 +- windows/wgl_context.cpp | 4 +- windows/wgl_context.h | 2 +- 125 files changed, 1539 insertions(+), 1460 deletions(-) create mode 100644 android/.cxx/abi_configuration_3f421w4c.json create mode 100644 android/.cxx/abi_configuration_3f421w4c.log create mode 100644 android/.cxx/abi_configuration_3f421w4c_key.json create mode 100644 android/.cxx/ndk_locator_record_1q1i3ah3.json create mode 100644 android/.cxx/ndk_locator_record_1q1i3ah3.log create mode 100644 android/.cxx/ndk_locator_record_1q1i3ah3_key.json rename android/src/main/kotlin/app/polyvox/filament/{PolyvoxFilamentPlugin.kt => FlutterFilamentPlugin.kt} (90%) rename example/android/app/src/main/kotlin/app/polyvox/{polyvox_filament_example => flutter_filament_example}/MainActivity.kt (85%) rename ios/{polyvox_filament.podspec => flutter_filament.podspec} (69%) rename ios/include/{PolyvoxFilamentApi.h => FlutterFilamentApi.h} (99%) rename ios/include/{PolyvoxFilamentFFIApi.h => FlutterFilamentFFIApi.h} (96%) create mode 100644 ios/include/FlutterFilamentPlugin.h delete mode 100644 ios/include/PolyvoxFilamentPlugin.h create mode 100644 ios/include/SwiftFlutterFilamentPlugin-Bridging-Header.h delete mode 100644 ios/include/SwiftPolyvoxFilamentPlugin-Bridging-Header.h rename ios/src/{PolyvoxFilamentApi.cpp => FlutterFilamentApi.cpp} (99%) rename ios/src/{PolyvoxFilamentFFIApi.cpp => FlutterFilamentFFIApi.cpp} (99%) rename lib/{PolyvoxFilamentPluginWeb.dart => FlutterFilamentPluginWeb.dart} (93%) rename linux/{polyvox_filament_plugin.cc => flutter_filament_plugin.cc} (89%) rename linux/{polyvox_filament_plugin_private.h => flutter_filament_plugin_private.h} (82%) rename linux/include/{polyvox_filament => flutter_filament}/filament_pb_texture.h (100%) rename linux/include/{polyvox_filament => flutter_filament}/filament_texture.h (100%) create mode 100644 linux/include/flutter_filament/flutter_filament_plugin.h rename linux/include/{polyvox_filament => flutter_filament}/resource_loader.hpp (94%) delete mode 100644 linux/include/polyvox_filament/polyvox_filament_plugin.h rename macos/{polyvox_filament.podspec => flutter_filament.podspec} (79%) rename windows/{polyvox_filament_plugin.cpp => flutter_filament_plugin.cpp} (90%) rename windows/{polyvox_filament_plugin.h => flutter_filament_plugin.h} (76%) rename windows/{polyvox_filament_plugin_c_api.cpp => flutter_filament_plugin_c_api.cpp} (51%) rename windows/include/{polyvox_filament/polyvox_filament_plugin_c_api.h => flutter_filament/flutter_filament_plugin_c_api.h} (59%) rename windows/test/{polyvox_filament_plugin_test.cpp => flutter_filament_plugin_test.cpp} (84%) diff --git a/README.md b/README.md index 4b7ec2ea..7835d2a4 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Powers the [Polyvox](https://polyvox.app) and [odd-io](https://github.com/odd-io This is still in beta: bugs/missing features are to be expected. -https://github.com/nmfisher/polyvox_filament/assets/7238578/abaed1c8-c97b-4999-97b2-39e85e0fa7dd +https://github.com/nmfisher/flutter_filament/assets/7238578/abaed1c8-c97b-4999-97b2-39e85e0fa7dd |Feature|Supported| diff --git a/android/.cxx/abi_configuration_3f421w4c.json b/android/.cxx/abi_configuration_3f421w4c.json new file mode 100644 index 00000000..cc7b4d82 --- /dev/null +++ b/android/.cxx/abi_configuration_3f421w4c.json @@ -0,0 +1,8 @@ +{ + "allAbis": [ + "arm64-v8a" + ], + "validAbis": [ + "ARM64_V8A" + ] +} \ No newline at end of file diff --git a/android/.cxx/abi_configuration_3f421w4c.log b/android/.cxx/abi_configuration_3f421w4c.log new file mode 100644 index 00000000..0637a088 --- /dev/null +++ b/android/.cxx/abi_configuration_3f421w4c.log @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/android/.cxx/abi_configuration_3f421w4c_key.json b/android/.cxx/abi_configuration_3f421w4c_key.json new file mode 100644 index 00000000..3ae4ccbd --- /dev/null +++ b/android/.cxx/abi_configuration_3f421w4c_key.json @@ -0,0 +1,20 @@ +{ + "ndkHandlerSupportedAbis": [ + "ARMEABI_V7A", + "ARM64_V8A", + "X86", + "X86_64" + ], + "ndkHandlerDefaultAbis": [ + "ARMEABI_V7A", + "ARM64_V8A", + "X86", + "X86_64" + ], + "externalNativeBuildAbiFilters": [], + "ndkConfigAbiFilters": [ + "arm64-v8a" + ], + "splitsFilterAbis": [], + "ideBuildOnlyTargetAbi": true +} \ No newline at end of file diff --git a/android/.cxx/ndk_locator_record_1q1i3ah3.json b/android/.cxx/ndk_locator_record_1q1i3ah3.json new file mode 100644 index 00000000..c7366bce --- /dev/null +++ b/android/.cxx/ndk_locator_record_1q1i3ah3.json @@ -0,0 +1,11 @@ +{ + "ndk": "C:\\Users\\Nick\\AppData\\Local\\Android\\Sdk\\ndk\\25.2.9519653", + "revision": { + "mMajor": 25, + "mMinor": 2, + "mMicro": 9519653, + "mPreview": 0, + "mPrecision": "MICRO", + "mPreviewSeparator": " " + } +} \ No newline at end of file diff --git a/android/.cxx/ndk_locator_record_1q1i3ah3.log b/android/.cxx/ndk_locator_record_1q1i3ah3.log new file mode 100644 index 00000000..2849d5b7 --- /dev/null +++ b/android/.cxx/ndk_locator_record_1q1i3ah3.log @@ -0,0 +1,22 @@ +[ + { + "level": "INFO", + "message": "android.ndkVersion from module build.gradle is [25.2.9519653]" + }, + { + "level": "INFO", + "message": "android.ndkPath from module build.gradle is not set" + }, + { + "level": "INFO", + "message": "ndk.dir in local.properties is not set" + }, + { + "level": "INFO", + "message": "Not considering ANDROID_NDK_HOME because support was removed after deprecation period." + }, + { + "level": "INFO", + "message": "sdkFolder is C:\\Users\\Nick\\AppData\\Local\\Android\\Sdk" + } +] \ No newline at end of file diff --git a/android/.cxx/ndk_locator_record_1q1i3ah3_key.json b/android/.cxx/ndk_locator_record_1q1i3ah3_key.json new file mode 100644 index 00000000..48347fb0 --- /dev/null +++ b/android/.cxx/ndk_locator_record_1q1i3ah3_key.json @@ -0,0 +1,17 @@ +{ + "ndkVersionFromDsl": "25.2.9519653", + "sdkFolder": "C:\\Users\\Nick\\AppData\\Local\\Android\\Sdk", + "sideBySideNdkFolderNames": [ + "19.2.5345600", + "21.1.6352462", + "21.4.7075529", + "22.0.7026061", + "22.1.7171670", + "23.0.7599858", + "23.1.7779620", + "23.2.8568313", + "24.0.8215888", + "25.1.8937393", + "25.2.9519653" + ] +} \ No newline at end of file diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index 9e6099f0..7a337f0e 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -7,9 +7,9 @@ include_directories(src/main/cpp) link_directories(src/main/jniLibs/${ANDROID_ABI}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") -add_library(polyvox_filament_android SHARED - "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/PolyvoxFilamentApi.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/PolyvoxFilamentFFIApi.cpp" +add_library(flutter_filament_android SHARED + "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/FlutterFilamentApi.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/FlutterFilamentFFIApi.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/FilamentAndroid.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/AssetManager.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/FilamentViewer.cpp" @@ -24,7 +24,7 @@ add_library(FILAMENT_SHADERS SHARED ) target_link_libraries( - polyvox_filament_android + flutter_filament_android FILAMENT_SHADERS -landroid -llog diff --git a/android/settings.gradle b/android/settings.gradle index 59eb7595..d7463b36 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1 +1 @@ -rootProject.name = 'polyvox_filament' +rootProject.name = 'flutter_filament' diff --git a/android/src/main/cpp/FilamentAndroid.cpp b/android/src/main/cpp/FilamentAndroid.cpp index abc96ac1..1e0c4695 100644 --- a/android/src/main/cpp/FilamentAndroid.cpp +++ b/android/src/main/cpp/FilamentAndroid.cpp @@ -3,7 +3,7 @@ extern "C" { - #include "PolyvoxFilamentFFIApi.h" + #include "FlutterFilamentFFIApi.h" void* get_native_window_from_surface( jobject surface, diff --git a/android/src/main/kotlin/app/polyvox/filament/PolyvoxFilamentPlugin.kt b/android/src/main/kotlin/app/polyvox/filament/FlutterFilamentPlugin.kt similarity index 90% rename from android/src/main/kotlin/app/polyvox/filament/PolyvoxFilamentPlugin.kt rename to android/src/main/kotlin/app/polyvox/filament/FlutterFilamentPlugin.kt index f36e6391..2807f757 100644 --- a/android/src/main/kotlin/app/polyvox/filament/PolyvoxFilamentPlugin.kt +++ b/android/src/main/kotlin/app/polyvox/filament/FlutterFilamentPlugin.kt @@ -26,21 +26,21 @@ import io.flutter.view.TextureRegistry.SurfaceTextureEntry import java.io.File import java.util.* -class LoadFilamentResourceFromOwnerImpl(plugin:PolyvoxFilamentPlugin) : LoadFilamentResourceFromOwner { +class LoadFilamentResourceFromOwnerImpl(plugin:FlutterFilamentPlugin) : LoadFilamentResourceFromOwner { var plugin = plugin override fun loadResourceFromOwner(path: String?, owner: Pointer?): ResourceBuffer { return plugin.loadResourceFromOwner(path, owner) } } -class FreeFilamentResourceFromOwnerImpl(plugin:PolyvoxFilamentPlugin) : FreeFilamentResourceFromOwner { +class FreeFilamentResourceFromOwnerImpl(plugin:FlutterFilamentPlugin) : FreeFilamentResourceFromOwner { var plugin = plugin override fun freeResourceFromOwner(rb: ResourceBuffer, owner: Pointer?) { plugin.freeResourceFromOwner(rb, owner) } } -class RenderCallbackImpl(plugin:PolyvoxFilamentPlugin) : RenderCallback { +class RenderCallbackImpl(plugin:FlutterFilamentPlugin) : RenderCallback { var plugin = plugin override fun renderCallback(owner:Pointer?) { plugin.renderCallback(); @@ -51,8 +51,8 @@ class RenderCallbackImpl(plugin:PolyvoxFilamentPlugin) : RenderCallback { } } -/** PolyvoxFilamentPlugin */ -class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, LoadFilamentResourceFromOwner, FreeFilamentResourceFromOwner { +/** FlutterFilamentPlugin */ +class FlutterFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, LoadFilamentResourceFromOwner, FreeFilamentResourceFromOwner { companion object { const val CHANNEL_NAME = "app.polyvox.filament/event" @@ -80,7 +80,7 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Lo this.flutterPluginBinding = flutterPluginBinding channel = MethodChannel(flutterPluginBinding.binaryMessenger, CHANNEL_NAME) channel.setMethodCallHandler(this) - _lib = Native.loadLibrary("polyvox_filament_android", FilamentInterop::class.java, Collections.singletonMap(Library.OPTION_ALLOW_OBJECTS, true)) + _lib = Native.loadLibrary("flutter_filament_android", FilamentInterop::class.java, Collections.singletonMap(Library.OPTION_ALLOW_OBJECTS, true)) } override fun onAttachedToActivity(binding: ActivityPluginBinding) { @@ -93,7 +93,7 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Lo var _lastId = 1 override fun loadResourceFromOwner(path: String?, owner: Pointer?): ResourceBuffer { - Log.i("polyvox_filament", "Loading resource from path $path") + Log.i("flutter_filament", "Loading resource from path $path") var data:ByteArray? = null if(path!!.startsWith("file://")) { data = File(path!!.substring(6)).readBytes() @@ -108,14 +108,14 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Lo if (hotReloadPath != null) { data = File(hotReloadPath).readBytes() } else { - Log.i("polyvox_filament", "Loading resource from main asset bundle at ${assetPath}") + Log.i("flutter_filament", "Loading resource from main asset bundle at ${assetPath}") val assetManager: AssetManager = activity.assets try { data = assetManager.open(key).readBytes() - Log.i("polyvox_filament", "Loaded ${data.size} bytes") + Log.i("flutter_filament", "Loaded ${data.size} bytes") } catch (e:Exception) { - Log.e("polyvox_filament", "Failed to open asset at ${assetPath}", null) + Log.e("flutter_filament", "Failed to open asset at ${assetPath}", null) } } } @@ -135,7 +135,7 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Lo rb.data = Pointer(0) } } catch(e:Exception) { - Log.e("polyvox_filament", "Error setting resource buffer : $e", null); + Log.e("flutter_filament", "Error setting resource buffer : $e", null); } rb.write(); return rb; @@ -153,7 +153,7 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Lo @RequiresApi(Build.VERSION_CODES.M) override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) { - Log.e("polyvox_filament", call.method, null) + Log.e("flutter_filament", call.method, null) when (call.method) { "createTexture" -> { if(_surfaceTextureEntry != null) { @@ -167,7 +167,7 @@ class PolyvoxFilamentPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Lo result.error("DIMENSION_MISMATCH","Both dimensions must be greater than zero (you provided $width x $height)", null); return; } - Log.i("polyvox_filament", "Creating Surface Texture of size ${width}x${height}"); + Log.i("flutter_filament", "Creating Surface Texture of size ${width}x${height}"); _surfaceTextureEntry = flutterPluginBinding.textureRegistry.createSurfaceTexture() _surfaceTexture = _surfaceTextureEntry!!.surfaceTexture(); diff --git a/android/src/main/kotlin/app/polyvox/filament/HotReloadPathHelper.kt b/android/src/main/kotlin/app/polyvox/filament/HotReloadPathHelper.kt index feea71d9..f347d2c2 100644 --- a/android/src/main/kotlin/app/polyvox/filament/HotReloadPathHelper.kt +++ b/android/src/main/kotlin/app/polyvox/filament/HotReloadPathHelper.kt @@ -11,17 +11,17 @@ class HotReloadPathHelper { companion object { fun getAssetPath(path: String, packageName: String): String? { val packagePath = "/data/user/0/${packageName}/code_cache/" - Log.v("polyvox_filament", "Looking for hot reloaded asset ${path} under package path ${packagePath}") + Log.v("flutter_filament", "Looking for hot reloaded asset ${path} under package path ${packagePath}") val files = File(packagePath).walkBottomUp().filter { it.path.endsWith(path) }.sortedBy { it.lastModified() }.toList() if(files.size > 0) { - Log.v("polyvox_filament", "Using hot reloaded asset at ${files.last().path}") + Log.v("flutter_filament", "Using hot reloaded asset at ${files.last().path}") return files.last().path; } - Log.v("polyvox_filament", "No hot reloaded asset found.") + Log.v("flutter_filament", "No hot reloaded asset found.") return null; } } diff --git a/example/README.md b/example/README.md index f5effa82..8f831b07 100644 --- a/example/README.md +++ b/example/README.md @@ -1,6 +1,6 @@ -# polyvox_filament_example +# flutter_filament_example -Demonstrates how to use the polyvox_filament plugin. +Demonstrates how to use the flutter_filament plugin. ## Linux diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 7dec6266..60b5af61 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -45,7 +45,7 @@ android { } defaultConfig { - applicationId "app.polyvox.filament_example" + applicationId "app.polyvox.flutter_filament_example" minSdkVersion 22 targetSdkVersion 31 versionCode flutterVersionCode.toInteger() diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 4c59afdd..10e1b0cb 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -1,9 +1,9 @@ + package="app.polyvox.flutter_filament_example"> diff --git a/example/android/app/src/main/kotlin/app/polyvox/polyvox_filament_example/MainActivity.kt b/example/android/app/src/main/kotlin/app/polyvox/flutter_filament_example/MainActivity.kt similarity index 85% rename from example/android/app/src/main/kotlin/app/polyvox/polyvox_filament_example/MainActivity.kt rename to example/android/app/src/main/kotlin/app/polyvox/flutter_filament_example/MainActivity.kt index be77f789..fbdcbc30 100644 --- a/example/android/app/src/main/kotlin/app/polyvox/polyvox_filament_example/MainActivity.kt +++ b/example/android/app/src/main/kotlin/app/polyvox/flutter_filament_example/MainActivity.kt @@ -1,4 +1,4 @@ -package app.polyvox.filament_example +package app.polyvox.flutter_filament_example import io.flutter.embedding.android.FlutterActivity import io.flutter.embedding.android.TransparencyMode diff --git a/example/integration_test/plugin_integration_test.dart b/example/integration_test/plugin_integration_test.dart index fef32531..c6827233 100644 --- a/example/integration_test/plugin_integration_test.dart +++ b/example/integration_test/plugin_integration_test.dart @@ -6,7 +6,7 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; -import 'package:polyvox_filament/widgets/filament_widget.dart'; +import 'package:flutter_filament/widgets/filament_widget.dart'; import '../lib/main.dart' as app; void main() { diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 2f81940b..5fbdb5fa 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -5,14 +5,14 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - polyvox_filament (0.0.1): + - flutter_filament (0.0.1): - Flutter DEPENDENCIES: - Flutter (from `Flutter`) - integration_test (from `.symlinks/plugins/integration_test/ios`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) - - polyvox_filament (from `.symlinks/plugins/polyvox_filament/ios`) + - flutter_filament (from `.symlinks/plugins/flutter_filament/ios`) EXTERNAL SOURCES: Flutter: @@ -21,14 +21,14 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/integration_test/ios" path_provider_foundation: :path: ".symlinks/plugins/path_provider_foundation/darwin" - polyvox_filament: - :path: ".symlinks/plugins/polyvox_filament/ios" + flutter_filament: + :path: ".symlinks/plugins/flutter_filament/ios" SPEC CHECKSUMS: Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 integration_test: 13825b8a9334a850581300559b8839134b124670 path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 - polyvox_filament: 35fece7761e74c973afd80fe3aa0ca225eaace32 + flutter_filament: 35fece7761e74c973afd80fe3aa0ca225eaace32 PODFILE CHECKSUM: 7adbc9d59f05e1b01f554ea99b6c79e97f2214a2 diff --git a/example/ios/RunnerTests/RunnerTests.swift b/example/ios/RunnerTests/RunnerTests.swift index 08fa3d41..481885f5 100644 --- a/example/ios/RunnerTests/RunnerTests.swift +++ b/example/ios/RunnerTests/RunnerTests.swift @@ -2,7 +2,7 @@ import Flutter import UIKit import XCTest -@testable import polyvox_filament +@testable import flutter_filament // This demonstrates a simple unit test of the Swift portion of this plugin's implementation. // @@ -11,7 +11,7 @@ import XCTest class RunnerTests: XCTestCase { func testGetPlatformVersion() { - let plugin = PolyvoxFilamentPlugin() + let plugin = FlutterFilamentPlugin() let call = FlutterMethodCall(methodName: "getPlatformVersion", arguments: []) diff --git a/example/lib/main.dart b/example/lib/main.dart index fa520981..5bafc7d5 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -4,16 +4,16 @@ import 'dart:typed_data'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:permission_handler/permission_handler.dart'; -import 'package:polyvox_filament/animations/animation_data.dart'; +import 'package:flutter_filament/animations/animation_data.dart'; -import 'package:polyvox_filament/filament_controller.dart'; +import 'package:flutter_filament/filament_controller.dart'; -import 'package:polyvox_filament/filament_controller_ffi.dart'; -import 'package:polyvox_filament/animations/animation_builder.dart'; +import 'package:flutter_filament/filament_controller_ffi.dart'; +import 'package:flutter_filament/animations/animation_builder.dart'; import 'package:path_provider/path_provider.dart'; -import 'package:polyvox_filament/widgets/filament_gesture_detector.dart'; -import 'package:polyvox_filament/widgets/filament_widget.dart'; +import 'package:flutter_filament/widgets/filament_gesture_detector.dart'; +import 'package:flutter_filament/widgets/filament_widget.dart'; void main() async { runApp(const MyApp()); diff --git a/example/linux/CMakeLists.txt b/example/linux/CMakeLists.txt index 437b0609..9465b20e 100644 --- a/example/linux/CMakeLists.txt +++ b/example/linux/CMakeLists.txt @@ -4,10 +4,10 @@ project(runner LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "polyvox_filament_example") +set(BINARY_NAME "flutter_filament_example") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "app.polyvox.polyvox_filament") +set(APPLICATION_ID "app.polyvox.flutter_filament") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/example/linux/flutter/generated_plugin_registrant.cc b/example/linux/flutter/generated_plugin_registrant.cc index a2d6c71e..98d022b4 100644 --- a/example/linux/flutter/generated_plugin_registrant.cc +++ b/example/linux/flutter/generated_plugin_registrant.cc @@ -6,10 +6,10 @@ #include "generated_plugin_registrant.h" -#include +#include void fl_register_plugins(FlPluginRegistry* registry) { - g_autoptr(FlPluginRegistrar) polyvox_filament_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "PolyvoxFilamentPlugin"); - polyvox_filament_plugin_register_with_registrar(polyvox_filament_registrar); + g_autoptr(FlPluginRegistrar) flutter_filament_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterFilamentPlugin"); + flutter_filament_plugin_register_with_registrar(flutter_filament_registrar); } diff --git a/example/linux/flutter/generated_plugins.cmake b/example/linux/flutter/generated_plugins.cmake index 5055e8c5..75876d76 100644 --- a/example/linux/flutter/generated_plugins.cmake +++ b/example/linux/flutter/generated_plugins.cmake @@ -3,7 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST - polyvox_filament + flutter_filament ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/example/linux/my_application.cc b/example/linux/my_application.cc index d665dbbb..aafe4dd9 100644 --- a/example/linux/my_application.cc +++ b/example/linux/my_application.cc @@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) { if (use_header_bar) { GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); gtk_widget_show(GTK_WIDGET(header_bar)); - gtk_header_bar_set_title(header_bar, "polyvox_filament_example"); + gtk_header_bar_set_title(header_bar, "flutter_filament_example"); gtk_header_bar_set_show_close_button(header_bar, TRUE); gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); } else { - gtk_window_set_title(window, "polyvox_filament_example"); + gtk_window_set_title(window, "flutter_filament_example"); } gtk_window_set_default_size(window, 1280, 720); diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift index 164ab2ff..bb5362df 100644 --- a/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,10 +5,10 @@ import FlutterMacOS import Foundation +import flutter_filament import path_provider_foundation -import polyvox_filament func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + SwiftFlutterFilamentPlugin.register(with: registry.registrar(forPlugin: "SwiftFlutterFilamentPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) - SwiftPolyvoxFilamentPlugin.register(with: registry.registrar(forPlugin: "SwiftPolyvoxFilamentPlugin")) } diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock index 90df6bfa..4b43a785 100644 --- a/example/macos/Podfile.lock +++ b/example/macos/Podfile.lock @@ -3,26 +3,26 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS - - polyvox_filament (0.0.1): + - flutter_filament (0.0.1): - FlutterMacOS DEPENDENCIES: - FlutterMacOS (from `Flutter/ephemeral`) - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) - - polyvox_filament (from `Flutter/ephemeral/.symlinks/plugins/polyvox_filament/macos`) + - flutter_filament (from `Flutter/ephemeral/.symlinks/plugins/flutter_filament/macos`) EXTERNAL SOURCES: FlutterMacOS: :path: Flutter/ephemeral path_provider_foundation: :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin - polyvox_filament: - :path: Flutter/ephemeral/.symlinks/plugins/polyvox_filament/macos + flutter_filament: + :path: Flutter/ephemeral/.symlinks/plugins/flutter_filament/macos SPEC CHECKSUMS: FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 - polyvox_filament: 410c2b06ba59f1182e2fa4338b583903631fb95f + flutter_filament: 410c2b06ba59f1182e2fa4338b583903631fb95f PODFILE CHECKSUM: 9cc8fc8fc62b1d9a89fd6f974ad4157b35254030 diff --git a/example/pubspec.lock b/example/pubspec.lock index ba7d5c7b..0a31e772 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -107,6 +107,13 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_filament: + dependency: "direct main" + description: + path: ".." + relative: true + source: path + version: "0.5.0" flutter_lints: dependency: "direct dev" description: @@ -319,13 +326,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.7.3" - polyvox_filament: - dependency: "direct main" - description: - path: ".." - relative: true - source: path - version: "0.5.0" process: dependency: transitive description: diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 8a00efd2..e2801abd 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,5 +1,5 @@ -name: polyvox_filament_example -description: Demonstrates how to use the polyvox_filament plugin. +name: flutter_filament_example +description: Demonstrates how to use the flutter_filament plugin. # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. @@ -18,7 +18,7 @@ dependencies: flutter: sdk: flutter path_provider: - polyvox_filament: + flutter_filament: path: ../ permission_handler: cupertino_icons: ^1.0.2 diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart index a8710c4c..78b385b9 100644 --- a/example/test/widget_test.dart +++ b/example/test/widget_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:polyvox_filament_example/main.dart'; +import 'package:flutter_filament_example/main.dart'; void main() { testWidgets('Verify Platform version', (WidgetTester tester) async { diff --git a/example/web/index.html b/example/web/index.html index e343b80b..bd7bcbe9 100644 --- a/example/web/index.html +++ b/example/web/index.html @@ -18,18 +18,18 @@ - + - + - polyvox_filament_example + flutter_filament_example