From bddc2dec014bb82606c4187fe76a9bf22ac2ab9f Mon Sep 17 00:00:00 2001
From: Ramarren <ramarren@gmail.com>
Date: Tue, 15 Jul 2008 14:10:42 +0200
Subject: [PATCH] Drop affi dependency

Did not need general affine transformations anyway, and all array sections have been rewritten into specific iteration.
---
 README.markdown | 1 -
 drawing.lisp    | 9 ---------
 opengl-text.asd | 2 +-
 package.lisp    | 2 +-
 texture.lisp    | 3 ---
 5 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/README.markdown b/README.markdown
index e04e0fa..d6e2288 100644
--- a/README.markdown
+++ b/README.markdown
@@ -10,7 +10,6 @@ This is a Common Lisp library for texture mapped fonts in OpenGL.
 - cl-vectors
 - zpb-ttf
 - ffa
-- affi
 - trivial-garbage
 
 # Usage
diff --git a/drawing.lisp b/drawing.lisp
index c58ee3b..357fd0c 100644
--- a/drawing.lisp
+++ b/drawing.lisp
@@ -18,15 +18,6 @@
 	(when (and gp kerning)
 	  (incf k (/ (zpb-ttf:kerning-offset gp g font) scaler)))
 	(for (xmin ymin xmax ymax) next (compute-actual-slice c gl-text))
-	#+(or)(let ((vertex (make-array '(4 3)
-					:initial-contents
-					(list (list (+ k xmin) ymin (* j depth-shift))
-					      (list (- (1+ k) (- 1 xmax)) ymin (* j depth-shift))
-					      (list (- (1+ k) (- 1 xmax)) ymax (* j depth-shift))
-					      (list (+ k xmin) ymax (* j depth-shift)))))
-		    (tex-coord (get-char-texture-coords c gl-text)))
-		(map-subarray vertex vertices :target-range `((,i ,(+ i 3)) :all))
-		(map-subarray tex-coord tex-coords :target-range `((,i ,(+ i 3)) :all)))
 	(setf (aref vertices i 0) (+ k xmin)
 	      (aref vertices i 1) ymin
 	      (aref vertices i 2) (* j depth-shift)
diff --git a/opengl-text.asd b/opengl-text.asd
index aa882ea..d516a84 100644
--- a/opengl-text.asd
+++ b/opengl-text.asd
@@ -1,7 +1,7 @@
 (asdf:defsystem opengl-text
   :description "Textured fonts for OpenGL"
   :licence "BSD-style"
-  :depends-on (:cl-opengl :iterate :alexandria :cl-paths-ttf :cl-vectors :ffa :affi :trivial-garbage)
+  :depends-on (:cl-opengl :iterate :alexandria :cl-paths-ttf :cl-vectors :ffa :trivial-garbage)
   :components ((:static-file "opengl-text.asd" :pathname "opengl-text.asd")
 	       (:file "package")
 	       (:file "opengl-text" :depends-on ("package"))
diff --git a/package.lisp b/package.lisp
index b65b607..230671a 100644
--- a/package.lisp
+++ b/package.lisp
@@ -1,5 +1,5 @@
 (defpackage #:opengl-text
-  (:use #:cl #:iterate #:alexandria #:ffa #:affi)
+  (:use #:cl #:iterate #:alexandria #:ffa)
   (:shadowing-import-from #:alexandria #:rotate)
   (:export #:draw-gl-string #:opengl-text #:color-of #:font-loader-of #:ensure-characters
 	   #:emsquare-of))
diff --git a/texture.lisp b/texture.lisp
index 295faf3..de3d774 100644
--- a/texture.lisp
+++ b/texture.lisp
@@ -17,9 +17,6 @@
 	      :all)))))
 
 (defun copy-character (source-array source-cell target-array target-cell em)
-  #+(or) (map-subarray source-array target-array
-		:source-range (cell-range source-cell em source-array)
-		:target-range (cell-range target-cell em target-array))
   (destructuring-bind ((sxmin sxmax) (symin symax) s-alpha) (cell-range source-cell em source-array)
     (assert (eql s-alpha :all))
     (destructuring-bind ((txmin txmax) (tymin tymax) t-lum-alpha) (cell-range target-cell em target-array)