antialias
/
soroban-abacus-flashcards
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify bead positioning with consistent center-based logic 

- All shapes now use center-based positioning (no exceptions)
- Remove shape-specific adjustments for cleaner code
- Calculate bead positions using centers for all shapes
- Diamond and square shapes offset from center appropriately

This eliminates the complex conditional logic and makes the code
much cleaner and easier to maintain. All three shapes now follow
the same positioning rules.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Thomas Hallock 2025-09-09 12:53:31 -05:00
parent a8078b8110
commit 472aa5fc63
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
templates/flashcards.typ
View File

@ -40,13 +40,13 @@
let bar-thickness = 2pt let bar-thickness = 2pt
// Function to draw a bead based on shape // Function to draw a bead based on shape
// Note: y parameter represents the TOP edge of the bead for all shapes // y parameter represents the CENTER of where the bead should be
let draw-bead(x, y, shape, fill-color) = { let draw-bead(x, y, shape, fill-color) = {
if shape == "diamond" { if shape == "diamond" {
// Horizontally elongated diamond (rhombus) // Horizontally elongated diamond (rhombus)
place( place(
dx: x - bead-size * 0.7, dx: x - bead-size * 0.7,
dy: y, dy: y - bead-size / 2,
polygon( polygon(
(bead-size * 0.7, 0pt), // left point (bead-size * 0.7, 0pt), // left point
(bead-size * 1.4, bead-size / 2), // top point (bead-size * 1.4, bead-size / 2), // top point
@ -60,7 +60,7 @@
// Square bead // Square bead
place( place(
dx: x - bead-size / 2, dx: x - bead-size / 2,
dy: y, dy: y - bead-size / 2,
rect( rect(
width: bead-size, width: bead-size,
height: bead-size, height: bead-size,
@ -71,7 +71,6 @@
) )
} else { } else {
// Circle (traditional option) // Circle (traditional option)
// For circles, y already represents where the center should be
place( place(
dx: x - bead-size / 2, dx: x - bead-size / 2,
dy: y, dy: y,
@ -111,22 +110,15 @@
// Draw heaven bead // Draw heaven bead
#let heaven-y = if heaven-active == 1 { #let heaven-y = if heaven-active == 1 {
heaven-earth-gap - bead-size - 2pt // Active (touching bar) heaven-earth-gap - bead-size / 2 - 2pt // Active (center just above bar)
} else { } else {
5pt // Inactive (at top) 5pt + bead-size / 2 // Inactive (center near top)
}
// Adjust y for circles (which use center positioning)
#let adjusted-y = if bead-shape == "circle" {
heaven-y + bead-size / 2
} else {
heaven-y
} }
#if heaven-active == 1 or not hide-inactive [ #if heaven-active == 1 or not hide-inactive [
#draw-bead( #draw-bead(
x-offset, x-offset,
adjusted-y, heaven-y,
bead-shape, bead-shape,
if heaven-active == 1 { active-color } else { inactive-color } if heaven-active == 1 { active-color } else { inactive-color }
) )
@ -136,22 +128,15 @@
#for i in range(4) [ #for i in range(4) [
#let is-active = i < earth-active #let is-active = i < earth-active
#let earth-y = if is-active { #let earth-y = if is-active {
heaven-earth-gap + bar-thickness + 2pt + i * (bead-size + bead-spacing) heaven-earth-gap + bar-thickness + 2pt + bead-size / 2 + i * (bead-size + bead-spacing)
} else { } else {
total-height - (4 - i) * (bead-size + bead-spacing) - 5pt total-height - (4 - i) * (bead-size + bead-spacing) - 5pt + bead-size / 2
}
// Adjust y for circles (which use center positioning)
#let adjusted-earth-y = if bead-shape == "circle" {
earth-y + bead-size / 2
} else {
earth-y
} }
#if is-active or not hide-inactive [ #if is-active or not hide-inactive [
#draw-bead( #draw-bead(
x-offset, x-offset,
adjusted-earth-y, earth-y,
bead-shape, bead-shape,
if is-active { active-color } else { inactive-color } if is-active { active-color } else { inactive-color }
) )