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=e15058ad11605012276f09717caa8a2d17e16653;hb=a40c9c2a3ef372ea0f2c87af644ca2302315baca;hp=8c25f0d397003448cc4375507600e99f0f77c925;hpb=b1e8d7bd8c9d0905e9fe3c46fc84a11779b95982;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 8c25f0d..e15058a 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,12 +1,7 @@
 /*
- * Sixth 3D engine. Copyright ©2012-2017, 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
- * or later as published by the Free Software Foundation.
- *
+ * Sixth 3D engine. Author: Svjatoslav Agejenko. 
+ * This project is released under Creative Commons Zero (CC0) license.
  */
-
 package eu.svjatoslav.sixth.e3d.renderer.raster.shapes.composite.textcanvas;
 
 import eu.svjatoslav.sixth.e3d.geometry.Point2D;
@@ -19,7 +14,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 +39,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 +125,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));
 
     }