From c033dd51cfc1669db6458e4af71a0d0592c5c1ea Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Fri, 22 Sep 2023 08:22:56 +0800 Subject: [PATCH] whitespace --- android/CMakeLists.txt | 3 ++- ios/Classes/SwiftPolyvoxFilamentPlugin.swift | 8 ++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index 9bec2dbd..e4a71100 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -8,9 +8,10 @@ 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}/src/main/cpp/FilamentAndroid.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/AssetManager.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/FilamentViewer.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/PolyvoxFilamentApi.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/StreamBufferAdapter.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/../ios/src/TimeIt.cpp" ) diff --git a/ios/Classes/SwiftPolyvoxFilamentPlugin.swift b/ios/Classes/SwiftPolyvoxFilamentPlugin.swift index 1889433c..8d41ea8d 100644 --- a/ios/Classes/SwiftPolyvoxFilamentPlugin.swift +++ b/ios/Classes/SwiftPolyvoxFilamentPlugin.swift @@ -308,8 +308,7 @@ public class SwiftPolyvoxFilamentPlugin: NSObject, FlutterPlugin, FlutterTexture return } let entityId = add_light(viewer, UInt8(type), Float(colour), Float(intensity),Float(posX), Float(posY), Float(posZ), Float(dirX), Float(dirY), Float(dirZ), shadows) - result(entityId) - + result(entityId) case "removeLight": remove_light(viewer, Int32(call.arguments as! Int64)) result(true) @@ -366,6 +365,7 @@ public class SwiftPolyvoxFilamentPlugin: NSObject, FlutterPlugin, FlutterTexture } update_viewport_and_camera_projection(viewer, UInt32(width), UInt32(height), scaleFactor) result(true) + case "scrollBegin": scroll_begin(viewer) result(true) @@ -403,7 +403,6 @@ public class SwiftPolyvoxFilamentPlugin: NSObject, FlutterPlugin, FlutterTexture } grab_update(viewer, x, y) result(true) - case "grabEnd": grab_end(viewer) result(true) @@ -474,7 +473,6 @@ public class SwiftPolyvoxFilamentPlugin: NSObject, FlutterPlugin, FlutterTexture result(FlutterError(code: "INVALID_ARGUMENTS", message: "Expected correct arguments for set_bone_animation", details: nil)) return } - // // Convert boneNames and meshName to C-style strings array. // var cBoneNames: [UnsafePointer?] = boneNames.map { $0.cString(using: .utf8) } // var cMeshName: [UnsafePointer?] = meshName.map { $0.cString(using: .utf8) } @@ -635,12 +633,10 @@ public class SwiftPolyvoxFilamentPlugin: NSObject, FlutterPlugin, FlutterTexture } let success = set_camera(viewer, asset, nodeName) result(success) - case "setCameraPosition": let args = call.arguments as! [Any] set_camera_position(viewer, Float(args[0] as! Double), Float(args[1] as! Double), Float(args[2] as! Double)) result(true) - case "setCameraRotation": let args = call.arguments as! [Any] set_camera_rotation(viewer, Float(args[0] as! Double), Float(args[1] as! Double), Float(args[2] as! Double), Float(args[3] as! Double))