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

diff --git a/src/assimp.scm b/src/assimp.scm
index 5de82f2..f3d8893 100644
--- a/src/assimp.scm
+++ b/src/assimp.scm
@@ -92,7 +92,29 @@
 		(cond (wrap-proc (wrap-proc p2))
 		      (else p2)))))))))
 
-(define* (get-pointer-of-pointers-procedure num-index root-index #:optional wrap-proc)
+(define (get-array num-index root-index type)
+  (lambda (pointer)
+    (let ((num (bv-uint-ref pointer num-index))
+	  (rootp (make-pointer (bv-uint-ref pointer root-index))))
+      (cond ((> num 0)
+	     (array->list
+	      (pointer->bytevector rootp num 0 type)))
+	    (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))
 	   (rootp (make-pointer (bv-uint-ref pointer root-index))))
@@ -109,12 +131,12 @@
 (define-type scene
   (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-procedure 8 12 wrap-mesh))
-  (materials (get-pointer-of-pointers-procedure 16 20))
-  (animations (get-pointer-of-pointers-procedure 24 28))
-  (textures (get-pointer-of-pointers-procedure 32 36))
-  (lights (get-pointer-of-pointers-procedure 40 44))
-  (cameras (get-pointer-of-pointers-procedure 48 52)))
+  (meshes (get-pointer-of-pointers 8 12 wrap-mesh))
+  (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))
+  (cameras (get-pointer-of-pointers 48 52)))
 
 (define (load-scene filename flags)
   (wrap-scene
@@ -133,8 +155,8 @@
   (name (get-aiString 0))
   (transformation (lambda (p) (array->list (pointer->bytevector p 16 1028 'f32))))
   (parent (get-pointer 1092 wrap-node))
-  (children (get-pointer-of-pointers-procedure 1096 1100 wrap-node))
-  (meshes (get-pointer-of-pointers-procedure 1104 1108 wrap-mesh)))
+  (children (get-pointer-of-pointers 1096 1100 wrap-node))
+  (meshes (get-array 1104 1108 'u32)))
 
 (export node?
 	node-contents)
@@ -144,16 +166,35 @@
 
 (define-type mesh
   (num-primitive-types (lambda (p) (bv-uint-ref p 0)))
-  (vertices (get-pointer-of-pointers-procedure 4 12))
-  (faces (get-pointer-of-pointers-procedure 8 124))
+  (vertices (get-pointer-of-pointers 4 12))
+  (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)))
   (colors (lambda (p) (bv-uint-ref p 28))) ;AI_MAX_NUMBER_OF_COLOR_SETS
   (texture-coords (lambda (p) (bv-uint-ref p 60))) ;AI_MAX_NUMBER_OF_TEXTURECOORDS
   (num-uv-components (lambda (p) (bv-uint-ref p 92))) ;AI_MAX_NUMBER_OF_TEXTURECOORDS
-  (bones (get-pointer-of-pointers-procedure 128 132))
+  (bones (get-pointer-of-pointers 128 132))
   (material-index (lambda (p) (bv-uint-ref p 136))))
 
 (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)