root/pbsplash
1
0
Fork 0
mirror of https://git.sr.ht/~calebccff/pbsplash synced 2026-01-12 20:48:40 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP: awful animation code...

Browse source
This commit is contained in:
Caleb Connolly 2023-06-07 18:55:07 +01:00
parent 080fcf60ca
commit e08a62d580
No known key found for this signature in database
GPG key ID: 0583312B195F64B6
4 changed files with 149 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/nanosvg.h
View file

@ -3022,14 +3022,16 @@ NSVGimage* nsvgParseFromFile(const char* filename, const char* units, float dpi)
char* data = NULL; char* data = NULL;
NSVGimage* image = NULL; NSVGimage* image = NULL;
printf("open file %s\n", filename);
fp = fopen(filename, "rb"); fp = fopen(filename, "rb");
if (!fp) goto error; if (!fp) {printf("%d\n", __LINE__); goto error; }
fseek(fp, 0, SEEK_END); fseek(fp, 0, SEEK_END);
size = ftell(fp); size = ftell(fp);
fseek(fp, 0, SEEK_SET); fseek(fp, 0, SEEK_SET);
data = (char*)malloc(size+1); data = (char*)malloc(size+1);
if (data == NULL) goto error; if (data == NULL) {printf("%d\n", __LINE__); goto error; }
if (fread(data, 1, size, fp) != size) goto error; if (fread(data, 1, size, fp) != size) {printf("%d\n", __LINE__); goto error; }
data[size] = '\0'; // Must be null terminated. data[size] = '\0'; // Must be null terminated.
fclose(fp); fclose(fp);
image = nsvgParse(data, units, dpi); image = nsvgParse(data, units, dpi);

25
include/pbsplash.h
View file

@ -12,6 +12,29 @@ struct col {
}; };
}; };
void animate_frame(int frame, int w, int y_off, long dpi); struct dpi_info {
long dpi;
int pixels_per_milli;
float logo_size_px;
int logo_size_max_mm;
};
typedef struct NSVGimage NSVGimage;
#define MAX_FRAMES 16
struct image_info {
char *path[MAX_FRAMES];
NSVGimage *image[MAX_FRAMES];
int num_frames;
float width;
float height;
float x;
float y;
};
void draw_svg(NSVGimage *image, int x, int y, int w, int h);
void animate_frame(int frame, int w, int y_off, long dpi, struct image_info *images);
#endif #endif

22
src/animate.c
View file

@ -31,7 +31,25 @@ static void circles_wave(int frame, int w, int y_off, long dpi)
} }
} }
void animate_frame(int frame, int w, int y_off, long dpi) static void animate_logo(int frame, struct image_info *images)
{ {
circles_wave(frame, w, y_off, dpi); static int step = 0;
tfb_draw_pixel(0, 0, tfb_black);
if (frame > 0 && (step + 1) * 4 < frame) {
step++;
}
// tfb_fill_rect(images->x, images->y, images->width, images->height,
// tfb_black);
draw_svg(images->image[step % images->num_frames], images->x, images->y, images->width,
images->height);
}
void animate_frame(int frame, int w, int y_off, long dpi,
struct image_info *images)
{
animate_logo(frame, images);
// circles_wave(frame, w, y_off, dpi);
} }

163
src/pbsplash.c
View file

