Ported to OpenGL

diff --git a/BUGS b/BUGS
index c2882d877f3c3efab0d9e7ed8995c83527d8b0bc..0a0df163e03810039e06c3c26d796e1bb51dcd77 100755 (executable)
--- a/BUGS
+++ b/BUGS
@@ -10,3 +10,8 @@
 
 2009/08/04 Jumping after falling down from a stone is possible
 - 2009/08/20 Fixed
+
+2011/01/02 Background not implemented
+
+2011/01/02 A lot of deprecated stuff in the code must be cleaned
+

diff --git a/add-object.lisp b/add-object.lisp
index 1a14a3581227f33625df8991a4071857c7e20c7c..077a2ae15b88ea5e03ddb111a8e2b8374b1c51b2 100755 (executable)
--- a/add-object.lisp
+++ b/add-object.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/animation.lisp b/animation.lisp
index ec09fc44a737db3d477b3c0b88a0629c8674e72f..a4da80a62574e27140ca07fe384fe718d6220c25 100755 (executable)
--- a/animation.lisp
+++ b/animation.lisp
@@ -1,6 +1,6 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
-;; Basic definitions for animations. Needs lispbuilder-sdl.
+;; Basic definitions for animations.
 
 (in-package :uxul-world)
 
@@ -20,20 +20,28 @@
 ;;                  :accessor images
 ;; ;                :type (simple-array 'sdl:surface (*))
 ;;                  :documentation "Array with the images")
+   (full-widths :initarg :full-widths
+               :initform (make-array (list 0))
+               :accessor full-widths
+               :documentation "Widths of images-1x")
+   (full-heights :initarg :full-heights
+               :initform (make-array (list 0))
+               :accessor full-heights
+               :documentation "Heights of images-1x")
    (images-2x :initarg :images-2x
-             :initform (make-array (list 0) :element-type 'sdl:surface)
+             :initform (make-array (list 0))
              :accessor images-2x
              :documentation "Array of double-sized images")
    (images-1x :initarg :images-1x
-             :initform (make-array (list 0) :element-type 'sdl:surface)
+             :initform (make-array (list 0))
              :accessor images-1x
              :documentation "Array of normal-sized images")
    (images-.5x :initarg :images-.5x
-              :initform (make-array (list 0) :element-type 'sdl:surface)
+              :initform (make-array (list 0))
               :accessor images-.5x
               :documentation "Array of half-sized images")
    (images-.25x :initarg :images-.25x
-               :initform (make-array (list 0) :element-type 'sdl:surface)
+               :initform (make-array (list 0))
                :accessor images-.25x
                :documentation "Array of quarter-sized images")       
    (sprite-image-number :initform 0
@@ -97,9 +105,16 @@ below, this will refer to an animation in the *graphics-table*." )))
       (setf (already-jumped obj) 0)
       (setf (sprite-image-number obj) (mod (+ 1 (sprite-image-number obj)) (length (images obj))))))
   (when (visible obj)
-    (sdl:draw-surface-at-* (elt (images obj) (sprite-image-number obj))
-                          (zoom-trans (+ *current-translation-x* (round (x obj))))
-                          (zoom-trans (+ *current-translation-y* (round (y obj)))))))
+    (make-quad (elt (images obj) (sprite-image-number obj))
+              (zoom-trans (round (x obj)))
+              (zoom-trans (round (y obj)))
+              
+              (ash (elt (full-widths obj)
+                               (sprite-image-number obj)) (+ 2 *zoom-ash*))
+              (ash (elt (full-heights obj)
+                               (sprite-image-number obj)) (+ 2 *zoom-ash*))
+
+)))
 
 ;additional methods to make life easier
 (defmethod pause ((obj animation))
@@ -129,28 +144,22 @@ below, this will refer to an animation in the *graphics-table*." )))
 (defun make-animation (frame-skip &rest image-list)
   "Create an animation from the list of animation-names given in the
 images-variable."
+  ;(format t "make-animation is being called~%")
   (make-instance 'animation
+                :full-widths (mapcar
+                              #'(lambda (x) (bmp-width (cadr x))) image-list)
+                :full-heights (mapcar
+                               #'(lambda (x) (bmp-height (cadr x))) image-list)
                 :images-2x (mapcar
-                            #'(lambda (x)
-                                (sdl:convert-surface :surface (sdl:load-image
-                                                               (car x) :alpha 1 )))
+                            #'(lambda (x) (load-bmp-blob-into-texture (car x)))
                             image-list)
                 :images-1x (mapcar
-                            #'(lambda (x)
-                                (sdl:convert-surface :surface (sdl:load-image
-                                                               (cadr x)
-                                                               :alpha 1 )))
+                            #'(lambda (x) (load-bmp-blob-into-texture (cadr x)))
                             image-list)
                 :images-.5x (mapcar
-                            #'(lambda (x)
-                                (sdl:convert-surface :surface (sdl:load-image
-                                                               (caddr x)
-                                                               :alpha 1 )))
+                            #'(lambda (x) (load-bmp-blob-into-texture (caddr x)))
                             image-list)
                 :images-.25x (mapcar
-                            #'(lambda (x)
-                                (sdl:convert-surface :surface (sdl:load-image
-                                                               (cadddr x)
-                                                               :alpha 1 )))
+                            #'(lambda (x) (load-bmp-blob-into-texture (cadddr x)))
                             image-list)
                 :sprite-delay frame-skip))
