take care of font scaling for 2x density (fixes processing#2739)

benfry · benfry · commit 9a63a4e1374d · 2015-06-13T17:07:14.000-04:00
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -5962,7 +5962,7 @@ public PFont createFont(String name, float size, boolean smooth) {
    * @see PApplet#loadFont(String)
    */
   public PFont createFont(String name, float size,
-                          boolean smooth, char charset[]) {
+                          boolean smooth, char[] charset) {
     String lowerName = name.toLowerCase();
     Font baseFont = null;
 
@@ -5982,11 +5982,12 @@ public PFont createFont(String name, float size,
       } else {
         baseFont = PFont.findFont(name);
       }
-      return new PFont(baseFont.deriveFont(size), smooth, charset,
-                       stream != null);
+      return new PFont(baseFont.deriveFont(size * pixelDensity),
+                       smooth, charset, stream != null,
+                       pixelDensity);
 
     } catch (Exception e) {
-      System.err.println("Problem createFont(" + name + ")");
+      System.err.println("Problem with createFont(\"" + name + "\")");
       e.printStackTrace();
       return null;
     }
diff --git a/core/src/processing/core/PFont.java b/core/src/processing/core/PFont.java
@@ -3,7 +3,8 @@
 /*
   Part of the Processing project - http://processing.org
 
-  Copyright (c) 2004-10 Ben Fry & Casey Reas
+  Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2004-12 Ben Fry & Casey Reas
   Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This library is free software; you can redistribute it and/or
@@ -84,7 +85,15 @@ public class PFont implements PConstants {
   /**
    * The original size of the font when it was first created
    */
-  protected int size;
+  //protected int size;
+  private int size;
+
+  protected int density;
+//  /**
+//   * The size that this font will default to when drawn. Used to create fonts
+//   * at 2x the size for high-res displays in OpenGL.
+//   */
+//  protected int defaultSize;
 
   /** true if smoothing was enabled for this font, used for native impl */
   protected boolean smooth;
@@ -124,11 +133,10 @@ public class PFont implements PConstants {
   protected Font font;
 
   /**
-   * True if this font was loaded from a stream, rather than from the OS.
-   * It's always safe to use the native version of a font loaded from a TTF
-   * file, since that's how it'll look when exported. Otherwise, you'll have
-   * to use hint(ENABLE_NATIVE_FONTS) to get the native version working with
-   * renderers that support it.
+   * True if this font was loaded from an InputStream, rather than by name
+   * from the OS. It's best to use the native version of a font loaded from
+   * a TTF file, since that will ensure that the font is available when the
+   * sketch is exported.
    */
   protected boolean stream;
 
@@ -329,9 +337,11 @@ public PFont(Font font, boolean smooth, char charset[]) {
    *
    * @nowebref
    */
-  public PFont(Font font, boolean smooth, char charset[], boolean stream) {
+  public PFont(Font font, boolean smooth, char charset[],
+               boolean stream, int density) {
     this(font, smooth, charset);
     this.stream = stream;
+    this.density = density;
   }
 
   /**
@@ -536,6 +546,24 @@ public int getSize() {
   }
 
 
+//  public void setDefaultSize(int size) {
+//    defaultSize = size;
+//  }
+
+
+  /**
+   * Returns the size that will be used when textFont(font) is called.
+   * When drawing with 2x pixel density, bitmap fonts in OpenGL need to be
+   * created (behind the scenes) at double the requested size. This ensures
+   * that they're shown at half on displays (so folks don't have to change
+   * their sketch code).
+   */
+  public int getDefaultSize() {
+    //return defaultSize;
+    return size / density;
+  }
+
+
   public boolean isStream() {
     return stream;
   }
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
@@ -28,6 +28,7 @@
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.FontMetrics;
+import java.awt.Frame;
 import java.awt.Image;
 import java.awt.Toolkit;
 import java.awt.font.FontRenderContext;
@@ -4117,7 +4118,7 @@ public void textFont(PFont which) {
         // float w = font.getStringBounds(text, g2.getFontRenderContext()).getWidth();
       }
       */
-      textSize(which.size);
+      textSize(which.getDefaultSize());
 
     } else {
       throw new RuntimeException(ERROR_TEXTFONT_NULL_PFONT);
@@ -4806,10 +4807,10 @@ protected void textCharImpl(char ch, float x, float y) { //, float z) {
     PFont.Glyph glyph = textFont.getGlyph(ch);
     if (glyph != null) {
       if (textMode == MODEL) {
-        float high    = glyph.height     / (float) textFont.size;
-        float bwidth  = glyph.width      / (float) textFont.size;
-        float lextent = glyph.leftExtent / (float) textFont.size;
-        float textent = glyph.topExtent  / (float) textFont.size;
+        float high    = glyph.height     / (float) textFont.getSize();
+        float bwidth  = glyph.width      / (float) textFont.getSize();
+        float lextent = glyph.leftExtent / (float) textFont.getSize();
+        float textent = glyph.topExtent  / (float) textFont.getSize();
 
         float x1 = x + lextent * textSize;
         float y1 = y - textent * textSize;
@@ -4858,6 +4859,7 @@ protected void textCharModelImpl(PImage glyph,
   }
 
 
+  /*
   protected void textCharScreenImpl(PImage glyph,
                                     int xx, int yy,
                                     int w0, int h0) {
@@ -4908,6 +4910,7 @@ protected void textCharScreenImpl(PImage glyph,
       }
     }
   }
+  */
 
 
   /**
@@ -4917,6 +4920,10 @@ protected void textCharScreenImpl(PImage glyph,
    */
   @SuppressWarnings("deprecation")
   public FontMetrics getFontMetrics(Font font) {  // ignore
+    Frame frame = parent.getFrame();
+    if (frame != null) {
+      return frame.getToolkit().getFontMetrics(font);
+    }
     return Toolkit.getDefaultToolkit().getFontMetrics(font);
   }
 
diff --git a/core/todo.txt b/core/todo.txt
@@ -1,5 +1,15 @@
 0238 (3.0b1)
 
+text/fonts
+X Text looks blurry in GL Retina
+X   https://github.com/processing/processing/issues/2739
+
+andres
+X ortho function is broken
+X   https://github.com/processing/processing/issues/1278
+X errors with loading SVGs in P3D/P2D
+X   https://github.com/processing/processing/issues/3379
+
 
 beta
 _ replace sketchXxxx() methods with another mechanism?
@@ -10,9 +20,24 @@ _   surface.size(), surface.noSmooth()... just like PGraphics methods?
 _   make final to move folks away from these?
 _   or is this a bad move until we've sorted out Android?
 _ update wiki/docs to say "don't override sketchXxxx() methods"
+_ pixelDensity(BEST)? (messes with pixels, but for most sketches, helpful)
+_ add pixelDensity() method to PImage/PGraphics
+_   pixelDensity(2) does: pixelWidth = width; width /= 2; pixelDensity = 2;
+_   this works for both PGraphics and images (though they're a little backwards)
+_   for PGraphics it comes early enough
+_ g.pixelDensity should prolly move to PApplet?
+_   or is it akin to g.fill and the rest?
 
 
 high priority
+_ sketches with new fullScreen() method should grab focus by default
+_   https://github.com/processing/processing/issues/3380
+_ fullScreen(SPAN) not working
+_   probably need to re-query for displays each time opening prefs
+_   what happens when a screen is added after p5 has started?
+_   https://github.com/processing/processing/issues/3381
+_ clear() is broken
+_   https://github.com/processing/processing/issues/3378
 _ add the "don't use this" warning to the JFrame in PSurfaceAWT 
 _ draw() executes twice when noLoop() called in setup()
 _   https://github.com/processing/processing/issues/3310
@@ -88,8 +113,6 @@ _   also not API we want to expose, so sort this out
 _   or maybe we're fine b/c now FX2D needs it as well
 _ when did setPath() sneak into PShape? API is nothing like anything else
 _   probably from the material stuff, but we need to fix that
-_ ortho function is broken
-_   https://github.com/processing/processing/issues/1278
 
 
 full screen
@@ -171,8 +194,6 @@ _ zero alpha values still a problem with retina renderer
 _   https://github.com/processing/processing/issues/2030
 _ NPE when using image() created with createGraphics(PGraphicsRetina2D)
 _   https://github.com/processing/processing/issues/2510
-_ Text looks blurry in GL Retina (andres)
-_   https://github.com/processing/processing/issues/2739
 _ check retina with PGraphicsRetina2D
 _ Text is half size in PGraphicsRetina2D
 _   https://github.com/processing/processing/issues/2738
diff --git a/todo.txt b/todo.txt
@@ -1,5 +1,12 @@
 0238 (3.0b1)
 
+gsoc
+X Mode problems window wasn't doing line breaks
+X   https://github.com/processing/processing/issues/3369
+X   https://github.com/processing/processing/pull/3370
+
+"OS X v10.11 is the last major release of OS X that will support the previously deprecated Java 6 runtime and tools provided by Apple. Applications or features that depend upon Java 6 may not function properly or will not launch when Java 6 is removed." https://developer.apple.com/library/prerelease/mac/releasenotes/General/rn-osx-10.11/index.html
+
 
 beta
 _ add "welcome" or "what's new" window to explain features in 3
