omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix android main loop, scale font texture

Browse Source
This commit is contained in:
omigamedev
2019-08-11 21:30:05 +02:00
parent 596e8760fa
commit 40e01ba1db
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/cpp/main.cpp
View File

@@ -1110,7 +1110,7 @@ void android_main(struct android_app* state) {
// If animating, we loop until all events are read, then continue // If animating, we loop until all events are read, then continue
// to draw the next frame of animation. // to draw the next frame of animation.
bool used = false; bool used = false;
int timeout = g_engine.display != EGL_NO_DISPLAY ? 0 : -1; int timeout = -1;//g_engine.display != EGL_NO_DISPLAY ? 0 : -1;
while (!used && (ident=ALooper_pollOnce(timeout, NULL, &events, while (!used && (ident=ALooper_pollOnce(timeout, NULL, &events,
(void**)&source)) != ALOOPER_POLL_ERROR) { (void**)&source)) != ALOOPER_POLL_ERROR) {

1
src/font.cpp
View File

@@ -15,6 +15,7 @@ bool Font::load(const std::string& ttf, int font_size, float font_scale)
LOG("Font::load %s", ttf.c_str()); LOG("Font::load %s", ttf.c_str());
if (file.open(ttf.c_str()) && file.read_all()) if (file.open(ttf.c_str()) && file.read_all())
{ {
w = h = 512 * ceilf(font_scale);
path = ttf; path = ttf;
scale = font_scale; scale = font_scale;
LOG("Font::load loaded"); LOG("Font::load loaded");

4
src/font.h
View File

@@ -12,8 +12,8 @@ enum class kFont : uint16_t
class Font class Font
{ {
public: public:
const int w = 512; int w = 512;
const int h = 512; int h = 512;
const int num_chars = 96; const int num_chars = 96;
const int start_char = 32; const int start_char = 32;
// {mix, max} // {mix, max}