Easy font

Author: squid233

src/main/java/module-info.java

@@ -16,11 +16,13 @@
     exports org.overrun.swgl.core.cfg;
     exports org.overrun.swgl.core.gl;
     exports org.overrun.swgl.core.gl.ims;
+    exports org.overrun.swgl.core.gui.font;
     exports org.overrun.swgl.core.io;
     exports org.overrun.swgl.core.level;
     exports org.overrun.swgl.core.model;
     exports org.overrun.swgl.core.model.obj;
     exports org.overrun.swgl.core.model.simple;
     exports org.overrun.swgl.core.util;
     exports org.overrun.swgl.core.util.math;
+    exports org.overrun.swgl.core.util.timing;
 }

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

@@ -31,10 +31,14 @@
 import org.overrun.swgl.core.io.Mouse;
 import org.overrun.swgl.core.io.ResManager;
 import org.overrun.swgl.core.io.Window;
-import org.overrun.swgl.core.util.Timer;
+import org.overrun.swgl.core.util.timing.Scheduler;
+import org.overrun.swgl.core.util.timing.Timer;
 
+import java.util.ArrayList;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Set;
+import java.util.function.BooleanSupplier;
 
 import static org.lwjgl.glfw.GLFW.*;
 import static org.overrun.swgl.core.cfg.GlobalConfig.*;
