X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela_draw.lisp;h=4b6f58fb126ec746a7c6b0b9d995226ae29bc03e;hb=862921d72ab5a90aee46074c40da8c0688a3a20d;hp=c984948fbbfa351a9aab7bd0cfc4dba3390d85d7;hpb=8caa865a3194eb573382a411df7636ebb472ca1f;p=gacela.git diff --git a/gacela_draw.lisp b/gacela_draw.lisp index c984948..4b6f58f 100644 --- a/gacela_draw.lisp +++ b/gacela_draw.lisp @@ -16,23 +16,15 @@ (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))) + (cond (color + `(let ((original-color (get-current-color))) + (apply #'set-current-color ,color) + ,@code + (apply #'set-current-color original-color))) + (t + `(progn + ,@code)))) (defmacro progn-textures (&body code) `(let (values) @@ -93,8 +85,8 @@ (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))) + (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)) @@ -114,18 +106,19 @@ (cond (texture (let ((width (getf (get-resource texture) :width)) (height (getf (get-resource texture) :height))) -(print texture) (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))) + (cond ((consp texture) (with-color texture (draw v1 v2 v3 v4))) + (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) @@ -135,21 +128,21 @@ (defun draw-square (&key (size 1) texture) (draw-rectangle size size :texture texture)) -(defun draw-cube (&key size texture) +(defun draw-cube (&key size texture texture-1 texture-2 texture-3 texture-4 texture-5 texture-6) (let ((-size (neg size))) (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) + (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 texture) + (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 texture) + (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 texture) + (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 texture) + (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 texture)))) + (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) @@ -162,7 +155,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 2d-rotate (rot) + (rotate 0 0 rot)) \ No newline at end of file