GLList; SpriteBatch use IMS

Author: squid233

src/main/java/module-info.java

@@ -15,6 +15,7 @@
     exports org.overrun.swgl.core.asset;
     exports org.overrun.swgl.core.cfg;
     exports org.overrun.swgl.core.gl;
+    exports org.overrun.swgl.core.gl.ims;
     exports org.overrun.swgl.core.io;
     exports org.overrun.swgl.core.level;
     exports org.overrun.swgl.core.model;

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

@@ -89,7 +89,6 @@ public void boot() {
             prepare();
             if (!glfwInit())
                 throw new IllegalStateException("Unable to initialize GLFW");
-            preStart();
 
             // Setup window
             glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE);//todo add to config
@@ -101,6 +100,7 @@ public void boot() {
                 glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
                 glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
             }
+            preStart();
             window = new Window();
             window.createHandle(initialWidth, initialHeight, initialTitle);
             long hWnd = window.getHandle();
@@ -123,6 +123,7 @@ public void boot() {
             glfwSetWindowFocusCallback(hWnd, (handle, focused) -> {
                 if (!focused) mouse.firstFocus = true;
             });
+            glfwSetScrollCallback(hWnd, (handle, xoffset, yoffset) -> onScroll(xoffset, yoffset));
 
             timer = new Timer();
             glfwMakeContextCurrent(hWnd);
@@ -230,6 +231,15 @@ public void onMouseBtnPress(int btn, int mods) {
     public void onMouseBtnRelease(int btn, int mods) {
     }
 
+    /**
+     * Will be called when a scrolling device is used, such as a mouse wheel or scrolling area of a touchpad.
+     *
+     * @param xoffset the scroll offset along the x-axis
+     * @param yoffset the scroll offset along the y-axis
+     */
+    public void onScroll(double xoffset, double yoffset) {
+    }
+
     /**
      * Called on setting {@link #frames}.
      */

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

@@ -70,6 +70,9 @@ public static void init() {
             maxTextureImageUnits = glGetInteger(GL_MAX_TEXTURE_IMAGE_UNITS);
             texture2dId = new int[maxCombinedTextureImageUnits];
             texture2DStates = new GLTextureState[maxCombinedTextureImageUnits];
+            for (int i = 0; i < maxCombinedTextureImageUnits; i++) {
+                texture2DStates[i] = new GLTextureState(GL_TEXTURE_2D);
+            }
         }
     }
 
@@ -91,6 +94,18 @@ public static int getMaxTexImgUnits() {
         return maxTextureImageUnits;
     }
 
+    public static void enableTexture2D() {
+        texture2DStates[activeTexture].enable();
+    }
+
+    public static void disableTexture2D() {
+        texture2DStates[activeTexture].disable();
+    }
+
+    public static boolean isTexture2dEnabled(int unit) {
+        return texture2DStates[unit].isEnabled();
+    }
+
     /**
      * Binds a 2D texture to the active texture unit.
      *
@@ -286,11 +301,27 @@ public static void disableBlend() {
      * @param dfactor The blend dst factor both RGB and alpha
      */
     public static void blendFunc(int sfactor, int dfactor) {
-        if (blendSFactorRGB != sfactor && blendSFactorAlpha != sfactor
-            && blendDFactorRGB != dfactor && blendDFactorAlpha != dfactor) {
+        if (blendSFactorRGB != sfactor || blendSFactorAlpha != sfactor
+            || blendDFactorRGB != dfactor || blendDFactorAlpha != dfactor) {
             blendSFactorRGB = blendSFactorAlpha = sfactor;
             blendDFactorRGB = blendDFactorAlpha = dfactor;
             glBlendFunc(sfactor, dfactor);
         }
     }
+
+    public static void blendFuncSeparate(
+        int sfactorRGB,
+        int dfactorRGB,
+        int sfactorAlpha,
+        int dfactorAlpha
+    ) {
+        if (blendSFactorRGB != sfactorRGB || blendSFactorAlpha != sfactorAlpha
+            || blendDFactorRGB != dfactorRGB || blendDFactorAlpha != dfactorAlpha) {
+            blendSFactorRGB = sfactorRGB;
+            blendSFactorAlpha = sfactorAlpha;
+            blendDFactorRGB = dfactorRGB;
+            blendDFactorAlpha = dfactorAlpha;
+            glBlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+        }
+    }
 }

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

@@ -40,11 +40,11 @@ public int getType() {
         return type;
     }
 
-    public void enabled() {
+    public void enable() {
         enabled = true;
     }
 
-    public void disabled() {
+    public void disable() {
         enabled = false;
     }