Asset management fixes and various package tinkering

borodust · Jan 2, 2017 · d5d3948 · d5d3948
1 parent 0164b1a
commit d5d3948
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 22 deletions.
diff --git a/cl-bodge.asd b/cl-bodge.asd
@@ -201,8 +201,7 @@
   :author "Pavel Korolev"
   :mailto "dev@borodust.org"
   :license "MIT"
-  :depends-on (cl-bodge/engine cl-bodge/utils cl-bodge/graphics cl-bodge/assets log4cl
-                               cl-bodge/assets)
+  :depends-on (cl-bodge/engine cl-bodge/utils cl-bodge/graphics cl-bodge/assets log4cl)
   :pathname "text"
   :serial t
   :components ((:file "packages")
@@ -260,7 +259,7 @@
   :license "MIT"
   :depends-on (cl-bodge/engine cl-bodge/utils cl-bodge/assets cl-bodge/graphics
                                cl-bodge/animation cl-bodge/scenegraph flexi-streams log4cl
-                               cl-fad bodge-sndfile opticl)
+                               cl-bodge/text cl-fad bodge-sndfile opticl)
   :pathname "resources"
   :serial t
   :components ((:file "packages")

diff --git a/graphics/packages.lisp b/graphics/packages.lisp
@@ -63,5 +63,6 @@
 
            define-shader-library
            define-shading-program
+           find-program-descriptor
            load-shading-program
            build-shading-program))
diff --git a/poiu/text-renderer.lisp b/poiu/text-renderer.lisp
@@ -42,7 +42,8 @@
 (define-system-function make-text-renderer graphics-system
     (width height font line-height &key (color (vec4 0.0 0.0 0.0 1.0)))
   (make-instance 'text-renderer
-                 :shading-program (load-shading-program 'text-shading)
+                 :shading-program (load-shading-program
+                                   (find-program-descriptor 'text-shading))
                  :font font
                  :width width
                  :height height

diff --git a/resources/converters.lisp b/resources/converters.lisp
@@ -16,7 +16,7 @@
                                               :scale (sequence->vec3 scale))))))))))
 
 
-(define-system-function chunk->mesh graphics-system (mesh-chunk)
+(define-system-function chunk->mesh ge.gx:graphics-system (mesh-chunk)
   (let* ((arrays (mesh-chunk-arrays mesh-chunk))
          (v-count (length (cadar arrays)))
          (chunk-bones (mesh-chunk-bones mesh-chunk))
@@ -49,3 +49,24 @@
                node)))
     (unless (null chunk)
       (%traverse chunk))))
+
+
+(defun chunk->image (chunk)
+  (make-instance 'image
+                 :width (image-chunk-width chunk)
+                 :height (image-chunk-height chunk)
+                 :pixel-format (image-chunk-pixel-format chunk)
+                 :data (image-chunk-data chunk)))
+
+
+(define-system-function chunk->font ge.gx:graphics-system (font-chunk atlas-image)
+  (let ((glyphs (loop for g in (font-atlas-chunk-children font-chunk)
+                   collect (ge.txt:make-glyph (code-char (glyph-metrics-character g))
+                                              (glyph-metrics-origin g)
+                                              (glyph-metrics-bounding-box g)
+                                              (glyph-metrics-advance-width g)
+                                              (glyph-metrics-kernings g)))))
+    (ge.txt:make-font atlas-image glyphs
+                      (font-atlas-chunk-ascender font-chunk)
+                      (- (font-atlas-chunk-descender font-chunk))
+                      (font-atlas-chunk-line-gap font-chunk))))
diff --git a/resources/packages.lisp b/resources/packages.lisp
@@ -3,7 +3,7 @@
 
 (defpackage :cl-bodge.resources
   (:nicknames :ge.rsc)
-  (:use :cl :cl-bodge.utils :cl-bodge.engine)
+  (:use :cl :cl-bodge.utils :cl-bodge.engine :cl-bodge.assets)
   (:export load-resource
            find-chunk
 
@@ -48,4 +48,6 @@
 
            chunk->animation
            chunk->skeleton
-           chunk->mesh))
+           chunk->mesh
+           chunk->image
+           chunk->font))
diff --git a/text/font.lisp b/text/font.lisp
@@ -54,20 +54,24 @@
     (gethash character glyph-table)))
 
 
-(define-system-function font-atlas-chunk->font graphics-system (font-chunk atlas-image)
-  (let ((glyphs (loop for g in (font-atlas-chunk-children font-chunk)
-                   collect (make-instance 'glyph
-                                          :character (glyph-metrics-character g)
-                                          :origin (glyph-metrics-origin g)
-                                          :bounding-box (glyph-metrics-bounding-box g)
-                                          :advance-width (glyph-metrics-advance-width g)
-                                          :kernings (glyph-metrics-kernings g)))))
-    (make-instance 'font
-                   :glyphs glyphs
-                   :atlas (make-2d-texture atlas-image :grey :generate-mipmaps-p nil)
-                   :ascender-height (font-atlas-chunk-ascender font-chunk)
-                   :descender-height (- (font-atlas-chunk-descender font-chunk))
-                   :line-gap (font-atlas-chunk-line-gap font-chunk))))
+(defun make-glyph (character origin bounding-box advance-width kernings)
+  (make-instance 'glyph
+                 :character character
+                 :origin origin
+                 :bounding-box bounding-box
+                 :advance-width advance-width
+                 :kernings kernings))
+
+
+(define-system-function make-font graphics-system (atlas-image glyphs ascender-height
+                                                               descender-height
+                                                               line-gap)
+  (make-instance 'font
+                 :glyphs glyphs
+                 :atlas (make-2d-texture atlas-image :grey :generate-mipmaps-p nil)
+                 :ascender-height ascender-height
+                 :descender-height descender-height
+                 :line-gap line-gap))
 
 
 (defun measure-string (string font)

diff --git a/text/packages.lisp b/text/packages.lisp
@@ -4,7 +4,8 @@
 (defpackage :cl-bodge.text
   (:nicknames :ge.txt)
   (:use :cl :cl-bodge.utils :cl-bodge.engine :cl-bodge.graphics :cl-bodge.assets)
-  (:export font-atlas-chunk->font
+  (:export make-glyph
+           make-font
            font-ascender-height
            font-descender-height
            font-line-gap