Skip to content

atb-agg demo fixes for retina displays #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yairchu wants to merge 6 commits into
base: master
Choose a base branch
from
Open

atb-agg demo fixes for retina displays #140

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ea78da
atb-agg demo: start with correct framebuffer size on retina
yairchu Dec 20, 2016
cd062f6
atb-agg demo: fix mouse cursor location misbehaving on retina displays
yairchu Dec 20, 2016
9f5ecfb
atb-agg demo: enable fontscaling for high-density displays
yairchu Dec 20, 2016
2421b4f
atg-agg demo draw text in same pos in retina
yairchu Dec 20, 2016
e5a7fd0
atg-agg: Allow larger fonts for retina displays
yairchu Dec 20, 2016
78965ec
demos/atb-agg: support any integer scale factor
yairchu Dec 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 42 additions & 9 deletions demos/atb-agg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,13 @@ build_buffer( void )
if (!font)
return;

int pixHeight;
{
int viewport[4];
glGetIntegerv( GL_VIEWPORT, viewport );
pixHeight = viewport[3];
}

markup.font = font;
font->hinting = p_hinting;
font->kerning = p_kerning;
Expand All @@ -166,7 +173,7 @@ build_buffer( void )
font->lcd_weights[3] = (unsigned char)(p_secondary*norm*255);
font->lcd_weights[4] = (unsigned char)(p_tertiary*norm*255);
pen.x = 10;
pen.y = 600 - font->height - 10;
pen.y = pixHeight - font->height - 10;
text_buffer_printf( text_buffer, &pen, &markup, text, NULL );

// Post-processing for width and orientation
Expand Down Expand Up @@ -288,19 +295,40 @@ void TW_CALL get_lcd_filtering( void *value, void *data )
// ------------------------------------------------------------------- init ---
void init( GLFWwindow* window )
{
int scale_factor;
{
int pixWidth, pixHeight, winWidth, winHeight;
glfwGetFramebufferSize( window, &pixWidth, &pixHeight );
glfwGetWindowSize( window, &winWidth, &winHeight );
scale_factor = (pixWidth / (double) winWidth) + 0.5;
}
{
char buf[256];
sprintf(buf, "GLOBAL fontscaling=%d", scale_factor);
TwDefine(buf);
}

TwInit( TW_OPENGL, NULL );

// Create a new tweak bar
bar = TwNewBar("TweakBar");
TwDefine("GLOBAL "
"help = 'This example shows how to tune all font parameters.' ");
TwDefine("TweakBar "
"size = '280 400' "
"position = '500 20' "
"color = '127 127 127' "
"alpha = 240 "
"label = 'Parameters' "
"resizable = True "
"fontresizable = True "
"iconifiable = True ");
{
char buf[256];
sprintf(
buf, "TweakBar size = '%d %d' position = '%d %d'",
280*scale_factor, 400*scale_factor,
500*scale_factor, 20*scale_factor);
TwDefine(buf);
}

{
TwEnumVal familyEV[NUM_FONTS] = {
Expand All @@ -321,8 +349,8 @@ void init( GLFWwindow* window )
"label = 'Size' "
"group = 'Font' "
"min = 6.0 "
"max = 24.0 "
"step = 0.05 "
"max = 60.0 "

@bagobor bagobor Dec 22, 2016

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it still works fine for non-retina systems?

@yairchu yairchu Dec 22, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should, it will just allow large fonts. If you happen to have such a system, could you check?

@yairchu yairchu Dec 22, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just checked on a friend's laptop and it indeed works fine

"step = 0.2 "
"help = ' ' ");
TwAddVarCB(bar, "LCD filtering", TW_TYPE_BOOL32, set_lcd_filtering, get_lcd_filtering, NULL,
"label = 'LCD filtering' "
Expand Down Expand Up @@ -503,7 +531,10 @@ void reshape( GLFWwindow* window, int width, int height )
// ------------------------------------------------------------- cursor_pos ---
void cursor_pos( GLFWwindow* window, double x, double y )
{
TwMouseMotion( x, y );
int pixWidth, pixHeight, winWidth, winHeight;
glfwGetFramebufferSize( window, &pixWidth, &pixHeight );
glfwGetWindowSize( window, &winWidth, &winHeight );
TwMouseMotion( (x * pixWidth) / winWidth, (y * pixHeight) / winHeight );
}


Expand Down Expand Up @@ -668,8 +699,6 @@ int main( int argc, char **argv )
glfwMakeContextCurrent( window );
glfwSwapInterval( 1 );

TwInit( TW_OPENGL, NULL );

glfwSetFramebufferSizeCallback( window, reshape );
glfwSetWindowRefreshCallback( window, display );
glfwSetCursorPosCallback( window, cursor_pos );
Expand All @@ -690,7 +719,11 @@ int main( int argc, char **argv )
init( window );

glfwShowWindow( window );
reshape( window, 800, 600 );
{
int pixWidth, pixHeight;
glfwGetFramebufferSize( window, &pixWidth, &pixHeight );
reshape( window, pixWidth, pixHeight );
}

while(!glfwWindowShouldClose( window ))
{
Expand Down