Client|Cleanup: GuiRootWidget provides a texture with a solid white p…

…ixel

A shared texture with a single white pixel is quite useful in many
widgets (at least until skin textures are added).

doomsday/client/include/ui/widgets/guirootwidget.h

@@ -50,6 +50,7 @@ class GuiRootWidget : public de::RootWidget
 
     de::AtlasTexture &atlas();
     de::GLUniform &uAtlas();
+    de::Id solidWhitePixel() const;
 
     static de::GLShaderBank &shaders();
 

doomsday/client/src/ui/widgets/guirootwidget.cpp

@@ -31,6 +31,7 @@ DENG2_PIMPL(GuiRootWidget)
     ClientWindow *window;
     QScopedPointer<AtlasTexture> atlas; ///< Shared atlas for most UI graphics/text.
     GLUniform uTexAtlas;
+    Id solidWhiteTex;
 
     Instance(Public *i, ClientWindow *win)
         : Base(i),
@@ -46,6 +47,21 @@ DENG2_PIMPL(GuiRootWidget)
         // shared GL resources, so we'll ask the widgets to do this now.
         self.notifyTree(&Widget::deinitialize);
     }
+
+    void initAtlas()
+    {
+        if(atlas.isNull())
+        {
+            atlas.reset(AtlasTexture::newWithRowAllocator(
+                            Atlas::BackingStore | Atlas::AllowDefragment,
+                            GLTexture::maximumSize().min(GLTexture::Size(4096, 4096))));
+            uTexAtlas = *atlas;
+
+            Image const solidWhitePixel = Image::solidColor(Image::Color(255, 255, 255, 255),
+                                                            Image::Size(1, 1));
+            solidWhiteTex = atlas->alloc(solidWhitePixel);
+        }
+    }
 };
 
 GuiRootWidget::GuiRootWidget(ClientWindow *window)
@@ -65,13 +81,7 @@ ClientWindow &GuiRootWidget::window()
 
 AtlasTexture &GuiRootWidget::atlas()
 {
-    if(d->atlas.isNull())
-    {
-        d->atlas.reset(AtlasTexture::newWithRowAllocator(
-                           Atlas::BackingStore | Atlas::AllowDefragment,
-                           GLTexture::maximumSize().min(GLTexture::Size(4096, 4096))));
-        d->uTexAtlas = *d->atlas;
-    }
+    d->initAtlas();
     return *d->atlas;
 }
 
@@ -80,6 +90,12 @@ GLUniform &GuiRootWidget::uAtlas()
     return d->uTexAtlas;
 }
 
+Id GuiRootWidget::solidWhitePixel() const
+{
+    d->initAtlas();
+    return d->solidWhiteTex;
+}
+
 GLShaderBank &GuiRootWidget::shaders()
 {
     return ClientApp::glShaderBank();

doomsday/client/src/ui/widgets/lineeditwidget.cpp

@@ -48,7 +48,6 @@ DENG2_OBSERVES(Atlas, Reposition)
     // GL objects.
     bool needGeometry;
     GLTextComposer composer;
-    Id bgTex;
     Drawable drawable;
     GLUniform uMvpMatrix;
     GLUniform uColor;
@@ -114,9 +113,6 @@ DENG2_OBSERVES(Atlas, Reposition)
         composer.setAtlas(atlas());
         composer.setText(self.text());
 
-        // Temporary background texture for development...
-        bgTex = atlas().alloc(Image::solidColor(Image::Color(255, 255, 255, 255), Image::Size(1, 1)));
-
         drawable.addBuffer(ID_BUF_TEXT, new VertexBuf);
         drawable.addBufferWithNewProgram(ID_BUF_CURSOR, new VertexBuf, "cursor");
 
@@ -133,7 +129,6 @@ DENG2_OBSERVES(Atlas, Reposition)
 
     void glDeinit()
     {
-        atlas().release(bgTex);
         composer.release();
     }
 
@@ -155,12 +150,14 @@ DENG2_OBSERVES(Atlas, Reposition)
 
         // The background.
         VertexBuf::Builder verts;
-        verts.makeQuad(pos, bgColor, atlas().imageRectf(bgTex).middle());
+        verts.makeQuad(pos, bgColor, atlas().imageRectf(self.root().solidWhitePixel()).middle());
 
         // Text lines.
         Rectanglei const contentRect = pos.shrunk(margin);
         composer.makeVertices(verts, contentRect, AlignLeft, AlignLeft);
 
+        Rectanglef const solidWhiteUv = atlas().imageRectf(self.root().solidWhitePixel());
+
         // Underline the possible suggested completion.
         if(self.isSuggestingCompletion())
         {
@@ -178,8 +175,7 @@ DENG2_OBSERVES(Atlas, Reposition)
                 Vector2i end   = wraps.charTopLeftInPixels(i, i == endPos.y?   endPos.x   : span.end)   + offset;
 
                 verts.makeQuad(Rectanglef(start, end + Vector2i(0, 1)),
-                               Vector4f(1, 1, 1, 1),
-                               atlas().imageRectf(bgTex).middle());
+                               Vector4f(1, 1, 1, 1), solidWhiteUv.middle());
             }
         }
 
@@ -194,8 +190,7 @@ DENG2_OBSERVES(Atlas, Reposition)
         verts.clear();
         verts.makeQuad(Rectanglef(cp + Vector2f(-1, 0),
                                   cp + Vector2f(1, font->height().value())),
-                       Vector4f(1, 1, 1, 1),
-                       atlas().imageRectf(bgTex).middle());
+                       Vector4f(1, 1, 1, 1), solidWhiteUv.middle());
 
         drawable.buffer<VertexBuf>(ID_BUF_CURSOR)
                 .setVertices(gl::TriangleStrip, verts, gl::Static);

doomsday/client/src/ui/widgets/logwidget.cpp

@@ -331,7 +331,6 @@ DENG2_PIMPL(LogWidget), public Font::RichFormat::IStyle
     GLUniform uBgMvpMatrix;
     Matrix4f projMatrix;
     Matrix4f viewMatrix;
-    Id bgTex;
     Id scrollTex;
 
     Instance(Public *i)
@@ -490,8 +489,6 @@ DENG2_PIMPL(LogWidget), public Font::RichFormat::IStyle
 
         Image solidWhitePixel = Image::solidColor(Image::Color(255, 255, 255, 255),
                                                   Image::Size(1, 1));
-        bgTex = self.root().atlas().alloc(solidWhitePixel);
-
         scrollTex = entryAtlas->alloc(solidWhitePixel);
 
         uTex = entryAtlas;
@@ -512,8 +509,6 @@ DENG2_PIMPL(LogWidget), public Font::RichFormat::IStyle
 
     void glDeinit()
     {
-        self.root().atlas().release(bgTex);
-
         clearCache();
 
         delete entryAtlas;
@@ -750,7 +745,7 @@ DENG2_PIMPL(LogWidget), public Font::RichFormat::IStyle
             bgBuf->setVertices(gl::TriangleStrip,
                                VertexBuf::Builder().makeQuad(pos,
                                    self.style().colors().colorf("background"),
-                                   self.root().atlas().imageRectf(bgTex).middle()),
+                                   self.root().atlas().imageRectf(self.root().solidWhitePixel()).middle()),
                                gl::Static);
         }