Changeset 57:9e1f05fbbcef

Timestamp:

06/14/08 08:09:03 (7 months ago)

Author:

Diggory Hardy <diggory.hardy@gmail.com>

branch:

default

Message:

Coloured and alpha-blended text is now supported.

TextWidgets? get text colour from argument.

Files:

• codeDoc/jobs.txt (modified) (1 diff)
• codeDoc/mergetag/file-format-binary.txt (modified) (1 diff)
• data/conf/fonts.mtt (modified) (1 diff)
• data/conf/gui.mtt (modified) (1 diff)
• mde/gl/basic.d (modified) (2 diffs)
• mde/gui/widget/miscWidgets.d (modified) (3 diffs)
• mde/resource/FontTexture.d (modified) (5 diffs)
• mde/resource/font.d (modified) (6 diffs)
• mde/types/basic.d (added)

codeDoc/jobs.txt

@@ -52 +52 @@
-
-
-git
-Implemented gl.texture module to load textures from file (untested)
-Fixed log level/option setting in Ini
+mercurial
+Coloured and alpha-blended text is now supported
+TextWidgets get text colour from argumen

codeDoc/mergetag/file-format-binary.txt

@@ -1 +1 @@
-Copyright © 2007-2008 Diggory Hardy
-License: GNU General Public License version 2 or later (see COPYING)
+
+
+No file format is set yet; this basically includes possibilities. The file format may or may not be compatible across platforms; if not it may just be used as a cache (i.e. open .mtt/.mtb, whichever is newest, and if it's .mtt then save a .mtb version).
-
-

data/conf/fonts.mtt

@@ -1 +1 @@
-{MT01}
-<char[]|fallback="default">
+!{Lists available fonts. This data may be moved to options for more generic handling.}
-{default}
-<char[]|path="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf">

data/conf/gui.mtt

@@ -8 +8 @@
-<int|x=150>
-<int|y=200>
-
+,0xFFFF00
-{WEmbedded}
-<int|x=20>

mde/gl/basic.d

@@ -25 +25 @@
-//BEGIN GL & window setup
-void glSetup () {
+    glDisable(GL_LIGHTING);
-    glDisable(GL_DEPTH_TEST);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
@@ -30 +31 @@
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
-    glEnable(GL_TEXTURE_2D);
-FLAT
+SMOOTH
-    
-    glClearColor (0.0f, 0.0f, 0.0f, 0.0f);

mde/gui/widget/miscWidgets.d

@@ -107 +107 @@
-{
-    this (IWindow wind, int[] data) {
-1
+2
-        if (font is null) font = FontStyle.get("default");
-        font.updateBlock (str, textCache);
-        mw = textCache.w;
-        mh = textCache.h;
+        colour = Colour (cast(ubyte) (data[1] >> 16u),
+                         cast(ubyte) (data[1] >> 8u),
+                         cast(ubyte) data[1] );
-        super (wind,data);
-    }
@@ -117 +120 @@
-    void draw () {
-        super.draw();
-
+, colour
-    }
-    
@@ -123 +126 @@
-    const str = "Text Widget\nαβγ − ΑΒΓ";
-    TextBlock textCache;
+    Colour colour;
-    static FontStyle font;
-}

mde/resource/FontTexture.d

@@ -25 +25 @@
-module mde.resource.FontTexture;
-
+import mde.types.basic; // Colour
-import mde.Options;
-import mde.resource.exception;
@@ -161 +162 @@
-    }
-    
-
-
+
+
+
+
+
+
+
+
+
+
+
-        updateCache (face, str, cache); // update if necessary
-        debug scope (failure)
-                logger.error ("drawTextCache failed");
-        
+        // opaque (GL_DECAL would be equivalent)
+        glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+        
+        drawCacheImpl (cache, x, y, col);
+    }
+    /** A variation of drawCache, for transparent text.
+     *
+     * Instead of passing the alpha value(s) as arguments, set the openGL colour prior to calling:
+     * ---
+     * glColor3f (.5f, .5f, .5f);   // set alpha to half
+     * drawCacheA (face, ...);
+     * 
+     * glColor3ub (0, 255, 127);    // alpha 0 for red, 1 for green, half for blue
+     * drawCacheA (face, ...);
+     * ---
+     *
+     * The overhead of the transparency is minimal. */
+    void drawCacheA (FT_Face face, char[] str, ref TextBlock cache, int x, int y, Colour col/+ = Colour.WHITE+/) {
+        updateCache (face, str, cache); // update if necessary
+        debug scope (failure)
+                logger.error ("drawTextCache failed");
+        
+        // transparency alpha
+        // alpha is current colour, per component
+        glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+        
+        drawCacheImpl (cache, x, y, col);
+    }
+   
+    private void drawCacheImpl (ref TextBlock cache, int x, int y, Colour col) {
+        if (DerelictGL.availableVersion() >= GLVersion.Version14) {
+            glBlendFunc (GL_CONSTANT_COLOR, GL_ONE_MINUS_SRC_COLOR);
+            glBlendColor(col.r, col.g, col.b, 1f);  // text colour
+        } else
+            glBlendFunc (col.nearestGLConst, GL_ONE_MINUS_SRC_COLOR);
+        
-        glEnable (GL_TEXTURE_2D);
-        glEnable(GL_BLEND);
-        glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_COLOR);
-        
-        foreach (chr; cache.chars) {
@@ -282 +327 @@
-    void drawTexture () {   // temp func
-        if (tex.length == 0) return;
+        glEnable (GL_TEXTURE_2D);
-        glBindTexture(GL_TEXTURE_2D, tex[0].texID);
-        glEnable (GL_TEXTURE_2D);
-        glEnable(GL_BLEND);
-        glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_COLOR);
+        float[4] Cc = [ 1.0f, 1f, 1f, 1f ];
+        glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, Cc.ptr);
+        glColor3f (1f, 0f, 0f);
-        
-        glBegin (GL_QUADS);
@@ -313 +361 @@
-    static LinePacker create () {
-        LinePacker p;
-check for error
+why do I get a blank texture when binding to non-0
-        //glGenTextures (1, &(p.texID));
-        p.texID = 0;
-        //FIXME: why do I get a blank texture when using bind?
-        glBindTexture(GL_TEXTURE_2D, p.texID);
-        
-        // add a pretty background to the texture
-fals
+tru
-            glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-            glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
@@ -336 +382 @@
-        
-        // Create a texture without initialising values.
-
+
+
-                     dimW, dimH, 0,
-                     GL_RGB, GL_UNSIGNED_BYTE, ptr);

