Changeset 191

Timestamp:

07/03/10 21:58:03 (2 years ago)

Author:

JoeCoder

Message:

Added css style inheritance and auto properties to yage.gui.style
Created Surface.getComputedStyle() to get styles in terms of pixels and replause "auto" with inherited values.
Reworked Surface.updateDimensions to work off of the new getComputedStyle()

Files:

• trunk/res/gui/skin2 (added)
• trunk/src/demo2/main.d (modified) (1 diff)
• trunk/src/tests/integration/main.d (modified) (3 diffs)
• trunk/src/yage/core/format.d (modified) (15 diffs)
• trunk/src/yage/gui/style.d (modified) (11 diffs)
• trunk/src/yage/gui/surface.d (modified) (18 diffs)
• trunk/src/yage/gui/textlayout.d (modified) (1 diff)
• trunk/src/yage/resource/font.d (modified) (1 diff)
• trunk/src/yage/scene/camera.d (modified) (2 diffs)

trunk/src/demo2/main.d

@@ -66 +66 @@
-    info.style.set("top: 40px; left: 40px; width: 500px; height: 260px; padding: 3px; color: brown; " ~
-        "border-width: 5px; border-image: url('gui/skin/clear2.png'); " ~
-: 14px
+-family:
-    info.style.overflowX = Style.Overflow.HIDDEN;
-    info.style.overflowY = Style.Overflow.HIDDEN;

trunk/src/tests/integration/main.d

@@ -75 +75 @@
-    
-    void keyState(int key, bool state)
-
+ || key == SDLK_UP
-            camera.up = state;
-
+ || key == SDLK_LEFT
-            camera.left = state;
-
+ || key == SDLK_DOWN
-            camera.down = state;
-
+ || key == SDLK_RIGHT
-            camera.right = state;
-        
@@ -135 +135 @@
-        l4.setPosition(Vec3f(-100, 0, 0));
-        l4.setLightRadius(100);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        //camera.setPosition(Vec3f(0, 0, -500));
-    }
@@ -391 +419 @@
-
-    // Create and start a Scene
-LightsAndFo
+Pickin
-    scene.getUpdateThread().setFrequency(60);
-    scene.play(); // start scene thread

trunk/src/yage/core/format.d

