X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_draw.lisp;h=fd2a7174d8ed7eabf7c5fd591565251e9cd25381;hb=ee0ee8aa7b6140f964ef3b04828f4144f831fcd4;hp=364163b65186240d29cf593d86d14652aacc9725;hpb=5293bb782051f9bfea3802151acb0c8644c98104;p=gacela.git diff --git a/gacela_draw.lisp b/gacela_draw.lisp index 364163b..fd2a717 100644 --- a/gacela_draw.lisp +++ b/gacela_draw.lisp @@ -14,10 +14,21 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with this program. If not, see . - (in-package :gacela) -(defmacro set-dimension (&key 2d 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)) @@ -34,67 +45,99 @@ (draw-vertexes (cdr vertexes))))) (defun draw-vertex (vertex &key texture-coord) - (cond ((consp (car vertex)) (draw-color (car vertex)) (apply #'glVertex3f (cadr vertex))) + (cond ((consp (car vertex)) + (with-color (car vertex) + (apply #'simple-draw-vertex (cadr vertex)))) (t (cond (texture-coord (apply #'glTexCoord2f texture-coord))) - (apply #'glVertex3f vertex)))) + (apply #'simple-draw-vertex vertex)))) -(defun draw-color (color) - (apply #'glColor3f color)) +(defun simple-draw-vertex (x y &optional (z 0)) + (cond ((3d-mode?) (glVertex3f x y z)) + (t (glVertex2f x y)))) -(defun load-texture (filename &optional (min-filter GL_LINEAR) (mag-filter GL_LINEAR)) - (init-textures) +(defun load-image-for-texture (filename) (init-video-mode) (let ((image (IMG_Load filename))) (cond ((/= image 0) - (let ((width (surface-w image)) (height (surface-h image)) - (texture (car (glGenTextures 1)))) - (glBindTexture GL_TEXTURE_2D texture) - (glTexImage2D GL_TEXTURE_2D 0 3 width height 0 GL_RGB 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) - (values texture width height)))))) + (let* ((width (surface-w image)) (height (surface-h image)) + (power-2 (nearest-power-of-two (min width height))) + (zoomx (/ power-2 width)) (zoomy (/ power-2 height)) + zoomed-image) + (cond ((and (= zoomx 1) (= zoomy 1)) (values image width height)) + (t (setq zoomed-image (zoomSurface image zoomx zoomy 0)) + (SDL_FreeSurface image) + (cond ((/= zoomed-image 0) (values zoomed-image width height)))))))))) + +(defun load-texture (filename &key (min-filter GL_LINEAR) (mag-filter GL_LINEAR) static) + (let ((key (make-resource-texture :filename filename :min-filter min-filter :mag-filter mag-filter))) + (cond ((get-resource key) 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) - (cond (texture - (lambda (&optional (f 1)) - (draw-rectangle (* f width) (* f height) :texture texture)))))) - -(defun draw-quad (v1 v2 v3 v4 &key texture color) - (cond (texture (glBindTexture GL_TEXTURE_2D texture) - (begin-draw 4) - (draw-vertex v1 :texture-coord '(0 0)) - (draw-vertex v2 :texture-coord '(1 0)) - (draw-vertex v3 :texture-coord '(1 1)) - (draw-vertex v4 :texture-coord '(0 1)) - (glEnd)) - (t (cond (color (draw-color color))) - (draw v1 v2 v3 v4)))) - -(defun draw-rectangle (width height &key texture color) + (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 (getf (get-resource texture) :id-texture)) + (begin-draw 4) + (draw-vertex v1 :texture-coord '(0 0)) + (draw-vertex v2 :texture-coord '(1 0)) + (draw-vertex v3 :texture-coord '(1 1)) + (draw-vertex v4 :texture-coord '(0 1)) + (glEnd))) + (t (draw v1 v2 v3 v4)))) + +(defun draw-rectangle (width height &key texture) (let* ((w (/ width 2)) (-w (neg w)) (h (/ height 2)) (-h (neg h))) - (draw-quad (list -w h 0) (list w h 0) (list w -h 0) (list -w -h 0) :texture texture :color color))) + (draw-quad (list -w h 0) (list w h 0) (list w -h 0) (list -w -h 0) :texture texture))) -(defun draw-square (&key (size 1) texture color) - (draw-rectangle size size :texture texture :color color)) +(defun draw-square (&key (size 1) texture) + (draw-rectangle size size :texture texture)) -(defun draw-cube (&key size texture color) +(defun draw-cube (&key size texture texture-1 texture-2 texture-3 texture-4 texture-5 texture-6) (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 :color color) - (glNormal3f 0 0 -1) - (draw-quad (list -size -size -size) (list size -size -size) (list size size -size) (list -size size -size) :texture texture :color color) - (glNormal3f 0 1 0) - (draw-quad (list size size size) (list -size size size) (list -size size -size) (list size size -size) :texture texture :color color) - (glNormal3f 0 -1 0) - (draw-quad (list -size -size size) (list size -size size) (list size -size -size) (list -size -size -size) :texture texture :color color) - (glNormal3f 1 0 0) - (draw-quad (list size -size -size) (list size -size size) (list size size size) (list size size -size) :texture texture :color color) - (glNormal3f -1 0 0) - (draw-quad (list -size -size size) (list -size -size -size) (list -size size -size) (list -size size size) :texture texture :color color))) + (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 (or texture-1 texture)) + (glNormal3f 0 0 -1) + (draw-quad (list -size -size -size) (list size -size -size) (list size size -size) (list -size size -size) :texture (or texture-2 texture)) + (glNormal3f 0 1 0) + (draw-quad (list size size size) (list -size size size) (list -size size -size) (list size size -size) :texture (or texture-3 texture)) + (glNormal3f 0 -1 0) + (draw-quad (list -size -size size) (list size -size size) (list size -size -size) (list -size -size -size) :texture (or texture-4 texture)) + (glNormal3f 1 0 0) + (draw-quad (list size -size -size) (list size -size size) (list size size size) (list size size -size) :texture (or texture-5 texture)) + (glNormal3f -1 0 0) + (draw-quad (list -size -size size) (list -size -size -size) (list -size size -size) (list -size size size) :texture (or texture-6 texture))))) (defun add-light (&key light position ambient (id GL_LIGHT1) (turn-on t)) (init-lighting) @@ -107,10 +150,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)))) \ No newline at end of file +(defun 2d-rotate (rot) + (rotate 0 0 rot)) \ No newline at end of file