Use AssetInstance to obtain loader or downloader

CHANGES.md

@@ -1,5 +1,6 @@
 [-SNAPSHOT]
 - Add Config Asset preloadListener
+- Add AssetInstance to obtain AssetLoader or AssetDownloader
 
 [1.0.4]
 - Fix music id

backends/backend-teavm/emu/com/badlogic/gdx/assets/AssetLoadingTaskEmu.java

@@ -13,6 +13,7 @@
 import com.badlogic.gdx.utils.async.AsyncResult;
 import com.badlogic.gdx.utils.async.AsyncTask;
 import com.github.xpenatan.gdx.backends.teavm.TeaApplication;
+import com.github.xpenatan.gdx.backends.teavm.assetloader.AssetInstance;
 import com.github.xpenatan.gdx.backends.teavm.gen.Emulate;
 import com.github.xpenatan.gdx.backends.teavm.assetloader.AssetType;
 import com.github.xpenatan.gdx.backends.teavm.assetloader.AssetLoader;
@@ -86,7 +87,7 @@ public Void call() throws Exception {
      */
     public boolean update() {
         // GTW: check if we have a file that was not preloaded and is not done loading yet
-        AssetLoader assetLoader = AssetLoader.getInstance();
+        AssetLoader assetLoader = AssetInstance.getLoaderInstance();
         FileHandle fileHandle = resolve(loader, assetDesc);
         String path = fileHandle.path();
         Files.FileType type = fileHandle.type();

backends/backend-teavm/emu/com/badlogic/gdx/graphics/PixmapEmu.java

@@ -6,6 +6,7 @@
 import com.badlogic.gdx.utils.BufferUtils;
 import com.badlogic.gdx.utils.Disposable;
 import com.badlogic.gdx.utils.GdxRuntimeException;
+import com.github.xpenatan.gdx.backends.teavm.assetloader.AssetInstance;
 import com.github.xpenatan.gdx.backends.teavm.assetloader.AssetLoaderListener;
 import com.github.xpenatan.gdx.backends.teavm.TeaApplication;
 import com.github.xpenatan.gdx.backends.teavm.TeaApplicationConfiguration;
@@ -88,7 +89,7 @@ public void onSuccess(String url, Blob result) {
                 responseListener.downloadComplete(pixmapEmu);
             }
         };
-        AssetDownloader.getInstance().load(true, url, AssetType.Binary, listener);
+        AssetInstance.getDownloaderInstance().load(true, url, AssetType.Binary, listener);
     }
 
     public PixmapEmu(FileHandle file) {

backends/backend-teavm/emu/com/badlogic/gdx/utils/SharedLibraryLoaderEmu.java

@@ -1,6 +1,7 @@
 package com.badlogic.gdx.utils;
 
 import com.badlogic.gdx.Gdx;
+import com.github.xpenatan.gdx.backends.teavm.assetloader.AssetInstance;
 import com.github.xpenatan.gdx.backends.teavm.assetloader.AssetLoaderListener;
 import com.github.xpenatan.gdx.backends.teavm.TeaApplication;
 import com.github.xpenatan.gdx.backends.teavm.gen.Emulate;
@@ -11,7 +12,7 @@ public class SharedLibraryLoaderEmu {
 
     public void load (String libraryName) {
         TeaApplication app = (TeaApplication)Gdx.app;
-        AssetLoader assetLoader = AssetLoader.getInstance();
+        AssetLoader assetLoader = AssetInstance.getLoaderInstance();
         assetLoader.loadScript(false, libraryName + ".js", new AssetLoaderListener<>() {
             @Override
             public void onSuccess(String url, String result) {

backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/TeaApplication.java

@@ -101,7 +101,8 @@ else if(agentInfo.isLinux())
         else
             System.setProperty("os.name", "no OS");
 
-        AssetInstance.setInstance(new AssetDownloadImpl(config.showDownloadLogs));
+        AssetDownloadImpl assetDownload = new AssetDownloadImpl(config.showDownloadLogs);
+        AssetInstance.setInstance(assetDownload);
 
         TeaWindow currentWindow = TeaWindow.get();
         LocationWrapper location = currentWindow.getLocation();
@@ -119,7 +120,7 @@ else if(agentInfo.isLinux())
 
         graphics = new TeaGraphics(config);
 
-        assetLoader = new AssetLoadImpl(hostPageBaseURL, graphics.canvas, this);
+        assetLoader = new AssetLoadImpl(hostPageBaseURL, graphics.canvas, this, assetDownload);
         AssetInstance.setInstance(assetLoader);
 
         input = new TeaInput(this, graphics.canvas);
@@ -222,7 +223,7 @@ public void run() {
                     initState = AppState.DOWNLOAD_ASSETS;
                     break;
                 case DOWNLOAD_ASSETS:
-                    int queue = AssetDownloader.getInstance().getQueue();
+                    int queue = assetLoader.getQueue();
                     if(queue == 0) {
                         initState = AppState.APP_LOOP;
 

backends/backend-teavm/src/main/java/com/github/xpenatan/gdx/backends/teavm/assetloader/AssetLoadImpl.java

@@ -42,7 +42,10 @@ public class  AssetLoadImpl implements AssetLoader {
 
     private HashSet<String> assetInQueue;
 
-    public AssetLoadImpl(String newBaseURL, HTMLCanvasElementWrapper canvas, TeaApplication teaApplication) {
+    private AssetDownloader assetDownloader;
+
+    public AssetLoadImpl(String newBaseURL, HTMLCanvasElementWrapper canvas, TeaApplication teaApplication, AssetDownloader assetDownloader) {
+        this.assetDownloader = assetDownloader;
         baseUrl = newBaseURL;
         assetInQueue = new HashSet<>();
         setupFileDrop(canvas, teaApplication);
@@ -189,7 +192,7 @@ public void onFailure(String url) {
             }
         };
 
-        AssetDownloader.getInstance().load(true, getAssetUrl() + assetFileUrl, AssetType.Binary, listener);
+        assetDownloader.load(true, getAssetUrl() + assetFileUrl, AssetType.Binary, listener);
     }
 
     @Override
@@ -236,7 +239,7 @@ public void loadAsset(boolean async, String path, AssetType assetType, FileType
         }
 
         assetInQueue.add(path1);
-        AssetDownloader.getInstance().load(async, getAssetUrl() + path1, AssetType.Binary, new AssetLoaderListener<Blob>() {
+        assetDownloader.load(async, getAssetUrl() + path1, AssetType.Binary, new AssetLoaderListener<Blob>() {
             @Override
             public void onProgress(int total, int loaded) {
                 if(listener != null) {
@@ -277,12 +280,12 @@ public void onSuccess(String url, Blob result) {
 
     @Override
     public void loadScript(boolean async, String url, AssetLoaderListener<String> listener) {
-        AssetDownloader.getInstance().loadScript(async, getScriptUrl() + url, listener);
+        assetDownloader.loadScript(async, getScriptUrl() + url, listener);
     }
 
     @Override
     public int getQueue() {
-        return AssetDownloader.getInstance().getQueue();
+        return assetDownloader.getQueue();
     }
 
     private String fixPath(String path1) {

examples/core/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/launcher/LoadingTestLauncher.java

@@ -15,6 +15,7 @@
 import com.badlogic.gdx.utils.viewport.Viewport;
 import com.github.xpenatan.gdx.backends.teavm.TeaApplication;
 import com.github.xpenatan.gdx.backends.teavm.TeaApplicationConfiguration;
+import com.github.xpenatan.gdx.backends.teavm.assetloader.AssetInstance;
 import com.github.xpenatan.gdx.backends.teavm.assetloader.AssetLoader;
 import com.github.xpenatan.gdx.examples.tests.LoadingTest;
 import com.github.xpenatan.gdx.examples.utils.LoadingBar;
@@ -61,7 +62,7 @@ enum STEPS {
     public void create() {
         teaApplication = TeaApplication.get();
 
-        assetLoader = AssetLoader.getInstance();
+        assetLoader = AssetInstance.getLoaderInstance();
 
         stage = new Stage();
         stage.setViewport(new ScreenViewport());

examples/freetype/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/BuildFreetypeTest.java

@@ -4,7 +4,6 @@
 import com.github.xpenatan.gdx.backends.teavm.config.TeaBuildConfiguration;
 import com.github.xpenatan.gdx.backends.teavm.config.TeaBuilder;
 import com.github.xpenatan.gdx.backends.teavm.gen.SkipClass;
-import com.github.xpenatan.gdx.examples.teavm.launcher.FreetypeTestLauncher;
 import java.io.File;
 import java.io.IOException;
 import org.teavm.tooling.TeaVMTool;

examples/freetype/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/launcher/FreetypeTestLauncher.java → examples/freetype/teavm/src/main/java/com/github/xpenatan/gdx/examples/teavm/FreetypeTestLauncher.java

@@ -1,4 +1,4 @@
-package com.github.xpenatan.gdx.examples.teavm.launcher;
+package com.github.xpenatan.gdx.examples.teavm;
 
 import com.github.xpenatan.gdx.backends.teavm.TeaApplication;
 import com.github.xpenatan.gdx.backends.teavm.TeaApplicationConfiguration;
@@ -11,6 +11,11 @@ public static void main(String[] args) {
         config.width = 0;
         config.height = 0;
         config.showDownloadLogs = true;
+
+        config.preloadListener = assetLoader -> {
+            assetLoader.loadScript(true, "freetype.js", null);
+        };
+
         new TeaApplication(new FreetypeDemo(), config);
     }
 }

extensions/asset-loader/src/main/java/com/github/xpenatan/gdx/backends/teavm/assetloader/AssetDownloader.java

@@ -8,11 +8,6 @@
  * @author xpenatan
  */
 public interface AssetDownloader {
-
-    static AssetDownloader getInstance() {
-        return AssetInstance.downloaderInstance;
-    }
-
     void load(boolean async, final String url, AssetType type, AssetLoaderListener<Blob> listener);
     void loadScript(boolean async, final String url, final AssetLoaderListener<String> listener);
     int getQueue();

extensions/asset-loader/src/main/java/com/github/xpenatan/gdx/backends/teavm/assetloader/AssetInstance.java

@@ -12,4 +12,12 @@ public static void setInstance(AssetLoader instance) {
     public static void setInstance(AssetDownloader instance) {
         AssetInstance.downloaderInstance = instance;
     }
+
+    public static AssetLoader getLoaderInstance() {
+        return AssetInstance.instance;
+    }
+
+    public static AssetDownloader getDownloaderInstance() {
+        return AssetInstance.downloaderInstance;
+    }
 }

extensions/asset-loader/src/main/java/com/github/xpenatan/gdx/backends/teavm/assetloader/AssetLoader.java

@@ -10,10 +10,6 @@
  */
 public interface AssetLoader {
 
-    static AssetLoader getInstance() {
-        return AssetInstance.instance;
-    }
-
     String getAssetUrl();
 
     String getScriptUrl();