upgrade to Filament 1.21.0

ios/Classes/FilamentMethodCallHandler.mm

@@ -1,34 +1,24 @@
 #import "FilamentMethodCallHandler.h"
-#import "FilamentViewController.h"
 #import "FilamentNativeViewFactory.h"
 
-static const FilamentMethodCallHandler* _handler;
+static int _resourceId = 0;
 
-static polyvox::ResourceBuffer loadResourceGlobal(const char* name) {
-  return [_handler loadResource:name];
-}
-
-static void* freeResourceGlobal(ResourceBuffer rb) {
-  [_handler freeResource:rb ];
-  return nullptr;
-}
+using namespace polyvox;
 
 @implementation FilamentMethodCallHandler {
-  FilamentViewController *_controller;
   FlutterMethodChannel* _channel;
-  polyvox::FilamentViewer* _viewer;
-  void* _layer;
+  FilamentViewer* _viewer;
   
   NSObject<FlutterPluginRegistrar>* _registrar;
 }
-- (instancetype)initWithController:(FilamentViewController*)controller
-                         registrar:(NSObject<FlutterPluginRegistrar>*)registrar
+- (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar
                          viewId:(int64_t)viewId
-                         layer:(void*)layer
+                          viewer:(FilamentViewer*)viewer
+                         
 {
-  _layer = layer;
   _registrar = registrar;
-  _controller = controller;
+  _viewer = viewer;
+  
   NSString* channelName = [NSString stringWithFormat:@"%@_%d",VIEW_TYPE,viewId];
   _channel = [FlutterMethodChannel
     methodChannelWithName:channelName
@@ -36,65 +26,45 @@ static void* freeResourceGlobal(ResourceBuffer rb) {
   [_channel setMethodCallHandler:^(FlutterMethodCall * _Nonnull call, FlutterResult  _Nonnull result) {
     [self handleMethodCall:call result:result];
   }];
-  _handler = self;
-  
-  _viewer = new polyvox::FilamentViewer(_layer, nullptr, nullptr, loadResourceGlobal, freeResourceGlobal);
-  [_controller setViewer:_viewer];
-  [_controller startDisplayLink];
-
+  [self ready];
   return self;
 }
 
 - (void)handleMethodCall:(FlutterMethodCall* _Nonnull)call result:(FlutterResult _Nonnull )result {
+  if(!_viewer) {
+    result([FlutterError errorWithCode:@"UNAVAILABLE"
+                                      message:@"View unavailable"
+                                      details:nil]);
+    return;
+  }
   if([@"loadSkybox" isEqualToString:call.method]) {
-    if(!_viewer)
-      return;
-
     _viewer->loadSkybox([call.arguments[0] UTF8String], [call.arguments[1] UTF8String]);
     result(@"OK");
   } else if([@"loadGlb" isEqualToString:call.method]) {
-    if(!_viewer)
-      return; // TODO should throw exception here
     _viewer->loadGlb([call.arguments UTF8String]);
     result(@"OK");
   } else if([@"loadGltf" isEqualToString:call.method]) {
-    if(!_viewer)
-      return; // TODO should throw exception here
     _viewer->loadGltf([call.arguments[0] UTF8String], [call.arguments[1] UTF8String]);
     result(@"OK");
   } else if([@"setCamera" isEqualToString:call.method]) {
-    if(!_viewer)
-      return; // TODO should throw exception here
     _viewer->setCamera([call.arguments UTF8String]);
     result(@"OK");
   } else if([@"panStart" isEqualToString:call.method]) {
-    if(!_viewer)
-      return;
     _viewer->manipulator->grabBegin([call.arguments[0] intValue], [call.arguments[1] intValue], true);
     result(@"OK");
   } else if([@"panUpdate" isEqualToString:call.method]) {
-    if(!_viewer)
-      return;
     _viewer->manipulator->grabUpdate([call.arguments[0] intValue], [call.arguments[1] intValue]);
     result(@"OK");
   } else if([@"panEnd" isEqualToString:call.method]) {
-    if(!_viewer)
-      return;
     _viewer->manipulator->grabEnd();
     result(@"OK");
   } else if([@"rotateStart" isEqualToString:call.method]) {
-    if(!_viewer)
-      return;
     _viewer->manipulator->grabBegin([call.arguments[0] intValue], [call.arguments[1] intValue], false);
     result(@"OK");
   } else if([@"rotateUpdate" isEqualToString:call.method]) {
-    if(!_viewer)
-      return;
     _viewer->manipulator->grabUpdate([call.arguments[0] intValue], [call.arguments[1] intValue]);
     result(@"OK");
   } else if([@"rotateEnd" isEqualToString:call.method]) {
-    if(!_viewer)
-      return;
     _viewer->manipulator->grabEnd();
     result(@"OK");
   } else if([@"releaseSourceAssets" isEqualToString:call.method]) {
@@ -104,36 +74,29 @@ static void* freeResourceGlobal(ResourceBuffer rb) {
     NSArray* frameData = call.arguments[0];
     NSNumber* numWeights = call.arguments[1];
     NSNumber* frameRate = call.arguments[2];
+    NSUInteger numElements = [frameData count];
 
     float* framesArr = (float*)malloc([frameData count] *sizeof(float));
     for(int i =0 ; i < [frameData count]; i++) {
       *(framesArr+i) = [[frameData objectAtIndex:i] floatValue];
     }
-    _viewer->animateWeights((float*)framesArr, [numWeights intValue], [frameData count] / numWeights, [frameRate floatValue]);
-    result(@"OK");
-  } else if([@"createMorpher" isEqualToString:call.method]) {
-    const char* meshName = [call.arguments[0] UTF8String];
-    NSArray* primitiveIndices = call.arguments[1];
-    int* primitiveIndicesArr = (int*)malloc([primitiveIndices count] *sizeof(int));
-    for(int i =0 ; i < [primitiveIndices count]; i++) {
-      primitiveIndicesArr[i] = [[primitiveIndices objectAtIndex:i] intValue];
-    }
-    _viewer->createMorpher(meshName, primitiveIndicesArr, [primitiveIndices count]);
-    free(primitiveIndicesArr);
+    NSUInteger numFrames =  numElements / [ numWeights intValue ];
+    _viewer->animateWeights((float*)framesArr, [numWeights intValue], numFrames, [frameRate floatValue]);
     result(@"OK");
   } else if([@"playAnimation" isEqualToString:call.method]) {
-    _viewer->playAnimation([call.arguments intValue]);
+    int animationIndex = [call.arguments[0] intValue];
+    bool loop = call.arguments[1];
+    _viewer->playAnimation(animationIndex, loop);
     result(@"OK");
   } else if([@"getTargetNames" isEqualToString:call.method]) {
-    polyvox::StringList list = _viewer->getTargetNames([call.arguments UTF8String]);
+    StringList list = _viewer->getTargetNames([call.arguments UTF8String]);
     NSMutableArray* asArray = [NSMutableArray arrayWithCapacity:list.count];
     for(int i = 0; i < list.count; i++) {
       asArray[i] = [NSString stringWithFormat:@"%s", list.strings[i]];
     }
     result(asArray);
   } else if([@"applyWeights" isEqualToString:call.method]) {
-    if(!_viewer)
-      return;
+
     NSArray* nWeights = call.arguments;
     
     int count = [nWeights count];
@@ -144,17 +107,14 @@ static void* freeResourceGlobal(ResourceBuffer rb) {
     _viewer->applyWeights(weights, count);
     result(@"OK");
   } else if([@"zoom" isEqualToString:call.method]) {
-    if(!_viewer)
-      return;
     _viewer->manipulator->scroll(0.0f, 0.0f, [call.arguments floatValue]);
     result(@"OK");
   } else {
-    
     result(FlutterMethodNotImplemented);
   }
 }
 
-- (polyvox::ResourceBuffer)loadResource:(const char* const)path {
+- (ResourceBuffer)loadResource:(const char* const)path {
     NSString* p = [NSString stringWithFormat:@"%s", path];
     NSString* key = [_registrar lookupKeyForAsset:p];
     NSString* nsPath = [[NSBundle mainBundle] pathForResource:key
@@ -167,12 +127,13 @@ static void* freeResourceGlobal(ResourceBuffer rb) {
     NSData* buffer = [NSData dataWithContentsOfFile:nsPath];
     void* cpy = malloc([buffer length]);
     memcpy(cpy, [buffer bytes],  [buffer length]); // can we avoid this copy somehow?
-    polyvox::ResourceBuffer rbuf(cpy, [buffer length]);
+    _resourceId++;
+    ResourceBuffer rbuf(cpy, [buffer length], _resourceId);
     return rbuf;
 }
 
 - (void)freeResource:(ResourceBuffer)rb {
-    free(rb.data);
+    free((void*)rb.data);
 }
 
 - (void)ready {