Add entity scaling option for bigger mobs, render them without blurring (#39)

DarkShadow44 · web-flow · commit 52dbd2555cc1 · 2025-01-20T15:12:07.000-06:00
* Add entity scale option

* Draw animal icons using nearest neighbor

* Add setting for entity blur

* Update changelog
diff --git a/doc/changelog.html b/doc/changelog.html
@@ -25,4 +25,6 @@ <h1>JourneyMap ${version} for Minecraft ${mcversion}</h1>
 <ul>
     <li>Fixed: Some PNGs fail to resize.</li>
     <li>Chore: Update buildscript.</li>
+    <li>Added: Option for entity icon scale.</li>
+    <li>Added: Option to disable entity icon blur.</li>
 </ul>
diff --git a/src/main/java/journeymap/client/properties/MapProperties.java b/src/main/java/journeymap/client/properties/MapProperties.java
@@ -48,6 +48,12 @@ public abstract class MapProperties extends PropertiesBase implements Comparable
     @Config(category = Inherit, key = "jm.common.mob_icon_set", stringListProvider = IconSetFileHandler.IconSetStringListProvider.class)
     public final AtomicReference<String> entityIconSetName = new AtomicReference<String>("2D");
 
+    @Config(category = Inherit, key = "jm.common.entity_scale", minValue = 50, maxValue = 400, defaultValue = 100)
+    public final AtomicInteger entityScale = new AtomicInteger(100);
+
+    @Config(category = Inherit, key = "jm.common.entity_blur")
+    public final AtomicBoolean entityBlur = new AtomicBoolean(true);
+
     public final AtomicInteger zoomLevel = new AtomicInteger(0);
 
     protected MapProperties()
@@ -85,6 +91,8 @@ public int hashCode()
         result = 31 * result + showWaypoints.hashCode();
         result = 31 * result + showSelf.hashCode();
         result = 31 * result + getEntityIconSetName().hashCode();
+        result = 31 * result + entityScale.hashCode();
+        result = 31 * result + entityBlur.hashCode();
         return result;
     }
 
@@ -105,7 +113,9 @@ protected Objects.ToStringHelper toStringHelper(MapProperties me)
                 .add("showSelf", showSelf)
                 .add("showVillagers", showVillagers)
                 .add("showWaypoints", showWaypoints)
-                .add("zoomLevel", zoomLevel);
+                .add("zoomLevel", zoomLevel)
+                .add("entityScale", entityScale)
+                .add("entityBlur", entityBlur);
     }
 
 
diff --git a/src/main/java/journeymap/client/properties/WebMapProperties.java b/src/main/java/journeymap/client/properties/WebMapProperties.java
@@ -92,7 +92,9 @@ public String toString()
                 ", showPets=" + showPets +
                 ", showPlayers=" + showPlayers +
                 ", showWaypoints=" + showWaypoints +
-                ", entityIconSetName=" + getEntityIconSetName();
+                ", entityIconSetName=" + getEntityIconSetName() +
+                ", entityScale=" + entityScale +
+                ", entityBlur=" + entityBlur;
     }
 
 
diff --git a/src/main/java/journeymap/client/render/draw/DrawEntityStep.java b/src/main/java/journeymap/client/render/draw/DrawEntityStep.java
@@ -39,19 +39,23 @@ public class DrawEntityStep implements DrawStep
     WeakReference<EntityLivingBase> entityLivingRef;
     String customName;
     boolean flip;
+    double entityScale;
+    boolean entityBlur;
 
     private DrawEntityStep(EntityLivingBase entityLiving)
     {
         super();
         this.entityLivingRef = new WeakReference<EntityLivingBase>(entityLiving);
     }
 