@ -32,11 +32,13 @@
volatile sig_atomic_t terminate = 0; volatile sig_atomic_t terminate = 0;
bool debug = false; bool debug = true;
struct col background_color = { .r = 0, .g = 0, .b = 0, .a = 255 }; struct col background_color = { .r = 0, .g = 0, .b = 0, .a = 255 };
static int screenWidth, screenHeight; static int screenWidth, screenHeight;
static struct dpi_info dpi_info = { .logo_size_max_mm = LOGO_SIZE_MAX_MM };
#define zalloc(size) calloc(1, size) #define zalloc(size) calloc(1, size)
#define LOG(fmt, ...) \ #define LOG(fmt, ...) \
@ -80,6 +82,7 @@ static void blit_buf(unsigned char *buf, int x, int y, int w, int h, bool vflip,
struct col prev_col = { .r = 0, .g = 0, .b = 0, .a = 0 }; struct col prev_col = { .r = 0, .g = 0, .b = 0, .a = 0 };
unsigned int col = tfb_make_color( unsigned int col = tfb_make_color(
background_color.r, background_color.g, background_color.b); background_color.r, background_color.g, background_color.b);
tfb_fill_rect(x, y, w, h, col);
for (size_t i = 0; i < w; i++) { for (size_t i = 0; i < w; i++) {
for (size_t j = 0; j < h; j++) { for (size_t j = 0; j < h; j++) {
@ -123,14 +126,14 @@ static void blit_buf(unsigned char *buf, int x, int y, int w, int h, bool vflip,
} }
} }
static void draw_svg(NSVGimage *image, int x, int y, int w, int h) void draw_svg(NSVGimage *image, int x, int y, int w, int h)
{ {
float sz = (int)((float)w / (float)image->width * 100.f) / 100.f; float sz = (int)((float)w / (float)image->width * 100.f) / 100.f;
LOG("draw_svg: (%d, %d), %dx%d, %f\n", x, y, w, h, sz); //LOG("draw_svg: (%d, %d), %dx%d, %f\n", x, y, w, h, sz);
NSVGrasterizer *rast = nsvgCreateRasterizer(); NSVGrasterizer *rast = nsvgCreateRasterizer();
unsigned char *img = zalloc(w * h * 4); unsigned char *img = zalloc(w * h * 4);
//blit_buf(img, x, y, w, h, false, false);
nsvgRasterize(rast, image, 0, 0, sz, img, w, h, w * 4); nsvgRasterize(rast, image, 0, 0, sz, img, w, h, w * 4);
blit_buf(img, x, y, w, h, false, false); blit_buf(img, x, y, w, h, false, false);
free(img); free(img);
@ -240,19 +243,15 @@ out:
return out_text; return out_text;
} }
struct dpi_info { struct dpi_info *calculate_dpi_info()
long dpi;
int pixels_per_milli;
float logo_size_px;
int logo_size_max_mm;
};
static void calculate_dpi_info(struct dpi_info *dpi_info)
{ {
if (dpi_info.logo_size_px)
return &dpi_info;
int w_mm = tfb_screen_width_mm(); int w_mm = tfb_screen_width_mm();
int h_mm = tfb_screen_height_mm(); int h_mm = tfb_screen_height_mm();
if ((w_mm < 1 || h_mm < 1) && !dpi_info->dpi) { if ((w_mm < 1 || h_mm < 1) && !dpi_info.dpi) {
fprintf(stderr, "ERROR!!!: Invalid screen size: %dx%d\n", w_mm, h_mm); fprintf(stderr, "ERROR!!!: Invalid screen size: %dx%d\n", w_mm, h_mm);
// Assume a dpi of 300 // Assume a dpi of 300
@ -260,38 +259,40 @@ static void calculate_dpi_info(struct dpi_info *dpi_info)
// Except ridiculous HiDPI displays // Except ridiculous HiDPI displays
// which honestly should expose their physical // which honestly should expose their physical
// dimensions.... // dimensions....
dpi_info->dpi = 300; dpi_info.dpi = 300;
} }
// If DPI is specified on cmdline then calculate display size from it // If DPI is specified on cmdline then calculate display size from it
// otherwise calculate the dpi based on the display size. // otherwise calculate the dpi based on the display size.
if (dpi_info->dpi > 0) { if (dpi_info.dpi > 0) {
w_mm = screenWidth / (float)dpi_info->dpi * 25.4; w_mm = screenWidth / (float)dpi_info.dpi * 25.4;
h_mm = screenHeight / (float)dpi_info->dpi * 25.4; h_mm = screenHeight / (float)dpi_info.dpi * 25.4;
} else { } else {
dpi_info->dpi = (float)screenWidth / (float)w_mm * 25.4; dpi_info.dpi = (float)screenWidth / (float)w_mm * 25.4;
} }
dpi_info->pixels_per_milli = (float)screenWidth / (float)w_mm; dpi_info.pixels_per_milli = (float)screenWidth / (float)w_mm;
if (dpi_info->logo_size_max_mm * dpi_info->pixels_per_milli > screenWidth) if (dpi_info.logo_size_max_mm * dpi_info.pixels_per_milli > screenWidth)
dpi_info->logo_size_max_mm = (screenWidth * 0.75f) / dpi_info->pixels_per_milli; dpi_info.logo_size_max_mm = (screenWidth * 0.75f) / dpi_info.pixels_per_milli;
dpi_info->logo_size_px = dpi_info.logo_size_px =
(float)(screenWidth < screenHeight ? screenWidth : (float)(screenWidth < screenHeight ? screenWidth :
screenHeight) * screenHeight) *
0.75f; 0.75f;
if (w_mm > 0 && h_mm > 0) { if (w_mm > 0 && h_mm > 0) {
if (w_mm < h_mm) { if (w_mm < h_mm) {
if (w_mm > dpi_info->logo_size_max_mm * 1.2f) if (w_mm > dpi_info.logo_size_max_mm * 1.2f)
dpi_info->logo_size_px = dpi_info->logo_size_max_mm * dpi_info->pixels_per_milli; dpi_info.logo_size_px = dpi_info.logo_size_max_mm * dpi_info.pixels_per_milli;
} else { } else {
if (h_mm > dpi_info->logo_size_max_mm * 1.2f) if (h_mm > dpi_info.logo_size_max_mm * 1.2f)
dpi_info->logo_size_px = dpi_info->logo_size_max_mm * dpi_info->pixels_per_milli; dpi_info.logo_size_px = dpi_info.logo_size_max_mm * dpi_info.pixels_per_milli;
} }
} }
printf("%dx%d @ %dx%dmm, dpi=%ld, logo_size_px=%f\n", screenWidth, printf("%dx%d @ %dx%dmm, dpi=%ld, logo_size_px=%f\n", screenWidth,
screenHeight, w_mm, h_mm, dpi_info->dpi, dpi_info->logo_size_px); screenHeight, w_mm, h_mm, dpi_info.dpi, dpi_info.logo_size_px);
return &dpi_info;
} }
struct msg_info { struct msg_info {
@ -373,35 +374,31 @@ static void show_messages(struct messages *msgs, const struct dpi_info *dpi_info
} }
} }
struct image_info { int load_image(const struct dpi_info *dpi_info, struct image_info *image_info, int i)
const char *path;
NSVGimage *image;
float width;
float height;
float x;
float y;
};
static int load_image(const struct dpi_info *dpi_info, struct image_info *image_info)
{ {
int logo_size_px = dpi_info->logo_size_px; int logo_size_px = dpi_info->logo_size_px;
image_info->image = nsvgParseFromFile(image_info->path, "", logo_size_px); image_info->image[i] = nsvgParseFromFile(image_info->path[i], "", logo_size_px);
if (!image_info->image) { if (!image_info->image[i] && i == 0) {
fprintf(stderr, "failed to load SVG image\n"); fprintf(stderr, "failed to load SVG image\n");
fprintf(stderr, " image path: %s\n", image_info->path); fprintf(stderr, " image path: %s\n", image_info->path[i]);
return 1;
} else if (!image_info->image[i]) {
return 1; return 1;
} }
// For taller images make sure they don't get too wide // For taller images make sure they don't get too wide
if (image_info->image->width < image_info->image->height * 1.1) if (image_info->image[i]->width < image_info->image[i]->height * 1.1)
logo_size_px = MM_TO_PX(dpi_info->dpi, 25); logo_size_px = MM_TO_PX(dpi_info->dpi, 25);
if (i > 0)
return 0;
float sz = float sz =
(float)logo_size_px / (float)logo_size_px /
(image_info->image->width > image_info->image->height ? image_info->image->height : image_info->image->width); (image_info->image[i]->width > image_info->image[i]->height ? image_info->image[i]->height : image_info->image[i]->width);
image_info->width = image_info->image->width * sz + 0.5; image_info->width = image_info->image[i]->width * sz + 0.5;
image_info->height = image_info->image->height * sz + 0.5; image_info->height = image_info->image[i]->height * sz + 0.5;
if (image_info->width > (dpi_info->logo_size_max_mm * dpi_info->pixels_per_milli)) { if (image_info->width > (dpi_info->logo_size_max_mm * dpi_info->pixels_per_milli)) {
float scalefactor = float scalefactor =
((float)(dpi_info->logo_size_max_mm * dpi_info->pixels_per_milli) / image_info->width); ((float)(dpi_info->logo_size_max_mm * dpi_info->pixels_per_milli) / image_info->width);
@ -415,6 +412,46 @@ static int load_image(const struct dpi_info *dpi_info, struct image_info *image_
return 0; return 0;
} }
/* strdup and increment a 2 digit number in the string at offset */
static char *strdupinc(const char *s, int i)
{
char *n = NULL;
char *base = zalloc(strlen(s));
LOG("%d, %s\n", i, s);
n = strstr(s, "01");
memcpy(base, s, strlen(s));
int len = strlen(s) - strlen(n);
base[len] = '0' + (i/10);
base[len + 1] = '1' + (i%10);
return base;
}
int load_images(const struct dpi_info *dpi_info, struct image_info *image_info)
{
if (strlen(image_info->path[0]) < 6) {
fprintf(stderr, "invalid image path\n");
return 1;
}
for (int i = 0; i < MAX_FRAMES; i++) {
if (i > 0)
image_info->path[i] = strdupinc(image_info->path[0], i);
if (load_image(dpi_info, image_info, i)) {
free(image_info->path[i]);
break;
}
image_info->num_frames++;
}
LOG("num_frames: %d\n", image_info->num_frames);
return 0;
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int rc = 0; int rc = 0;
@ -429,15 +466,9 @@ int main(int argc, char **argv)
.msg = NULL, .msg = NULL,
.bottom_msg = NULL, .bottom_msg = NULL,
}; };
struct dpi_info dpi_info = {
.dpi = 0,
.pixels_per_milli = 0,
.logo_size_px = 0,
.logo_size_max_mm = LOGO_SIZE_MAX_MM,
};
struct image_info image_info = { struct image_info image_info = {
.path = NULL, .path = { },
.image = NULL, .image = { },
.width = 0, .width = 0,
.height = 0, .height = 0,
.x = 0, .x = 0,
@ -466,7 +497,7 @@ int main(int argc, char **argv)
msgs.font_path = optarg; msgs.font_path = optarg;
break; break;
case 's': case 's':
image_info.path = optarg; image_info.path[0] = strdup(optarg);
break; break;
case 'm': case 'm':
message = malloc(strlen(optarg) + 1); message = malloc(strlen(optarg) + 1);
@ -528,7 +559,7 @@ int main(int argc, char **argv)
LOG("active tty: '%s'\n", active_tty); LOG("active tty: '%s'\n", active_tty);
if ((rc = tfb_acquire_fb(/*TFB_FL_NO_TTY_KD_GRAPHICS */ 0, "/dev/fb0", if ((rc = tfb_acquire_fb(TFB_FL_USE_DOUBLE_BUFFER, "/dev/fb0",
active_tty)) != TFB_SUCCESS) { active_tty)) != TFB_SUCCESS) {
fprintf(stderr, "tfb_acquire_fb() failed with error code: %d\n", fprintf(stderr, "tfb_acquire_fb() failed with error code: %d\n",
rc); rc);
@ -539,18 +570,18 @@ int main(int argc, char **argv)
screenWidth = (int)tfb_screen_width(); screenWidth = (int)tfb_screen_width();
screenHeight = (int)tfb_screen_height(); screenHeight = (int)tfb_screen_height();
calculate_dpi_info(&dpi_info); struct dpi_info *dpi_info = calculate_dpi_info();
rc = load_image(&dpi_info, &image_info); rc = load_images(dpi_info, &image_info);
if (rc) if (rc)
goto out; goto out;
float animation_y = image_info.y + image_info.height + MM_TO_PX(dpi_info.dpi, 5); float animation_y = image_info.y + image_info.height + MM_TO_PX(dpi_info->dpi, 5);
tfb_clear_screen(tfb_make_color(background_color.r, background_color.g, tfb_clear_screen(tfb_make_color(background_color.r, background_color.g,
background_color.b)); background_color.b));
draw_svg(image_info.image, image_info.x, image_info.y, image_info.width, image_info.height); draw_svg(image_info.image[0], image_info.x, image_info.y, image_info.width, image_info.height);
if (!message && !message_bottom) if (!message && !message_bottom)
goto no_messages; goto no_messages;
@ -568,7 +599,7 @@ int main(int argc, char **argv)
if (message) if (message)
msgs.msg = &msg; msgs.msg = &msg;
show_messages(&msgs, &dpi_info); show_messages(&msgs, dpi_info);
no_messages: no_messages:
tfb_flush_window(); tfb_flush_window();
@ -592,7 +623,8 @@ no_messages:
} }
clock_gettime(CLOCK_REALTIME, &start); clock_gettime(CLOCK_REALTIME, &start);
tick = timespec_to_double(timespec_sub(start, epoch)) * tickrate; tick = timespec_to_double(timespec_sub(start, epoch)) * tickrate;
animate_frame(tick, screenWidth, animation_y, dpi_info.dpi); animate_frame(tick, screenWidth, animation_y, dpi_info->dpi, &image_info);
tfb_flush_window();
tfb_flush_fb(); tfb_flush_fb();
clock_gettime(CLOCK_REALTIME, &end); clock_gettime(CLOCK_REALTIME, &end);
diff = timespec_sub(end, start); diff = timespec_sub(end, start);
@ -608,15 +640,18 @@ no_messages:
out: out:
// Before we exit print the logo so it will persist // Before we exit print the logo so it will persist
if (image_info.image) { if (image_info.image[0]) {
ioctl(tty, KDSETMODE, KD_TEXT); ioctl(tty, KDSETMODE, KD_TEXT);
draw_svg(image_info.image, image_info.x, image_info.y, image_info.width, image_info.height); draw_svg(image_info.image[0], image_info.x, image_info.y, image_info.width, image_info.height);
} }
// Draw the messages again so they will persist // Draw the messages again so they will persist
show_messages(&msgs, &dpi_info); show_messages(&msgs, dpi_info);
nsvgDelete(image_info.image); for (int i = 0; i < image_info.num_frames; i++) {
nsvgDelete(image_info.image[i]);
free(image_info.path[i]);
}
nsvgDelete(msgs.font); nsvgDelete(msgs.font);
free_message(msgs.msg); free_message(msgs.msg);
free_message(msgs.bottom_msg); free_message(msgs.bottom_msg);