Merge branch 'master' into Smooth_font

This commit is contained in:
Bodmer 2018-02-24 18:57:27 +00:00 committed by GitHub
commit 3419f9ed4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions

View File

@ -34,7 +34,7 @@ Configuration of the library font selections, pins used to interface with the TF
I have made some changes that will be uploaded soon that improves sprite and image rendering performance by up to 3x faster on the ESP8266. These updates are currently being tested/debugged.
**2. Anti-aliased fonts**
**2. Anti-aliased fonts - see Smooth_font branch for beta version**
I have been experimenting with anti-aliased font files in "vlw" format generated by the free [Processing IDE](https://processing.org/). This IDE can be used to generate font files from your computer's font set and include **any** Unicode characters. This means Greek, Japanese and any other UTF-16 glyphs can be used.

View File

@ -4306,12 +4306,6 @@ void spiWriteBlock(uint16_t color, uint32_t repeat)
}
#endif
////////////////////////////////////////////////////////////////////////////////////////
#ifdef TOUCH_CS
#include "Extensions/Touch.cpp"
#endif
#include "Extensions/Button.cpp"
#include "Extensions/Sprite.cpp"