Changeset 79

Timestamp:

07/17/08 22:24:02 (5 months ago)

Author:

JoeCoder

Message:

More font additions.

Files:

• trunk/bin/yage3d.exe (modified) (previous)
• trunk/demo2/main.d (modified) (4 diffs)
• trunk/doc/ideas.txt (modified) (3 diffs)
• trunk/doc/ref/snippet.d (deleted)
• trunk/doc/unresolved.txt (modified) (1 diff)
• trunk/src/yage/core/math.d (modified) (1 diff)
• trunk/yage/core/vector.d (modified) (3 diffs)
• trunk/yage/gui/style.d (modified) (3 diffs)
• trunk/yage/gui/surface.d (modified) (9 diffs)
• trunk/yage/resource/font.d (modified) (3 diffs)
• trunk/yage/resource/image.d (modified) (10 diffs)
• trunk/yage/resource/resource.d (modified) (3 diffs)
• trunk/yage/resource/texture.d (modified) (4 diffs)
• trunk/yage/system/constant.d (modified) (1 diff)
• trunk/yage/system/device.d (modified) (5 diffs)

trunk/demo2/main.d

@@ -102 +102 @@
-    
-    
-
+ some windows
-    void onMouseDown2(Surface self, byte buttons, Vec2i coordinates){
-        self.raise();
@@ -122 +122 @@
-
-    auto window1 = new Surface(view);   
-5%; right: 3%; width: 160; height: 12
+0; right: 0; width: 400; height: 6
-        "background-repeat: nineslice; background-material: url('gui/skin/clear2.png')");
-    window1.onMouseDown = &onMouseDown2;
-    window1.onMouseMove = &onMouseMove2;
-    window1.onMouseUp = &onMouseUp2;
-
-
+//
+//
-    
-    auto window2 = new Surface(window1);
-10; right: 1
+30; right: 
-        "background-repeat: nineslice; background-material: url('gui/skin/clear2.png')");
-    window2.onMouseDown = &onMouseDown2;
@@ -138 +138 @@
-    window2.onMouseOver = &onMouseOver;
-    window2.onMouseOut = &onMouseOut;
+    
+
+    window1.style.fontFamily = Resource.font("gui/font/Vera.ttf");
+    window1.style.fontSize = 12;
+    window1.style.color = Color("black");
-
-    // Music
@@ -190 +195 @@
-        fps++;
-        if (frame.get()>=0.25f)
-Yage Test (%.2f fps) (%d objects, %d polygons, %d vertices rendered)\0
+(%.2f fps) (%d objects, %d polygons, %d vertices)
-                fps/frame.get(), camera.getNodeCount(), camera.getPolyCount(), camera.getVertexCount());
-caption
-//delete
+(caption ~"\0")
+window1.text =
-            frame.reset();
-            fps = 0;

trunk/doc/ideas.txt

