Compare commits

..

No commits in common. "main" and "v0.2.1" have entirely different histories.
main ... v0.2.1

5 changed files with 195 additions and 288 deletions

463
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -1,13 +1,13 @@
[package] [package]
name = "servicepoint-simulator" name = "servicepoint-simulator"
version = "0.2.3" version = "0.2.1"
edition = "2021" edition = "2021"
publish = true publish = true
license = "GPL-3.0-or-later" license = "GPL-3.0-or-later"
keywords = ["cccb", "cccb-servicepoint", "cli"] keywords = ["cccb", "cccb-servicepoint", "cli"]
description = "A simulator for the Service Point display." description = "A simulator for the Service Point display."
homepage = "https://git.berlin.ccc.de/servicepoint/servicepoint-simulator" homepage = "https://git.berlin.ccc.de/servicepoint/servicepoint-simulator"
repository = "https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git" repository = "https://git.berlin.ccc.de/servicepoint/servicepoint-simulator"
readme = "README.md" readme = "README.md"
rust-version = "1.80.0" rust-version = "1.80.0"
resolver = "2" resolver = "2"
@ -20,7 +20,7 @@ clap = { version = "4.5", features = ["derive"] }
thiserror = "2.0" thiserror = "2.0"
# package parsing # package parsing
servicepoint = { features = ["all_compressions"], version = "0.15.2" } servicepoint = { features = ["all_compressions"], version = "0.14.0" }
# font rendering # font rendering
font-kit = "0.14.2" font-kit = "0.14.2"

View file

@ -37,16 +37,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750969886, "lastModified": 1746183838,
"narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a676066377a2fe7457369dd37c31fd2263b662f4", "rev": "bf3287dac860542719fe7554e21e686108716879",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View file

@ -2,7 +2,7 @@
description = "Flake for servicepoint-simulator"; description = "Flake for servicepoint-simulator";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nix-filter.url = "github:numtide/nix-filter"; nix-filter.url = "github:numtide/nix-filter";
naersk = { naersk = {
url = "github:nix-community/naersk"; url = "github:nix-community/naersk";

View file

@ -102,8 +102,8 @@ impl FontRenderer8x8 {
for y in 0..TILE_SIZE { for y in 0..TILE_SIZE {
for x in 0..TILE_SIZE { for x in 0..TILE_SIZE {
let canvas_val = canvas.pixels[x + y * TILE_SIZE] != 0; let canvas_val = canvas.pixels[x + y * TILE_SIZE] != 0;
let bitmap_x = offset.x + x; let bitmap_x = (offset.x + x) as isize;
let bitmap_y = offset.y + y; let bitmap_y = (offset.y + y) as isize;
if !bitmap.set_optional(bitmap_x, bitmap_y, canvas_val) { if !bitmap.set_optional(bitmap_x, bitmap_y, canvas_val) {
return Err(OutOfBounds(x, y)); return Err(OutOfBounds(x, y));
} }