X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela.lisp;h=b5d611dabe09af9e1eaea50368bf46ab0a565b37;hb=15dc6f156f90086f1f82655b43183f0d8647fa0e;hp=d5d28525a2f56718f986c9704f302937858eee39;hpb=4cb43f867b6a2fcf40ced44ac937d8930005d01e;p=gacela.git

diff --git a/gacela.lisp b/gacela.lisp
index d5d2852..b5d611d 100644
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -38,9 +38,7 @@
 
 
 ;;; Video Subsystem
-(defstruct surface address clip-w clip-h shape)
-
-(let (screen flags)
+(let (screen flags current-width current-height)
 
   (defun init-video-mode (&key (width *width-screen*) (height *height-screen*) (bpp *bpp-screen*))
     (cond ((null screen)
@@ -51,12 +49,17 @@
 			  (if (= (getf (SDL_GetVideoInfo) :blit_hw) 0) 0 SDL_HWACCEL)))
 	   (setq screen (SDL_SetVideoMode width height bpp flags))
 	   (init-GL)
-	   (resize-screen-GL width height))
+	   (resize-screen-GL width height)
+	   (setq current-width width current-height height))
 	  (t t)))
 
   (defun resize-screen (width height bpp)
     (setq screen (SDL_SetVideoMode width height bpp flags))
-    (resize-screen-GL width height))
+    (resize-screen-GL width height)
+    (setq current-width width current-height height))
+
+  (defun apply-mode-change ()
+    (resize-screen-GL current-width current-height))
 
   (defun fill-screen (color)
     (init-video-mode)
@@ -69,9 +72,25 @@
   (defun quit-video-mode ()
     (setq screen nil)))
 
+(let ((mode '2d))
+  (defun set-2d-mode ()
+    (cond ((3d-mode?)
+	   (setq mode '2d)
+	   (init-video-mode)
+	   (glDisable GL_DEPTH_TEST)
+	   (apply-mode-change))))
+
+  (defun set-3d-mode ()
+    (cond ((not (3d-mode?))
+	   (setq mode '3d)
+	   (init-video-mode)
+	   (glEnable GL_DEPTH_TEST)
+	   (apply-mode-change))))
+
+  (defun 3d-mode? ()
+    (eq mode '3d)))
 
 (defun init-GL ()
-  (2d-mode)
   (glShadeModel GL_SMOOTH)
   (glClearColor 0 0 0 0)
   (glClearDepth 1)
@@ -86,16 +105,16 @@
   (glEnable GL_LIGHTING))
 
 (defun resize-screen-GL (width height)
-  (let ((ratio (if (= height 0) width (/ width height))))
-;    (glViewPort 0 0 width height)
-    (glMatrixMode GL_PROJECTION)
-    (glLoadIdentity)
-    (let* ((w (/ width 2)) (-w (neg w)) (h (/ height 2)) (-h (neg h)))
-      (glOrtho -w w -h h 0 1))
-;    (gluPerspective 45 ratio 0.1 100)
-    (glMatrixMode GL_MODELVIEW)
-    (glLoadIdentity)
-    t))
+  (glViewPort 0 0 width height)
+  (glMatrixMode GL_PROJECTION)
+  (glLoadIdentity)
+  (cond ((3d-mode?) (let ((ratio (if (= height 0) width (/ width height))))
+		      (gluPerspective 45 ratio 0.1 100))) ;0.1
+	(t (let* ((w (/ width 2)) (-w (neg w)) (h (/ height 2)) (-h (neg h)))
+	     (glOrtho -w w -h h 0 1))))
+  (glMatrixMode GL_MODELVIEW)
+  (glLoadIdentity)
+  t))
 
 (let ((current-color '(1 1 1 1)))
   (defun get-current-color ()
@@ -121,20 +140,6 @@
 						     (caddr transparent-color)))
 			optimized-image)))))))
 
-(defun load-image2 (image-file &key (transparent-color nil))
-  (let ((address-image (load-image image-file :transparent-color transparent-color)))
-    (list
-     (lambda (x y) (print-surface x y address-image))
-     (lambda () (SDL_FreeSurface address-image)))))
-
-(defun clean-screen ()
-  (fill-screen *background-color*))
-
-(defun refresh-screen ()
-  (clean-screen)
-  (funcall-procs #'print-mob)
-  (flip))
-
 
 ;;; Audio Subsystem
 (let ((audio nil))