-    public void update(boolean flip, TextureImpl locatorTexture, TextureImpl texture, boolean showHeading)
+    public void update(boolean flip, TextureImpl locatorTexture, TextureImpl texture, boolean showHeading, double entityScale, boolean entityBlur)
     {
         this.locatorTexture = locatorTexture;
         this.texture = texture;
         this.flip = flip;
         this.showHeading = showHeading;
+        this.entityScale = entityScale;
+        this.entityBlur = entityBlur;
         EntityLivingBase entityLiving = entityLivingRef.get();
         if (entityLiving != null)
         {
@@ -69,6 +73,8 @@ public void draw(double xOffset, double yOffset, GridRenderer gridRenderer, floa
             return;
         }
 
+        drawScale *= entityScale;
+
         Point2D pixel = gridRenderer.getPixel(entityLiving.posX, entityLiving.posZ);
         if (pixel != null)
         {
@@ -106,12 +112,12 @@ private void drawPlayer(double drawX, double drawY, GridRenderer gridRenderer, f
 
         if (locatorTexture != null && showHeading)
         {
-            DrawUtil.drawEntity(drawX, drawY, heading, false, locatorTexture, alpha, drawScale, rotation);
+            DrawUtil.drawEntity(drawX, drawY, heading, false, locatorTexture, alpha, drawScale, rotation, true);
         }
 
         if (texture != null)
         {
-            DrawUtil.drawEntity(drawX, drawY, heading, true, texture, alpha, drawScale * .75f, rotation);
+            DrawUtil.drawEntity(drawX, drawY, heading, true, texture, alpha, drawScale * .75f, rotation, true);
         }
         int labelOffset = texture == null ? 0 : rotation == 0 ? -texture.getHeight() / 2 : texture.getHeight() / 2;
         Point2D labelPoint = gridRenderer.shiftWindowPosition(drawX, drawY, 0, -labelOffset);
@@ -140,7 +146,7 @@ private void drawCreature(double drawX, double drawY, GridRenderer gridRenderer,
 
         if (locatorTexture != null && showHeading)
         {
-            DrawUtil.drawEntity(drawX, drawY, heading, false, locatorTexture, alpha, drawScale, rotation);
+            DrawUtil.drawEntity(drawX, drawY, heading, false, locatorTexture, alpha, drawScale, rotation, true);
         }
 
         int labelOffset = texture == null ? 8 : rotation == 0 ? texture.getHeight() : -texture.getHeight();
@@ -153,7 +159,7 @@ private void drawCreature(double drawX, double drawY, GridRenderer gridRenderer,
 
         if (texture != null)
         {
-            DrawUtil.drawEntity(drawX, drawY, heading, true, texture, alpha, drawScale, rotation);
+            DrawUtil.drawEntity(drawX, drawY, heading, true, texture, alpha, drawScale, rotation, entityBlur);
         }
     }
 
diff --git a/src/main/java/journeymap/client/render/draw/DrawUtil.java b/src/main/java/journeymap/client/render/draw/DrawUtil.java
@@ -230,14 +230,14 @@ public static int getLabelHeight(FontRenderer fr, boolean fontShadow)
         return fr.FONT_HEIGHT + (2 * vpad);
     }
 
-    private static void drawQuad(TextureImpl texture, float alpha, final double x, final double y, final double width, final double height, boolean flip, double rotation)
+    private static void drawQuad(TextureImpl texture, float alpha, final double x, final double y, final double width, final double height, boolean flip, double rotation, boolean linear)
     {
-        drawQuad(texture, x, y, width, height, rotation, null, alpha, flip, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false);
+        drawQuad(texture, x, y, width, height, rotation, null, alpha, flip, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false, linear);
     }
 
     private static void drawQuad(TextureImpl texture, final double x, final double y, final double width, final double height, boolean flip, double rotation)
     {
-        drawQuad(texture, x, y, width, height, rotation, null, 1f, flip, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false);
+        drawQuad(texture, x, y, width, height, rotation, null, 1f, flip, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false, true);
     }
 
     /**
@@ -252,7 +252,7 @@ private static void drawQuad(TextureImpl texture, final double x, final double y
      * @param glBlendSfactor For normal alpha blending: GL11.GL_SRC_ALPHA
      * @param glBlendDFactor For normal alpha blending: GL11.GL_ONE_MINUS_SRC_ALPHA
      */
-    public static void drawQuad(TextureImpl texture, final double x, final double y, final double width, final double height, double rotation, Integer color, float alpha, boolean flip, boolean blend, int glBlendSfactor, int glBlendDFactor, boolean clampTexture)
+    public static void drawQuad(TextureImpl texture, final double x, final double y, final double width, final double height, double rotation, Integer color, float alpha, boolean flip, boolean blend, int glBlendSfactor, int glBlendDFactor, boolean clampTexture, boolean linear)
     {
         GL11.glPushMatrix();
 
@@ -277,8 +277,8 @@ public static void drawQuad(TextureImpl texture, final double x, final double y,
                 renderHelper.glColor4f(1, 1, 1, alpha);
             }
 
-            renderHelper.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR);
-            renderHelper.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR);
+            renderHelper.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, linear ? GL11.GL_LINEAR : GL11.GL_NEAREST);
+            renderHelper.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, linear ? GL11.GL_LINEAR : GL11.GL_NEAREST);
 
             int texEdgeBehavior = clampTexture ? GL12.GL_CLAMP_TO_EDGE : GL11.GL_REPEAT;
             renderHelper.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, texEdgeBehavior);