\ No newline at end of file

diff --git a/bmp.lisp b/bmp.lisp
index 0b05d552ced739463ebb33e81c88d81492b8897e..24ba92e54d9dbf2445e49dfd84e5d3f2dd5ab064 100755 (executable)
--- a/bmp.lisp
+++ b/bmp.lisp
@@ -1,6 +1,6 @@
 ;;; -*- lisp -*-\r
 \r
-;;; Copyright 2010 Christoph Senjak\r
+;;; Copyright 2010-2011 Christoph Senjak\r
 \r
 (in-package :uxul-world)\r
 \r

diff --git a/burning-marshmallow.lisp b/burning-marshmallow.lisp
index cb8b374eb4f56ea58cf19054cae50a841be95444..49563d52228d5c5834b2c32f9bbd4b4cb178959a 100755 (executable)
--- a/burning-marshmallow.lisp
+++ b/burning-marshmallow.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/collision.lisp b/collision.lisp
index 9de46670f6938226613f81a2836af9b7c40c5373..2aa57c572bc2b85a804d70ad0830816a2e7fcb98 100755 (executable)
--- a/collision.lisp
+++ b/collision.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/constants.lisp b/constants.lisp
index 40c5204234cac18cd6e5c195425b833151d09140..0f257a5e9b0a01b2a01dd89d7f5f5e761e8b493b 100755 (executable)
--- a/constants.lisp
+++ b/constants.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/draw.lisp b/draw.lisp
index 82a32c9176906f4958ca646f24455a95250b5fb0..5c4761daad8442d12d705cfd0b613d04795efe46 100755 (executable)
--- a/draw.lisp
+++ b/draw.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 ;; various draw-methods
 
@@ -28,28 +28,14 @@
 
 (defmethod draw ((obj room))
   (let ((*current-translation-x*
-        #|(cond
-          ((< (- (x (graphic-centralizer obj)) 400) 0) 0)
-          ((> (+ (x (graphic-centralizer obj)) 400) (width obj))
-           (- 800 (width obj)))
-          (T
-           (- 400 (x (graphic-centralizer obj)))))|#
-        (- (ash 400 (- *zoom-ash*)) (x (graphic-centralizer obj)))
-         )
+        (*  2 (- 400 (x (graphic-centralizer obj)))))
        (*current-translation-y*
-        #|(cond
-          ((< (- (y (graphic-centralizer obj)) 300) 0) 0)
-          ((> (+ (y (graphic-centralizer obj)) 300) (height obj))
-           (- 600 (height obj)))
-          (T
-           (- 300 (y (graphic-centralizer obj)))))|#
-        (- (ash 300 (- *zoom-ash*)) (y (graphic-centralizer obj)))
-         ))
+        (* 2 (- 300 (y (graphic-centralizer obj))))))
     (draw-background *current-translation-x* *current-translation-y*)
