X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht%2Fvideo.scm;h=f4feff4f4b552f6ac5d0b1f2affcb4b4b14169fa;hb=3bb58c2b45af12c0f9c9eac648e67ac6fa90e104;hp=7dd433dc65b5d4b45dc71f91ac703b1b89d56fb8;hpb=fc3be36ca8e29c32e1758ae99c9982aa287d8920;p=guile-irrlicht.git

diff --git a/irrlicht/video.scm b/irrlicht/video.scm
index 7dd433d..f4feff4 100644
--- a/irrlicht/video.scm
+++ b/irrlicht/video.scm
@@ -32,6 +32,57 @@
 (export <texture>)
 
 
+;; SMaterial
+(define-class <material> (<irrlicht-base>)
+  (irr-class #:init-value "SMaterial"))
+
+(define* (make-material #:key
+                        (material-type 'solid)
+                        (ambient-color '(255 255 255 255))
+                        (diffuse-color '(255 255 255 255))
+                        (emissive-color '(0 0 0 0))
+                        (specular-color '(255 255 255 255))
+                        (shininess 0)
+                        (material-type-param 0)
+                        (material-type-param-2 0)
+                        (thickness 1)
+                        (z-buffer 'less-equal)
+                        (anti-aliasing 'simple)
+                        (color-mask 'all)
+                        (color-material 'diffuse)
+                        (blend-operation 'none)
+                        (polygon-offset-factor 0)
+                        (polygon-offset-direction 'front)
+                        (wireframe #f)
+                        (point-cloud #f)
+                        (gouraud-shading #t)
+                        (lighting #t)
+                        (z-write-enable #t)
+                        (backface-culling #t)
+                        (frontface-culling #f)
+                        (fog-enable #f)
+                        (normalize-normals #f)
+                        (use-mip-maps #t))
+  (let ((SMaterial_make (get-irrlicht-proc "SMaterial_make")))
+    (SMaterial_make #:material-type material-type #:ambient-color ambient-color
+                    #:diffuse-color diffuse-color #:emissive-color emissive-color
+                    #:specular-color specular-color #:shininess shininess
+                    #:material-type-param material-type-param
+                    #:material-type-param-2 material-type-param-2
+                    #:thickness thickness #:z-buffer z-buffer #:anti-aliasing anti-aliasing
+                    #:color-mask color-mask #:color-material color-material
+                    #:blend-operation blend-operation
+                    #:polygon-offset-factor polygon-offset-factor
+                    #:polygon-offset-direction polygon-offset-direction
+                    #:wireframe wireframe #:point-cloud point-cloud
+                    #:gouraud-shading gouraud-shading #:lighting lighting
+                    #:z-write-enable z-write-enable #:backface-culling backface-culling
+                    #:frontface-culling frontface-culling #:fog-enable fog-enable
+                    #:normalize-normals normalize-normals #:use-mip-maps use-mip-maps)))
+
+(export <material> make-material)
+
+
 ;; IVideoDriver
 (define-class <video-driver> (<irrlicht-base>)
   (irr-class #:init-value "IVideoDriver"))
@@ -51,19 +102,51 @@
      video-data
      source-rect)))
 
+(define-method (draw-vertex-primitive-list (video-driver <video-driver>) vertices indices . rest)
+  (let-keywords rest #f
+        ((v-type 'standard)
+         (p-type 'triangles))
+    (let ((drawVertexPrimitiveList (get-irrlicht-proc "drawVertexPrimitiveList" video-driver)))
+      (drawVertexPrimitiveList video-driver vertices indices v-type p-type))))
+
 (define-method (end-scene (video-driver <video-driver>))
   ((get-irrlicht-proc "endScene" video-driver)
    video-driver))
 
+(define-method (get-fps (video-driver <video-driver>))
+  (let ((getFPS (get-irrlicht-proc "getFPS" video-driver)))
+    (getFPS video-driver)))
+
 (define-method (get-name (video-driver <video-driver>))
   (let ((getName (get-irrlicht-proc "getName" video-driver)))
     (getName video-driver)))
 
 (define-method (get-texture (video-driver <video-driver>) filename)
-  (make <texture>
-    #:irr-pointer
-    ((get-irrlicht-proc "getTexture" video-driver)
-     video-driver
-     filename)))
+  (let ((getTexture (get-irrlicht-proc "getTexture" video-driver)))
+    (getTexture video-driver filename)))
+
+(define-method (set-material! (video-driver <video-driver>) (material <material>))
+  (let ((setMaterial (get-irrlicht-proc "setMaterial" video-driver)))
+    (setMaterial video-driver material)))
+
+(define-method (set-transform! (video-driver <video-driver>) state mat)
+  (let ((setTransform (get-irrlicht-proc "setTransform" video-driver)))
+    (setTransform video-driver state mat)))
+
+(export <video-driver> begin-scene draw-vertex-primitive-list end-scene get-fps get-name get-texture
+        set-material! set-transform!)
+
+
+;; S3DVertex
+(define-class <vertex3d> (<irrlicht-base>)
+  (irr-class #:init-value "S3DVertex"))
+
+(define-method (get-position (vertex3d <vertex3d>))
+  (let ((S3DVertex_Pos (get-irrlicht-proc "S3DVertex_Pos")))
+    (S3DVertex_Pos vertex3d)))
+
+(define (make-vertex3d position normal color tcoords)
+  (let ((S3DVertex_make (get-irrlicht-proc "S3DVertex_make")))
+    (S3DVertex_make position normal color tcoords)))
 
-(export <video-driver> begin-scene end-scene get-name get-texture)
+(export <vertex3d> get-position make-vertex3d)