wrap Irrlicht objects in C++

[guile-irrlicht.git] / irrlicht / video.scm

diff --git a/irrlicht/video.scm b/irrlicht/video.scm
index 6c56f62776c86290d16642b76e7e2c8b157b0b2a..f4feff4f4b552f6ac5d0b1f2affcb4b4b14169fa 100644 (file)
--- a/irrlicht/video.scm
+++ b/irrlicht/video.scm
@@ -64,23 +64,21 @@
                         (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))))
+    (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)
 
@@ -124,11 +122,8 @@
     (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)))
@@ -152,8 +147,6 @@
 
 (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))))
+    (S3DVertex_make position normal color tcoords)))
 
 (export <vertex3d> get-position make-vertex3d)