+    (gl:scale *zoomx* (- *zoomy*) 1)
+    (gl:translate *current-translation-x* *current-translation-y* 0)
     (dolist (image (get-objects obj 'uxul-world::game-object))
-      (if (and (redraw image)
-              (visible image)
-              (rectangle-in-screen image)) (draw image)))))
+      (and (redraw image) (visible image) (draw image)))))
 
 
 ;; FIXME
@@ -61,20 +47,14 @@
           (old-draw-rectangle obj :r 255 :g 255 :b 255))
 
   ;;; FIXME ************
-  (sdl:draw-box-*
-   10 10 (floor (* (power obj) (/ (- +screen-width+ 20) 10))) 10
-   :color (sdl:color :r (abs *player-bar-color*) :g (abs *player-bar-color*) :b (abs *player-bar-color*)))
+  ;; (sdl:draw-box-*
+  ;;  10 10 (floor (* (power obj) (/ (- +screen-width+ 20) 10))) 10
+  ;;  :color (sdl:color :r (abs *player-bar-color*) :g (abs *player-bar-color*) :b (abs *player-bar-color*)))
   (incf *player-bar-color* 5)
   (if (= *player-bar-color* 255) (setf *player-bar-color* -255))
 
   (call-next-method))
 
-(defmethod draw ((obj stone))
-  (call-next-method)
-  #+nil(if (rectangle-in-screen obj)
-      (old-draw-rectangle obj :r 255 :g 255 :b 255)))
+(defmethod draw ((obj stone)) (call-next-method))
 
-(defmethod draw ((obj simple-enemy))
-  (call-next-method)
-  #+nil(if (rectangle-in-screen obj)
-      (old-draw-rectangle obj :r 255 :g 255 :b 255)))
+(defmethod draw ((obj simple-enemy)) (call-next-method))

diff --git a/elementary-classes.lisp b/elementary-classes.lisp
index 43cd9cf218e0fdc5f9d17557a0eac1a3e38d38ba..b7390d42dbdc8519ed05bfc2bed49653f028afb6 100755 (executable)
--- a/elementary-classes.lisp
+++ b/elementary-classes.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/files.lisp b/files.lisp
index 9c6d44e55eedc87c642d2e5fb0d64f103675eab6..07808be5357d76fd3e5b134c242122bbe529c332 100755 (executable)
--- a/files.lisp
+++ b/files.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 ;; This file declares the constants for loading different files and
 ;; file-formats.

