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

diff --git a/src/assimp.scm b/src/assimp.scm
index aac4475..81329da 100644
--- a/src/assimp.scm
+++ b/src/assimp.scm
@@ -16,8 +16,12 @@
 
 
 (define-module (assimp assimp)
-  #:use-module (ice-9 iconv)
-  #:use-module (rnrs bytevectors)
+  #:use-module (assimp low-level)
+  #:use-module (assimp low-level color)
+  #:use-module (assimp low-level material)
+  #:use-module (assimp low-level mesh)
+  #:use-module (assimp low-level scene)
+  #:use-module (assimp low-level vector)
   #:use-module (system foreign))
 
 (define libassimp (dynamic-link "libassimp"))
@@ -28,142 +32,190 @@
 		      (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-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))
-  (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-conversion-type parse-aiScene -> scene
+  (flags (field 'mFlags))
+  (root-node (wrap (field 'mRootNode) wrap-node))
+  (meshes (wrap (array (field 'mNumMeshes) (field 'mMeshes)) wrap-mesh))
+  (materials (wrap (array (field 'mNumMaterials) (field 'mMaterials)) wrap-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))))
 
 (define (load-scene filename flags)
   (wrap-scene
    (aiImportFile (string->pointer filename)
-		 flags)))
+ 		 flags)))
 
 (export load-scene
-	unwrap-scene
 	scene?
-	scene-contents)
+	scene-contents
+	scene-flags
+	scene-root-node
+	scene-meshes
+	scene-materials
+	scene-animations
+	scene-textures
+	scene-lights
+	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 -> node
+  (name (sized-string (field 'mName)))
+  (transformation (field 'mTransformation))
+  (parent (wrap (field 'mParent) wrap-node))
+  (children (wrap (array (field 'mNumChildren) (field 'mChildren)) wrap-node))
+  (meshes (array (field 'mNumMeshes) (field 'mMeshes))))
 
 (export node?
-	node-contents)
+	node-contents
+	node-name
+	node-transformation
+	node-parent
+	node-children
+	node-meshes)
 
 
 ;;; Meshes
 
-(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))
-  (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))))
+(define-conversion-type parse-aiMesh -> mesh
+  (name (sized-string (field 'mName)))
+  (primitive-types (field 'mPrimitiveTypes))
+  (vertices (wrap
+	     (array (field 'mNumVertices) (field 'mVertices) #:element-proc get-element-address)
+	     wrap-vector3d))
+  (faces (wrap
+	  (array (field 'mNumFaces) (field 'mFaces) #:element-size 8 #:element-proc get-element-address)
+	  wrap-face))
+  (normals (wrap
+	    (array (field 'mNumVertices) (field 'mNormals) #:element-size 12 #:element-proc get-element-address)
+	    wrap-vector3d))
+  (tangents (wrap
+	     (array (field 'mNumVertices) (field 'mTangents) #:element-size 12 #:element-proc get-element-address)
+	     wrap-vector3d))
+  (bitangents (wrap
+	       (array (field 'mNumVertices) (field 'mBitangents) #:element-size 12 #:element-proc get-element-address)
+	       wrap-vector3d))
+  (colors (map
+	   (lambda (c)
+	     (wrap
+	      (array (field 'mNumVertices) c #:element-size 16 #:element-proc get-element-address)
+	      wrap-color4d))
+	   (field 'mColors)))
+  (texture-coords (map
+		   (lambda (tc)
+		     (wrap
+		      (array (field 'mNumVertices) tc #:element-size 12 #:element-proc get-element-address)
+		      wrap-vector3d))
+		   (field 'mTextureCoords)))
+  (num-uv-components (field 'mNumUVComponents))
+  (bones (wrap (array (field 'mNumBones) (field 'mBones)) wrap-bone))
+  (material-index (field 'mMaterialIndex)))
 
 (export mesh?
-	mesh-contents)
+	mesh-contents
+	mesh-name
+	mesh-primitive-types
+	mesh-vertices
+	mesh-faces
+	mesh-normals
+	mesh-tangents
+	mesh-bitangents
+	mesh-colors
+	mesh-texture-coords
+	mesh-num-uv-components
+	mesh-bones
+	mesh-material-index)
+
+
+;;; Materials
+
+(define-conversion-type parse-aiMaterial -> material
+  (properties (array (field 'mNumProperties) (field 'mProperties)))
+  (num-allocated (field 'mNumAllocated)))
+
+(export material?
+	material-contents
+	material-properties
+	material-num-allocated)
+
+
+;;; Faces
+
+(define-conversion-type parse-aiFace -> face
+  (indices (array (field 'mNumIndices) (field 'mIndices))))
+
+(export face?
+	face-contents
+	face-indices)
+
+
+;;; Vectors
+
+(define-conversion-type parse-aiVector2D -> vector2d
+  (x (field 'x))
+  (y (field 'y)))
+
+(export vector2d?
+	vector2d-contents
+	vector2d-x
+	vector2d-y)
+
+(define-conversion-type parse-aiVector3D -> vector3d
+  (x (field 'x))
+  (y (field 'y))
+  (z (field 'z)))
+
+(export vector3d?
+	vector3d-contents
+	vector3d-x
+	vector3d-y
+	vector3d-z)
+
+
+;;; Colors
+
+(define-conversion-type parse-aiColor4D -> color4d
+  (r (field 'r))
+  (g (field 'g))
+  (b (field 'b))
+  (a (field 'a)))
+
+(export color4d?
+	color4d-contents
+	color4d-r
+	color4d-g
+	color4d-b
+	color4d-a)
+
+
+;;; Bones
+
+(define-conversion-type parse-aiBone -> bone
+  (name (sized-string (field 'mName)))
+  (weights (wrap
+	    (array (field 'mNumWeights) (field 'mWeights) #:element-size 8 #:element-proc get-element-address)
+	    wrap-vertex-weight))
+  (offset-matrix (field 'mOffsetMatrix)))
+
+(export bone?
+	bone-contents
+	bone-name
+	bone-weights
+	bone-offset-matrix)
+
+
+;;; Weights
+
+(define-conversion-type parse-aiVertexWeight -> vertex-weight
+  (vertex-id (field 'mVertexId))
+  (weight (field 'mWeight)))
+
+(export vertex-weight?
+	vertex-weight-contents
+	vertex-weight-vertex-id	
+	vertex-weight-weight)