Refactor|libgui: Interface cleanup

skyjake · May 28, 2013 · 18099ec · 18099ec
1 parent eab4b49
commit 18099ec
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/doomsday/libgui/include/de/gui/drawable.h b/doomsday/libgui/include/de/gui/drawable.h
@@ -106,10 +106,10 @@ class LIBGUI_PUBLIC Drawable : public AssetGroup
      * @param id  Identifier of the buffer.
      * @return GL buffer.
      */
-    GLBuffer &buffer(Id id) const;
+    GLBuffer &buffer(Id id = 1) const;
 
     template <typename VBType>
-    VBType &buffer(Id id) const {
+    VBType &buffer(Id id = 1) const {
         DENG2_ASSERT(dynamic_cast<VBType *>(&buffer(id)) != 0);
         return static_cast<VBType &>(buffer(id));
     }

diff --git a/doomsday/libgui/include/de/gui/image.h b/doomsday/libgui/include/de/gui/image.h
@@ -99,6 +99,9 @@ class LIBGUI_PUBLIC Image : public ISerializable
     Size size() const;
     Rectanglei rect() const;
 
+    duint width() const { return size().x; }
+    duint height() const { return size().y; }
+
     /**
      * Number of bits per pixel.
      */
@@ -118,6 +121,11 @@ class LIBGUI_PUBLIC Image : public ISerializable
 
     void *bits();
 
+    /**
+     * Determines if the image has a zero size (no pixels).
+     */
+    bool isNull() const;
+
     /**
      * Determines if the image format can be uploaded to OpenGL without
      * conversion of any kind.

diff --git a/doomsday/libgui/src/atlas.cpp b/doomsday/libgui/src/atlas.cpp
@@ -208,7 +208,7 @@ Atlas::Size Atlas::totalSize() const
 
 Id Atlas::alloc(Image const &image)
 {
-    if(image.size() == Image::Size(0, 0))
+    if(image.isNull())
     {
         return Id::None;
     }

diff --git a/doomsday/libgui/src/image.cpp b/doomsday/libgui/src/image.cpp
@@ -190,6 +190,11 @@ void *Image::bits()
     return d->refPixels.base();
 }
 
+bool Image::isNull() const
+{
+    return size() == Size(0, 0);
+}
+
 bool Image::isGLCompatible() const
 {
     if(d->format == UseQImageFormat)