diff --git a/flying-nasobem.lisp b/flying-nasobem.lisp
index 7017ec627a5290307715c2634a25bcf40190cef7..4d027383c0416d1430e78e3d2b9ff374dc563e6b 100755 (executable)
--- a/flying-nasobem.lisp
+++ b/flying-nasobem.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/functions.lisp b/functions.lisp
index aa71ef54b495d50d189270a23780ed25fca9a13e..e2cf0e3b416bbbbf3df18003472c1187c92a3530 100755 (executable)
--- a/functions.lisp
+++ b/functions.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/game-object-with-animation.lisp b/game-object-with-animation.lisp
index f188e53949e8a322cf0026ab51316bec5869adb4..8c9886e3e85228b4cc948f2a9aa7e7f4b4dea9f5 100755 (executable)
--- a/game-object-with-animation.lisp
+++ b/game-object-with-animation.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/game-object.lisp b/game-object.lisp
index df28f331ceb24af5aef9bc2bffb404ca997c9120..caee7a69e14c263d9888fa0141771a8a9b8892ed 100755 (executable)
--- a/game-object.lisp
+++ b/game-object.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 
@@ -128,10 +128,11 @@
 
 (defmethod draw-bounds ((obj game-object))
   "This function draws a rectangle with the Object's Bounds. May be useful for some debug-spam"
-  (sdl:draw-rectangle-* (+ (x obj) *current-translation-x*)
-                       (+ (y obj) *current-translation-y*)
-                       (width obj) (height obj)
-                       :color sdl:*BLACK*))
+  ;; (sdl:draw-rectangle-* (+ (x obj) *current-translation-x*)
+  ;;                   (+ (y obj) *current-translation-y*)
+  ;;                   (width obj) (height obj)
+  ;;                   :color sdl:*BLACK*)
+)
 
 (defun collide-blocks (moving-rectangle standing-rectangle collision)
   "as MANY collision-methods need to move the moving-object around the

diff --git a/game.lisp b/game.lisp
index cc389c253fb21f76880d0df8de97af2df89cf206..25ac6000d3afa0cd7ca84066ca7a7fc6ec7a8558 100755 (executable)
--- a/game.lisp
+++ b/game.lisp
@@ -1,8 +1,10 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 
 (defparameter *cfont* nil)
+(defparameter *zoomx* 1.0)
+(defparameter *zoomy* 1.0)
 
 (defun run-testing-room ()
   (start-game :room-function #'make-testing-room))
@@ -17,24 +19,36 @@
   "Start the Game: Call room-function for getting the room-object to
 run. Music is ignored so far. 15-fps makes only every second frame be
 drawn (for very slow computers)"
-  (sdl:set-video-driver "directx")
-     (sdl:with-init (sdl:sdl-init-video sdl:sdl-init-audio)
+;  (sdl:set-video-driver "directx")
+     (sdl:with-init (sdl:sdl-init-video) ;sdl:sdl-init-video sdl:sdl-init-audio)
        (sdl:window +screen-width+ +screen-height+
                   :title-caption "Uxul World"
                   :icon-caption "Uxul World"
+                  :flags sdl:sdl-opengl
                   ;:opengl T
-                  :flags (logior sdl:sdl-hw-accel  sdl:sdl-hw-surface)
-                  :flags (logior sdl:sdl-hw-surface) #| sdl:sdl-fullscreen )|# 
-)
+                  ;:flags (logior sdl:sdl-hw-accel  sdl:sdl-hw-surface)
+                  ;:flags (logior sdl:sdl-hw-surface) #| sdl:sdl-fullscreen )|# 
+                  )
+       (setf cl-opengl-bindings:*gl-get-proc-address*
+            #'sdl-cffi::sdl-gl-get-proc-address)
        ;;(if music (sdl-mixer:OPEN-AUDIO :frequency 44100))
-       (let ((*graphics-table* (make-hash-table :test #'equal)))
+
+       (gl:hint :perspective-correction-hint :nicest)
+
+
+       (let ((*graphics-table* (make-hash-table :test #'equal))
+            (*zoomx* (/ 1.0 +screen-width+))
+            (*zoomxi* (/ .01 +screen-width+))
+            (*zoomy* (/ 1.0 +screen-height+))
+            (*zoomyi* (/ .01 +screen-height+))
+            (*zoom-ash* 0))
         (if 15-fps
             (setf (sdl:frame-rate) 15)
             (setf (sdl:frame-rate) 30))
         
         (setf *current-room* (funcall room-function))
 
-        (sdl:clear-display (sdl:color :r 0 :g 0 :b 0));; :update-p nil)
+        ;(sdl:clear-display (sdl:color :r 0 :g 0 :b 0));; :update-p nil)
 
         ;;(if music (sdl-mixer:play-sample levelmusic))
       
@@ -51,14 +65,21 @@ drawn (for very slow computers)"
                            (cond
                              ((sdl:key= key :SDL-KEY-ESCAPE)
                               (sdl:push-quit-event))
-                             ((sdl:key= key :SDL-KEY-O)
-                              (setf *zoom-ash*
-                                    (max -3 (1- *zoom-ash*))))
-                             ((sdl:key= key :SDL-KEY-I)
-                              (setf *zoom-ash*
-                                    (min 0 (1+ *zoom-ash*))))
+                             ((sdl:key= key :SDL-KEY-U)
+                              (incf *zoomx* *zoomxi*)
+                              (incf *zoomy* *zoomyi*))
+                             ((sdl:key= key :SDL-KEY-D)
+                              (decf *zoomx* *zoomxi*)
+                              (decf *zoomy* *zoomyi*))
                              (T
                               (on-key-down *current-room* key))))
+          (:mouse-button-down-event
+           (:button btn)
+           (cond
+             ((= btn sdl:mouse-wheel-up)
+              (incf *zoomx* *zoomxi*) (incf *zoomy* *zoomyi*))
+             ((= btn sdl:mouse-wheel-down)
+              (decf *zoomx* *zoomxi*) (decf *zoomy* *zoomyi*))))
           (:key-up-event (:key key)
                          (on-key-up *current-room* key))
           (:idle
@@ -66,46 +87,50 @@ drawn (for very slow computers)"
              (invoke *current-room*)
              (when 15-fps
                (invoke *current-room*))
-             (sdl:clear-display (sdl:color :r 128 :g 128 :b 128)); :update-p nil)
+             (gl:clear :color-buffer-bit :depth-buffer-bit)
+             (gl:enable :texture-2d)
+             (gl:enable :blend)
+             (gl:blend-func :src-alpha :one-minus-src-alpha)
+             (gl:load-identity)
              (draw *current-room*)
-             (sdl:update-display)
-        ))))))
+             (gl:flush)
+             (sdl:update-display)))))))
 
 
-;; For Debugging
+;; ;; For Debugging
 
