X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_draw.lisp;h=00eb5516208f950a952201b59a9f3a8dc06959a9;hb=15dc6f156f90086f1f82655b43183f0d8647fa0e;hp=90efd0611772cd693edde2b5e8e38fea8ed0f215;hpb=4859bd92e3604ae7f32ea84d815833caa2c6ee13;p=gacela.git diff --git a/gacela_draw.lisp b/gacela_draw.lisp index 90efd06..00eb551 100644 --- a/gacela_draw.lisp +++ b/gacela_draw.lisp @@ -16,24 +16,20 @@ (in-package :gacela) -(let ((mode '2d)) - (defun 2d-mode () - (glDisable GL_DEPTH_TEST) - (setq mode '2d)) - - (defun 3d-mode () - (glEnable GL_DEPTH_TEST) - (setq mode '3d)) - - (defun 3d-mode? () - (eq mode '3d))) - (defmacro with-color (color &body code) `(let ((original-color (get-current-color))) (apply #'set-current-color ,color) ,@code (apply #'set-current-color original-color))) +(defmacro progn-textures (&body code) + `(let (values) + (init-video-mode) + (glEnable GL_TEXTURE_2D) + (setq values (multiple-value-list (progn ,@code))) + (glDisable GL_TEXTURE_2D) + (apply #'values values))) + (defun draw (&rest vertexes) (begin-draw (length vertexes)) (draw-vertexes vertexes) @@ -73,38 +69,44 @@ (cond ((/= zoomed-image 0) (values zoomed-image width height)))))))))) (defun load-texture (filename &key (min-filter GL_LINEAR) (mag-filter GL_LINEAR) static) -; (init-textures) -; (init-video-mode) - (let ((key (make-texture :filename filename :min-filter min-filter :mag-filter mag-filter))) + (let ((key (make-resource-texture :filename filename :min-filter min-filter :mag-filter mag-filter))) (cond ((get-resource key) key) - (t - (progn-textures - (multiple-value-bind - (image real-w real-h) (load-image-for-texture filename) - (cond (image - (let ((width (surface-w image)) (height (surface-h image)) - (byteorder (if (= (SDL_ByteOrder) SDL_LIL_ENDIAN) - (if (= (surface-format-BytesPerPixel image) 3) GL_BGR GL_BGRA) - (if (= (surface-format-BytesPerPixel image) 3) GL_RGB GL_RGBA))) - (texture (car (glGenTextures 1)))) - (glBindTexture GL_TEXTURE_2D texture) - (glTexImage2D GL_TEXTURE_2D 0 3 width height 0 byteorder GL_UNSIGNED_BYTE (surface-pixels image)) - (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MIN_FILTER min-filter) - (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MAG_FILTER mag-filter) - (SDL_FreeSurface image) - (set-resource key (list :texture texture :width real-w :height real-h) nil :static static) - key))))))))) + (t (true-load-texture filename min-filter mag-filter static))))) + +(defun true-load-texture (filename min-filter mag-filter static) + (let ((key (make-resource-texture :filename filename :min-filter min-filter :mag-filter mag-filter))) + (progn-textures + (multiple-value-bind + (image real-w real-h) (load-image-for-texture filename) + (cond (image + (let ((width (surface-w image)) (height (surface-h image)) + (byteorder (if (= (SDL_ByteOrder) SDL_LIL_ENDIAN) + (if (= (surface-format-BytesPerPixel image) 3) GL_RGB GL_RGBA) + (if (= (surface-format-BytesPerPixel image) 3) GL_BGR GL_BGRA))) + (texture (car (glGenTextures 1)))) + (glBindTexture GL_TEXTURE_2D texture) + (glTexImage2D GL_TEXTURE_2D 0 3 width height 0 byteorder GL_UNSIGNED_BYTE (surface-pixels image)) + (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MIN_FILTER min-filter) + (glTexParameteri GL_TEXTURE_2D GL_TEXTURE_MAG_FILTER mag-filter) + (SDL_FreeSurface image) + (set-resource key + `(:id-texture ,texture :width ,real-w :height ,real-h) + (lambda () (true-load-texture filename min-filter mag-filter static)) + (lambda () (glDeleteTextures 1 `(,texture))) + :static static) + key))))))) (defun draw-image-function (filename) - (multiple-value-bind - (texture width height) (load-texture filename) - (lambda (&optional (f 1)) - (cond (texture - (draw-rectangle (* f width) (* f height) :texture texture)))))) + (let ((texture (load-texture filename))) + (lambda (&optional (f 1)) + (cond (texture + (let ((width (getf (get-resource texture) :width)) + (height (getf (get-resource texture) :height))) + (draw-rectangle (* f width) (* f height) :texture texture))))))) (defun draw-quad (v1 v2 v3 v4 &key texture) (cond (texture (progn-textures - (glBindTexture GL_TEXTURE_2D texture) + (glBindTexture GL_TEXTURE_2D (getf (get-resource texture) :id-texture)) (begin-draw 4) (draw-vertex v1 :texture-coord '(0 0)) (draw-vertex v2 :texture-coord '(1 0)) @@ -122,19 +124,19 @@ (defun draw-cube (&key size texture) (let ((-size (neg size))) - (enable :textures texture) - (glNormal3f 0 0 1) - (draw-quad (list -size size size) (list size size size) (list size -size size) (list -size -size size) :texture texture) - (glNormal3f 0 0 -1) - (draw-quad (list -size -size -size) (list size -size -size) (list size size -size) (list -size size -size) :texture texture) - (glNormal3f 0 1 0) - (draw-quad (list size size size) (list -size size size) (list -size size -size) (list size size -size) :texture texture) - (glNormal3f 0 -1 0) - (draw-quad (list -size -size size) (list size -size size) (list size -size -size) (list -size -size -size) :texture texture) - (glNormal3f 1 0 0) - (draw-quad (list size -size -size) (list size -size size) (list size size size) (list size size -size) :texture texture) - (glNormal3f -1 0 0) - (draw-quad (list -size -size size) (list -size -size -size) (list -size size -size) (list -size size size) :texture texture))) + (progn-textures + (glNormal3f 0 0 1) + (draw-quad (list -size size size) (list size size size) (list size -size size) (list -size -size size) :texture texture) + (glNormal3f 0 0 -1) + (draw-quad (list -size -size -size) (list size -size -size) (list size size -size) (list -size size -size) :texture texture) + (glNormal3f 0 1 0) + (draw-quad (list size size size) (list -size size size) (list -size size -size) (list size size -size) :texture texture) + (glNormal3f 0 -1 0) + (draw-quad (list -size -size size) (list size -size size) (list size -size -size) (list -size -size -size) :texture texture) + (glNormal3f 1 0 0) + (draw-quad (list size -size -size) (list size -size size) (list size size size) (list size size -size) :texture texture) + (glNormal3f -1 0 0) + (draw-quad (list -size -size size) (list -size -size -size) (list -size size -size) (list -size size size) :texture texture)))) (defun add-light (&key light position ambient (id GL_LIGHT1) (turn-on t)) (init-lighting) @@ -147,10 +149,10 @@ (defun translate (x y &optional (z 0)) (glTranslatef x y z)) -(defun rotate (xrot yrot &optional zrot) +(defun rotate (xrot yrot zrot) (glRotatef xrot 1 0 0) (glRotatef yrot 0 1 0) - (cond (zrot (glRotatef zrot 0 0 1)))) + (glRotatef zrot 0 0 1)) -(defun enable (&key textures) - (cond (textures (glEnable GL_TEXTURE_2D)))) +(defun 2d-rotate (rot) + (rotate 0 0 rot)) \ No newline at end of file