add getters from animation names and play animation method

android/src/main/cpp/filament_api.cpp

@@ -6,10 +6,11 @@
 #include <android/native_activity.h>
 
 using namespace polyvox;
+using namespace std;
 
 static AAssetManager* am;
 
-std::vector<AAsset*> _assets;
+vector<AAsset*> _assets;
 uint64_t id = -1;
 
 static polyvox::ResourceBuffer loadResource(const char* name) {
@@ -122,30 +123,44 @@ extern "C" {
     ((FilamentViewer*)viewer)->animateWeights((float*)data, numWeights, numFrames, frameRate);
   }
 
-  void get_target_names(void* viewer, char* meshName, char*** outPtr, int* countPtr ) {
-    StringList names = ((FilamentViewer*)viewer)->getTargetNames(meshName);
-         
-    *countPtr = names.count;
-    
-	  *outPtr = (char**)malloc(sizeof(char*) * names.count);
-
-    __android_log_print(ANDROID_LOG_VERBOSE, "filament_api", "Got %d names", names.count);     
-    
-    for(int i = 0; i < names.count; i++) {
-      std::string as_str(names.strings[i]);      
-      (*outPtr)[i] = (char*)malloc(sizeof(char) * as_str.length());
-	    strcpy((*outPtr)[i], as_str.c_str());
-    }
+  void play_animation(void* viewer, int index) {
+    __android_log_print(ANDROID_LOG_VERBOSE, "filament_api", "Playing embedded animation %d", index);     
+    ((FilamentViewer*)viewer)->playAnimation(index);
   }
 
-  void free_pointer(char*** ptr, int size) {
-    __android_log_print(ANDROID_LOG_VERBOSE, "filament_api", "Freeing %d char pointers", size);     
-    for(int i = 0; i < size; i++) {
-      __android_log_print(ANDROID_LOG_VERBOSE, "filament_api", "%d", i);     
-      // free((*ptr)[i]);
+  char** get_animation_names(void* viewer, int* countPtr) {
+    auto names = ((FilamentViewer*)viewer)->getAnimationNames();
+    __android_log_print(ANDROID_LOG_VERBOSE, "filament_api", "Got %d animation names", names->size());     
+    char** names_c;
+    names_c = new char*[names->size()];
+    for(int i = 0; i < names->size(); i++) {
+      names_c[i] = (char*) names->at(i).c_str();
+      __android_log_print(ANDROID_LOG_VERBOSE, "filament_api", "Alloced animation name %s ", (char*) names->at(i).c_str());     
     }
-    __android_log_print(ANDROID_LOG_VERBOSE, "filament_api", "Free complete");     
-    // free(*ptr);
+    (*countPtr) = names->size();
+    return names_c;
+  }
+
+  char** get_target_names(void* viewer, char* meshName, int* countPtr ) {
+    StringList names = ((FilamentViewer*)viewer)->getTargetNames(meshName);
+
+    __android_log_print(ANDROID_LOG_VERBOSE, "filament_api", "Got %d names", names.count);     
+         
+    *countPtr = names.count;
+
+    char** retval;
+    retval = new char*[names.count];
+
+    __android_log_print(ANDROID_LOG_VERBOSE, "filament_api", "Allocated char* array of size %d", names.count);     
+
+    for(int i =0; i < names.count; i++) {
+      retval[i] = (char*)names.strings[i];  
+    }
+    return retval;
+  }
+
+  void free_pointer(char** ptr, int num) {
+    free(ptr);
   }
 
   void release_source_assets(void* viewer) {

android/src/main/kotlin/app/polyvox/filament/FilamentInterop.kt

@@ -54,10 +54,14 @@ interface FilamentInterop : Library {
 
     fun animate_weights(viewer:Pointer, frames:FloatArray, numWeights:Int, numFrames:Int,  frameRate:Float);
 
-    fun get_target_names(viewer:Pointer, meshName:String, outPtr:PointerByReference, outLen:IntByReference);
+    fun get_target_names(viewer:Pointer, meshName:String, outLen:IntByReference) : Pointer;
 
-    fun free_pointer(ptr:PointerByReference, size:Int)
+    fun get_animation_names(viewer:Pointer, outLen:IntByReference) : Pointer;
 
-    fun release_source_assets(viewer:Pointer)
+    fun play_animation(viewer:Pointer, index:Int);
+
+    fun free_pointer(ptr:Pointer, size:Int);
+
+    fun release_source_assets(viewer:Pointer);
 
 }

android/src/main/kotlin/app/polyvox/filament/FilamentView.kt

@@ -201,19 +201,38 @@ PlatformView  {
             "getTargetNames" -> {
               if(_viewer == null)
                 return;
-              val arrPtr = PointerByReference();
+              
               val countPtr = IntByReference();
-              _lib.get_target_names(_viewer!!, call.arguments as String, arrPtr, countPtr)
+              val arrPtr = _lib.get_target_names(_viewer!!, call.arguments as String, countPtr)
 
-              val names = arrPtr.value.getStringArray(0, countPtr.value);
-
-              Log.v(TAG, "Got target names $names")
+              val names = arrPtr.getStringArray(0, countPtr.value);
 
+              for(i in 0..countPtr.value-1) {
+                Log.v(TAG, "Got target names ${names[i]} ${names[i].length}")
+              }
+              
               val namesAsList = names.toCollection(ArrayList())
 
               _lib.free_pointer(arrPtr, countPtr.getValue())
 
-              Log.v(TAG, "Free complete")
+              result.success(namesAsList)
+            } 
+            "getAnimationNames" -> {
+              if(_viewer == null)
+                return;
+              
+              val countPtr = IntByReference();
+              val arrPtr = _lib.get_animation_names(_viewer!!, countPtr)
+
+              val names = arrPtr.getStringArray(0, countPtr.value);
+
+              for(i in 0..countPtr.value-1) {
+                Log.v(TAG, "Got animation names ${names[i]} ${names[i].length}")
+              }
+              
+              val namesAsList = names.toCollection(ArrayList())
+
+              _lib.free_pointer(arrPtr, 1)
 
               result.success(namesAsList)
             } 
@@ -281,6 +300,13 @@ PlatformView  {
             "releaseSourceAssets" -> {
               _lib.release_source_assets(_viewer!!)
               result.success("OK");
+            } 
+            "playAnimation" -> {
+              _lib.play_animation(_viewer!!, call.arguments as Int)
+              result.success("OK")
+            }
+            else -> {
+              result.notImplemented()
             }
         }
     }