-(defun preview-animation (frameskip &rest images)
+;; (defun preview-animation (frameskip &rest images)
 
-     (sdl:with-init (sdl:sdl-init-video sdl:sdl-init-audio)
-       (sdl:window +screen-width+ +screen-height+
-                  :title-caption "Uxul World"
-                  :icon-caption "Uxul World"
-                  :flags (logior sdl:sdl-hw-accel)
-                  #| :flags (logior sdl:sdl-hw-surface sdl:sdl-fullscreen )|#  )
-       (let ((*graphics-table*
-             #-ecl (trivial-garbage:make-weak-hash-table
-                    :weakness :value
-                    :test #'equal)
-             #+ecl (make-hash-table :test #'equal)
-             )
-            (my-anim (apply #'make-animation frameskip images))
-            )
+;;      (sdl:with-init (sdl:sdl-init-video sdl:sdl-init-audio)
+;;        (sdl:window +screen-width+ +screen-height+
+;;                :title-caption "Uxul World"
+;;                :icon-caption "Uxul World"
+;;                :flags (logior sdl:sdl-hw-accel)
+;;                #| :flags (logior sdl:sdl-hw-surface sdl:sdl-fullscreen )|#  )
+;;        (let ((*graphics-table*
+;;           #-ecl (trivial-garbage:make-weak-hash-table
+;;                  :weakness :value
+;;                  :test #'equal)
+;;           #+ecl (make-hash-table :test #'equal)
+;;           )
+;;          (my-anim (apply #'make-animation frameskip images))
+;;          )
         
-        (setf (sdl:frame-rate) 30)
-        (sdl:clear-display (sdl:color :r 64 :g 64 :b 46));; :update-p nil)
+;;      (setf (sdl:frame-rate) 30)
+;;      (sdl:clear-display (sdl:color :r 64 :g 64 :b 46));; :update-p nil)
       
-        (sdl:with-events ()
-          (:quit-event () t)
-          (:key-down-event (:key key)
-                           (cond
-                             ((sdl:key= key :SDL-KEY-ESCAPE)
-                              (sdl:push-quit-event))))
-          (:idle
-           (progn
-             (sdl:clear-display (sdl:color :r 64 :g 64 :b 46));; :update-p nil)
+;;      (sdl:with-events ()
+;;        (:quit-event () t)
+;;        (:key-down-event (:key key)
+;;                         (cond
+;;                           ((sdl:key= key :SDL-KEY-ESCAPE)
+;;                            (sdl:push-quit-event))))
+;;        (:idle
+;;         (progn
+;;           (sdl:clear-display (sdl:color :r 64 :g 64 :b 46));; :update-p nil)
 
 
-             (draw my-anim)
+;;           (draw my-anim)
              
-             (sdl:update-display)
-        ))))))
+;;           (sdl:update-display)
+;;      ))))))

diff --git a/imagemagick.lisp b/imagemagick.lisp
index 51b0e13d4cef3f263b6870290236945287f271b3..3e615158aa7709e775e3c422d576b19d951d6f7d 100755 (executable)
--- a/imagemagick.lisp
+++ b/imagemagick.lisp
@@ -1,4 +1,4 @@
-;; Copyright 2010 Christoph Senjak\r
+;; Copyright 2010-2011 Christoph Senjak\r
 \r
 (in-package :uxul-world)\r
 \r

diff --git a/leveleditor.lisp b/leveleditor.lisp
index 3dfc2a0dde402f1ead60e70b3123b69d0b33088f..c70c70648e25f45a8d45cc68680f8688bc240515 100755 (executable)
--- a/leveleditor.lisp
+++ b/leveleditor.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world-leveleditor)
 

diff --git a/macros.lisp b/macros.lisp
index 5ce181f3b2157fa6a4c68cb5a763fdb47a480b39..03c0d850424d25acd260bcb2e14b4e5a4d493bfc 100755 (executable)
--- a/macros.lisp
+++ b/macros.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/objectarray.lisp b/objectarray.lisp
index 9f63900d8514f027eb63f5e6019060bb383d225e..5fd96aa180769cd2bf6c921b620ae5984227f56e 100755 (executable)
--- a/objectarray.lisp
+++ b/objectarray.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/on-collision.lisp b/on-collision.lisp
index 45d7d0781692c1f63de774a76c8354e4a1f2c459..645c968126036d896ef9d7aa11226c75bc0ddde6 100755 (executable)
--- a/on-collision.lisp
+++ b/on-collision.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/opengl.lisp b/opengl.lisp
new file mode 100644 (file)
index 0000000..907aa6d
--- /dev/null
+++ b/opengl.lisp
@@ -0,0 +1,27 @@
+;; Copyright 2010-2011 Christoph Senjak\r
+\r
+(in-package :uxul-world)\r
+\r
+(defun load-bmp-blob-into-texture (blob)\r
+  (let*\r
+      ((id (car (gl:gen-textures 1)))\r
+       (pix (bmp-pixel-data blob))\r
+       (w (bmp-width blob))\r
+       (h (bmp-height blob)))\r
+    (gl:bind-texture :texture-2d id)\r
+    (gl:tex-image-2d :texture-2d 0 :rgba8 w h 0 :bgra :unsigned-byte pix)\r
+    (gl:tex-parameter :texture-2d :texture-min-filter :linear)\r
+    (gl:tex-parameter :texture-2d :texture-mag-filter :linear)\r
+    (gl:flush)\r
+    id))\r
+\r
+(defun make-quad (id x y w h)\r
+  (setf x (- (+ x x) +screen-width+ ))\r
+  (setf y (- (+ y y)  +screen-height+))\r
+  (gl:bind-texture :texture-2d id)\r
+  (gl:with-primitive :quads\r
+    (gl:tex-coord 0 0) (gl:vertex x (+ y h))\r
+    (gl:tex-coord 1 0) (gl:vertex  (+ x w) (+ y h))\r
+    (gl:tex-coord 1 1) (gl:vertex (+ x w) y)\r
+    (gl:tex-coord 0 1) (gl:vertex x y)))\r
+\r

diff --git a/player.lisp b/player.lisp
index 9e56626e73ac432982387c288dfcc8ea181598e1..b3637675a6bf8e2dc1cff848c60d976bf787d3ec 100755 (executable)
--- a/player.lisp
+++ b/player.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/room.lisp b/room.lisp
index e041a17d4a41635c8b08a1ced34bc2387b5975a0..ac76394bb328fd86be478b021ac56ddcd76e1ece 100755 (executable)
--- a/room.lisp
+++ b/room.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/simple-enemy.lisp b/simple-enemy.lisp
index c1614c9918c6ba1709760315ed50e24bcc3e44fb..4315c5b24f8310b13106e00b26d3ea1f68e8bacb 100755 (executable)
--- a/simple-enemy.lisp
+++ b/simple-enemy.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/small-classes.lisp b/small-classes.lisp
index d1d86598e5a9a7decc31f6f3d97cf508a62f686e..18c10c8c56132b0b220dc4e689e3859a8f61c9d0 100755 (executable)
--- a/small-classes.lisp
+++ b/small-classes.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/testing-room.lisp b/testing-room.lisp
index a65e9db2216e6bbf2208e41129575bc726fb73e3..860c55e3e10de5a28d93d1e08b426820f74c3128 100755 (executable)
--- a/testing-room.lisp
+++ b/testing-room.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)
 

