(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)
(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))
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 (getf 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 (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)
(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)
(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