X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=irrlicht%2Fvideo.scm;h=596c7742542beca7bbab2c74b50b5677293a1fb6;hb=1a76862e831371dd0a7eb74b460c93b5932165c1;hp=e113815ad3501fa5ecc0b284affcee1976562248;hpb=eaa186435f0c641c53841d8d15581525bd542249;p=guile-irrlicht.git

diff --git a/irrlicht/video.scm b/irrlicht/video.scm
index e113815..596c774 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,40 +19,68 @@
 
 
 (define-module (irrlicht video)
-  #:use-module (system foreign)
-  #:use-module ((irrlicht bindings core) #:prefix ffi-core:)
-  #:use-module ((irrlicht bindings video) #:prefix ffi-video:)
-  #:export (begin-scene
-            end-scene
-            get-fps
-            get-texture
-            get-video-driver-name))
-
-(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
-                         (if back-buffer 1 0)
-                         (if z-buffer 1 0)
-                         (make-c-struct ffi-video:scolor color)
-                         video-data
-                         (if (null? source-rect)
-                             %null-pointer
-                             (make-c-struct ffi-core:rect 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>)
+
+
+;; 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)))
+
+(export <video-driver> begin-scene end-scene get-fps get-name get-texture)
+
+
+;; S3DVertex
+(define-class <vertex3d> (<irrlicht-base>)
+  (irr-class #:init-value "S3DVertex"))
+
+(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> make-vertex3d)