New type 'face'

diff --git a/src/assimp.scm b/src/assimp.scm
index b91e8ab2e4ff5f30cae95eb11ac30cb05fb3d582..f3d8893c7fe2265b23250ff012e2441d551f33e4 100644 (file)
--- a/src/assimp.scm
+++ b/src/assimp.scm
@@ -102,6 +102,18 @@
            (else
             '())))))
 
            (else
             '())))))
 

+(define* (get-structs-array num-index root-index struct-size #:optional wrap-proc)
+  (lambda (pointer)
+    (let ((num (bv-uint-ref pointer num-index))
+         (rootp (bv-uint-ref pointer root-index)))
+      (let loop ((i (- num 1)))
+       (cond ((< i 0)
+              '())
+             (else
+              (let* ((p (make-pointer (+ rootp (* i struct-size))))
+                     (wp (if wrap-proc (wrap-proc p) p)))
+                (cons wp (loop (- i 1))))))))))
+

 (define* (get-pointer-of-pointers num-index root-index #:optional wrap-proc)
   (lambda (pointer)
     (let* ((num (bv-uint-ref pointer num-index))
 (define* (get-pointer-of-pointers num-index root-index #:optional wrap-proc)
   (lambda (pointer)
     (let* ((num (bv-uint-ref pointer num-index))


@@ -155,7 +167,7 @@
 (define-type mesh
   (num-primitive-types (lambda (p) (bv-uint-ref p 0)))
   (vertices (get-pointer-of-pointers 4 12))
 (define-type mesh
   (num-primitive-types (lambda (p) (bv-uint-ref p 0)))
   (vertices (get-pointer-of-pointers 4 12))

-  (faces (get-pointer-of-pointers 8 124))
+  (faces (get-structs-array 8 124 8 wrap-face))

   (normals (lambda (p) (bv-uint-ref p 16)))
   (tangents (lambda (p) (bv-uint-ref p 20)))
   (bitangents (lambda (p) (bv-uint-ref p 24)))
   (normals (lambda (p) (bv-uint-ref p 16)))
   (tangents (lambda (p) (bv-uint-ref p 20)))
   (bitangents (lambda (p) (bv-uint-ref p 24)))


@@ -177,3 +189,12 @@
 
 (export material?
        material-contents)
 
 (export material?
        material-contents)

+
+
+;;; Faces
+
+(define-type face
+  (indices (get-array 0 4 'u32)))
+
+(export face?
+       face-contents)