X-Git-Url: https://git.jsancho.org/?p=guile-assimp.git;a=blobdiff_plain;f=src%2Fassimp.scm;h=9954e8212bcb47cab6f070bc22e4f80654e091bb;hp=7422b8175f7897ce4571b94759c0c371c57ae497;hb=d53c6fdc3383148b2e73599fb955693aa6f597a5;hpb=63cca7faa50c513c8aa201d15336e555438fddb5

diff --git a/src/assimp.scm b/src/assimp.scm
index 7422b81..9954e82 100644
--- a/src/assimp.scm
+++ b/src/assimp.scm
@@ -16,196 +16,273 @@
 
 
 (define-module (assimp assimp)
+  #:use-module (assimp low-level)
+  #:use-module (assimp low-level cimport)
+  #:use-module (assimp low-level color)
+  #:use-module (assimp low-level material)
+  #:use-module (assimp low-level matrix)
+  #:use-module (assimp low-level mesh)
   #:use-module (assimp low-level scene)
-  #:use-module (ice-9 iconv)
-  #:use-module (rnrs bytevectors)
+  #:use-module (assimp low-level types)
+  #:use-module (assimp low-level vector)
   #:use-module (system foreign))
 
-(define libassimp (dynamic-link "libassimp"))
-
-(define aiImportFile
-  (pointer->procedure '*
-		      (dynamic-func "aiImportFile" libassimp)
-		      (list '* unsigned-int)))
-
-
-;;; Type Generation
-
-(define-syntax define-type
-  (lambda (x)
-    (define (mk-string . args)
-      (string-concatenate
-       (map (lambda (a)
-	      (if (string? a)
-		  a
-		  (symbol->string (syntax->datum a))))
-	    args)))
-    (define (mk-symbol . args)
-      (datum->syntax x
-        (string->symbol
-	 (apply mk-string args))))
-    (syntax-case x ()
-      ((_ name (field field-proc) ...)
-       (with-syntax ((type? (mk-symbol #'name "?"))
-		     (wrap-type (mk-symbol "wrap-" #'name))
-		     (unwrap-type (mk-symbol "unwrap-" #'name))
-		     (output-string (mk-string "#<" #'name " ~x>"))
-		     (type-contents (mk-symbol #'name "-contents")))
-         #'(begin
-	     (define-wrapped-pointer-type name
-	       type?
-	       wrap-type unwrap-type
-	       (lambda (x p)
-		 (format p output-string
-			 (pointer-address (unwrap-type x)))))
-	     (define (type-contents wrapped)
-	       (let ((unwrapped (unwrap-type wrapped)))
-		 (cond ((= (pointer-address unwrapped) 0)
-			'())
-		       (else
-			(filter
-			 (lambda (f)
-			   (not (null? (cdr f))))
-			 (list (cons 'field (field-proc unwrapped))
-			       ...))))))))))))
-
-
-(define (bv-uint-ref pointer index)
-  (bytevector-uint-ref
-   (pointer->bytevector pointer 4 index)
-   0
-   (native-endianness)
-   4))
-
-(define (get-aiString index)
-  (lambda (pointer)
-    (let* ((length (bv-uint-ref pointer index))
-	   (data (pointer->bytevector pointer length (+ index 4))))
-      (bytevector->string data (fluid-ref %default-port-encoding)))))
-
-(define* (get-pointer index #:optional wrap-proc)
-  (lambda (pointer)
-    (let ((p (bv-uint-ref pointer index)))
-      (cond ((= p 0) '())
-	    (else
-	     (let ((p2 (make-pointer p)))
-	       (list
-		(cond (wrap-proc (wrap-proc p2))
-		      (else p2)))))))))
-
-(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))))
-      (let loop ((i 0))
-	(cond ((= i num)
-	       '())
-	      (else
-	       (let* ((p (make-pointer (bv-uint-ref rootp (* 4 i))))
-		      (wp (if wrap-proc (wrap-proc p) p)))
-		 (cons wp (loop (+ i 1))))))))))
 
 ;;; Scenes
 
-(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 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
-   (aiImportFile (string->pointer filename)
-		 flags)))
-
-(define (load-scene filename flags)
-  (parse-aiNode
-   (assoc-ref
-    (parse-aiScene
-     (aiImportFile (string->pointer filename)
-		   flags))
-    'mRootNode)))
-
-(export load-scene
-	unwrap-scene
-	scene?
-	scene-contents)
+(define-conversion-type parse-aiScene -> ai-scene
+  (flags (field 'mFlags))
+  (root-node (wrap (field 'mRootNode) wrap-ai-node))
+  (meshes (wrap (array (field 'mNumMeshes) (field 'mMeshes)) wrap-ai-mesh))
+  (materials (wrap (array (field 'mNumMaterials) (field 'mMaterials)) wrap-ai-material))
+  (animations (array (field 'mNumAnimations) (field 'mAnimations)))
+  (textures (array (field 'mNumTextures) (field 'mTextures)))
+  (lights (array (field 'mNumLights) (field 'mLights)))
+  (cameras (array (field 'mNumCameras) (field 'mCameras))))
+
+(export ai-scene?
+	ai-scene-contents
+	ai-scene-flags
+	ai-scene-root-node
+	ai-scene-meshes
+	ai-scene-materials
+	ai-scene-animations
+	ai-scene-textures
+	ai-scene-lights
+	ai-scene-cameras)
 
 
 ;;; Nodes
 
-(define-type node
-  (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 1096 1100 wrap-node))
-  (meshes (get-array 1104 1108 'u32)))
+(define-conversion-type parse-aiNode -> ai-node
+  (name (sized-string (field 'mName)))
+  (transformation (wrap (parse-aiMatrix4x4 (field 'mTransformation) #:reverse #t) wrap-ai-matrix4x4))
+  (parent (wrap (field 'mParent) wrap-ai-node))
+  (children (wrap (array (field 'mNumChildren) (field 'mChildren)) wrap-ai-node))
+  (meshes (array (field 'mNumMeshes) (field 'mMeshes))))
 
-(export node?
-	node-contents)
+(export ai-node?
+	ai-node-contents
+	ai-node-name
+	ai-node-transformation
+	ai-node-parent
+	ai-node-children
+	ai-node-meshes)
 
 
 ;;; Meshes
 
-(define AI_MAX_NUMBER_OF_COLOR_SETS 8)
-
-(define-type mesh
-  (num-primitive-types (lambda (p) (bv-uint-ref p 0)))
-  (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 128 132))
-  (material-index (lambda (p) (bv-uint-ref p 136))))
-
-(export mesh?
-	mesh-contents)
+(define-conversion-type parse-aiMesh -> ai-mesh
+  (name (sized-string (field 'mName)))
+  (primitive-types (field 'mPrimitiveTypes))
+  (vertices (wrap
+	     (array (field 'mNumVertices) (field 'mVertices) #:element-proc get-element-address)
+	     wrap-ai-vector3d))
+  (faces (wrap
+	  (array (field 'mNumFaces) (field 'mFaces) #:element-size 8 #:element-proc get-element-address)
+	  wrap-ai-face))
+  (normals (wrap
+	    (array (field 'mNumVertices) (field 'mNormals) #:element-size 12 #:element-proc get-element-address)
+	    wrap-ai-vector3d))
+  (tangents (wrap
+	     (array (field 'mNumVertices) (field 'mTangents) #:element-size 12 #:element-proc get-element-address)
+	     wrap-ai-vector3d))
+  (bitangents (wrap
+	       (array (field 'mNumVertices) (field 'mBitangents) #:element-size 12 #:element-proc get-element-address)
+	       wrap-ai-vector3d))
+  (colors (map
+	   (lambda (c)
+	     (wrap
+	      (array (field 'mNumVertices) c #:element-size 16 #:element-proc get-element-address)
+	      wrap-ai-color4d))
+	   (field 'mColors)))
+  (texture-coords (map
+		   (lambda (tc)
+		     (wrap
+		      (array (field 'mNumVertices) tc #:element-size 12 #:element-proc get-element-address)
+		      wrap-ai-vector3d))
+		   (field 'mTextureCoords)))
+  (num-uv-components (field 'mNumUVComponents))
+  (bones (wrap (array (field 'mNumBones) (field 'mBones)) wrap-ai-bone))
+  (material-index (field 'mMaterialIndex)))
+
+(export ai-mesh?
+	ai-mesh-contents
+	ai-mesh-name
+	ai-mesh-primitive-types
+	ai-mesh-vertices
+	ai-mesh-faces
+	ai-mesh-normals
+	ai-mesh-tangents
+	ai-mesh-bitangents
+	ai-mesh-colors
+	ai-mesh-texture-coords
+	ai-mesh-num-uv-components
+	ai-mesh-bones
+	ai-mesh-material-index)
 
 
 ;;; Materials
 
-(define-type material
-  (properties (get-pointer-of-pointers 4 0))
-  (allocated (lambda (p) (bv-uint-ref p 8))))
+(define-conversion-type parse-aiMaterial -> ai-material
+  (properties (array (field 'mNumProperties) (field 'mProperties)))
+  (num-allocated (field 'mNumAllocated)))
 
-(export material?
-	material-contents)
+(export ai-material?
+	ai-material-contents
+	ai-material-properties
+	ai-material-num-allocated)
 
 
 ;;; Faces
 
-(define-type face
-  (indices (get-array 0 4 'u32)))
+(define-conversion-type parse-aiFace -> ai-face
+  (indices (array (field 'mNumIndices) (field 'mIndices))))
+
+(export ai-face?
+	ai-face-contents
+	ai-face-indices)
+
+
+;;; Vectors
+
+(define-conversion-type parse-aiVector2D -> ai-vector2d
+  (x (field 'x))
+  (y (field 'y)))
+
+(export ai-vector2d?
+	ai-vector2d-contents
+	ai-vector2d-x
+	ai-vector2d-y)
+
+(define-conversion-type parse-aiVector3D -> ai-vector3d
+  (x (field 'x))
+  (y (field 'y))
+  (z (field 'z)))
+
+(export ai-vector3d?
+	ai-vector3d-contents
+	ai-vector3d-x
+	ai-vector3d-y
+	ai-vector3d-z)
+
+
+;;; Matrixes
+
+(define-conversion-type parse-aiMatrix3x3 -> ai-matrix3x3
+  (a1 (field 'a1))
+  (a2 (field 'a2))
+  (a3 (field 'a3))
+  (b1 (field 'b1))
+  (b2 (field 'b2))
+  (b3 (field 'b3))
+  (c1 (field 'c1))
+  (c2 (field 'c2))
+  (c3 (field 'c3)))
+
+(export ai-matrix3x3?
+	ai-matrix3x3-contents
+	ai-matrix3x3-a1
+	ai-matrix3x3-a2
+	ai-matrix3x3-a3
+	ai-matrix3x3-b1
+	ai-matrix3x3-b2
+	ai-matrix3x3-b3
+	ai-matrix3x3-c1
+	ai-matrix3x3-c2
+	ai-matrix3x3-c3)
+
+(define-conversion-type parse-aiMatrix4x4 -> ai-matrix4x4
+  (a1 (field 'a1))
+  (a2 (field 'a2))
+  (a3 (field 'a3))
+  (a4 (field 'a4))
+  (b1 (field 'b1))
+  (b2 (field 'b2))
+  (b3 (field 'b3))
+  (b4 (field 'b4))
+  (c1 (field 'c1))
+  (c2 (field 'c2))
+  (c3 (field 'c3))
+  (c4 (field 'c4))
+  (d1 (field 'd1))
+  (d2 (field 'd2))
+  (d3 (field 'd3))
+  (d4 (field 'd4)))
+
+(export ai-matrix4x4?
+	ai-matrix4x4-contents
+	ai-matrix4x4-a1
+	ai-matrix4x4-a2
+	ai-matrix4x4-a3
+	ai-matrix4x4-a4
+	ai-matrix4x4-b1
+	ai-matrix4x4-b2
+	ai-matrix4x4-b3
+	ai-matrix4x4-b4
+	ai-matrix4x4-c1
+	ai-matrix4x4-c2
+	ai-matrix4x4-c3
+	ai-matrix4x4-c4
+	ai-matrix4x4-d1
+	ai-matrix4x4-d2
+	ai-matrix4x4-d3
+	ai-matrix4x4-d4)
+
+
+;;; Colors
+
+(define-conversion-type parse-aiColor4D -> ai-color4d
+  (r (field 'r))
+  (g (field 'g))
+  (b (field 'b))
+  (a (field 'a)))
+
+(export ai-color4d?
+	ai-color4d-contents
+	ai-color4d-r
+	ai-color4d-g
+	ai-color4d-b
+	ai-color4d-a)
+
+
+;;; Bones
+
+(define-conversion-type parse-aiBone -> ai-bone
+  (name (sized-string (field 'mName)))
+  (weights (wrap
+	    (array (field 'mNumWeights) (field 'mWeights) #:element-size 8 #:element-proc get-element-address)
+	    wrap-ai-vertex-weight))
+  (offset-matrix (wrap (parse-aiMatrix4x4 (field 'mOffsetMatrix) #:reverse #t) wrap-ai-matrix4x4)))
+
+(export ai-bone?
+	ai-bone-contents
+	ai-bone-name
+	ai-bone-weights
+	ai-bone-offset-matrix)
+
+
+;;; Weights
+
+(define-conversion-type parse-aiVertexWeight -> ai-vertex-weight
+  (vertex-id (field 'mVertexId))
+  (weight (field 'mWeight)))
+
+(export ai-vertex-weight?
+	ai-vertex-weight-contents
+	ai-vertex-weight-vertex-id
+	ai-vertex-weight-weight)
+
+
+;;; Functions
+
+(define-public (ai-import-file filename flags)
+  (wrap-ai-scene
+   (aiImportFile (string->pointer filename)
+		 flags)))
 
-(export face?
-	face-contents)
+(define-public (ai-multiply-matrix4 m1 m2)
+  (let ((cm1 (parse-aiMatrix4x4 (map cdr (ai-matrix4x4-contents m1)) #:reverse #t))
+	(cm2 (parse-aiMatrix4x4 (map cdr (ai-matrix4x4-contents m2)) #:reverse #t)))
+    (aiMultiplyMatrix4 cm1 cm2)
+    (wrap-ai-matrix4x4 cm1)))