Lighting system (working in progress), human entity

Author: squid233

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

@@ -26,8 +26,6 @@
 
 import org.overrun.swgl.core.io.IFileProvider;
 
-import java.util.Optional;
-
 /**
  * A swgl asset.
  *
@@ -43,16 +41,6 @@ public abstract class Asset {
      */
     public abstract void reload(String name, IFileProvider provider);
 
-    /**
-     * Converts the data to a byte array.
-     *
-     * @return The array. Can be empty.
-     */
-    @Deprecated(forRemoval = true)
-    public Optional<byte[]> toBytes() {
-        return Optional.empty();
-    }
-
     /**
      * Closes this asset.
      *

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

@@ -30,6 +30,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.function.Consumer;
 
 /**
@@ -183,8 +184,7 @@ public void reloadAssets(boolean force) {
      * @throws ClassCastException If value is not an instance of {@code T}
      */
     @SuppressWarnings("unchecked")
-    @Nullable
-    public <T extends Asset> T getAsset(String name)
+    public <T extends Asset> Optional<T> getAsset(String name)
         throws RuntimeException, ClassCastException {
         var wrapper = assets.get(name);
         // Check if asset present, else it is an alias
@@ -197,7 +197,7 @@ public <T extends Asset> T getAsset(String name)
                     + "' and original name '" + nm + "'!");
         }
         var t = wrapper.asset();
-        return (T) t;
+        return Optional.ofNullable((T) t);
     }
 
     /**
@@ -232,7 +232,8 @@ public void close() throws Exception {
         for (var v : assets.values()) {
             try {
                 v.asset().close();
-            } catch (Exception ignored) {
+            } catch (Exception e) {
+                e.printStackTrace();
             }
         }
     }

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

@@ -0,0 +1,39 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 Overrun Organization
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package org.overrun.swgl.core.asset;
+
+/**
+ * @author squid233
+ * @since 0.1.0
+ */
+@FunctionalInterface
+public interface ITextureParam {
+    /**
+     * Set the texture parameter to GL.
+     *
+     * @param target The texture target.
+     */
+    void set(int target);
+}

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

@@ -24,16 +24,15 @@
 
 package org.overrun.swgl.core.asset;
 
+import org.jetbrains.annotations.Nullable;
 import org.lwjgl.opengl.GL;
 import org.lwjgl.system.MemoryStack;
 import org.overrun.swgl.core.cfg.GlobalConfig;
 import org.overrun.swgl.core.io.IFileProvider;
 
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.Optional;
+import java.util.function.Consumer;
 
 import static org.lwjgl.opengl.GL30C.*;
 import static org.lwjgl.stb.STBImage.*;
@@ -64,10 +63,8 @@ public class Texture2D extends Texture {
     private int id;
     private boolean failed;
     private int width, height;
-    private final Map<Integer, Runnable> texParamRecorder = new LinkedHashMap<>();
-    private final List<Integer> recorderIds = new ArrayList<>();
-    private int nextRecorderId;
-    private byte[] bytes;
+    @Nullable
+    private ITextureParam param;
 
     /**
      * Create an empty 2D texture.
@@ -86,6 +83,31 @@ public Texture2D(String name, IFileProvider provider) {
         reload(name, provider);
     }
 
+    public static void createAsset(
+        AssetManager mgr,
+        String name,
+        @Nullable Consumer<Texture2D> consumer,
+        IFileProvider provider
+    ) {
+        mgr.createAsset(name, AssetTypes.TEXTURE2D, consumer, provider);
+    }
+
+    public static void createAssetParam(
+        AssetManager mgr,
+        String name,
+        @Nullable ITextureParam param,
+        IFileProvider provider
+    ) {
+        mgr.createAsset(name, AssetTypes.TEXTURE2D, (Texture2D tex) -> tex.setParam(param), provider);
+    }
+
+    public static Optional<Texture2D> getAsset(
+        AssetManager mgr,
+        String name
+    ) {
+        return mgr.getAsset(name);
+    }
+
     /**
      * {@inheritDoc}
      * <p>
@@ -101,7 +123,7 @@ public Texture2D(String name, IFileProvider provider) {
      */
     @Override
     public void reload(String name, IFileProvider provider) {
-        bytes = provider.getAllBytes(name);
+        byte[] bytes = provider.getAllBytes(name);
         var buffer = asBuffer(bytes, name);
         try {
             build(buffer);
@@ -110,26 +132,13 @@ public void reload(String name, IFileProvider provider) {
         }
     }
 
-    public int recordTexParam(Runnable recorder) {
-        recorderIds.add(nextRecorderId++);
-        texParamRecorder.put(nextRecorderId, recorder);
-        return nextRecorderId;
+    public void setParam(@Nullable ITextureParam param) {
+        this.param = param;
     }
 
-    public void rerecordTexParam(int id, Runnable recorder) {
-        if (!hasRecorder(id)) {
-            throw new IllegalArgumentException("Please use recordTexParam first!");
-        }
-        texParamRecorder.put(id, recorder);
-    }
-
-    public void destroyRecorder(int id) {
-        recorderIds.remove((Object) id);
-        texParamRecorder.remove(id);
-    }
-
-    public boolean hasRecorder(int id) {
-        return recorderIds.contains(id);
+    @Nullable
+    public ITextureParam getParam() {
+        return param;
     }
 
     private ByteBuffer fail() {
@@ -178,9 +187,8 @@ private void build(ByteBuffer buffer) {
         if (!glIsTexture(id))
             create();
         bindTexture2D(0, id);
-        for (var recorder : texParamRecorder.values()) {
-            recorder.run();
-        }
+        if (param != null)
+            param.set(GL_TEXTURE_2D);
         glTexImage2D(GL_TEXTURE_2D,
             0,
             GL_RGBA,