@@ -7 +7 @@
-Add boolean set operations to the Resource manager, to load all resources from a new level and free only those that aren't part of that set.
-
-Layer
+Surface
-{
-layer
+surface
-
-    setOnClick(function);       // mousebutton, mouseposition
@@ -36 +36 @@
-
-A sensor node that checks for certain events (brightness, velocity, distance, etc.) and calls callback functions when
-
+  (any node can do this in its update function).
-
-Use axis sorting to tell what lights affect what nodes (instead of n*m distance check).  But most lights have large radius?
@@ -42 +42 @@
-Use dx cross dy to calculate normals for parametric graphnodes.
-
+Create typed exceptions.
+
+Make logging consistent and typed.
+

trunk/doc/unresolved.txt

@@ -22 +22 @@
-fixed?
-
-Dmd has trouble compiling incrementally with -O
-
-There is jumpiness in the rendering.  Every 10th or so frame takes almost exactly twice as long to render
-than others, when rendering the same thing.  Especially noticable when rendering lots of models

trunk/src/yage/core/math.d

@@ -10 +10 @@
-import std.math;
-import std.random;
+import std.intrinsic;
-
-public const float PI_180 = 0.01745329251994;   // PI / 180

trunk/yage/core/vector.d

@@ -123 +123 @@
-
-
-near additions and subtract
+ear additions, subtractions, multiplcations, and divis
-    VST opAdd(VST s)
-    {   VST res;
@@ -130 +130 @@
-        return res;
-    }
-D
+d
-    void opAddAssign(VST s)
-    {   for (int i=0; i<v.length; i++)
-            v[i] += s.v[i];
-    }   
-D
+d
-    VST opSub(VST s)
-    {   VST res;
@@ -142 +142 @@
-        return res;
-    }
-D
+d
-    void opSubAssign(VST s)
-    {   for (int i=0; i<v.length; i++)
-            v[i] -= s.v[i];
+    }
+    
+    /// Allow for additions, subtractions, multiplcations, and divisions where a scalar is applied to each vector component.
+    void opMulAssign(float s)
+    {   for (int i=0; i<v.length; i++)
+            v[i] += s;
+    }
+    /// ditto
+    void opDivAssign(float s)
+    {   for (int i=0; i<v.length; i++)
+            v[i] /= s;
-    }
-    

trunk/yage/gui/style.d

@@ -10 +10 @@
-import yage.core.color;
-import yage.core.vector;
+import yage.resource.font;
-import yage.resource.resource;
-import yage.resource.material;
@@ -154 +155 @@
-    }
-    // Font
-//Font 
-//float fontSize
-//byte fontSizeUnit
+Font
+float fontSize = 12
+Unit fontSizeUnit = Style.PX
-    //float fontWeight;
-//
+
-        
-    // Padding
@@ -242 +243 @@
-            switch (property)
-            {   /// TODO: Lots more properties
+                case "color":               color = Color(tokens[1]); break;
+            
-                case "backgroundcolor":     backgroundColor = Color(tokens[1]); break;
-                case "backgroundrepeat":    backgroundRepeat = translate[tokens[1]]; break;

trunk/yage/gui/surface.d

@@ -13 +13 @@
-import derelict.opengl.glext;
-import derelict.opengl.glu;
+import derelict.opengl.extension.ext.blend_color; // opengl 1.2
-import yage.core.all;
-import yage.system.device;
@@ -18 +19 @@
-import yage.system.input;
-import yage.resource.texture;
+import yage.resource.image;
-import yage.gui.style;
-import yage.system.rendertarget;
@@ -33 +35 @@
-{
-    static final Style defaultStyle;
-
+
+
+
+
-    
-    // internal values
@@ -40 +45 @@
-    Vec2f offset;       // pixel distance of top left from the window's top left at 0, 0
-    
-is this used?
+used to track mouseover/mouseout
-    
-    protected Style old_style; // Used for comparison to see if dirty.
-    protected Surface old_parent;
+    protected char[] old_text;
-    
-    protected float[72] vertices = 0; // Used for rendering
@@ -94 +100 @@
-
-    /**
-
+
+
-    void calculate()
-    {           
@@ -185 +192 @@
-                    float h = this.height();
-                    vertices[0..8] = [0.0f, h, w, h, w, 0, 0, 0];
-                        
+
-                    break;
-                case Style.NINESLICE:
@@ -201 +208 @@
-                    // V    |
-                    // 1<---2
-                    // TODO: Use same array for both using glScalef, once portion becomes unnecessary.
-                    // TODO: Ensure this operation is 100% on the stack.
-                    vertices[0..72] = [
@@ -281 +287 @@
-        
-        glEnable(GL_BLEND);
- 
+
-            
-        //This may need to be changed for when people wish to render surfaces individually so the already rendered are not cleared.
@@ -297 +303 @@
-    }
-    
+    
+    
-    void draw()
-    {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-
+
+
-                calculate();
-            
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            glPushMatrix();
-            glTranslatef(topLeft.x, topLeft.y, 0);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-            if (style.backgroundColor.a > 0) // If backgroundColor alpha.
-            {   glColor4ubv(style.backgroundColor.ub.ptr);
-
-
-
-
+
+
+
+
+
+
-            if (style.backgroundMaterial !is null)
-            {   glEnable(GL_TEXTURE_2D);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            // Using a zbuffer might make this unecessary.  tradeoffs?
-            if (!children.sorted(true, (Surface s){return s.style.zIndex;} ))

trunk/yage/resource/font.d

@@ -10 +10 @@
-import std.stdio;
-import derelict.freetype.ft;
+import yage.core.math;
-import yage.resource.exception;
-import yage.resource.resource;
@@ -22 +23 @@
-    FT_Face face;
-    
+    ///
-    this(char[] filename)
-    {
-        // Initialize Freetype library if not initialized
+        // TODO: Move this into Device?
-        if (!freetype_initialized)
-
-
-
+
+
-        }
-        
@@ -37 +39 @@
-            throw new ResourceLoadException("Could not open font file '" ~ source ~ "'. The format is not recognized by Freetype2.");
-        else if (error)
-
+
+
+
+
+
+
-    }
-    
-    
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    {   
+        // Calculate parameters
+        if (line_height==-1)
+            line_height = cast(int)(height*1.5);
+        if (line_width==-1)
+            line_width = int.max;       
-        
+        // Give our font size to freetype.
-        auto error = FT_Set_Pixel_Sizes(face, width, height);   // face, pixel width, pixel height
-        if (error)
-Font Error
+Invalid font size
-        
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            if (error)
-                throw new Exception("Font Error.");
-            
-            auto bitmap = face.glyph.bitmap;
-            writefln("glyph size=", bitmap.width, " ", bitmap.rows);
-            ubyte[] data = (cast(ubyte*)bitmap.buffer)[0..(bitmap.width*bitmap.rows)];
-            Image img = new Image(data, 1, bitmap.width, bitmap.rows);
-            
-
+
+
+
+
+
+
+
+
-            
-
+
+
+
-        
-        
+        // Composite all glyph images into a single image.
+        // We have to do this here since we need to render them before calculating sizes.
+        int img_width = image_pow2 ? nextPow2(total_width) : total_width;
+        int img_height = image_pow2 ? nextPow2(line_height*lines) : line_height*lines;
+        Image result = new Image(1, img_width, img_height);
+        for (int i=0; i<letters.length; i++)
+        {   result.overlay(letters[i].image, letters[i].advancex+letters[i].left, (letters[i].advancey-letters[i].top+height));
+            delete letters[i].image;
+        }
+    
+        return result;
-    }
-
-
-
-
-
-
-
-
-
-
-
+
-}

trunk/yage/resource/image.d

@@ -17 +17 @@
- * Bugs:
- * An RGB image will often be returned when loading grayscale images.  Use setFormat(IMAGE_FORMAT_GRAYSCALE) to correct this.
-
+
+
-class Image
-{
@@ -43 +44 @@
-
-    /**
+     * Create a new emtpy image.
+     * Params:
+     *     channels = number of color channels.
+     *     width = width in pixels
+     *     height = height in pixel */
+    this(int channels, int width, int height)
+    {   data.length = channels*width*height;
+        this.channels = channels;
+        this.width = width;
+        this.height = height;
+    }
+    
+    /**
-     * Construct from image data in memory.  This does not create a copy of the data.
-     * Params:
-
-
-
+
+
+
+
-    this(ubyte[] data, int channels, int width, int height=0)
-    {   this.data = data;
@@ -54 +69 @@
-        if (height)
-            this.height = height;
+        else if (width && channels)
+            this.height = data.length / (width*channels);
-        else
-data.length / (width*channels)
+0
-    }
-    
@@ -187 +204 @@
-    body
-    {   int i = (y*width+x)*channels;
-        //std.stdio.writefln(i, "..", i+channels);
-        return data[i..(i+channels)];
-    }
@@ -193 +209 @@
-    in { assert(x<width && y<height); }
-    body
-*
+
-        return data[i..(i+channels)] = val[0..channels];
-    }
-
+    /**
+     * Paste another image on top of this one.
+     * This does not make a copy. */
+    void overlay(Image img, int xoffset=0, int yoffset=0)
+    {
+        for (int x=0; x<img.width; x++)
+        {   int xoffsetx = xoffset + x;
+            if (xoffsetx < width && xoffsetx > 0)
+            {   for (int y=0; y<img.height; y++)
+                {   int yoffsety = yoffset+y;
+                    if (yoffsety < height && yoffsety > 0)
+                        this[xoffsetx, yoffsety][0..channels] = img[x, y][0..channels]; // TODO: convert format
+        }   }   }
+    }
+    
+    void overlayAndFlip(Image img, int xoffset=0, int yoffset=0)
+    {
+        for (int x=0; x<img.width; x++)
+        {   int xoffsetx = xoffset + x;
+            if (xoffsetx < width && xoffsetx > 0)
+            {   for (int y=0; y<img.height; y++)
+                {   int yoffsety = yoffset+y;
+                    if (yoffsety < height && yoffsety > 0)
+                        this[xoffsetx, yoffsety][0..channels] = img[x, img.height-y-1][0..channels];
+        }   }   }
+    }
+    
-    /**
-     * Return a c-style pointer to the image data.
@@ -210 +253 @@
-     *     width = The new width.
-     *     height = The new height.  If 0, height will be calculated automatically with aspect ratio maintained.
-.
+ and of the new size, or an exact copy if the dimensions are the same. 
-    Image resize(int width, int height=0)
-    {   Image result = new Image();
@@ -217 +260 @@
-            result.height = height;
-        else
-
+      
-        result.channels = channels;
+        
+        // Return a copy if there's nothing to resize.
+        if (result.width == this.width && result.height == this.height)
+        {   result.data = this.data.dup;
+            return this;
+        }
+        
-        result.data.length = width*height*channels;
-        
-        float width1 = 1/(width-1.0f);
-        float height1= 1/(height-1.0f);     
@@ -235 +284 @@
-
-    // TODO: modify this to return a new image in the given format.
-void
+Image
-    {   if (channels == this.channels)
-
-
-ubyte[] result
+ this
+
+Image result = new Image(channels, width, height)
-    
-        switch (channels)
@@ -245 +294 @@
-            case 1:
-                // Set each pixel to the average of RGB, dropping alpha if present
-
-
-
+
+
+
+
+
+
+
-                break;
-            case 3:
@@ -277 +330 @@
-        }
-        this.channels = channels;
+        
+        return this;
-    }
-    /**

trunk/yage/resource/resource.d

@@ -11 +11 @@
-import yage.core.array;
-import yage.core.misc;
+import yage.resource.font;
-import yage.resource.model;
-import yage.resource.material;
@@ -32 +33 @@
-    static char[][] paths = [""];       // paths to look for resources
-
+    private static Font[char[]]     fonts;
-    private static GPUTexture[char[]][2][2]  textures; // [source][clamped][compressed][mipmapped][filter]
-    private static Shader[char[]]   shaders;
@@ -119 +121 @@
-    }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    static Model model(char[] source)
-    {   if (source in models)

trunk/yage/resource/texture.d

@@ -172 +172 @@
-        if (blend != BLEND_MULTIPLY)
-            glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+        
+        glBindTexture(GL_TEXTURE_2D, 0);
-    }
-
@@ -205 +207 @@
-    this()
-    {   glGenTextures(1, &gl_index);
-
-
+
+
+
+
+
+
-    }
-
@@ -296 +302 @@
-
-        // Upload image
+        // TODO: Use image's built in resizer instead of glu.
+        // glu has resizing issues with non power of two source textures.
-        if (mipmap)
-        {   //writefln(GL_TEXTURE_2D, " ", glinternalformat, " ", image.getWidth(), " ", image.getHeight(), " ", glformat, " ", GL_UNSIGNED_BYTE, " ", image.getData().length);
@@ -316 +324 @@
-
-            // Resize if necessary
-
+
+
-            glTexImage2D(GL_TEXTURE_2D, 0, glinternalformat, image.getWidth(), image.getHeight(), 0, glformat, GL_UNSIGNED_BYTE, image.getData().ptr);
-

trunk/yage/system/constant.d

@@ -15 +15 @@
-    DEVICE_SHADER,              /// Hardware support for openGl vertex and fragment shaders
-    DEVICE_VBO,                 /// Hardware support for caching vertex data in video memory (Vertex Buffer Object)
+    DEVICE_BLEND_COLOR,
-
-    DEVICE_MAX_LIGHTS,          /// Maximum number of lights that can be used at one time

trunk/yage/system/device.d

@@ -41 +41 @@
-abstract class Device
-{
+    
-    // Video
-    protected static SDL_Surface* sdl_surface; // Holds a reference to the main (and only) SDL surface
@@ -153 +154 @@
-        }else
-            Log.write("GL_ARB_vertex_buffer_object not supported.  This is still ok.");
+        
+        // Attempt to load blend color extension
+        if (getSupport(DEVICE_BLEND_COLOR))
+        {   if (!EXTBlendColor.load("GL_EXT_blend_color"))
+                throw new Exception("GL_EXT_blend_color extension detected but it could not be loaded.");
+            Log.write("GL_EXT_blend_color support enabled.");
+        }else
+            Log.write("GL_EXT_blend_color not supported.  This is still ok.");
-
-        // OpenGL options
@@ -226 +235 @@
-    static bool checkExtension(char[] name)
-    {   char[] exts = std.string.toString(cast(char*)glGetString(GL_EXTENSIONS));
-upper(exts), toupper(name)~" ");
-
+lower(exts), tolower(name)~" "); 
+ // [above] append space to ensure we're not matching part of another extension.
-        if (result>=0)
-            return true;
@@ -273 +282 @@
-    static bool getSupport(int constant)
-    {   //return false;
-;   // so support only has to be found once
+, bc=-1;    // so lookup only has to occur once.
-        switch (constant)
-        {   case DEVICE_SHADER:
@@ -294 +303 @@
-                    np2 = checkExtension("GL_ARB_texture_non_power_of_two");
-                return cast(bool)np2;
+            case DEVICE_BLEND_COLOR:
+                if (bc==-1)
+                    bc = checkExtension("GL_EXT_blend_color");
+                return cast(bool)bc;
-            default:
-                throw new Exception("Unknown Device.getSupport() constant: '" ~