@@ -8 +8 @@
- * This behaves exactly the same as writef, but returns a string instead of printing it. 
- * It can also accept the _arguments, and _argptr directly from another var arg function.
-6
+3
-char[] swritef(...)
-{   
@@ -49 +49 @@
- *
- *  o  The origin of this software must not be misrepresented; you must not
-    
-    
-    
+ 
+ 
+ 
- *  o  Altered source versions must be plainly marked as such, and must not
-    
+ 
- *  o  This notice may not be removed or altered from any source
-    
+ 
- */
-
@@ -67 +67 @@
-import tango.core.Exception;
-
-//Had to add this for tangobos.
-private T va_arg2(T)(inout void* _argptr)
-{
-    version(DigitalMars) {
-        T arg = *cast(T*)_argptr;
-        _argptr = _argptr + ((T.sizeof + int.sizeof - 1) & ~(int.sizeof - 1));
-        return arg;
-    } else {
-        T t; return t;
-    }
-}
-
-
-
-version (Windows)
-{
-    
-    
-    
-    
-    
-    
-    
-    
+   
+   
+   
+   
+   
+   
+   
+   
-}
-
-version (DigitalMarsC)
-{
-    
-    
-    
-    
-    
+   
+   
+   
+   
+   
-}
-else
-{
-    
-    
+   
+   
-}
-
@@ -112 +98 @@
-class FormatError : Exception
-{   this()
-    
-    
-
-    
-    
-    
+   
+   
+
+   
+   
+   
-}
-
@@ -123 +109 @@
-private enum Mangle : char
-{
-    Tvoid    
-    Tbool    
-    Tbyte    
-    Tubyte    
-    Tshort    
-    
-    Tint    
-    Tuint    
-    Tlong    
-    Tulong    
-    Tfloat    
-    
-    Treal    
-
-    
-    
-    Tireal    
-    
-    
-    Tcreal    
-
-    Tchar    
-    Twchar    
-    Tdchar    
-
-    Tarray    
-    
-    
-    
-    
-    Tident    
-    Tclass    
-    
-    Tenum    
-    
-    
-
-    Tconst    
-    
+   Tvoid   
+   Tbool   
+   Tbyte   
+   Tubyte  
+   Tshort  
+   
+   Tint    
+   Tuint   
+   Tlong   
+   Tulong  
+   Tfloat  
+   
+   Treal   
+
+   
+   
+   Tireal  
+   
+   
+   Tcreal  
+
+   Tchar   
+   Twchar  
+   Tdchar  
+
+   Tarray  
+   
+   
+   
+   
+   Tident  
+   Tclass  
+   
+   Tenum   
+   
+   
+
+   Tconst  
+   
-}
-
@@ -200 +186 @@
-private void doFormatPtr(void delegate(dchar) putc, TypeInfo[] arguments,  void* argptr, void* p_args)
-{   int j;
-    
-    
-    
-    
-    
-
-    
-    
+   
+   
+   
+   
+   
+
+   
+   
-        FLdash = 1,
-        FLplus = 2,
@@ -215 +201 @@
-        FL0pad = 0x40,
-        FLprecision = 0x80,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-        flags = 0;
@@ -1129 +1115 @@
-        do
-        {
-    
-    
-    
+   
+   
+   
-        } while (m == Mangle.Tconst || m == Mangle.Tinvariant);
-    
-        if (m == Mangle.Tarray)
-        {
-    
+   
-            ti.classinfo.name[9..14] == "Array") 
-    
-    
-    
-    
+   
+   
+   
+   
-            case Mangle.Tchar:
-            case Mangle.Twchar:
-            case Mangle.Tdchar:
-    
-    
-    
+   
+   
+   
-            default:
-    
-    
-    
+   
+   
+   
-        L1:
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-
-    
-    
-    
-
-    fmt = va_arg2
-    
-
-
-    wfmt = va_arg2
-    
-    
-
-
-    dfmt = va_arg2
-    
-    
-
-
-
-    
-    
-
-
-    
-    
-    
-    
-    
-    
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+       fmt = va_arg
+       
+   
+   
+       wfmt = va_arg
+       
+       
+   
+   
+       dfmt = va_arg
+       
+       
+   
+   
+   
+       
+       
+   
+   
+       
+       
+   
+   
+   
+   
-                alias void[] array_t;
-                switch (m2)
-                {
-    
+   
-                    fmt = *cast(char[]*)p_args; p_args += array_t.sizeof;
-                    break;
-        
-    
+   
-                    wfmt = *cast(wchar[]*)p_args; p_args += array_t.sizeof;
-                    fmt = .toString(wfmt);
-                    break;
-        
-    
+   
-                    dfmt = *cast(dchar[]*)p_args; p_args += array_t.sizeof;
-                    fmt = .toString(dfmt);
-                    break;
-        
-    
-    
+   
+   
-                    mi++;
-                    goto L1;
-        
-    
+   
-                    formatArg('s');
-                    continue;
-                }
-    
-
-    
-    
+   
+
+   
+   
-    
-                dchar getFmtChar()
-                {   // Valid format specifier characters will never be UTF
-    
-
-    
+   
+   
+   
-                }
-        
@@ -1234 +1220 @@
-                {   int n;
-        
-    
-    
-
-
-    
-
-
-    
-    
-    
+   
+   
+   
+   
+       
+   
+   
+       
+   
+   
-                }
-        
-                int getFmtStar()
-                {   Mangle m;
-    
-
-    
-    
-    
-    
-    
-    
-    
-       return va_arg2
-    
-    
-               
-
-
-    
+   
+
+   
+   
+   
+   
+   
+   
+   
+       return va_arg
+   
+   
+               
+   
+   
+   
-                }
-        
-                if (c != '%')
-                {   if (c > 0x7F)   // if UTF sequence
-    
+   
-                        try {
-    
+   
-                        } catch (UnicodeException e) // invalid utf
-                        {   
-                            i++;
-                        }
-    
+   
-                    Lputc:
-    
-    
+   
+   
-                }
-        
@@ -1285 +1271 @@
-                while (1)
-                {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-        
@@ -1305 +1290 @@
-                if (c == '*')
-                {
-    
-    
-    
+   
+   
+   
-                    field_width = -field_width;
-    
-
-    
+   
+
+   
-                }
-                else if (c >= '0' && c <= '9')
-    
+   
-        
-                if (flags & FLplus)
-    
+   
-                if (flags & FLdash)
-    
+   
-        
-                // Get precision
@@ -1326 +1311 @@
-                {   flags |= FLprecision;
-        
-    
-    
-    
+   
+   
+   
-                    precision = getFmtStar();
-                    if (precision < 0)
-                    {   precision = 0;
-    
+   
-                    }
-        
-                    c = getFmtChar();
-    
-    
+   
+   
-                    precision = getFmtInt();
-                }
@@ -1348 +1333 @@
-                do
-                {
-    
+   
-                } while (m == Mangle.Tconst || m == Mangle.Tinvariant);
-        
@@ -1354 +1339 @@
-                    throw new FormatError("Formatting specifiers can't be UTF");    // format specifiers can't be UTF
-                formatArg(cast(char)c);
-    
+   
-        }
-        else
-        {
-    
+   
-        }
-    
-    
-
-    
-    
+   
+   
+
+   
+   
-}
- 
@@ -1370 +1355 @@
-
-version (skyos)
-    
+   
-
-
-unittest
-{
-    
-    
-
-    
+   
+   
+
+   
- 
-    
-    
-
-    
-    
-    
-    
-    
+   
+   
+
+   
+   
+   
+   
+   
-   
-    
+   
-    { /*nothing*/ }
-    
-
-    
-
-    
-    
-
-    
-    
-
-    
-    
-
-    
-    
-
-    
-    
-
-    
-    
-
-    
-    
-
-    
-    
-
-    
-    
-
-    
-    
-
-    
-    
-    
-
-    
-    
-    
-
-    
-    
-    
-
-    
-    
-    
-
-    
-    
-    
-
-    
-    
-
-    
-    
-
-    
-    
-
-    
-    
-
-    
-    
-
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-
-    
-    
-
-    
-    
-
-    
-    
-
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-
-    
-    
-    
-    
-
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-
-    
-    
-    
+   
+   
+       
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+   
+
+   
+   
+   
+
+   
+   
+   
+
+   
+   
+   
+
+   
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+
+   
+   
+   
+   
+
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+
+   
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+   
+
+   
+   
+   
-    r = swritef(" %d", ds[j]);
-    if (j == 0)
-    
+   
-    else
-    
-    
-
-    
-    
+   
+   
+
+   
+   
-}

trunk/src/yage/gui/style.d

@@ -30 +30 @@
-struct CSSValue
-{   
+    static const CSSValue AUTO;  /// Has a value of float.nan.  This means inherit from parent style.
+    
-    /**
-     * CSSValues used to set units for measurements, such as width, padding, etc. */
@@ -145 +147 @@
-struct Style
-{
-
-    /// CSSValues that can be assigned to the borderImagestyle property.
-    enum BorderImageStyle
-
+ Allowed values.
-        ROUND, /// ditto
-        REPEAT   /// ditto
@@ -155 +156 @@
-    /// CSSValues that can be assigned to the fontStyle property.
-    enum FontStyle
-
+
+
-        ITALIC /// ditto
-    }
@@ -161 +163 @@
-    /// CSSValues that can be assigned to the fontWeight property.
-    enum FontWeight
-
+
+
-        BOLD /// ditto
-    }
@@ -173 +176 @@
-    /// CSSValues that can be assigned to the textAlign property.
-    enum TextAlign
-
+
+
-        CENTER, /// ditto
-        RIGHT, /// ditto
@@ -181 +185 @@
-    /// CSSValues that can be assigned to the textDecoration property.
-    enum TextDecoration
-
+
+
-        UNDERLINE, /// ditto
-        OVERLINE, /// ditto
-        LINETHROUGH /// ditto
-    }
-
-    /*
-    char[] enumToString(T)(T e)
-    {
-        return e.stringof;
-    }*/
-    
-    union { 
@@ -267 +266 @@
-
-    // Cursor
-
-
+ /// TODO
+/
-    
-    /// Font properties
-    Font fontFamily;
- = CSSValue(12)
+
-    FontStyle fontStyle; /// ditto
-    FontWeight fontWeight; /// ditto
-    
-    /// Text properties
-
+ // TODO: How to have a value for AUTO?
-    TextAlign textAlign = TextAlign.LEFT; /// ditto
-    TextDecoration textDecoration = TextDecoration.NONE; /// ditto
- = CSSValue(float.nan)
+
-    CSSValue letterSpacing; /// ditto
-    
-    /**
-     * CSS 3D transform property, defaults to identity matrix.  See: http://w3.org/TR/css3-3d-transforms     */
-
-
+
-
-    // Other
@@ -300 +298 @@
-    bool visible = true; /// Set whether the element is visible. visibility is an alias of visible for CSS compatibility.
-    int zIndex; /// Sets the stack order of the surface relative to its siblings.
+    
+    bool backfaceVisibility = true; /// Draw the back side of surfaces if they're rotated in 3d.
+    
-
-    /**
@@ -470 +471 @@
-    }   }
-    static char[] enumToString(Style.FontStyle style) /// ditto
-
-
+
+
+
+
+
+
-    static char[] enumToString(Style.FontWeight style) /// ditto
-
-
+
+
+
+
+
-    static char[] enumToString(Style.Overflow style) /// ditto
-    {   return style==Style.Overflow.VISIBLE ? "visible" : "hidden";
@@ -480 +488 @@
-    static char[] enumToString(Style.TextAlign style) /// ditto
-    {   switch(style)
-
+
+
-            case Style.TextAlign.CENTER: return "center";
-            case Style.TextAlign.RIGHT: return "right";
@@ -487 +496 @@
-    static char[] enumToString(Style.TextDecoration style) /// ditto
-    {   switch(style)
-
+
+
-            case Style.TextDecoration.UNDERLINE: return "underline";
-            case Style.TextDecoration.OVERLINE: return "overline";

trunk/src/yage/gui/surface.d

@@ -17 +17 @@
-import yage.system.graphics.render;
-import yage.system.window;
+import yage.resource.manager;
-import yage.resource.texture;
-import yage.resource.image;
@@ -35 +36 @@
-    
-    char[] text;
-    bool editable = true;   
-    bool mouseChildren = true;
-    
-    TextLayout textLayout;
-    
-    protected char[] oldText;
-    protected Texture textTexture;  
+    
+    bool editable = true;
+    bool mouseChildren = true;
+    
+    TextLayout textLayout;
-
-    /// Callback functions
-    bool delegate(Surface self) onBlur; ///
-    bool delegate(Surface self) onDraw; ///
-    bool delegate(Surface self) onFocus; ///
-    bool delegate(Surface self, byte buttons, Vec2i coordinates) onClick; /// unfinished
@@ -84 +84 @@
-        ALT   = LALT | RALT, /// ditto
-        META  = LMETA | RMETA /// ditto
-
-
-
-
+
-    
-    protected Vec2f offset;     // pixel distance of the topleft corner from parent's top left, a relative offset
-    protected Vec2f size;       // pixel outer width/height, which includes borders and padding.
-    //public Vec4f border;      // now stored in calculatedStyle
-    //protected Vec4f padding;  
-    
-    public Vec2f offsetAbsolute;    // pixel distance of top left from the window's top left at 0, 0, an absolute offset
-    
-    protected bool mouseIn;         // used to track mouseover/mouseout
-_
+
-    protected bool resize_dirty = true;
-    
-
-
-final Style defaultStyle;
-
-grabbedSurface;
-
-
-//
+ // geometry used to render this surface
+
+Style defaultStyle; // Used by getDefaultStyle()  
+protected static Surface grabbedSurface; // surface that has captured the mouse
+focusSurface; // surface that has focus for receiving input
+
+
+ * Create a new Surface at 0, 0 with 0 width and height. *
-    this()
-    {   geometry = new SurfaceGeometry();
-
+getCalculatedStyle()
-        if (!focusSurface)
-            focus();
@@ -118 +113 @@
-     * Release focus if this Surface has focus when it's destroyed. */
-    ~this()
-==
+ is 
-            focusSurface = null;
-    }
@@ -134 +129 @@
-     * Get the inner-most width/height of the surface.  Just as with CSS, this is the width/height inside the padding. */
-    float width() 
-
+
+
-    }   
-    float height() /// ditto
-
+
+
-    }
-    
@@ -143 +140 @@
-     * Get the width/height of the surface, including the width/height of the padding, but not including the border. */
-    float innerWidth()
-
+
+
-    }
-    float innerHeight() /// ditto
-
+
+
-    }
-    
@@ -187 +186 @@
-        // Search self
-        Vec2f[4] polygon;
-.ptr
+
-        if (Vec2f(x, y).inside(polygon))
-            return this;
-        
-        return null;        
-
-
-
-
-
-
-
-
-
+
-    
-    /**
@@ -250 +241 @@
-    {   
-        // Get top, right, bottom, and left in terms of pixels, or nan.
-
+      
-        Vec4f dimension;
-
-        for (int i=0; i<4; i++)
-        {   int xy = (i+1) % 2;
@@ -269 +259 @@
-        {
-            Vec2f[4] polygon;
-.ptr
+
-
-            for (int i=0; i<4; i++)
@@ -312 +302 @@
-        }
-        
-
+getCalculatedStyle()
-    }
-    
@@ -319 +309 @@
-    void update()
-    {
-
+
+
+
-        if (resize_dirty)
-        {   
@@ -325 +317 @@
-            Vec4f padding;
-            for (int i=0; i<4; i++)
-alculatedStyle
-alculatedStyle
+s
+s
-            }
-            geometry.setDimensions(Vec2f(width(), height()), border, padding);
-        
-        
-        }
-        
@@ -338 +328 @@
-            int width = cast(int)width();
-            int height = cast(int)height();
-
-
+
+
+
-            assert(textImage !is null);
-            
@@ -345 +336 @@
-                textTexture = new Texture(textImage, Texture.Format.AUTO, false, "Surface Text", true);
-            else
-            //  textTexture.commit(textImage, false, false, text, true);
-                textTexture.setImage(textImage);
-            textTexture.padding = Vec2i(nextPow2(width)-width, -(nextPow2(height)-height));
@@ -527 +517 @@
-     * Params:
-     *     polygon = A pointer to a Vec2f[4] where the result will be stored. */
-
-
+
+
+
+
-        polygon[1] = Vec3f(size.x, 0, 0).transform(style.transform).vec2f + offset; // top right
-        polygon[2] = size.vec3f.transform(style.transform).vec2f + offset;          // bottom right
-        polygon[3] = Vec3f(0, size.y, 0).transform(style.transform).vec2f + offset; // bottom left
+        return polygon;
-    }
-    
@@ -556 +549 @@
-    // Get dimensions of this Surface's parent in pixels
-    protected float parentWidth() 
-
+()
-    }
-    protected float parentHeight() // ditto
-    {   return parent ? parent.height() : Window.getInstance.getHeight(); 
+    }
+    
+
+    static Style getDefaultStyle()
+    {
+        if (!defaultStyle.fontFamily)
+        {   defaultStyle.fontFamily = ResourceManager.getDefaultFont();
+            defaultStyle.fontSize = 12;
+            defaultStyle.fontStyle = Style.FontStyle.NORMAL;
+            defaultStyle.fontWeight = Style.FontWeight.NORMAL;
+            defaultStyle.color = "black";
+            defaultStyle.textAlign = Style.TextAlign.LEFT;
+            defaultStyle.textDecoration = Style.TextDecoration.NONE;            
+        }
+        return defaultStyle;
+    }
+    
+    /**
+     * Get a style with all auto/null/inherit/% values replaced with absolute values. */
+    Style getCalculatedStyle()
+    {   
+        Style cs = style;  // calculated style
+        Style pcs = parent ? parent.getCalculatedStyle() : getDefaultStyle();
+        
+        // Font and text properties
+        cs.fontFamily = style.fontFamily is null ? pcs.fontFamily : style.fontFamily;
+        cs.fontSize = style.fontSize == CSSValue.AUTO ? pcs.fontSize : style.fontSize;
+        cs.fontStyle = style.fontStyle == Style.FontStyle.AUTO ? pcs.fontStyle : style.fontStyle;
+        cs.fontWeight = style.fontWeight == Style.FontWeight.AUTO ? pcs.fontWeight : style.fontWeight;
+        cs.textAlign = style.textAlign == Style.TextAlign.AUTO ? pcs.textAlign : style.textAlign;
+        cs.textDecoration = style.textDecoration == Style.TextDecoration.AUTO ? pcs.textDecoration : style.textDecoration;
+        
+        // Dimensional properties:
+        
+        // Convert all sizes to pixels
+        Vec2f parent_size = Vec2f(parentWidth(), parentHeight());
+        cs.width = style.width.toPx(parent_size.x);
+        cs.height = style.height.toPx(parent_size.y);       
+        for (int i=0; i<4; i++)
+        {   ubyte xy = i%2;
+            float scale_by = xy==0 ? parent_size.y : parent_size.x;         
+            cs.padding[i] = style.padding[i].toPx(scale_by, false);
+            cs.borderWidth[i] = style.borderWidth[i].toPx(scale_by, false);         
+            cs.dimension[i].value = style.dimension[i].toPx(parent_size[xy]);
+        }
+        
+        // Ensure at least 4 of the 6 of top/right/bottom/left/width/height are set.
+        for (int xy=0; xy<2; xy++)
+        {   int topLeft= xy==0 ? 3 : 0; // top or left
+            int bottomRight = xy==0 ? 1 : 2; // bottom or right
+            if (isNaN(cs.dimension[topLeft].value))
+            {   if (isNaN(cs.dimension[bottomRight].value))
+                    cs.dimension[topLeft] = 0;
+                if (isNaN(cs.size[xy].value))
+                    cs.size[xy] = parent_size[xy];          
+            }
+        }
+        return cs;
-    }
-
@@ -565 +616 @@
-     * Update the internally stored x, y, width, and height based on the style.
-     * This will also update the geometry, recurse through children, and call the resize event if necessary. */
-
+Style cs
-    {
-        Vec2f old_offset = offset;
-        Vec2f old_size = size;
-
-
-
-
+
+
-        Vec2f parent_size = Vec2f(parentWidth(), parentHeight());
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        for (int xy=0; xy<2; xy++)
-        {   int topLeft= xy==0 ? 3 : 0; // top or left
-            int bottomRight = xy==0 ? 1 : 2; // bottom or right
+
+            float grandparent_size=0, parent_border=0, parent_padding=0;
+            if (parent)
+            {   grandparent_size = xy==0 ? parent.parentHeight() : parent.parentWidth();            
+                parent_border = parent.style.borderWidth[xy].toPx(grandparent_size, false);
+                parent_padding = parent.style.padding[xy].toPx(grandparent_size, false);
+            }               
-            
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            {   size[xy] = style_size[xy];
-style_dimensions[bottomRight]
+cs.dimension[bottomRight].value
-            }
-            else if (isNaN(style_size[xy])) // width or height is NaN
-style_dimensions[topLeft]
-style_dimensions[bottomRight]
+cs.dimension[topLeft].value
+cs.dimension[bottomRight].value
-            }
-            else // bottom or right is NaN
-style_dimensions[topLeft]
+cs.dimension[topLeft].value
-                size[xy] = style_size[xy];
-        }   }   
@@ -633 +664 @@
-            resize(size-old_size); // trigger resize event.
-            foreach (c; children)
-
+c.getCalculatedStyle()
-        }
-    }

trunk/src/yage/gui/textlayout.d

@@ -368 +368 @@
-{   // Font
-    Font fontFamily;
-in
+ushor
-    Color color = {r:0, g:0, b:0, a:255};
-    Style.FontWeight fontWeight;

trunk/src/yage/resource/font.d

@@ -185 +185 @@
-        else
-        {   Letter result;
-
+   
-            // Use regular or italic (shear) matrix?
-            FT_Matrix matrix;

trunk/src/yage/scene/camera.d

@@ -203 +203 @@
-    public void buildFrustum(Scene scene)
-    {   //assert(!transform_dirty);
-
+//
-        
-        // Create the clipping matrix from the modelview and projection matrices
@@ -229 +229 @@
-        foreach (inout Plane p; frustum)
-            p = p.normalize();
+    }
+    
+    override protected void calcTransform()
+    {   super.calcTransform();
+        //if (scene)
+        //  buildFrustum(scene);
-    }
-