Navigation Menu

Skip to content

Commit

Permalink
Drop affi dependency
Browse files Browse the repository at this point in the history
Did not need general affine transformations anyway, and all array sections have been rewritten into specific iteration.
  • Loading branch information
Ramarren committed Jul 15, 2008
1 parent 3bd6c00 commit bddc2de
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 15 deletions.
1 change: 0 additions & 1 deletion README.markdown
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions drawing.lisp
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion 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"))
Expand Down
2 changes: 1 addition & 1 deletion 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))
Expand Down
3 changes: 0 additions & 3 deletions texture.lisp
Expand Up @@ -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)
Expand Down

0 comments on commit bddc2de

Please sign in to comment.