mirror of
https://github.com/seekrs/MacroLibX.git
synced 2026-01-11 14:43:34 +00:00
reworking application and bridge
This commit is contained in:
@@ -3,12 +3,12 @@
|
||||
|
||||
typedef struct
|
||||
{
|
||||
void* mlx;
|
||||
void* win;
|
||||
void* logo_png;
|
||||
void* logo_jpg;
|
||||
void* logo_bmp;
|
||||
void* img;
|
||||
mlx_context mlx;
|
||||
mlx_window win;
|
||||
mlx_image logo_png;
|
||||
mlx_image logo_jpg;
|
||||
mlx_image logo_bmp;
|
||||
mlx_image img;
|
||||
} mlx_t;
|
||||
|
||||
int update(void* param)
|
||||
@@ -17,17 +17,17 @@ int update(void* param)
|
||||
mlx_t* mlx = (mlx_t*)param;
|
||||
|
||||
if(i == 200)
|
||||
mlx_clear_window(mlx->mlx, mlx->win, 0xFF334D4D);
|
||||
mlx_clear_window(mlx->mlx, mlx->win, 0x334D4DFF);
|
||||
|
||||
if(i >= 250)
|
||||
mlx_set_font_scale(mlx->mlx, "default", 16.f);
|
||||
else
|
||||
mlx_set_font_scale(mlx->mlx, "default", 6.f);
|
||||
|
||||
mlx_string_put(mlx->mlx, mlx->win, 160, 120, 0xFFFF2066, "this text should be hidden");
|
||||
mlx_string_put(mlx->mlx, mlx->win, 160, 120, 0xFF2066FF, "this text should be hidden");
|
||||
|
||||
mlx_put_image_to_window(mlx->mlx, mlx->win, mlx->logo_png, 100, 100);
|
||||
mlx_transform_put_image_to_window(mlx->mlx, mlx->win, mlx->logo_bmp, 220, 40, 0.5f, 75.0f);
|
||||
//mlx_transform_put_image_to_window(mlx->mlx, mlx->win, mlx->logo_bmp, 220, 40, 0.5f, 75.0f);
|
||||
mlx_put_image_to_window(mlx->mlx, mlx->win, mlx->img, 150, 60);
|
||||
|
||||
mlx_set_font(mlx->mlx, "default");
|
||||
@@ -35,29 +35,29 @@ int update(void* param)
|
||||
|
||||
for(int j = 0, color = 0; j < 400; j++)
|
||||
{
|
||||
mlx_pixel_put(mlx->mlx, mlx->win, j, j, 0xFFFF0000 + color);
|
||||
mlx_pixel_put(mlx->mlx, mlx->win, 399 - j, j, 0xFF0000FF);
|
||||
mlx_pixel_put(mlx->mlx, mlx->win, j, j, 0x0000FFFF + (color << 24));
|
||||
mlx_pixel_put(mlx->mlx, mlx->win, 399 - j, j, 0x0000FFFF);
|
||||
color += (color < 255);
|
||||
}
|
||||
|
||||
mlx_transform_put_image_to_window(mlx->mlx, mlx->win, mlx->logo_jpg, 210, 150, 2.0f, 0.0f);
|
||||
//mlx_transform_put_image_to_window(mlx->mlx, mlx->win, mlx->logo_jpg, 210, 150, 2.0f, 0.0f);
|
||||
mlx_set_font_scale(mlx->mlx, "default", 8.f);
|
||||
mlx_string_put(mlx->mlx, mlx->win, 210, 175, 0xFFAF2BFF, "hidden");
|
||||
|
||||
for(int j = 0; j < 20; j++)
|
||||
{
|
||||
for(int k = 0; k < 20; k++)
|
||||
mlx_pixel_put(mlx->mlx, mlx->win, 220 + j, 160 + k, 0xFFFF0000);
|
||||
mlx_pixel_put(mlx->mlx, mlx->win, 220 + j, 160 + k, 0xFF0000FF);
|
||||
}
|
||||
|
||||
i++;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void* create_image(mlx_t* mlx)
|
||||
mlx_image create_image(mlx_t* mlx)
|
||||
{
|
||||
unsigned char pixel[4];
|
||||
void* img = mlx_new_image(mlx->mlx, 100, 100);
|
||||
mlx_image img = mlx_new_image(mlx->mlx, 100, 100);
|
||||
for(int i = 0, j = 0, k = 0; i < (100 * 100) * 4; i += 4, j++)
|
||||
{
|
||||
if(j >= 100)
|
||||
@@ -67,10 +67,10 @@ void* create_image(mlx_t* mlx)
|
||||
}
|
||||
if(i < 10000 || i > 20000)
|
||||
{
|
||||
pixel[0] = i;
|
||||
pixel[1] = j;
|
||||
pixel[2] = k;
|
||||
pixel[3] = 0x99;
|
||||
pixel[0] = 0x99;
|
||||
pixel[1] = i;
|
||||
pixel[2] = j;
|
||||
pixel[3] = k;
|
||||
mlx_set_image_pixel(mlx->mlx, img, j, k, *((int*)pixel));
|
||||
}
|
||||
}
|
||||
@@ -90,13 +90,13 @@ int key_hook(int key, void* param)
|
||||
mlx_loop_end(mlx->mlx);
|
||||
break;
|
||||
case 22 : // (S)how
|
||||
mlx_mouse_show();
|
||||
mlx_mouse_show(mlx->mlx);
|
||||
break;
|
||||
case 11 : // (H)ide
|
||||
mlx_mouse_hide();
|
||||
mlx_mouse_hide(mlx->mlx);
|
||||
break;
|
||||
case 6 : // (C)lear
|
||||
mlx_clear_window(mlx->mlx, mlx->win, 0xFF334D4D);
|
||||
mlx_clear_window(mlx->mlx, mlx->win, 0x334D4DFF);
|
||||
break;
|
||||
case 79 : // RIGHT KEY
|
||||
mlx_mouse_move(mlx->mlx, mlx->win, x + 10, y);
|
||||
@@ -131,9 +131,15 @@ int main(void)
|
||||
int dummy;
|
||||
|
||||
mlx.mlx = mlx_init();
|
||||
mlx.win = mlx_new_resizable_window(mlx.mlx, 400, 400, "My window");
|
||||
|
||||
mlx_get_screens_size(mlx.mlx, mlx.win, &w, &h);
|
||||
mlx_window_create_info info = { 0 };
|
||||
info.title = "My window";
|
||||
info.width = 400;
|
||||
info.height = 400;
|
||||
info.is_resizable = true;
|
||||
mlx.win = mlx_new_window(mlx.mlx, &info);
|
||||
|
||||
mlx_get_screen_size(mlx.mlx, mlx.win, &w, &h);
|
||||
printf("screen size : %dx%d\n", w, h);
|
||||
|
||||
mlx_set_fps_goal(mlx.mlx, 60);
|
||||
@@ -141,17 +147,17 @@ int main(void)
|
||||
mlx_on_event(mlx.mlx, mlx.win, MLX_KEYDOWN, key_hook, &mlx);
|
||||
mlx_on_event(mlx.mlx, mlx.win, MLX_WINDOW_EVENT, window_hook, &mlx);
|
||||
|
||||
mlx.logo_png = mlx_png_file_to_image(mlx.mlx, "42_logo.png", &dummy, &dummy);
|
||||
mlx.logo_bmp = mlx_bmp_file_to_image(mlx.mlx, "42_logo.bmp", &dummy, &dummy);
|
||||
mlx.logo_jpg = mlx_jpg_file_to_image(mlx.mlx, "42_logo.jpg", &dummy, &dummy);
|
||||
mlx.logo_png = mlx_new_image_from_file(mlx.mlx, "42_logo.png", &dummy, &dummy);
|
||||
mlx.logo_bmp = mlx_new_image_from_file(mlx.mlx, "42_logo.bmp", &dummy, &dummy);
|
||||
mlx.logo_jpg = mlx_new_image_from_file(mlx.mlx, "42_logo.jpg", &dummy, &dummy);
|
||||
|
||||
mlx_pixel_put(mlx.mlx, mlx.win, 200, 10, 0xFFFF00FF);
|
||||
mlx_pixel_put(mlx.mlx, mlx.win, 200, 10, 0xFF00FFFF);
|
||||
mlx_put_image_to_window(mlx.mlx, mlx.win, mlx.logo_png, 10, 190);
|
||||
|
||||
mlx.img = create_image(&mlx);
|
||||
|
||||
mlx_set_font_scale(mlx.mlx, "font.ttf", 16.f);
|
||||
mlx_string_put(mlx.mlx, mlx.win, 20, 20, 0xFF0020FF, "that text will disappear");
|
||||
mlx_string_put(mlx.mlx, mlx.win, 20, 20, 0x0020FFFF, "that text will disappear");
|
||||
|
||||
mlx_loop_hook(mlx.mlx, update, &mlx);
|
||||
mlx_loop(mlx.mlx);
|
||||
@@ -162,7 +168,7 @@ int main(void)
|
||||
mlx_destroy_image(mlx.mlx, mlx.img);
|
||||
mlx_destroy_window(mlx.mlx, mlx.win);
|
||||
|
||||
mlx_destroy_display(mlx.mlx);
|
||||
mlx_destroy_context(mlx.mlx);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user