Merge branch 'master' of github.com:nmfisher/polyvox_filament

android/src/main/cpp/filament_api.cpp

@@ -56,15 +56,13 @@ extern "C" {
 
   void* filament_viewer_new(
     jobject surface,
-    const char* opaqueShaderPath, 
-    const char* fadeShaderPath,
     JNIEnv* env,
     jobject assetManager
   ) {
     ANativeWindow* layer = ANativeWindow_fromSurface(env, surface);
     am = AAssetManager_fromJava(env, assetManager);
     
-    return new FilamentViewer((void*)layer, opaqueShaderPath, fadeShaderPath, loadResource, freeResource);
+    return new FilamentViewer((void*)layer, loadResource, freeResource);
   }
 
   void render(

android/src/main/cpp/filament_api.h

@@ -8,8 +8,6 @@ void load_skybox(void* viewer, const char* skyboxPath, const char* iblPath);
 
 void* filament_viewer_new(
     void* layer, 
-    const char* opaqueShaderPath, 
-    const char* fadeShaderPath, 
     void* assetManager
 );
 }

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

@@ -20,8 +20,6 @@ interface FilamentInterop : Library {
 
     fun filament_viewer_new(
             layer:Object,
-            opaqueShaderPath:String,
-            fadeShaderPath:String,
             env:JNIEnv,
             am:AssetManager
     ) : Pointer;