@@ -388,9 +388,9 @@ public static void drawBoundTexture(double startU, double startV, double startX,
         renderHelper.draw();
     }
 
-    public static void drawImage(TextureImpl texture, double x, double y, boolean flip, float alpha, float scale, double rotation)
+    public static void drawImage(TextureImpl texture, double x, double y, boolean flip, float alpha, float scale, double rotation, boolean linear)
     {
-        drawQuad(texture, alpha, x, y, (texture.getWidth() * scale), (texture.getHeight() * scale), flip, rotation);
+        drawQuad(texture, alpha, x, y, (texture.getWidth() * scale), (texture.getHeight() * scale), flip, rotation, linear);
     }
 
     public static void drawImage(TextureImpl texture, double x, double y, boolean flip, float scale, double rotation)
@@ -405,17 +405,17 @@ public static void drawClampedImage(TextureImpl texture, double x, double y, flo
 
     public static void drawClampedImage(TextureImpl texture, Integer color, double x, double y, float scale, float alpha, double rotation)
     {
-        drawQuad(texture, x, y, (texture.getWidth() * scale), (texture.getHeight() * scale), rotation, color, alpha, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, true);
+        drawQuad(texture, x, y, (texture.getWidth() * scale), (texture.getHeight() * scale), rotation, color, alpha, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, true, true);
     }
 
     public static void drawColoredImage(TextureImpl texture, int alpha, Integer color, double x, double y, float scale, double rotation)
     {
-        drawQuad(texture, x, y, (texture.getWidth() * scale), (texture.getHeight() * scale), rotation, color, alpha, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false);
+        drawQuad(texture, x, y, (texture.getWidth() * scale), (texture.getHeight() * scale), rotation, color, alpha, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false, true);
     }
 
     public static void drawColoredImage(TextureImpl texture, int alpha, Integer color, double x, double y, double rotation)
     {
-        drawQuad(texture, x, y, texture.getWidth(), texture.getHeight(), rotation, color, alpha, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false);
+        drawQuad(texture, x, y, texture.getWidth(), texture.getHeight(), rotation, color, alpha, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false, true);
     }
 
     /**
@@ -430,7 +430,7 @@ public static void drawColoredImage(TextureImpl texture, int alpha, Integer colo
      */
     public static void drawEntity(double x, double y, double heading, boolean flipInsteadOfRotate, TextureImpl texture, float scale, double rotation)
     {
-        drawEntity(x, y, heading, flipInsteadOfRotate, texture, 1f, scale, rotation);
+        drawEntity(x, y, heading, flipInsteadOfRotate, texture, 1f, scale, rotation, true);
     }
 
     /**
@@ -443,7 +443,7 @@ public static void drawEntity(double x, double y, double heading, boolean flipIn
      * @param flipInsteadOfRotate
      * @param texture
      */
-    public static void drawEntity(double x, double y, double heading, boolean flipInsteadOfRotate, TextureImpl texture, float alpha, float scale, double rotation)
+    public static void drawEntity(double x, double y, double heading, boolean flipInsteadOfRotate, TextureImpl texture, float alpha, float scale, double rotation, boolean linear)
     {
         // Adjust to scale
         double width = (texture.getWidth() * scale);
@@ -454,12 +454,12 @@ public static void drawEntity(double x, double y, double heading, boolean flipIn
         if (flipInsteadOfRotate)
         {
             boolean flip = (heading % 180) < 90;
-            drawImage(texture, drawX, drawY, flip, alpha, scale, -rotation);
+            drawImage(texture, drawX, drawY, flip, alpha, scale, -rotation, linear);
         }
         else
         {
             // Draw texture in rotated position
-            drawImage(texture, drawX, drawY, false, alpha, scale, heading);
+            drawImage(texture, drawX, drawY, false, alpha, scale, heading, linear);
         }
     }
 
diff --git a/src/main/java/journeymap/client/render/draw/RadarDrawStepFactory.java b/src/main/java/journeymap/client/render/draw/RadarDrawStepFactory.java
@@ -36,6 +36,8 @@ public List<DrawStep> prepareSteps(List<EntityDTO> entityDTOs, GridRenderer grid
         final boolean showMobHeading = mapProperties.showMobHeading.get();
         final boolean showPlayerHeading = mapProperties.showPlayerHeading.get();
         final List<DrawStep> drawStepList = new ArrayList<DrawStep>();
+        final double entityScale = (double)mapProperties.entityScale.get() / 100;
+        final boolean entityBlur = mapProperties.entityBlur.get();
 
         try
         {
@@ -104,7 +106,7 @@ public List<DrawStep> prepareSteps(List<EntityDTO> entityDTOs, GridRenderer grid
                         {
                             entityIcon = tc.getPlayerSkin(ForgeHelper.INSTANCE.getEntityName(entityLiving));
                             DrawEntityStep drawStep = DataCache.instance().getDrawEntityStep(entityLiving);
-                            drawStep.update(false, locatorImg, entityIcon, showPlayerHeading);
+                            drawStep.update(false, locatorImg, entityIcon, showPlayerHeading, entityScale, true);
                             drawStepList.add(drawStep);
                         }
                         else
@@ -113,7 +115,7 @@ public List<DrawStep> prepareSteps(List<EntityDTO> entityDTOs, GridRenderer grid
                             if (entityIcon != null)
                             {
                                 DrawEntityStep drawStep = DataCache.instance().getDrawEntityStep(entityLiving);
-                                drawStep.update(false, locatorImg, entityIcon, showMobHeading);
+                                drawStep.update(false, locatorImg, entityIcon, showMobHeading, entityScale, entityBlur);
                                 drawStepList.add(drawStep);
                             }
                         }
diff --git a/src/main/java/journeymap/client/ui/theme/ThemeMinimapFrame.java b/src/main/java/journeymap/client/ui/theme/ThemeMinimapFrame.java
@@ -132,7 +132,7 @@ public void drawMask()
         }
         else
         {
-            DrawUtil.drawQuad(textureCircleMask, x, y, this.width, this.height, 0, null, 1f, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, true);
+            DrawUtil.drawQuad(textureCircleMask, x, y, this.width, this.height, 0, null, 1f, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, true, true);
         }
     }
 
@@ -209,7 +209,7 @@ public void drawFrame()
             }
             else
             {
-                DrawUtil.drawQuad(textureCircle, x, y, this.width, this.height, 0, frameColor, 1f, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, true);
+                DrawUtil.drawQuad(textureCircle, x, y, this.width, this.height, 0, frameColor, 1f, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, true, true);
             }
         }
     }
