X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht%2Fvideo.scm;h=23f9db497ca6c35caa1d89ff4ac5cb7cb873505c;hb=671b139a1cc72854edc73325a7feac30fd8705a8;hp=36ea0ec8a4afa77ff73448ff984f81c3d0a0a4a7;hpb=0d8955b4f8a481aec28acc91ba964ff66c918e75;p=guile-irrlicht.git

diff --git a/irrlicht/video.scm b/irrlicht/video.scm
index 36ea0ec..23f9db4 100644
--- a/irrlicht/video.scm
+++ b/irrlicht/video.scm
@@ -1,5 +1,5 @@
 ;;; guile-irrlicht --- FFI bindings for Irrlicht Engine
-;;; Copyright (C) 2019 Javier Sancho <jsf@jsancho.org>
+;;; Copyright (C) 2020 Javier Sancho <jsf@jsancho.org>
 ;;;
 ;;; This file is part of guile-irrlicht.
 ;;;
@@ -19,42 +19,129 @@
 
 
 (define-module (irrlicht video)
-  #:use-module (system foreign)
-  #:use-module ((irrlicht bindings core) #:prefix ffi-core:)
-  #:use-module ((irrlicht bindings video) #:prefix ffi-video:)
-  #:use-module (irrlicht util)
-  #:export (begin-scene
-            end-scene
-            get-fps
-            get-texture
-            get-video-driver-name)
-  #:re-export ((ffi-video:make-s3dvertex . make-s3dvertex)))
-
-(define* (begin-scene driver
-                      #:key
-                      (back-buffer #t)
-                      (z-buffer #t)
-                      (color '(255 0 0 0))
-                      (video-data %null-pointer)
-                      (source-rect '()))
-  (ffi-video:begin-scene driver
-                         (bool->integer back-buffer)
-                         (bool->integer z-buffer)
-                         (ffi-video:scolor->pointer color)
-                         video-data
-                         (if (null? source-rect)
-                             %null-pointer
-                             (ffi-core:rect->pointer source-rect))))
-
-(define (end-scene driver)
-  (ffi-video:end-scene driver))
-
-(define (get-fps driver)
-  (ffi-video:get-fps driver))
-
-(define (get-texture driver filename)
-  (ffi-video:get-texture driver (string->pointer filename)))
-
-(define (get-video-driver-name driver)
-  (pointer->string
-   (ffi-video:get-video-driver-name driver)))
+  #:use-module (oop goops)
+  #:use-module (ice-9 optargs)
+  #:use-module (irrlicht base)
+  #:use-module (irrlicht foreign))
+
+
+;; ITexture
+(define-class <texture> (<irrlicht-base>)
+  (irr-class #:init-value "ITexture"))
+
+(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")))
+    (make <material>
+      #:irr-pointer
+      (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"))
+
+(define-method (begin-scene (video-driver <video-driver>) . rest)
+  (let-keywords rest #f
+        ((back-buffer #t)
+         (z-buffer #t)
+         (color '(255 0 0 0))
+         video-data
+         source-rect)
+    ((get-irrlicht-proc "beginScene" video-driver)
+     video-driver
+     back-buffer
+     z-buffer
+     color
+     video-data
+     source-rect)))
+
+(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)))
+
+(define-method (set-material! (video-driver <video-driver>) (material <material>))
+  (let ((setMaterial (get-irrlicht-proc "setMaterial" video-driver)))
+    (setMaterial video-driver material)))
+
+(export <video-driver> begin-scene end-scene get-fps get-name get-texture set-material!)
+
+
+;; 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")))
+    (make <vertex3d>
+      #:irr-pointer
+      (S3DVertex_make position normal color tcoords))))
+
+(export <vertex3d> get-position make-vertex3d)