@@ -70,6 +74,14 @@ public abstract class GlfwApplication extends Application {
      * The resource managers.
      */
     protected final Set<ResManager> resManagers = new LinkedHashSet<>();
+    /**
+     * The scheduled tasks executed per loop.
+     */
+    protected final List<Scheduler> scheduledPerLoopTasks = new ArrayList<>();
+    /**
+     * The passed application ticks.
+     */
+    protected int passedAppTicks = 0;
 
     /**
      * Update the time and ticking.
@@ -78,7 +90,11 @@ public void updateTime() {
         timer.update();
 
         for (int i = 0; i < timer.ticks; i++) {
+            for (var task : scheduledPerLoopTasks) {
+                task.tick(passedAppTicks);
+            }
             tick();
+            ++passedAppTicks;
         }
     }
 
@@ -193,6 +209,16 @@ public void addResManager(ResManager manager) {
         resManagers.add(manager);
     }
 
+    /**
+     * Scheduled tasks executed per loop.
+     *
+     * @param frequency The frequency in ticks.
+     * @param command   The command to be executed.
+     */
+    public void schedulePerLoop(int frequency, BooleanSupplier command) {
+        scheduledPerLoopTasks.add(new Scheduler(passedAppTicks, frequency, command));
+    }
+
     /**
      * Will be called when a key is pressed.
      *

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

@@ -33,6 +33,8 @@
  * @since 0.1.0
  */
 public abstract class Asset {
+    public static final String BUILTIN_RES_BASE_DIR = "__$$swgl_core$$__unique_res$$__";
+
     /**
      * Reloads or loads the asset by the specified name and {@link IFileProvider FileProvider}.
      *

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

@@ -226,7 +226,8 @@ public void reloadAssets(boolean force) {
      * @throws ClassCastException If value is not an instance of {@code T}
      */
     @SuppressWarnings("unchecked")
-    public <T extends Asset> Optional<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
@@ -242,6 +243,21 @@ public <T extends Asset> Optional<T> getAsset(String name)
         return Optional.ofNullable((T) t);
     }
 
+    /**
+     * Get the asset from assets lazily.
+     *
+     * @param name The asset name or alias.
+     * @param <T>  The asset type.
+     * @return The asset.
+     * @throws RuntimeException   If asset not found.
+     * @throws ClassCastException If value is not an instance of {@code T}
+     */
+    public <T extends Asset>
+    Supplier<Optional<T>> getAssetLazy(String name)
+        throws RuntimeException, ClassCastException {
+        return () -> getAsset(name);
+    }
+
     /**
      * Freeze this manager.
      *

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

@@ -28,11 +28,13 @@
 import org.lwjgl.opengl.GL;
 import org.lwjgl.system.MemoryStack;
 import org.overrun.swgl.core.cfg.GlobalConfig;
+import org.overrun.swgl.core.io.HeapManager;
 import org.overrun.swgl.core.io.IFileProvider;
 
 import java.nio.ByteBuffer;
 import java.util.Optional;
 import java.util.function.Consumer;
+import java.util.function.Supplier;
 
 import static org.lwjgl.opengl.GL30C.*;
 import static org.lwjgl.stb.STBImage.*;
@@ -46,25 +48,12 @@
  * @since 0.1.0
  */
 public class Texture2D extends Texture {
-    /**
-     * The missing texture storage in RGB.
-     * <h3>Preview</h3>
-     * <div style="display:grid;grid-template-columns:8px 8px;grid-template-rows:8px 8px">
-     *     <div style="background-color:#f800f8"></div>
-     *     <div style="background-color:#000000"></div>
-     *     <div style="background-color:#000000"></div>
-     *     <div style="background-color:#f800f8"></div>
-     * </div>
-     */
-    private static final int[] MISSING_NO = {
-        0xf800f8, 0x000000,
-        0x000000, 0xf800f8
-    };
     private int id;
     private boolean failed;
     private int width, height;
     @Nullable
     private ITextureParam param;
+    public int defaultWidth = 16, defaultHeight = 16;
 
     /**
      * Create an empty 2D texture.
@@ -79,7 +68,6 @@ public Texture2D() {
      * @param provider The file provider.
      */
     public Texture2D(String name, IFileProvider provider) {
-        create();
         reload(name, provider);
     }
 
@@ -108,6 +96,13 @@ public static Optional<Texture2D> getAsset(
         return mgr.getAsset(name);
     }
 
+    public static Supplier<Optional<Texture2D>> getAssetLazy(
+        AssetManager mgr,
+        String name
+    ) {
+        return mgr.getAssetLazy(name);
+    }
+
     /**
      * {@inheritDoc}
      * <p>
@@ -143,24 +138,36 @@ public ITextureParam getParam() {
 
     private ByteBuffer fail() {
         failed = true;
-        width = 2;
-        height = 2;
-        var buffer = memAlloc(MISSING_NO.length * 4);
-        buffer.asIntBuffer().put(MISSING_NO).flip();
+        width = (defaultWidth == 0 ? 16 : defaultWidth);
+        height = (defaultHeight == 0 ? 16 : defaultHeight);
+        int[] missingNo = new int[width * height];
+        final int hx = width >> 1;
+        final int hy = height >> 1;
+        for (int x = 0; x < width; x++) {
+            for (int y = 0; y < height; y++) {
+                int index = x + y * width;
+                if (y < hy)
+                    missingNo[index] = x < hx ? 0xf800f8 : 0x000000;
+                else
+                    missingNo[index] = x < hx ? 0x000000 : 0xf800f8;
+            }
+        }
+        var buffer = memAlloc(missingNo.length * 4);
+        buffer.asIntBuffer().put(missingNo).flip();
         return buffer;
     }
 
     private ByteBuffer asBuffer(byte[] bytes,
                                 String name) {
         if (bytes == null)
             return fail();
-        var bb = memAlloc(bytes.length);
-        try (var stack = MemoryStack.stackPush()) {
-            bb.put(bytes).flip();
+        try (var heap = new HeapManager();
+             var stack = MemoryStack.stackPush()) {
             var xp = stack.mallocInt(1);
             var yp = stack.mallocInt(1);
             var cp = stack.mallocInt(1);
-            var buffer = stbi_load_from_memory(bb,
+            var buffer = stbi_load_from_memory(
+                heap.utilMemAlloc(bytes.length).put(bytes).flip(),
                 xp,
                 yp,
                 cp,
@@ -176,8 +183,6 @@ private ByteBuffer asBuffer(byte[] bytes,
                 height = yp.get(0);
             }
             return buffer;
-        } finally {
-            memFree(bb);
         }
     }
 
@@ -225,7 +230,7 @@ public int getId() {
     }
 
     /**
-     * If true, the texture used {@link #MISSING_NO missing texture}.
+     * If true, the texture uses the missing texture.
      *
      * @return If the texture loading failed.
      */

src/main/java/org/overrun/swgl/core/gl/GLClear.java

@@ -39,15 +39,10 @@ public class GLClear {
     /**
      * AttribMask
      */
-    public static final int COLOR_BUFFER_BIT = GL_COLOR_BUFFER_BIT;
-    /**
-     * AttribMask
-     */
-    public static final int DEPTH_BUFFER_BIT = GL_DEPTH_BUFFER_BIT;
-    /**
-     * AttribMask
-     */
-    public static final int STENCIL_BUFFER_BIT = GL_STENCIL_BUFFER_BIT;
+    public static final int
+        COLOR_BUFFER_BIT = GL_COLOR_BUFFER_BIT,
+        DEPTH_BUFFER_BIT = GL_DEPTH_BUFFER_BIT,
+        STENCIL_BUFFER_BIT = GL_STENCIL_BUFFER_BIT;
     private static final float[] clearColor = {0.0f, 0.0f, 0.0f, 0.0f};
     private static double clearDepth = 1.0;
     private static int clearStencil = 1;

src/main/java/org/overrun/swgl/core/gl/GLDrawMode.java

@@ -26,7 +26,7 @@
 
 import org.jetbrains.annotations.Contract;
 
-import static org.lwjgl.opengl.GL40.*;
+import static org.lwjgl.opengl.GL40C.*;
 
 /**
  * The OpenGL drawing modes.
@@ -42,7 +42,7 @@ public enum GLDrawMode {
     TRIANGLES(GL_TRIANGLES, false),
     TRIANGLE_STRIP(GL_TRIANGLE_STRIP, false),
     TRIANGLE_FAN(GL_TRIANGLE_FAN, false),
-//    QUADS(GL_QUADS, true),
+    QUADS(GL_TRIANGLES, true),
 //    QUAD_STRIP(GL_QUAD_STRIP, true),
 //    POLYGON(GL_POLYGON, true),
     LINES_ADJACENCY(GL_LINES_ADJACENCY, false),