diff --git a/src/main/resources/assets/journeymap/lang/en_US.lang b/src/main/resources/assets/journeymap/lang/en_US.lang
@@ -137,6 +137,10 @@ jm.common.mapgui_only_ready=Press [§b%1$s§f]
 jm.common.memory_warning=Minecraft is running out of memory: %1$s
 jm.common.mob_icon_set=Mob Icons
 jm.common.mob_icon_set.tooltip=The iconset used to display mobs on radar
+jm.common.entity_scale=Entity Scale
+jm.common.entity_scale.tooltip=The scale used for entities
+jm.common.entity_blur=Entity Blur
+jm.common.entity_blur.tooltip=If true, enables blur for entity icons. Set to false for a pixelated look
 jm.common.new_version_available=Newer version available: %1$s
 jm.common.night=Night
 jm.common.off=Off

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,9 @@ public String toString()`
`92`	`92`	`", showPets=" + showPets +`
`93`	`93`	`", showPlayers=" + showPlayers +`
`94`	`94`	`", showWaypoints=" + showWaypoints +`
`95`		`- ", entityIconSetName=" + getEntityIconSetName();`
	`95`	`+ ", entityIconSetName=" + getEntityIconSetName() +`
	`96`	`+ ", entityScale=" + entityScale +`
	`97`	`+ ", entityBlur=" + entityBlur;`
`96`	`98`	`}`
`97`	`99`
`98`	`100`
Original file line number	Diff line number	Diff line change
`@@ -39,19 +39,23 @@ public class DrawEntityStep implements DrawStep`
`39`	`39`	`WeakReference<EntityLivingBase> entityLivingRef;`
`40`	`40`	`String customName;`
`41`	`41`	`boolean flip;`
	`42`	`+ double entityScale;`
	`43`	`+ boolean entityBlur;`
`42`	`44`
`43`	`45`	`private DrawEntityStep(EntityLivingBase entityLiving)`
`44`	`46`	`{`
`45`	`47`	`super();`
`46`	`48`	`this.entityLivingRef = new WeakReference<EntityLivingBase>(entityLiving);`
`47`	`49`	`}`
`48`	`50`
`49`		`- public void update(boolean flip, TextureImpl locatorTexture, TextureImpl texture, boolean showHeading)`
	`51`	`+ public void update(boolean flip, TextureImpl locatorTexture, TextureImpl texture, boolean showHeading, double entityScale, boolean entityBlur)`
`50`	`52`	`{`
`51`	`53`	`this.locatorTexture = locatorTexture;`
`52`	`54`	`this.texture = texture;`
`53`	`55`	`this.flip = flip;`
`54`	`56`	`this.showHeading = showHeading;`
	`57`	`+ this.entityScale = entityScale;`
	`58`	`+ this.entityBlur = entityBlur;`
`55`	`59`	`EntityLivingBase entityLiving = entityLivingRef.get();`
`56`	`60`	`if (entityLiving != null)`
`57`	`61`	`{`
`@@ -69,6 +73,8 @@ public void draw(double xOffset, double yOffset, GridRenderer gridRenderer, floa`
`69`	`73`	`return;`
`70`	`74`	`}`
`71`	`75`
	`76`	`+ drawScale *= entityScale;`
	`77`	`+`
`72`	`78`	`Point2D pixel = gridRenderer.getPixel(entityLiving.posX, entityLiving.posZ);`
`73`	`79`	`if (pixel != null)`
`74`	`80`	`{`
`@@ -106,12 +112,12 @@ private void drawPlayer(double drawX, double drawY, GridRenderer gridRenderer, f`
`106`	`112`
`107`	`113`	`if (locatorTexture != null && showHeading)`
`108`	`114`	`{`
`109`		`- DrawUtil.drawEntity(drawX, drawY, heading, false, locatorTexture, alpha, drawScale, rotation);`
	`115`	`+ DrawUtil.drawEntity(drawX, drawY, heading, false, locatorTexture, alpha, drawScale, rotation, true);`
`110`	`116`	`}`
`111`	`117`
`112`	`118`	`if (texture != null)`
`113`	`119`	`{`
`114`		`- DrawUtil.drawEntity(drawX, drawY, heading, true, texture, alpha, drawScale * .75f, rotation);`
	`120`	`+ DrawUtil.drawEntity(drawX, drawY, heading, true, texture, alpha, drawScale * .75f, rotation, true);`
`115`	`121`	`}`
`116`	`122`	`int labelOffset = texture == null ? 0 : rotation == 0 ? -texture.getHeight() / 2 : texture.getHeight() / 2;`
`117`	`123`	`Point2D labelPoint = gridRenderer.shiftWindowPosition(drawX, drawY, 0, -labelOffset);`
`@@ -140,7 +146,7 @@ private void drawCreature(double drawX, double drawY, GridRenderer gridRenderer,`
`140`	`146`
`141`	`147`	`if (locatorTexture != null && showHeading)`
`142`	`148`	`{`
`143`		`- DrawUtil.drawEntity(drawX, drawY, heading, false, locatorTexture, alpha, drawScale, rotation);`
	`149`	`+ DrawUtil.drawEntity(drawX, drawY, heading, false, locatorTexture, alpha, drawScale, rotation, true);`
`144`	`150`	`}`
`145`	`151`
`146`	`152`	`int labelOffset = texture == null ? 8 : rotation == 0 ? texture.getHeight() : -texture.getHeight();`
`@@ -153,7 +159,7 @@ private void drawCreature(double drawX, double drawY, GridRenderer gridRenderer,`
`153`	`159`
`154`	`160`	`if (texture != null)`
`155`	`161`	`{`
`156`		`- DrawUtil.drawEntity(drawX, drawY, heading, true, texture, alpha, drawScale, rotation);`
	`162`	`+ DrawUtil.drawEntity(drawX, drawY, heading, true, texture, alpha, drawScale, rotation, entityBlur);`
`157`	`163`	`}`
`158`	`164`	`}`
`159`	`165`
Original file line number	Diff line number	Diff line change
`@@ -230,14 +230,14 @@ public static int getLabelHeight(FontRenderer fr, boolean fontShadow)`
`230`	`230`	`return fr.FONT_HEIGHT + (2 * vpad);`
`231`	`231`	`}`
`232`	`232`
`233`		`- private static void drawQuad(TextureImpl texture, float alpha, final double x, final double y, final double width, final double height, boolean flip, double rotation)`
	`233`	`+ private static void drawQuad(TextureImpl texture, float alpha, final double x, final double y, final double width, final double height, boolean flip, double rotation, boolean linear)`
`234`	`234`	`{`
`235`		`- drawQuad(texture, x, y, width, height, rotation, null, alpha, flip, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false);`
	`235`	`+ drawQuad(texture, x, y, width, height, rotation, null, alpha, flip, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false, linear);`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`private static void drawQuad(TextureImpl texture, final double x, final double y, final double width, final double height, boolean flip, double rotation)`
`239`	`239`	`{`
`240`		`- drawQuad(texture, x, y, width, height, rotation, null, 1f, flip, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false);`
	`240`	`+ drawQuad(texture, x, y, width, height, rotation, null, 1f, flip, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false, true);`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`/**`
`@@ -252,7 +252,7 @@ private static void drawQuad(TextureImpl texture, final double x, final double y`
`252`	`252`	`* @param glBlendSfactor For normal alpha blending: GL11.GL_SRC_ALPHA`
`253`	`253`	`* @param glBlendDFactor For normal alpha blending: GL11.GL_ONE_MINUS_SRC_ALPHA`
`254`	`254`	`*/`
`255`		`- public static void drawQuad(TextureImpl texture, final double x, final double y, final double width, final double height, double rotation, Integer color, float alpha, boolean flip, boolean blend, int glBlendSfactor, int glBlendDFactor, boolean clampTexture)`
	`255`	`+ public static void drawQuad(TextureImpl texture, final double x, final double y, final double width, final double height, double rotation, Integer color, float alpha, boolean flip, boolean blend, int glBlendSfactor, int glBlendDFactor, boolean clampTexture, boolean linear)`
`256`	`256`	`{`
`257`	`257`	`GL11.glPushMatrix();`
`258`	`258`
`@@ -277,8 +277,8 @@ public static void drawQuad(TextureImpl texture, final double x, final double y,`
`277`	`277`	`renderHelper.glColor4f(1, 1, 1, alpha);`
`278`	`278`	`}`
`279`	`279`
`280`		`- renderHelper.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR);`
`281`		`- renderHelper.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR);`
	`280`	`+ renderHelper.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, linear ? GL11.GL_LINEAR : GL11.GL_NEAREST);`
	`281`	`+ renderHelper.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, linear ? GL11.GL_LINEAR : GL11.GL_NEAREST);`
`282`	`282`
`283`	`283`	`int texEdgeBehavior = clampTexture ? GL12.GL_CLAMP_TO_EDGE : GL11.GL_REPEAT;`
`284`	`284`	`renderHelper.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, texEdgeBehavior);`
`@@ -388,9 +388,9 @@ public static void drawBoundTexture(double startU, double startV, double startX,`
`388`	`388`	`renderHelper.draw();`
`389`	`389`	`}`
`390`	`390`
`391`		`- public static void drawImage(TextureImpl texture, double x, double y, boolean flip, float alpha, float scale, double rotation)`
	`391`	`+ public static void drawImage(TextureImpl texture, double x, double y, boolean flip, float alpha, float scale, double rotation, boolean linear)`
`392`	`392`	`{`
`393`		`- drawQuad(texture, alpha, x, y, (texture.getWidth() * scale), (texture.getHeight() * scale), flip, rotation);`
	`393`	`+ drawQuad(texture, alpha, x, y, (texture.getWidth() * scale), (texture.getHeight() * scale), flip, rotation, linear);`
`394`	`394`	`}`
`395`	`395`
`396`	`396`	`public static void drawImage(TextureImpl texture, double x, double y, boolean flip, float scale, double rotation)`
`@@ -405,17 +405,17 @@ public static void drawClampedImage(TextureImpl texture, double x, double y, flo`
`405`	`405`
`406`	`406`	`public static void drawClampedImage(TextureImpl texture, Integer color, double x, double y, float scale, float alpha, double rotation)`
`407`	`407`	`{`
`408`		`- drawQuad(texture, x, y, (texture.getWidth() * scale), (texture.getHeight() * scale), rotation, color, alpha, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, true);`
	`408`	`+ drawQuad(texture, x, y, (texture.getWidth() * scale), (texture.getHeight() * scale), rotation, color, alpha, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, true, true);`
`409`	`409`	`}`
`410`	`410`
`411`	`411`	`public static void drawColoredImage(TextureImpl texture, int alpha, Integer color, double x, double y, float scale, double rotation)`
`412`	`412`	`{`
`413`		`- drawQuad(texture, x, y, (texture.getWidth() * scale), (texture.getHeight() * scale), rotation, color, alpha, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false);`
	`413`	`+ drawQuad(texture, x, y, (texture.getWidth() * scale), (texture.getHeight() * scale), rotation, color, alpha, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false, true);`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`public static void drawColoredImage(TextureImpl texture, int alpha, Integer color, double x, double y, double rotation)`
`417`	`417`	`{`
`418`		`- drawQuad(texture, x, y, texture.getWidth(), texture.getHeight(), rotation, color, alpha, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false);`
	`418`	`+ drawQuad(texture, x, y, texture.getWidth(), texture.getHeight(), rotation, color, alpha, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, false, true);`
`419`	`419`	`}`
`420`	`420`
`421`	`421`	`/**`
`@@ -430,7 +430,7 @@ public static void drawColoredImage(TextureImpl texture, int alpha, Integer colo`
`430`	`430`	`*/`
`431`	`431`	`public static void drawEntity(double x, double y, double heading, boolean flipInsteadOfRotate, TextureImpl texture, float scale, double rotation)`
`432`	`432`	`{`
`433`		`- drawEntity(x, y, heading, flipInsteadOfRotate, texture, 1f, scale, rotation);`
	`433`	`+ drawEntity(x, y, heading, flipInsteadOfRotate, texture, 1f, scale, rotation, true);`
`434`	`434`	`}`
`435`	`435`
`436`	`436`	`/**`
`@@ -443,7 +443,7 @@ public static void drawEntity(double x, double y, double heading, boolean flipIn`
`443`	`443`	`* @param flipInsteadOfRotate`
`444`	`444`	`* @param texture`
`445`	`445`	`*/`
`446`		`- public static void drawEntity(double x, double y, double heading, boolean flipInsteadOfRotate, TextureImpl texture, float alpha, float scale, double rotation)`
	`446`	`+ public static void drawEntity(double x, double y, double heading, boolean flipInsteadOfRotate, TextureImpl texture, float alpha, float scale, double rotation, boolean linear)`
`447`	`447`	`{`
`448`	`448`	`// Adjust to scale`
`449`	`449`	`double width = (texture.getWidth() * scale);`
`@@ -454,12 +454,12 @@ public static void drawEntity(double x, double y, double heading, boolean flipIn`
`454`	`454`	`if (flipInsteadOfRotate)`
`455`	`455`	`{`
`456`	`456`	`boolean flip = (heading % 180) < 90;`
`457`		`- drawImage(texture, drawX, drawY, flip, alpha, scale, -rotation);`
	`457`	`+ drawImage(texture, drawX, drawY, flip, alpha, scale, -rotation, linear);`
`458`	`458`	`}`
`459`	`459`	`else`
`460`	`460`	`{`
`461`	`461`	`// Draw texture in rotated position`
`462`		`- drawImage(texture, drawX, drawY, false, alpha, scale, heading);`
	`462`	`+ drawImage(texture, drawX, drawY, false, alpha, scale, heading, linear);`
`463`	`463`	`}`
`464`	`464`	`}`
`465`	`465`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ public List<DrawStep> prepareSteps(List<EntityDTO> entityDTOs, GridRenderer grid`
`36`	`36`	`final boolean showMobHeading = mapProperties.showMobHeading.get();`
`37`	`37`	`final boolean showPlayerHeading = mapProperties.showPlayerHeading.get();`
`38`	`38`	`final List<DrawStep> drawStepList = new ArrayList<DrawStep>();`
	`39`	`+ final double entityScale = (double)mapProperties.entityScale.get() / 100;`
	`40`	`+ final boolean entityBlur = mapProperties.entityBlur.get();`
`39`	`41`
`40`	`42`	`try`
`41`	`43`	`{`
`@@ -104,7 +106,7 @@ public List<DrawStep> prepareSteps(List<EntityDTO> entityDTOs, GridRenderer grid`
`104`	`106`	`{`
`105`	`107`	`entityIcon = tc.getPlayerSkin(ForgeHelper.INSTANCE.getEntityName(entityLiving));`
`106`	`108`	`DrawEntityStep drawStep = DataCache.instance().getDrawEntityStep(entityLiving);`
`107`		`- drawStep.update(false, locatorImg, entityIcon, showPlayerHeading);`
	`109`	`+ drawStep.update(false, locatorImg, entityIcon, showPlayerHeading, entityScale, true);`
`108`	`110`	`drawStepList.add(drawStep);`
`109`	`111`	`}`
`110`	`112`	`else`
`@@ -113,7 +115,7 @@ public List<DrawStep> prepareSteps(List<EntityDTO> entityDTOs, GridRenderer grid`
`113`	`115`	`if (entityIcon != null)`
`114`	`116`	`{`
`115`	`117`	`DrawEntityStep drawStep = DataCache.instance().getDrawEntityStep(entityLiving);`
`116`		`- drawStep.update(false, locatorImg, entityIcon, showMobHeading);`
	`118`	`+ drawStep.update(false, locatorImg, entityIcon, showMobHeading, entityScale, entityBlur);`
`117`	`119`	`drawStepList.add(drawStep);`
`118`	`120`	`}`
`119`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public void drawMask()`
`132`	`132`	`}`
`133`	`133`	`else`
`134`	`134`	`{`
`135`		`- DrawUtil.drawQuad(textureCircleMask, x, y, this.width, this.height, 0, null, 1f, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, true);`
	`135`	`+ DrawUtil.drawQuad(textureCircleMask, x, y, this.width, this.height, 0, null, 1f, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, true, true);`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`@@ -209,7 +209,7 @@ public void drawFrame()`
`209`	`209`	`}`
`210`	`210`	`else`
`211`	`211`	`{`
`212`		`- DrawUtil.drawQuad(textureCircle, x, y, this.width, this.height, 0, frameColor, 1f, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, true);`
	`212`	`+ DrawUtil.drawQuad(textureCircle, x, y, this.width, this.height, 0, frameColor, 1f, false, true, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, true, true);`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`	`}`