Shader related files loaded as classpath files now.

crashinvaders · Aug 12, 2019 · 437a96d · 437a96d
1 parent 2d7113a
commit 437a96d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/demo/android/build.gradle b/demo/android/build.gradle
@@ -10,7 +10,7 @@ android {
             aidl.srcDirs = ['src']
             renderscript.srcDirs = ['src']
             res.srcDirs = ['res']
-            assets.srcDirs = ['../assets', '../../gdx-vfx/effects/assets']
+            assets.srcDirs = ['../assets']
             jniLibs.srcDirs = ['libs']
         }
 

diff --git a/gdx-vfx/build.gradle b/gdx-vfx/build.gradle
@@ -1,4 +1,4 @@
 subprojects {
     group = "com.crashinvaders.vfx"
-    version = '0.1'
+    version = '0.2'
 }
diff --git a/gdx-vfx/core/src/com/crashinvaders/vfx/utils/ShaderLoader.java b/gdx-vfx/core/src/com/crashinvaders/vfx/utils/ShaderLoader.java
@@ -41,8 +41,8 @@ public static ShaderProgram fromFile(String vertexFileName, String fragmentFileN
         log += "...";
         Gdx.app.log(TAG, "Compiling " + log);
 
-        String vpSrc = Gdx.files.internal(basePath + vertexFileName + ".vert").readString();
-        String fpSrc = Gdx.files.internal(basePath + fragmentFileName + ".frag").readString();
+        String vpSrc = Gdx.files.classpath(basePath + vertexFileName + ".vert").readString();
+        String fpSrc = Gdx.files.classpath(basePath + fragmentFileName + ".frag").readString();
 
         ShaderProgram program = ShaderLoader.fromString(vpSrc, fpSrc, vertexFileName, fragmentFileName, defines);
         return program;

diff --git a/gdx-vfx/effects/src/com/crashinvaders/vfx/effects/LensFlareEffect2.java b/gdx-vfx/effects/src/com/crashinvaders/vfx/effects/LensFlareEffect2.java
@@ -62,7 +62,7 @@ public LensFlareEffect2(Settings settings, Pixmap.Format fboFormat, Texture text
         } else {
             // Load default lens color texture if none supplied.
             ownsLensColorTexture = true;
-            lensColorTexture = new Texture(Gdx.files.internal("vfx-lens-color.png"));
+            lensColorTexture = new Texture(Gdx.files.classpath("vfx-lens-color.png"));
             lens.setLensColorTexture(lensColorTexture);
         }
     }