From fb1f381f062a9c43303387a8eee3d4c137bd90be Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 1 May 2018 21:41:02 +0300 Subject: [PATCH] Added FreeType, which lets us use whatever fonts we want --- android/assets/skin/Esteban-Regular.ttf | Bin 0 -> 46504 bytes android/assets/skin/OFL.txt | 94 ++++++++++++++++++ build.gradle | 10 +- .../ui/pickerscreens/PolicyPickerScreen.kt | 28 ++++-- desktop/build.gradle | 1 + 5 files changed, 124 insertions(+), 9 deletions(-) create mode 100644 android/assets/skin/Esteban-Regular.ttf create mode 100644 android/assets/skin/OFL.txt diff --git a/android/assets/skin/Esteban-Regular.ttf b/android/assets/skin/Esteban-Regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..f278773f89685d0b0ce1b6881c454c7c2a39f62d GIT binary patch literal 46504 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 Be>ngE literal 0 HcmV?d00001 diff --git a/android/assets/skin/OFL.txt b/android/assets/skin/OFL.txt new file mode 100644 index 00000000..17588bc2 --- /dev/null +++ b/android/assets/skin/OFL.txt @@ -0,0 +1,94 @@ +Copyright (c) 2011, Ang�lica D�iaz (http://typereview.wordpress.com|angiecina@gmail.com), +with Reserved Font Name "Esteban" + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/build.gradle b/build.gradle index 8170a23f..f32a1186 100644 --- a/build.gradle +++ b/build.gradle @@ -77,7 +77,14 @@ project(":android") { natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-arm64-v8a" natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86" natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86_64" - + + // Freetype + compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" + natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi" + natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a" + natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a" + natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86" + natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64" } } @@ -104,6 +111,7 @@ project(":core") { dependencies { compile "com.badlogicgames.gdx:gdx:$gdxVersion" compile "com.badlogicgames.gdx:gdx-box2d:$gdxVersion" + compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" } } diff --git a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt index 125cd955..d3485b3e 100644 --- a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt @@ -13,11 +13,23 @@ import com.unciv.ui.utils.ImageGetter import com.unciv.ui.utils.disable import com.unciv.ui.utils.enable + + class PolicyPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen() { private var pickedPolicy: Policy? = null init { + + + // Proof-of-concept for font generation +// val generator = FreeTypeFontGenerator(Gdx.files.internal("skin/Esteban-Regular.ttf")) +// val parameter = FreeTypeFontParameter() +// parameter.size = 25 +// val font12 = generator.generateFont(parameter) // font size 12 pixels +// generator.dispose() // don't forget to dispose to avoid memory leaks! +// rightSideButton.style.font = font12 + val policies = civInfo.policies displayTutorials("PolicyPickerScreen") @@ -91,24 +103,24 @@ class PolicyPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen( } private fun getPolicyButton(policy: Policy, image: Boolean): Button { - var toReturn = Button(CameraStageBaseScreen.skin) + var policyButton = Button(CameraStageBaseScreen.skin) if (image) { val policyImage = ImageGetter.getImage("PolicyIcons/" + policy.name.replace(" ", "_") + "_(Civ5).png") - toReturn.add(policyImage).size(30f) + policyButton.add(policyImage).size(30f) } else - toReturn = TextButton(policy.name, CameraStageBaseScreen.skin) + policyButton = TextButton(policy.name, CameraStageBaseScreen.skin) if (civInfo.policies.isAdopted(policy.name)) { // existing - toReturn.color = Color.GREEN + policyButton.color = Color.GREEN } else if (!civInfo.policies. getAdoptedPolicies().containsAll(policy.requires!!)) // non-available { - toReturn.disable() + policyButton.color = Color.GRAY } - toReturn.addClickListener { pickPolicy(policy) } - toReturn.pack() - return toReturn + policyButton.addClickListener { pickPolicy(policy) } + policyButton.pack() + return policyButton } } \ No newline at end of file diff --git a/desktop/build.gradle b/desktop/build.gradle index a14115e3..8bf47bc8 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -55,5 +55,6 @@ task afterEclipseImport(description: "Post processing after project generation", } dependencies { + compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop" compile project(path: ':core') } \ No newline at end of file