Adding resmgr on construction & addAsset in assetmgr

Author: squid233

src/main/java/org/overrun/swgl/core/Application.java

@@ -25,6 +25,7 @@
 package org.overrun.swgl.core;
 
 import org.overrun.swgl.core.io.Mouse;
+import org.overrun.swgl.core.io.ResManager;
 
 /**
  * A swgl application.
@@ -40,6 +41,14 @@ public abstract class Application implements Runnable, AutoCloseable, Mouse.Call
     public void prepare() {
     }
 
+    /**
+     * Add a resource manager. It should be implemented by its subclasses.
+     *
+     * @param manager The resource manager.
+     */
+    public void addResManager(ResManager manager) {
+    }
+
     /**
      * Prepare starting argument here after initializing GLFW.
      */

src/main/java/org/overrun/swgl/core/GlfwApplication.java

@@ -33,8 +33,8 @@
 import org.overrun.swgl.core.io.Window;
 import org.overrun.swgl.core.util.Timer;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.LinkedHashSet;
+import java.util.Set;
 
 import static org.lwjgl.glfw.GLFW.*;
 import static org.overrun.swgl.core.cfg.GlobalConfig.*;
@@ -69,7 +69,7 @@ public abstract class GlfwApplication extends Application {
     /**
      * The resource managers.
      */
-    protected final List<ResManager> resManagers = new ArrayList<>();
+    protected final Set<ResManager> resManagers = new LinkedHashSet<>();
 
     /**
      * Update the time and ticking.
@@ -188,6 +188,7 @@ public void close() throws Exception {
      *
      * @param manager The resource manager.
      */
+    @Override
     public void addResManager(ResManager manager) {
         resManagers.add(manager);
     }

src/main/java/org/overrun/swgl/core/asset/AssetManager.java

@@ -32,6 +32,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 /**
  * The asset manager.
@@ -51,6 +52,7 @@ private static final class AssetWrapper {
         private Asset asset;
         private final Consumer<Asset> consumer;
         private final IFileProvider provider;
+        private Supplier<Asset> assetSupplier;
         private boolean reloaded;
 
         private AssetWrapper(String name,
@@ -72,7 +74,10 @@ public boolean createAsset(String name,
             if (!reloaded)
                 // Construct from constructor without any parameters
                 try {
-                    asset = type.createInstance();
+                    if (assetSupplier != null)
+                        asset = assetSupplier.get();
+                    else
+                        asset = type.createInstance();
                 } catch (Exception e) {
                     e.printStackTrace();
                     return false;
@@ -114,13 +119,50 @@ void createAsset(String name,
      * @param name     The asset original name.
      * @param type     The asset type provider.
      * @param provider The file provider.
+     */
+    public void createAsset(String name,
+                            IAssetTypeProvider type,
+                            IFileProvider provider) {
+        createAsset(name, type, null, provider);
+    }
+
+    /**
+     * Add an asset.
+     *
+     * @param name     The asset original name.
+     * @param type     The asset type provider.
+     * @param consumer The consumer to be accepted before loading asset.
+     * @param provider The file provider.
+     * @param supplier The asset supplier to get lazily.
      * @param <T>      The asset type.
      */
+    @SuppressWarnings("unchecked")
     public <T extends Asset>
-    void createAsset(String name,
-                     IAssetTypeProvider type,
-                     IFileProvider provider) {
-        createAsset(name, type, null, provider);
+    void addAsset(String name,
+                  IAssetTypeProvider type,
+                  @Nullable Consumer<T> consumer,
+                  IFileProvider provider,
+                  Supplier<Asset> supplier) {
+        if (isFrozen())
+            throw new IllegalStateException("Couldn't add asset in frozen state!");
+        var w = new AssetWrapper(name, type, (Consumer<Asset>) consumer, provider);
+        assets.put(name, w);
+        w.assetSupplier = supplier;
+    }
+
+    /**
+     * Add an asset.
+     *
+     * @param name     The asset original name.
+     * @param type     The asset type provider.
+     * @param provider The file provider.
+     * @param supplier The asset supplier to get lazily.
+     */
+    public void addAsset(String name,
+                         IAssetTypeProvider type,
+                         IFileProvider provider,
+                         Supplier<Asset> supplier) {
+        addAsset(name, type, null, provider, supplier);
     }
 
     /**

src/main/java/org/overrun/swgl/core/io/ResManager.java

@@ -24,6 +24,8 @@
 
 package org.overrun.swgl.core.io;
 
+import org.overrun.swgl.core.Application;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -36,6 +38,22 @@
 public class ResManager implements AutoCloseable {
     private final List<AutoCloseable> resources = new ArrayList<>();
 
+    /**
+     * Default constructor.
+     */
+    public ResManager() {
+    }
+
+    /**
+     * Construct and add this to an application.
+     *
+     * @param app The application to be added.
+     */
+    public ResManager(Application app) {
+        this();
+        app.addResManager(this);
+    }
+
     /**
      * Add a resource to resources list.
      *

src/test/java/org/overrun/swgl/game/SwglGame.java

@@ -67,7 +67,6 @@ public static void main(String[] args) {
     private static final IFileProvider FILE_PROVIDER = IFileProvider.of(SwglGame.class);
     private static final boolean PLACE_PREVIEW = false;
     private static final float GAMMA = 1.0f;
-    private final ResManager resManager = new ResManager();
     private final FpsCamera camera = new FpsCamera();
     private World world;
     private WorldRenderer worldRenderer;
@@ -103,7 +102,7 @@ public void start() {
         if (vidMode != null)
             window.moveToCenter(vidMode.width(), vidMode.height());
 
-        addResManager(resManager);
+        var resManager = new ResManager(this);
 
         assetManager = resManager.addResource(new AssetManager());
         ITextureParam texParam = target -> {

src/test/java/org/overrun/swgl/test/CameraApp.java

@@ -67,7 +67,6 @@ public static void main(String[] args) {
     public static final String CONTAINER_TEXTURE = "textures/camera/container.png";
     public static final String AWESOME_FACE_TEXTURE = "textures/camera/awesomeface.png";
     private static final IFileProvider FILE_PROVIDER = IFileProvider.of(CameraApp.class);
-    private final ResManager resManager = new ResManager();
     private GLProgram program;
     private SimpleModel containerModel;
     private final Transformation transformation = new Transformation();
@@ -105,7 +104,7 @@ public void start() {
         setDepthFunc(GL_LEQUAL);
         GLUtil.setupDebugMessageCallback(System.err);
         clearColor(0.2f, 0.3f, 0.3f, 1.0f);
-        addResManager(resManager);
+        var resManager = new ResManager(this);
         program = resManager.addResource(new GLProgram(
             new MappedVertexLayout(
                 Pair.of("Position", VertexFormat.POSITION_FMT),

src/test/java/org/overrun/swgl/test/HelloTriangleApp.java

@@ -61,7 +61,6 @@ public static void main(String[] args) {
     }
 
     private static final IFileProvider FILE_PROVIDER = IFileProvider.of(HelloTriangleApp.class);
-    private final ResManager resManager = new ResManager();
     private GLProgram program;
     private SimpleModel triangle;
     private final Transformation transformation = new Transformation();
@@ -82,7 +81,7 @@ public void start() {
         GLStateMgr.enableDebugOutput();
         GLUtil.setupDebugMessageCallback(System.err);
         clearColor(0.0f, 0.0f, 0.0f, 1.0f);
-        addResManager(resManager);
+        var resManager = new ResManager(this);
         program = resManager.addResource(new GLProgram(
             new MappedVertexLayout(
                 Pair.of("Position", VertexFormat.POSITION_FMT),

src/test/java/org/overrun/swgl/test/LightingApp.java

@@ -80,7 +80,6 @@ public static void main(String[] args) {
         new Vector3f(0.0f, 0.0f, -3.0f)
     };
     private static final Vector3f CONTAINER_ROTATE = new Vector3f(1.0f, 0.3f, 0.5f).normalize();
-    private final ResManager resManager = new ResManager();
     private GLProgram objectProgram, lightingProgram;
     private ObjModel objectModel;
     private ObjModel lightModel;
@@ -112,7 +111,7 @@ public void start() {
         setDepthFunc(GL_LEQUAL);
         GLUtil.setupDebugMessageCallback(System.err);
         clearColor(0.1f, 0.1f, 0.1f, 1.0f);
-        addResManager(resManager);
+        var resManager = new ResManager(this);
 
         // Models
         objectModel = ObjModels.loadModel("models/lighting/container2.obj");