diff --git a/trampoline.lisp b/trampoline.lisp
index 65e09cdfe117e6531c037ce130d04126fe04a1d2..c1dadbc1b75b2cac786242dc82ca1af2744563d8 100755 (executable)
--- a/trampoline.lisp
+++ b/trampoline.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2010 Christoph Senjak\r
+;;; Copyright 2010-2011 Christoph Senjak\r
 \r
 (in-package :uxul-world)\r
 \r

diff --git a/uxul-world-leveleditor.lisp b/uxul-world-leveleditor.lisp
index 0a2b8ca8dad4f268ecc054db62d4ae73b09aa705..c0dc56c6a8a986b676a3e79659ce124f05fab25e 100755 (executable)
--- a/uxul-world-leveleditor.lisp
+++ b/uxul-world-leveleditor.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (defpackage #:uxul-world-leveleditor
        (:use

diff --git a/uxul-world.asd b/uxul-world.asd
index bb9f51500a596ca6f57fe2216291a35ac9cce6e7..3813bf29a51557eb06c7307135f7e5b91ae2c277 100755 (executable)
--- a/uxul-world.asd
+++ b/uxul-world.asd
@@ -7,13 +7,15 @@
   :version "No Release Yet"
   :author "Christoph Senjak <firstName.secondName at googlemail.com>"
   :license "Copyright 2009 Christoph Senjak."
-  :depends-on (#:lispbuilder-sdl #:closer-mop
+  :depends-on (#:lispbuilder-sdl #:cl-opengl
+                                #:closer-mop
                                 #:cl-fad
                                  #:lispbuilder-sdl)
   :components ((:file "uxul-world")
                (:file "constants")
                (:file "macros")
               (:file "bmp")
+              (:file "opengl")
                (:file "xy-coordinates")
                (:file "collision")
                (:file "files")

diff --git a/uxul-world.lisp b/uxul-world.lisp
index fd6efd187aa3449fa114b96b1c0a67e50dd3159d..1a64c1ccff94b6fac7cf400f661e59dd3900dbcd 100755 (executable)
--- a/uxul-world.lisp
+++ b/uxul-world.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (defpackage #:uxul-world
        (:use

diff --git a/xy-coordinates.lisp b/xy-coordinates.lisp
index 83f8d3e11e1e1178c808d1738d12643554c2a207..7e554ecfb19a2184ae61eceedc68a5ee01d97e3a 100755 (executable)
--- a/xy-coordinates.lisp
+++ b/xy-coordinates.lisp
@@ -1,4 +1,4 @@
-;;; Copyright 2009 Christoph Senjak
+;;; Copyright 2009-2011 Christoph Senjak
 
 (in-package :uxul-world)