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

diff --git a/irrlicht/video.scm b/irrlicht/video.scm
index dc61f64..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,124 +19,43 @@
 
 
 (define-module (irrlicht video)
-  #:use-module (ice-9 match)
-  #:use-module (system foreign)
-  #:use-module ((irrlicht bindings core) #:prefix ffi-core:)
-  #:use-module ((irrlicht bindings video) #:prefix ffi-video:)
-  #:use-module (irrlicht util)
-  #:use-module (irrlicht util foreign)
-  #:export (begin-scene
-            end-scene
-            get-fps
-            get-texture
-            get-video-driver-name
-            set-material!
-            set-transform!
-            make-s3dvertex
-            vertex-position
-            make-material))
-
-(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)))
-
-(define (set-material! driver material)
-  (ffi-video:set-material
-   driver
-   (ffi-video:smaterial->pointer material)))
-
-(define (set-transform! driver state mat)
-  (let ((transform-state
-         (match state
-                ('view ffi-video:ETS_VIEW)
-                ('world ffi-video:ETS_WORLD)
-                ('projection ffi-video:ETS_PROJECTION)
-                ('texture0 ffi-video:ETS_TEXTURE_0)
-                ('texture1 ffi-video:ETS_TEXTURE_1)
-                ('texture2 ffi-video:ETS_TEXTURE_2)
-                ('texture3 ffi-video:ETS_TEXTURE_3)
-                ('texture4 ffi-video:ETS_TEXTURE_4)
-                ('texture5 ffi-video:ETS_TEXTURE_5)
-                ('texture6 ffi-video:ETS_TEXTURE_6)
-                ('texture7 ffi-video:ETS_TEXTURE_7)
-                ('count ffi-video:ETS_COUNT))))
-    (ffi-video:set-transform
-     driver
-     transform-state
-     mat)))
-
-;; s3d vertices
-(define (make-s3dvertex position normal color t-coords)
-  (ffi-video:pointer->s3dvertex
-   (make-c-struct ffi-video:s3dvertex
-                  (list position normal color t-coords))))
-
-(define (vertex-position vertex)
-  (let ((data (parse-c-struct (ffi-video:s3dvertex->pointer vertex)
-                              ffi-video:s3dvertex)))
-    (car data)))
-
-;; smaterial
-(define* (make-material #:key (wireframe #f) (lighting #t))
-  (let ((material
-         (list
-          ;; textureLayer[4]
-          (list %null-pointer 0 0 0 0 0 0 %null-pointer %null-pointer)
-          (list %null-pointer 0 0 0 0 0 0 %null-pointer %null-pointer)
-          (list %null-pointer 0 0 0 0 0 0 %null-pointer %null-pointer)
-          (list %null-pointer 0 0 0 0 0 0 %null-pointer %null-pointer)
-          ffi-video:EMT_SOLID         ; materialType
-          (list 255 255 255 255)      ; ambientColor
-          (list 255 255 255 255)      ; diffuseColor
-          (list 0 0 0 0)              ; emissiveColor
-          (list 255 255 255 255)      ; specularColor
-          0                           ; shininess
-          0                           ; materialTypeParam
-          0                           ; materialTypeParam2
-          1                           ; thickness
-          ffi-video:ECFN_LESSEQUAL    ; zBuffer
-          ffi-video:EAAM_SIMPLE       ; antiAliasing
-          (list
-           ffi-video:ECP_ALL          ; colorMask
-           ffi-video:ECM_DIFFUSE      ; colorMaterial
-           ffi-video:EBO_NONE         ; blendOperation
-           0                          ; polygonOffsetFactor
-           ffi-video:EPO_FRONT        ; polygonOffsetDirection
-           (bool->integer wireframe)  ; wireframe
-           (bool->integer #f)         ; pointCloud
-           (bool->integer #t)         ; gouraudShading
-           (bool->integer lighting)   ; lighting
-           (bool->integer #t)         ; zWriteEnable
-           (bool->integer #t)         ; backfaceCulling
-           (bool->integer #f)         ; frontfaceCulling
-           (bool->integer #f)         ; fogEnable
-           (bool->integer #f)         ; normalizeNormals
-           (bool->integer #t)         ; useMipMaps
-           ))))
-    (ffi-video:pointer->smaterial
-     (make-c-struct+ ffi-video:smaterial material))))
+  #: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)