X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fgacela_draw.scm;h=f72c75142ecc314c7cb6adf98dd4e0a93c6c6d28;hb=cf6094cdd9222b104b1cf08637de9d8021473923;hp=7dc912fa69909637e0642d830ea28d85b38c9f3c;hpb=042f93e750461b4d7235f702c973f0bd1effcae9;p=gacela.git diff --git a/src/gacela_draw.scm b/src/gacela_draw.scm index 7dc912f..f72c751 100644 --- a/src/gacela_draw.scm +++ b/src/gacela_draw.scm @@ -26,12 +26,12 @@ (else `(begin ,@code)))) (define-macro (progn-textures . code) - `(let (values) + `(let ((result #f)) (init-video-mode) (glEnable GL_TEXTURE_2D) - (set! values (multiple-value-list (begin ,@code))) + (set! result (begin ,@code)) (glDisable GL_TEXTURE_2D) - (apply values values))) + result)) (define (draw . vertexes) (begin-draw (length vertexes)) @@ -39,7 +39,8 @@ (glEnd)) (define (begin-draw number-of-points) - (cond ((= number-of-points 3) (glBegin GL_TRIANGLES)) + (cond ((= number-of-points 2) (glBegin GL_LINES)) + ((= number-of-points 3) (glBegin GL_TRIANGLES)) ((= number-of-points 4) (glBegin GL_QUADS)))) (define (draw-vertexes vertexes) @@ -59,19 +60,27 @@ (cond ((3d-mode?) (glVertex3f x y z)) (else (glVertex2f x y)))) -(define (load-image-for-texture filename) - (init-video-mode) +(define (load-image filename) + (init-sdl) (let ((image (IMG_Load filename))) (cond (image - (let* ((width (get-surface-width image)) (height (get-surface-height image)) + (SDL_DisplayFormatAlpha image))))) + +(define (load-image-for-texture filename) + (init-sdl) + (let ((image (load-image filename))) + (cond (image + (let* ((width (surface-w image)) (height (surface-h image)) (power-2 (nearest-power-of-two (min width height))) (resized-image #f)) (cond ((and (= width power-2) (= height power-2)) (values image width height)) (else (set! resized-image (resize-surface image power-2 power-2)) - (if resized-image (values resized-image width height))))))))) + (if resized-image (values resized-image width height)))))) + (else + (values #f 0 0))))) (define (resize-surface surface width height) - (let ((old-width (get-surface-width surface)) (old-height (get-surface-height surface))) + (let ((old-width (surface-w surface)) (old-height (surface-h surface))) (cond ((and (= width old-width) (= height old-height)) surface) (else (let ((zoomx (/ (+ width 0.5) old-width)) (zoomy (/ (+ height 0.5) old-height))) (zoomSurface surface zoomx zoomy 0)))))) @@ -81,72 +90,82 @@ (receive (image real-w real-h) (load-image-for-texture filename) (cond (image - (let ((width (get-surface-width image)) (height (get-surface-height image)) - (byteorder (if (= (SDL_ByteOrder) SDL_LIL_ENDIAN) + (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 - `(: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 (filename &ptional (zoom 1)) + (glTexImage2D GL_TEXTURE_2D 0 4 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) + (set-texture-size! texture real-w real-h) + texture)))))) + +(define* (draw-image filename #:optional (zoom 1)) (let ((texture (load-texture filename))) (cond (texture (draw-texture texture zoom))))) -(defun draw-texture (texture &optional (zoom 1)) +(define* (draw-texture texture #:optional (zoom 1)) (cond (texture - (let ((width (getf (get-resource texture) :width)) - (height (getf (get-resource texture) :height))) - (draw-rectangle (* zoom width) (* zoom height) :texture texture))))) - -(defun draw-quad (v1 v2 v3 v4 &key texture) - (let ((id-texture (getf (get-resource texture) :id-texture))) - (cond (id-texture - (progn-textures - (glBindTexture GL_TEXTURE_2D 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))) - ((consp texture) (with-color texture (draw v1 v2 v3 v4))) - (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))) - -(defun draw-square (&key (size 1) texture) - (draw-rectangle size size :texture texture)) - -(defun draw-cube (&key (size 1) texture texture-1 texture-2 texture-3 texture-4 texture-5 texture-6) - (let ((-size (neg size))) + (let ((width (texture-w texture)) + (height (texture-h texture))) + (draw-rectangle (* zoom width) (* zoom height) #:texture texture))))) + +(define* (draw-line length #:optional color) + (let ((l (/ length 2))) + (cond (color + (with-color color (draw (list 0 l) (list 0 (- l))))) + (else + (draw (list 0 l) (list 0 (- l))))))) + +(define* (draw-quad v1 v2 v3 v4 #:key texture color) + (cond (texture + (progn-textures + (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))) + (color + (with-color color (draw v1 v2 v3 v4))) + (else + (draw v1 v2 v3 v4)))) + +(define* (draw-rectangle width height #:key texture color) + (let ((w (/ width 2)) (h (/ height 2))) + (draw-quad (list (- w) h 0) + (list w h 0) + (list w (- h) 0) + (list (- w) (- h) 0) + #:texture texture + #:color color))) + +(define* (draw-square #:key (size 1) texture color) + (draw-rectangle size size #:texture texture #:color color)) + +(define* (draw-cube #:key (size 1) + texture texture-1 texture-2 texture-3 texture-4 texture-5 texture-6 + color color-1 color-2 color-3 color-4 color-5 color-6) + (let ((-size (- 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 (or texture-1 texture)) + (draw-quad (list -size size size) (list size size size) (list size -size size) (list -size -size size) #:texture (or texture-1 texture) #:color (or color-1 color)) (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)) + (draw-quad (list -size -size -size) (list size -size -size) (list size size -size) (list -size size -size) #:texture (or texture-2 texture) #:color (or color-2 color)) (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)) + (draw-quad (list size size size) (list -size size size) (list -size size -size) (list size size -size) #:texture (or texture-3 texture) #:color (or color-3 color)) (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)) + (draw-quad (list -size -size size) (list size -size size) (list size -size -size) (list -size -size -size) :texture (or texture-4 texture) #:color (or color-4 color)) (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)) + (draw-quad (list size -size -size) (list size -size size) (list size size size) (list size size -size) :texture (or texture-5 texture) #:color (or color-5 color)) (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))))) + (draw-quad (list -size -size size) (list -size -size -size) (list -size size -size) (list -size size size) :texture (or texture-6 texture) #:color (or color-6 color))))) -(defun add-light (&key light position ambient (id GL_LIGHT1) (turn-on t)) +(define* (add-light #:key light position ambient (id GL_LIGHT1) (turn-on t)) (init-lighting) (and light (glLightfv id GL_DIFFUSE (first light) (second light) (third light) (fourth light))) (and light position (glLightfv GL_POSITION (first position) (second position) (third position) (fourth position))) @@ -154,30 +173,35 @@ (and turn-on (glEnable id)) id) -(defun translate (x y &optional (z 0)) +(define* (translate x y #:optional (z 0)) (glTranslatef x y z)) -(defun rotate (&rest rot) - (cond ((3d-mode?) (apply #'3d-rotate rot)) - (t (apply #'2d-rotate rot)))) +(define* (rotate #:rest rot) + (cond ((3d-mode?) (apply 3d-rotate rot)) + (else (apply 2d-rotate rot)))) -(defun 3d-rotate (xrot yrot zrot) +(define (3d-rotate xrot yrot zrot) (glRotatef xrot 1 0 0) (glRotatef yrot 0 1 0) (glRotatef zrot 0 0 1)) -(defun 2d-rotate (rot) +(define (2d-rotate rot) (glRotatef rot 0 0 1)) -(defun to-origin () +(define (to-origin) (glLoadIdentity) (cond ((3d-mode?) (camera-look)))) -(let ((camera-eye '(0 0 0)) (camera-center '(0 0 -100)) (camera-up '(0 1 0))) - (defun set-camera (&key eye center up) - (cond (eye (setq camera-eye eye))) - (cond (center (setq camera-center center))) - (cond (up (setq camera-up up)))) +(define set-camera #f) +(define camera-look #f) - (defun camera-look () - (apply #'gluLookAt (concatenate 'list camera-eye camera-center camera-up)))) +(let ((camera-eye '(0 0 0)) (camera-center '(0 0 -100)) (camera-up '(0 1 0))) + (set! set-camera + (lambda* (#:key eye center up) + (cond (eye (set! camera-eye eye))) + (cond (center (set! camera-center center))) + (cond (up (set! camera-up up))))) + + (set! camera-look + (lambda () + (apply gluLookAt (append camera-eye camera-center camera-up)))))