From 9141c0a786869f061f24c260535ea658b19c6582 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Wed, 9 Dec 2009 07:55:23 +0000
Subject: [PATCH] allow non-square fonts to be output

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8381 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/particles/particlefont.pl | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/data/particles/particlefont.pl b/data/particles/particlefont.pl
index 8d7b0e0cf..fd5b6df69 100644
--- a/data/particles/particlefont.pl
+++ b/data/particles/particlefont.pl
@@ -21,9 +21,9 @@ sub checkmagick($)
 	return $e;
 }
 
-my ($pixw, $pixh, $cols, $beamoffset, $beams) = @ARGV;
+my ($pixw, $pixh, $cols, $rows, $beamoffset, $beams) = @ARGV;
 defined $beams
-	or die "Usage: $0 pixw pixh columns beamoffset beams\n";
+	or die "Usage: $0 pixw pixh columns rows beamoffset beams\n";
 
 if($magick)
 {
@@ -31,8 +31,9 @@ if($magick)
 	checkmagick $magick->ReadImage("xc:white");
 }
 
-my $square = 1.0 / $cols;
-my $rows = $cols - $beams;
+my $square_x = 1.0 / $cols;
+my $square_y = 1.0 / $rows;
+$rows -= $beams;
 
 my $dx = 1.0 / $pixw;
 my $dy = 1.0 / $pixh;
@@ -42,10 +43,10 @@ for my $row(0..$rows-1)
 {
 	for my $col(0..$cols-1)
 	{
-		my $s0 = $col * $square + $dx;
-		my $s1 = ($col+1) * $square - $dx;
-		my $t0 = $row * $square + $dy;
-		my $t1 = ($row+1) * $square - $dy;
+		my $s0 = $col * $square_x + $dx;
+		my $s1 = ($col+1) * $square_x - $dx;
+		my $t0 = $row * $square_y + $dy;
+		my $t1 = ($row+1) * $square_y - $dy;
 		print "$i $s0 $t0 $s1 $t1\n";
 		if($magick)
 		{
@@ -70,8 +71,8 @@ for my $beam(0..$beams-1)
 	my $s0 = 0;
 	my $s1 = 1;
 	my $row = $beam + $rows;
-	my $t0 = $row * $square + $dy;
-	my $t1 = ($row+1) * $square - $dy;
+	my $t0 = $row * $square_y + $dy;
+	my $t1 = ($row+1) * $square_y - $dy;
 	print "$i $s0 $t0 $s1 $t1\n";
 	if($magick)
 	{
-- 
2.39.2