mde/resource/font.d

@@ -17 +17 @@
-module mde.resource.font;
-
+public import mde.types.basic;  // Colour
-import mde.Options;
-import mde.resource.FontTexture;
@@ -229 +230 @@
-     * The text block is drawn with top-left corner at x,y. To put the text's baseline at a given
-     * y coordinate would require some changes. Line height is currently variable, depending on the
-
+
+
+
+
-     *
-     * As a CPU-side code optimisation, store a TextBlock (unique to str) and pass a reference as
@@ -247 +251 @@
-     * of a text block is to use a TextBlock cache and update it, either with this function or with
-     * the updateBlock function. */
-
+, Colour col
-        try {
-TextCache (face, str, cache, x, y
+Cache (face, str, cache, x, y, col
-        } catch (Exception e) {
-            logger.warn ("Exception while drawing text: "~e.msg);
@@ -255 +259 @@
-    }
-    /** ditto */
-
+, Colour col
-        try {
-            // Using the cache method for one-time use is slightly less than optimal, but doing so
@@ -261 +265 @@
-            // would be horrible).
-            TextBlock cache;
-TextCache (face, str, cache, x, y
+Cache (face, str, cache, x, y, col
-        } catch (Exception e) {
-            logger.warn ("Exception while drawing text: "~e.msg);
@@ -267 +271 @@
-    }
-    
+    /** A variation of textBlock for transparency.
+     *
+     * Set the alpha by calling glColor*() first. See FontTexture.drawCacheA()'s documentation for
+     * details. */
+    void textBlockA (int x, int y, char[] str, ref TextBlock cache, Colour col) {
+        try {
+            fontTex.drawCacheA (face, str, cache, x, y, col);
+        } catch (Exception e) {
+            logger.warn ("Exception while drawing text: "~e.msg);
+        }
+    }
-    
-    /** The font-specified vertical distance between the baseline of consecutive lines. */