X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht%2Fvideo.scm;h=0d0b37fc1bba3adf49f67c596a3621370c4c311f;hb=7dda4e01bc5cfa5d5533f15a5729dff04292d4dc;hp=b0f48d999957b95dd1a2cca85b00989b093718ee;hpb=4eb7b8f04ad278d49d632d62030b5fe648e3b97a;p=guile-irrlicht.git

diff --git a/irrlicht/video.scm b/irrlicht/video.scm
index b0f48d9..0d0b37f 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,43 +19,43 @@
 
 
 (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)
-               (ffi-video:vertex-position . vertex-position)))
-
-(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" #:getter irr-class))
+
+(export <texture>)
+
+
+;; IVideoDriver
+(define-class <video-driver> (<irrlicht-base>)
+  (irr-class #:init-value "IVideoDriver" #:getter irr-class))
+
+(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)
+     (irr-pointer video-driver)
+     back-buffer
+     z-buffer
+     color
+     video-data
+     source-rect)))
+
+(define-method (get-texture (video-driver <video-driver>) filename)
+  (make <texture>
+    #:irr-pointer
+    ((get-irrlicht-proc "getTexture" video-driver)
+     (irr-pointer video-driver)
+     filename)))
+
+(export <video-driver> begin-scene get-texture)