Small fixes (#74)

* New text texture filtering detection
* Better hover control

Author: Nightenom

src/main/java/com/ldtteam/blockui/Pane.java

@@ -45,6 +45,7 @@ public class Pane extends UiRenderMacros
     // Runtime
     protected BOWindow window;
     protected View parent;
+    protected Pane hoverSource = null;
     /**
      * Should be only used during drawing methods. Outside drawing scope value may be outdated.
      */
@@ -204,6 +205,14 @@ public boolean isVisible()
         return visible;
     }
 
+    /**
+     * @return visible because of anything
+     */
+    public boolean shouldDraw()
+    {
+        return visible || hoverSource != null;
+    }
+
     public void setVisible(final boolean v)
     {
         visible = v;
@@ -337,7 +346,7 @@ public void draw(final BOGuiGraphics target, final double mx, final double my)
         wasCursorInPane = isPointInPane(mx, my);
         handleHover(oldCursorInPane);
 
-        if (visible)
+        if (shouldDraw())
         {
             if (wasCursorInPane && isEnabled())
             {
@@ -370,7 +379,7 @@ public void draw(final BOGuiGraphics target, final double mx, final double my)
      */
     public void drawLast(final BOGuiGraphics target, final double mx, final double my)
     {
-        if (visible)
+        if (shouldDraw())
         {
             drawSelfLast(target, mx, my);
         }
@@ -411,7 +420,7 @@ public void drawSelfLast(final BOGuiGraphics ms, final double mx, final double m
      */
     public boolean isPointInPane(final double mx, final double my)
     {
-        return isVisible() && mx >= x && mx < (x + width) && my >= y && my < (y + height);
+        return shouldDraw() && mx >= x && mx < (x + width) && my >= y && my < (y + height);
     }
 
     /**
@@ -558,7 +567,7 @@ public void putInside(final View newParent)
 
     public boolean isClickable()
     {
-        return visible && isEnabled();
+        return shouldDraw() && isEnabled();
     }
 
     // ----------Mouse-------------//
@@ -642,7 +651,7 @@ public boolean handleRightClick(final double mx, final double my)
      */
     public boolean canHandleClick(final double mx, final double my)
     {
-        return isVisible() && isEnabled() && isPointInPane(mx, my);
+        return shouldDraw() && isEnabled() && isPointInPane(mx, my);
     }
 
     /**
@@ -820,23 +829,24 @@ protected void handleHover(final boolean wasCursorInPaneLastTick)
         {
             onHover = window.findPaneByID(onHoverId); // do not use setHoverPane, here onHover is defined in xml
             Objects.requireNonNull(onHover, String.format("Hover pane \"%s\" for \"%s\" was not found.", onHoverId, id));
+            onHover.hide(); // automatically hide it (in case someone forgot to do so in xml)
         }
 
-        if (onHover == null)
-        {
-            return;
-        }
-
-        if (this.wasCursorInPane && !onHover.isVisible() && onHover.isEnabled())
+        if (onHover != null && this.wasCursorInPane && onHover.hoverSource == null && onHover.isEnabled())
         {
-            onHover.show();
+            onHover.hoverSource = this;
         }
-        // if onHover was already drawn then we good
-        // else we have to wait for next frame
-        else if (!onHover.wasCursorInPane && !this.wasCursorInPane && this.wasCursorInPane == wasCursorInPaneLastTick
-            && onHover.isVisible())
+        // if onHover was already drawn then we good, else we have to wait for next frame
+        else if (!this.wasCursorInPane && !wasCursorInPaneLastTick)
         {
-            onHover.hide();
+            if (onHover != null && onHover.hoverSource == this && !onHover.wasCursorInPane)
+            {
+                onHover.hoverSource = null;
+            }
+            else if (hoverSource != null && !hoverSource.wasCursorInPane)
+            {
+                hoverSource = null;
+            }
         }
     }
 

src/main/java/com/ldtteam/blockui/controls/AbstractTextElement.java

@@ -31,7 +31,9 @@
  */
 public abstract class AbstractTextElement extends Pane
 {
+    @Deprecated(forRemoval = true, since = "1.20.1")
     public static final int FILTERING_ROUNDING = 50;
+    public static final float FILTERING_MAX_SCALE = 2; // enable texture filtering when text is below this scale (in monitor pixels)
     public static final float FILTERING_THRESHOLD = 0.02f; // should be 1/FILTERING_ROUNDING
 
     public static final double DEFAULT_TEXT_SCALE = 1.0d;
@@ -307,30 +309,21 @@ else if (textAlignment.isVerticalCentered())
 
         ms.pushPose();
         ms.translate(x + offsetX, y + offsetY, 0.0d);
+        ms.scale((float) textScale, (float) textScale, 1.0f);
 
         final Matrix4f matrix4f = ms.last().pose();
 
+        // we want to see how big is one scaled pixel on monitor (using one texel)
+        final int fbW = window.getScreen().getFramebufferWidth(), fbH = window.getScreen().getFramebufferHeight();
         final Vector4f temp = new Vector4f(1, 1, 0, 0);
-        matrix4f.transform(temp);
-        final float oldScaleX = temp.x();
-        final float oldScaleY = temp.y();
-        final float newScaleX = (float) Math.round(oldScaleX * textScale * FILTERING_ROUNDING) / FILTERING_ROUNDING;
-        final float newScaleY = (float) Math.round(oldScaleY * textScale * FILTERING_ROUNDING) / FILTERING_ROUNDING;
-
-        if (Math.abs((float) Math.round(newScaleX) - newScaleX) > FILTERING_THRESHOLD
-            || Math.abs((float) Math.round(newScaleY) - newScaleY) > FILTERING_THRESHOLD)
-        {
-            // smooth the texture
-            // if (newScaleX < window.getScreen().getVanillaGuiScale() || newScaleY < window.getScreen().getVanillaGuiScale())
-            // TODO: figure out how to not linear filter when mag filter is used, might just want to use direct ogl call
-            NeoForgeRenderTypes.enableTextTextureLinearFiltering = true;
-            ms.scale((float) textScale, (float) textScale, 1.0f);
-        }
-        else
-        {
-            // round scale if not smoothing
-            ms.scale(newScaleX / oldScaleX, newScaleY / oldScaleY, 1.0f);
-        }
+        matrix4f.transform(temp); // PVM
+        temp.w = 1; // vector -> point
+        temp.mulProject(RenderSystem.getProjectionMatrix()); // projection, perspective
+        temp.add(1, 1, 0, 0); // viewport, discard non (x,y)
+        temp.mul(fbW / 2.0f, fbH / 2.0f, 0, 0);
+
+        final float scale = temp.distanceSquared(FILTERING_THRESHOLD, fbH - FILTERING_THRESHOLD, 0, 0);
+        NeoForgeRenderTypes.enableTextTextureLinearFiltering = Math.abs(temp.x - fbH + temp.y) > FILTERING_THRESHOLD || scale < FILTERING_MAX_SCALE * FILTERING_MAX_SCALE;
 
         final MultiBufferSource.BufferSource drawBuffer = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
         int lineShift = 0;

src/main/java/com/ldtteam/blockui/mod/ClientEventSubscriber.java

@@ -73,7 +73,7 @@ public static void onClientTickEvent(final ClientTickEvent event)
                 window.addChild(dumpAtlases);
                 window.addChild(createTestGuiButton(id++, "General All-in-one", new ResourceLocation(BlockUI.MOD_ID, "gui/test.xml"), parent -> {
                     parent.findPaneOfTypeByID("missing_out_of_jar", Image.class).setImage(OutOfJarResourceLocation.ofMinecraftFolder(BlockUI.MOD_ID, "missing_out_of_jar.png"), false);
-                    parent.findPaneOfTypeByID("working_out_of_jar", Image.class).setImage(OutOfJarResourceLocation.ofMinecraftFolder(BlockUI.MOD_ID, "../../../src/test/resources/button.png"), false);
+                    parent.findPaneOfTypeByID("working_out_of_jar", Image.class).setImage(OutOfJarResourceLocation.of(BlockUI.MOD_ID, Path.of("../../src/test/resources/button.png")), false);
                 }));
                 window.addChild(createTestGuiButton(id++, "Tooltip Positioning", new ResourceLocation(BlockUI.MOD_ID, "gui/test2.xml")));
                 window.addChild(createTestGuiButton(id++, "ItemIcon To BlockState", new ResourceLocation(BlockUI.MOD_ID, "gui/test3.xml"), BlockStateTestGui::setup));

src/main/java/com/ldtteam/blockui/views/DropDownList.java

@@ -320,6 +320,6 @@ default MutableComponent getLabel(final int index)
     @Override
     public boolean isPointInPane(final double mx, final double my)
     {
-        return super.isPointInPane(mx, my) || (overlay.isVisible() && list.isPointInPane(mx, my));
+        return super.isPointInPane(mx, my) || (overlay.shouldDraw() && list.isPointInPane(mx, my));
     }
 }

src/main/java/com/ldtteam/blockui/views/View.java

@@ -246,7 +246,7 @@ public void onUpdate()
         // copy to prevent CME during scrolling list updates, ctor uses fast array copy so it's cheap
         for (final Pane child : new ArrayList<>(children))
         {
-            if (child.isVisible())
+            if (child.shouldDraw())
             {
                 child.onUpdate();
             }