X-Git-Url: https://git.jsancho.org/?p=guile-assimp.git;a=blobdiff_plain;f=src%2Fassimp.scm;h=f3d8893c7fe2265b23250ff012e2441d551f33e4;hp=aac4475da1f91714274477e79d3fbd559a6760fe;hb=97d868192018795a86bf88d6534c132303f6cd08;hpb=7109f062d51a61a9262711eca439896e63f9348c

diff --git a/src/assimp.scm b/src/assimp.scm
index aac4475..f3d8893 100644
--- a/src/assimp.scm
+++ b/src/assimp.scm
@@ -102,6 +102,18 @@
 	    (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))
@@ -120,7 +132,7 @@
   (flags (lambda (p) (bv-uint-ref p 0)))
   (root-node (lambda (p) (wrap-node (make-pointer (bv-uint-ref p 4)))))
   (meshes (get-pointer-of-pointers 8 12 wrap-mesh))
-  (materials (get-pointer-of-pointers 16 20))
+  (materials (get-pointer-of-pointers 16 20 wrap-material))
   (animations (get-pointer-of-pointers 24 28))
   (textures (get-pointer-of-pointers 32 36))
   (lights (get-pointer-of-pointers 40 44))
@@ -155,7 +167,7 @@
 (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)))
@@ -167,3 +179,22 @@
 
 (export mesh?
 	mesh-contents)
+
+
+;;; Materials
+
+(define-type material
+  (properties (get-pointer-of-pointers 4 0))
+  (allocated (lambda (p) (bv-uint-ref p 8))))
+
+(export material?
+	material-contents)
+
+
+;;; Faces
+
+(define-type face
+  (indices (get-array 0 4 'u32)))
+
+(export face?
+	face-contents)