(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)))
+
(defun draw (&rest vertexes)
(begin-draw (length vertexes))
(draw-vertexes vertexes)
(draw-vertexes (cdr vertexes)))))
(defun draw-vertex (vertex &key texture-coord)
- (cond ((consp (car vertex)) (draw-color (car vertex)) (apply #'simple-draw-vertex (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 #'simple-draw-vertex vertex))))
(cond ((3d-mode?) (glVertex3f x y z))
(t (glVertex2f x y))))
-(defun draw-color (color)
- (apply #'glColor3f color))
-
-(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 &optional (min-filter GL_LINEAR) (mag-filter GL_LINEAR))
+; (init-textures)
+; (init-video-mode)
+ (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)
+ (values texture real-w real-h)))))))
(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)
+ (lambda (&optional (f 1))
+ (cond (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 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)
(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)
+ (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 :color color)
+ (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 :color color)
+ (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 :color color)
+ (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 :color color)
+ (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 :color color)))
+ (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)
(cond (zrot (glRotatef zrot 0 0 1))))
(defun enable (&key textures)
- (cond (textures (glEnable GL_TEXTURE_2D))))
\ No newline at end of file
+ (cond (textures (glEnable GL_TEXTURE_2D))))
projects / gacela.git / blobdiff