picrate 1.1.0-java → 1.2.0-java
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +2 -0
- data/lib/picrate/helper_methods.rb +4 -0
- data/lib/picrate/version.rb +1 -1
- data/lib/{picrate-1.1.0.jar → picrate-1.2.0.jar} +0 -0
- data/pom.rb +1 -1
- data/pom.xml +1 -1
- data/src/main/java/monkstone/ColorUtil.java +2 -2
- data/src/main/java/processing/core/PApplet.java +4284 -4244
- data/src/main/java/processing/core/PFont.java +29 -27
- data/src/main/java/processing/core/PGraphics.java +144 -142
- data/vendors/Rakefile +1 -1
- data/vendors/picrate.geany +1 -1
- metadata +3 -3
@@ -514,7 +514,7 @@ public class PFont implements PConstants {
|
|
514
514
|
/**
|
515
515
|
* Use the getNative() method instead, which allows library interfaces to be
|
516
516
|
* written in a cross-platform fashion for desktop, Android, and others.
|
517
|
-
* @return
|
517
|
+
* @return
|
518
518
|
*/
|
519
519
|
@Deprecated
|
520
520
|
public Font getFont() {
|
@@ -523,7 +523,7 @@ public class PFont implements PConstants {
|
|
523
523
|
|
524
524
|
/**
|
525
525
|
* Return the native java.awt.Font associated with this PFont (if any).
|
526
|
-
* @return
|
526
|
+
* @return
|
527
527
|
*/
|
528
528
|
public Object getNative() {
|
529
529
|
if (subsetting) {
|
@@ -534,7 +534,7 @@ public class PFont implements PConstants {
|
|
534
534
|
|
535
535
|
/**
|
536
536
|
* Return size of this font.
|
537
|
-
* @return
|
537
|
+
* @return
|
538
538
|
*/
|
539
539
|
public int getSize() {
|
540
540
|
return size;
|
@@ -548,7 +548,7 @@ public class PFont implements PConstants {
|
|
548
548
|
* drawing with 2x pixel density, bitmap fonts in OpenGL need to be created
|
549
549
|
* (behind the scenes) at double the requested size. This ensures that they're
|
550
550
|
* shown at half on displays (so folks don't have to change their sketch code).
|
551
|
-
* @return
|
551
|
+
* @return
|
552
552
|
*/
|
553
553
|
public int getDefaultSize() {
|
554
554
|
//return defaultSize;
|
@@ -570,7 +570,7 @@ public class PFont implements PConstants {
|
|
570
570
|
/**
|
571
571
|
* Attempt to find the native version of this font.(Public so that it can be
|
572
572
|
* used by OpenGL or other renderers.)
|
573
|
-
* @return
|
573
|
+
* @return
|
574
574
|
*/
|
575
575
|
public Object findNative() {
|
576
576
|
if (font == null) {
|
@@ -673,7 +673,7 @@ public class PFont implements PConstants {
|
|
673
673
|
* subclasses use it.
|
674
674
|
* @param a
|
675
675
|
* @param b
|
676
|
-
* @return
|
676
|
+
* @return
|
677
677
|
*/
|
678
678
|
public float kern(char a, char b) {
|
679
679
|
return 0;
|
@@ -682,7 +682,7 @@ public class PFont implements PConstants {
|
|
682
682
|
/**
|
683
683
|
* Returns the ascent of this font from the baseline.The value is based on a
|
684
684
|
* font of size 1.
|
685
|
-
* @return
|
685
|
+
* @return
|
686
686
|
*/
|
687
687
|
public float ascent() {
|
688
688
|
return ((float) ascent / (float) size);
|
@@ -691,7 +691,7 @@ public class PFont implements PConstants {
|
|
691
691
|
/**
|
692
692
|
* Returns how far this font descends from the baseline.The value is based on
|
693
693
|
a font size of 1.
|
694
|
-
* @return
|
694
|
+
* @return
|
695
695
|
*/
|
696
696
|
public float descent() {
|
697
697
|
return ((float) descent / (float) size);
|
@@ -700,7 +700,7 @@ public class PFont implements PConstants {
|
|
700
700
|
/**
|
701
701
|
* Width of this character for a font of size 1.
|
702
702
|
* @param c
|
703
|
-
* @return
|
703
|
+
* @return
|
704
704
|
*/
|
705
705
|
public float width(char c) {
|
706
706
|
if (c == 32) {
|
@@ -872,7 +872,7 @@ public class PFont implements PConstants {
|
|
872
872
|
};
|
873
873
|
|
874
874
|
/**
|
875
|
-
* @return
|
875
|
+
* @return
|
876
876
|
* @webref pfont
|
877
877
|
* @usage application
|
878
878
|
* @brief Gets a list of the fonts installed on the system
|
@@ -899,24 +899,26 @@ public class PFont implements PConstants {
|
|
899
899
|
* <a href="https://github.com/processing/processing/issues/5481">issue
|
900
900
|
* #5481</a>
|
901
901
|
* @param name
|
902
|
-
* @return
|
902
|
+
* @return
|
903
903
|
*/
|
904
|
-
|
905
|
-
|
906
|
-
|
907
|
-
|
908
|
-
|
909
|
-
|
910
|
-
|
911
|
-
|
912
|
-
|
913
|
-
|
914
|
-
|
915
|
-
|
916
|
-
|
917
|
-
|
918
|
-
|
919
|
-
|
904
|
+
static public Font findFont(String name) {
|
905
|
+
Font font = new Font(name, Font.PLAIN, 1);
|
906
|
+
// make sure we have the name of the system fallback font
|
907
|
+
if (systemFontName == null) {
|
908
|
+
// Figure out what the font is named when things fail
|
909
|
+
systemFontName = new Font("", Font.PLAIN, 1).getFontName();
|
910
|
+
}
|
911
|
+
// warn the user if they didn't get the font they want
|
912
|
+
if (!name.equals(systemFontName)
|
913
|
+
&& font.getFontName().equals(systemFontName)) {
|
914
|
+
PGraphics.showWarning("\"" + name + "\" is not available, "
|
915
|
+
+ "so another font will be used.\n"
|
916
|
+
+ "Use PFont.list in sketch to show available fonts.\n"
|
917
|
+
+ "Or <fc-match \"" + name + "\"> in a terminal to find\n"
|
918
|
+
+ "an alternative");
|
919
|
+
}
|
920
|
+
return font;
|
921
|
+
}
|
920
922
|
|
921
923
|
//////////////////////////////////////////////////////////////
|
922
924
|
/**
|