[rename] bitmap/image

6 files changed, 17 insertions, 17 deletions

diff --git a/examples/01-click-and-drag-bitmap.lisp b/examples/01-click-and-drag-image.lisp
index 4bcdba8..d13bce3 100644
--- a/examples/01-click-and-drag-bitmap.lisp
+++ b/examples/01-click-and-drag-image.lisp
@@ -1,4 +1,4 @@
-;;; 01-bitmap-display.lisp
+;;; 01-image-display.lisp
 
 (defpackage #:ww.examples/1
   (:use #:cl)
@@ -6,7 +6,7 @@
 
 (in-package :ww.examples/1)
 
-(defclass bitmap-display (ww::application ) ())
+(defclass image-display (ww::application ) ())
 
 (ww::defhandler dragging-unit
     (ww::on-mousemotion (app x y)
@@ -26,9 +26,9 @@
       (ww::remove-handler app #'dragging-unit)))
 
 
-(defmethod ww::boot ((app bitmap-display))
+(defmethod ww::boot ((app image-display))
   (let ((bm
-          (make-instance 'ww::bitmap
+          (make-instance 'ww::image
                          :texture (ww::get-asset "Fezghoul.png"))))
     (describe (ww::model-matrix bm))
     (describe bm)
@@ -43,7 +43,7 @@
 (defun start ()
   (ww::start
    (make-instance
-    'bitmap-display
+    'image-display
     :mouse-button-events-bubble-p t 
     :mouse-motion-events-bubble-p t
     :asset-root (merge-pathnames
diff --git a/examples/02-moving-bitmp.lisp b/examples/02-moving-bitmp.lisp
index b07f1aa..d0a5598 100644
--- a/examples/02-moving-bitmp.lisp
+++ b/examples/02-moving-bitmp.lisp
@@ -1,4 +1,4 @@
-;;; 01-bitmap-display.lisp
+;;; 01-image-display.lisp
 
 (defpackage #:ww.examples/2
   (:use #:cl)
@@ -6,7 +6,7 @@
 
 (in-package :ww.examples/2)
 
-(defclass bitmap-display (ww::application ) ())
+(defclass image-display (ww::application ) ())
 
 (defvar *shared-anim-table* (make-hash-table :synchronized t))
 
@@ -100,12 +100,12 @@
     (ww::on-mousewheel ()
       (print (list :mousewheel horiz vert dir))))
 
-(defmethod ww::boot ((app bitmap-display))
+(defmethod ww::boot ((app image-display))
   (let ((bm
-          (make-instance 'ww::bitmap
+          (make-instance 'ww::image
                          :texture (ww::get-asset "Fezghoul.png")))
         (bm2
-          (make-instance 'ww::bitmap
+          (make-instance 'ww::image
                          :texture (ww::get-asset "GelatinousCube.png"))))
 
     (ww::add-handler app #'wheelie)
@@ -130,7 +130,7 @@
 
 
 (defun start ()
-  (ww::start (make-instance 'bitmap-display
+  (ww::start (make-instance 'image-display
                             :scale 2.0
                             :fps 60
                             :width 800
diff --git a/examples/07-renderarea.lisp b/examples/07-renderarea.lisp
index 78d116b..95a6e9d 100644
--- a/examples/07-renderarea.lisp
+++ b/examples/07-renderarea.lisp
@@ -32,7 +32,7 @@
 (defmethod ww::boot ((app scrollarea-example))
   (let ((cube
           (make-instance
-           'ww::bitmap
+           'ww::image
            :texture (ww::get-asset "GelatinousCube.png")))
         (cube-container
           (make-instance
diff --git a/examples/08-pong.lisp b/examples/08-pong.lisp
index 6fc9faa..f40e66d 100644
--- a/examples/08-pong.lisp
+++ b/examples/08-pong.lisp
@@ -15,8 +15,8 @@
 (defclass/std mobile ()
   ((dx dy dr :std 0)))
 
-(defclass/std paddle (ww::bitmap mobile) ())
-(defclass/std ball (ww::bitmap mobile) ())
+(defclass/std paddle (ww::image mobile) ())
+(defclass/std ball (ww::image mobile) ())
 
 ;;; UTILITY FUNCTIONS
 
diff --git a/examples/09-ghoulspree.lisp b/examples/09-ghoulspree.lisp
index 463eb89..cf18e31 100644
--- a/examples/09-ghoulspree.lisp
+++ b/examples/09-ghoulspree.lisp
@@ -14,7 +14,7 @@
    (collision-on-p :std t)
    (gravity-on-p :std nil)))
 
-(defclass/std ghoul (ww:bitmap)
+(defclass/std ghoul (ww:image)
   ((dx dy dr :std)))
 
 ;;; UTILITY FUNCTIONS
diff --git a/examples/README.txt b/examples/README.txt
index 30d8891..ac2d40f 100644
--- a/examples/README.txt
+++ b/examples/README.txt
@@ -1,13 +1,13 @@
 EXAMPLES
 
 +----------------------------------
-| 01-clck-and-drag-bitmap.lisp
+| 01-clck-and-drag-image.lisp
 
 This is the "sanity check" example. It ensures that basic things can
 happen like "loading textures from disk" and "displaying textures".
 
 It also shows off mousevent bubbling to some extent by letting you click
-and drag the bitmap.
+and drag the image.
 
 +----------------------------------
 | 02-moving-bitmp.lisp