diff --git a/fonts/AlegreyaSans-Thin.svg b/fonts/AlegreyaSans-Thin.svg new file mode 100644 index 0000000..72784a8 --- /dev/null +++ b/fonts/AlegreyaSans-Thin.svg @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fonts/Roboto.svg b/fonts/Roboto.svg new file mode 100644 index 0000000..f16e84b --- /dev/null +++ b/fonts/Roboto.svg @@ -0,0 +1,1390 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fonts/SourceCodePro-ExtraLight/output.svg b/fonts/SourceCodePro-ExtraLight.svg similarity index 100% rename from fonts/SourceCodePro-ExtraLight/output.svg rename to fonts/SourceCodePro-ExtraLight.svg diff --git a/src/audio/AudioClient.java b/src/audio/AudioClient.java index 35d0d95..3269cfb 100644 --- a/src/audio/AudioClient.java +++ b/src/audio/AudioClient.java @@ -16,7 +16,7 @@ public class AudioClient { private static final int SAMPLE_RATE = 192000; private static final float ROTATE_SPEED = 0; private static final float TRANSLATION_SPEED = 0; - private static final Vector2 TRANSLATION = new Vector2(0.3, 0.3); + private static final Vector2 TRANSLATION = new Vector2(0, 0.5); private static final float SCALE = 1; private static final float WEIGHT = Shape.DEFAULT_WEIGHT; diff --git a/src/parser/TextParser.java b/src/parser/TextParser.java index 2232512..411a31d 100644 --- a/src/parser/TextParser.java +++ b/src/parser/TextParser.java @@ -15,8 +15,8 @@ import shapes.Vector2; public class TextParser extends FileParser{ - private static final char WIDE_CHAR = '_'; - private static final double LENGTH_SCALAR = 1.2; + private static final char WIDE_CHAR = 'W'; + private static final double HEIGHT_SCALAR = 1.6; private final Map> charToShape; private final List text; @@ -52,12 +52,14 @@ public class TextParser extends FileParser{ } } - double length = LENGTH_SCALAR * Shape.width(charToShape.get(WIDE_CHAR)); + double width = Shape.width(charToShape.get(WIDE_CHAR)); + double height = HEIGHT_SCALAR * Shape.height(charToShape.get(WIDE_CHAR)); - for (String line : text) { + for (int i = 0, textSize = text.size(); i < textSize; i++) { + String line = text.get(i); char[] lineChars = line.toCharArray(); - for (int i = 0; i < lineChars.length; i++) { - shapes.addAll(Shape.translate(charToShape.get(lineChars[i]), new Vector2(i * length, 0))); + for (int j = 0; j < lineChars.length; j++) { + shapes.addAll(Shape.translate(charToShape.get(lineChars[j]), new Vector2(j * width, -i * height))); } } diff --git a/text/hello.txt b/text/hello.txt index 6769dd6..9aa086d 100644 --- a/text/hello.txt +++ b/text/hello.txt @@ -1 +1,4 @@ -Hello world! \ No newline at end of file +αβγΓηθ +ικλΛμν +πΠρσΣτ +υϕχψΨω \ No newline at end of file