X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fe3d%2Frenderer%2Fraster%2Fshapes%2Fcomposite%2Ftextcanvas%2FCanvasCharacter.java;h=9823a72474999b7dbc64ac0cf4000362dd055afe;hb=2ba2ce636354885e669e9e3fbb97226025e5af45;hp=5bedc0e8d32cc9024c4beffebd950d01b8d98b26;hpb=03447008b8ee26a6463d2cd03005dc26464863db;p=sixth-3d.git diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/textcanvas/CanvasCharacter.java b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/textcanvas/CanvasCharacter.java index 5bedc0e..9823a72 100644 --- a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/textcanvas/CanvasCharacter.java +++ b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/shapes/composite/textcanvas/CanvasCharacter.java @@ -1,5 +1,5 @@ /* - * Sixth 3D engine. Copyright ©2012-2016, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu + * Sixth 3D engine. Copyright ©2012-2020, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu * * This program is free software; you can redistribute it and/or * modify it under the terms of version 3 of the GNU Lesser General Public License @@ -19,7 +19,6 @@ import java.awt.*; public class CanvasCharacter extends AbstractCoordinateShape { - public static final double SIZE_MULTIPLIER = 0.005; private static final int MAX_FONT_SIZE = 500; private static final Font[] fonts = new Font[MAX_FONT_SIZE]; private String value; @@ -45,8 +44,8 @@ public class CanvasCharacter extends AbstractCoordinateShape { // set corner coordinates (for drawing background) { - final double widthHalf = TextCanvas.FONT_CHAR_WIDTH / 2d; - final double heightHalf = TextCanvas.FONT_CHAR_HEIGHT / 2d; + final double widthHalf = TextCanvas.FONT_CHAR_WIDTH_PIXELS / 2d; + final double heightHalf = TextCanvas.FONT_CHAR_HEIGHT_PIXELS / 2d; // upper left coordinates[1].coordinate = point.clone().translateX(-widthHalf) @@ -131,9 +130,10 @@ public class CanvasCharacter extends AbstractCoordinateShape { renderingContext.graphics.setFont(getFont(size)); renderingContext.graphics.setColor(foregroundAwtColor); - renderingContext.graphics.drawString(value, (int) onScreenLocation.x - - (int) (size / 3.2), (int) onScreenLocation.y - + (int) (size / 2.5)); + renderingContext.graphics.drawString( + value, + (int) onScreenLocation.x - (int) (size / 3.2), + (int) onScreenLocation.y + (int) (size / 2.5)); }