Changeset 53:f000d6cd0f74

Timestamp:

06/05/08 12:16:52 (7 months ago)

Author:

Diggory Hardy <diggory.hardy@gmail.com>

branch:

default

Message:

Changes to paths, command line arguments and font LCD rendering.

Use "./" instead of "" as default install dir on windows.
Implemented a command-line argument parser.
Changes to LCD filter/render-mode option handling after testing what actually happens.
Changed some FontTexture? messages and internals.

Files:

• .hgignore (added)
• codeDoc/jobs.txt (modified) (1 diff)
• data/conf/options.mtt (modified) (2 diffs)
• mde/Options.d (modified) (1 diff)
• mde/mde.d (modified) (2 diffs)
• mde/resource/FontTexture.d (modified) (10 diffs)
• mde/resource/font.d (modified) (1 diff)
• mde/resource/paths.d (modified) (8 diffs)
• mde/scheduler/Init.d (modified) (6 diffs)

codeDoc/jobs.txt

@@ -53 +53 @@
-
-Done (for git log message):
-Options: impl template to ease creating Options sub-classes.
-New OptionsFont class (currently only controls render mode and hinting).

data/conf/options.mtt

@@ -5 +5 @@
-<char[]|L10n="en-GB">
-<int|logLevel=1>
+<int|logOptions=0x1003>
-<double|pollInterval=0.01>
-
-{font}
-0
-
+2
+x30000
-
-{video}
@@ -17 +18 @@
-<bool|fullscreen=false>
-<int|screenW=1280>
-1272
+800
-<int|screenH=1024>
-993
+600
-

mde/Options.d

@@ -476 +476 @@
-OptionsMisc miscOpts;
-class OptionsMisc : Options {
-Level
+Options
-    
-    static this() {

mde/mde.d

@@ -37 +37 @@
-import tango.util.log.Log : Log, Logger;
-
-
+char[][] args
-{
-    //BEGIN Initialisation
-    Logger logger = Log.getLogger ("mde.mde");
-    logger.info ("Starting mde...");
-    
-    // Create instances now, so they can be used during init (if necessary)
@@ -49 +48 @@
-    scope Init init;
-    try {
-
+args
-    } catch (InitException e) {
-        logger.fatal ("Initialisation failed: " ~ e.msg);

mde/resource/FontTexture.d

@@ -33 +33 @@
-import Utf = tango.text.convert.Utf;
-import tango.util.log.Log : Log, Logger;
-import tango.io.Stdout;
-
-private Logger logger;
@@ -75 +74 @@
-    {
-        debug scope (failure)
-warn
+error
-        
-        if (cache.cacheVer == cacheVer) // Existing cache is up-to-date
@@ -166 +165 @@
-        updateCache (face, str, cache); // update if necessary
-        debug scope (failure)
-warn
+error
-        
-        glEnable (GL_TEXTURE_2D);
@@ -199 +198 @@
-    void addGlyph (FT_Face face, dchar chr) {
-        debug scope (failure)
-warn
+error
-        
-        auto gi = FT_Get_Char_Index (face, chr);
@@ -209 +208 @@
-        
-        auto b = g.bitmap;
-        if (b.pitch != b.width) {
-            char[128] tmp;
-            logger.warn (logger.format (tmp, "b.pitch is {}, b.width is {}", b.pitch, b.width));
-            //throw new fontGlyphException ("Unsupported freetype bitmap: b.pitch != b.width");
-        }
-        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-        //glPixelStorei (GL_UNPACK_ROW_LENGTH, b.pitch);
@@ -235 +229 @@
-        // if here, no existing texture had the room for the glyph so create a new texture
-        // NOTE: check if using more than one texture impacts performance due to texture switching
-
+new 
-        tex ~= TexPacker.create();
-        assert (tex[$-1].addGlyph (ga), "Failed to fit glyph in a new texture but addGlyph didn't throw");
@@ -244 +238 @@
-        ubyte[] buffer; // use our own pointer, since for LCD modes we need to perform a conversion
-        if (b.pixel_mode == FT_Pixel_Mode.FT_PIXEL_MODE_GRAY && b.num_grays == 256) {
+            assert (b.pitch == b.width, "Have assumed b.pitch == b.width for gray glyphs.");
-            buffer = b.buffer[0..b.pitch*b.rows];
-            format = GL_LUMINANCE;
@@ -358 +353 @@
-            throw new fontGlyphException ("Glyph too large to fit texture!");
-        
+        attr.texID = texID;     // Set now. Possibly reset if new texture is needed.
+        if (attr.w == 0) return true;   // 0 sized glyph; x and y are unimportant.
+        
-        bool cantFitExtraLine = nextYPos + attr.h >= dimH;
-        foreach (ref line; lines) {
@@ -381 +379 @@
-        line.yPos = nextYPos;
-        line.height = attr.h * EXTRA_H;
-        Stdout.format ("Creating new line of height {}", line.height).newline;
-        line.length = attr.w;
-        size_t i = 0;
@@ -390 +387 @@
-        attr.x = 0; // first glyph in the line
-        attr.y = line.yPos;
-        attr.texID = texID;
-        return true;
-    }

mde/resource/font.d

@@ -72 +72 @@
-            }
-            
-
-
-
-
-
-
+
+
+
+
+
+
+
-                logger.warn ("Your FreeType 2 library may compiled without support for LCD/sub-pixel rendering.");
-
-
-
-
-
+
+
+
+
+
+
-                Options.setInt ("font", "renderMode", FT_LOAD_TARGET_NORMAL);
-            }

mde/resource/paths.d

@@ -40 +40 @@
-import tango.io.Console;
-import tango.io.FilePath;
-
-
+
-//import tango.scrapple.sys.win32.Registry;     // Trouble getting this to work
-
@@ -116 +115 @@
-    }
-    
+    /// Print all paths found.
+    static void printPaths () {
+        Cout ("Data paths found:");
+        dataDir.coutPaths;
+        Cout ("\nConf paths found:");
+        confDir.coutPaths;
+        Cout ("\nLog file directory:\n\t")(logDir).newline;
+    }
+    
-private:
-    PathView[] getFiles (char[] filename, PRIORITY readOrder)
@@ -166 +174 @@
-    }
-    
+    void coutPaths () {
+        if (pathsLen) {
+            for (size_t i = 0; i < pathsLen; ++i)
+                Cout ("\n\t" ~ paths[i]);
+        } else
+            Cout ("[none]");
+    }
+    
-    // Use a static array to store all possible paths with separate length counters.
-    // Lowest priority paths are first.
@@ -186 +202 @@
-// FIXME: use tango/sys/Environment.d
-version (linux) {
-
+
+
-        // Home directory:
-fromStringz (getenv (toStringz ("HOME"))
+Environment.get("HOME", "."
-        
-        // Base paths:
-        // Static data (must exist):
-
+
+
-        // Config (can just use defaults if necessary, so long as we can save afterwards):
-        PathView userPath = findPath (true, HOME~"/.config/mde", HOME~"/.mde");
@@ -199 +217 @@
-        dataDir.addPath (staticPath.toString);      // we know this is valid anyway
-        dataDir.tryPath (userPath.toString ~ DATA);
+        if (extraDataPath) dataDir.tryPath (extraDataPath);
-        if (!dataDir.pathsLen) throw new mdeException ("Fatal: no data path found!");
-        
@@ -205 +224 @@
-        confDir.tryPath ("/etc/mde");
-        confDir.tryPath (userPath.toString ~ CONF, true);
+        if (extraConfPath) confDir.tryPath (extraConfPath);
-        if (!confDir.pathsLen) throw new mdeException ("Fatal: no conf path found!");
-        
@@ -211 +231 @@
-    }
-} else version (Windows) {
-
+char[] base = "./"
-        //FIXME: Get path from registry
-        //FIXME: Get user path (Docs&Settings/USER/Local Settings/Application data/mde)
+        //http://www.dsource.org/projects/tango/forums/topic/187
-        
-        // Base paths:
-"");
-userPath = findPath (true, "user");   // FIXME: see above
-staticPath = findPath (false, "data");
+base)
+staticPath = findPath (false, installPath.append("data").toString);
+userPath = findPath (true, installPath.append("user").toString);   // FIXME: see above
-        
-        // Static data paths:
-        dataDir.addPath (staticPath.toString);   // we know this is valid anyway
-        dataDir.tryPath (userPath.toString ~ DATA);
+        if (extraDataPath) dataDir.tryPath (extraDataPath);
-        if (!dataDir.pathsLen) throw new mdeException ("Fatal: no data path found!");
-        
-        // Configuration paths:
-        confDir.tryPath (staticPath.toString ~ CONF);
-"conf"
+installPath.append("user").toString
-        confDir.tryPath (userPath.toString ~ CONF, true);
+        if (extraConfPath) confDir.tryPath (extraConfPath);
-        if (!confDir.pathsLen) throw new mdeException ("Fatal: no conf path found!");
-        
@@ -238 +261 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
-// The maximum number of paths for any one "directory".
-// There are NO CHECKS that this is not exceeded.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // no valid path...
-
-
-throw new mde
-
+    
+    
+    throw new Path
+    
-//END Path resolution
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    
+     
+     
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
-            
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
-    
-    /** Get identifiers for all sections.
-
-
-
+ 
+ 
+ 
-    ID[] getSectionNames () {
-        ID[] names;
-        for (int i = readersLen-1; i >= 0; --i) names ~= readers[i].getSectionNames;
-        return names;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}

mde/scheduler/Init.d

@@ -35 +35 @@
-import tango.core.Exception;
-import tango.stdc.stringz : fromStringz;
+import tango.io.Console;    // for printing command-line usage
+import TimeStamp = tango.text.convert.TimeStamp, tango.time.WallClock;  // output date in log file
+import tango.util.Arguments;
-import tango.util.log.Log : Log, Logger;
-import tango.util.log.ConsoleAppender : ConsoleAppender;
@@ -59 +62 @@
-static this()
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-}
-static ~this()
@@ -125 +103 @@
-    * Hence a list of clean-up functions is built similarly to scope(failure) --- see addCleanupFct.
-    */
-
+char[][] cmdArgs
-    {
-        debug logger.trace ("Init: starting");
-        
-        //BEGIN Pre-init (stage init0)
+        //FIXME: warn on invalid arguments, including base-path on non-Windows
+        // But Arguments doesn't support this (in tango 0.99.6 and in r3563).
+        Arguments args;
+        try {
+            args = new Arguments();
+            args.define("base-path").parameters(1);
+            args.define("data-path").parameters(1,-1);
+            args.define("conf-path").parameters(1,-1);
+            args.define("paths");
+            args.define("q").aliases(["quick-exit"]);
+            args.define("help").aliases(["h"]);
+            args.parse(cmdArgs);
+            if (args.contains("help"))  // lazy way to print help
+                throw new InitException ("Help requested"); // and stop
+        } catch (Exception e) {
+            printUsage(cmdArgs[0]);
+            throw new InitException ("Parsing arguments failed: "~e.msg);
+        }
+        
+    // Find/create paths:
+    try {
+            if (args.contains("data-path"))
+                paths.extraDataPath = args["data-path"];
+            if (args.contains("conf-path"))
+                paths.extraConfPath = args["conf-path"];
+            if (args.contains("base-path"))
+                paths.resolvePaths (args["base-path"]);
+            else
+                paths.resolvePaths();
+    } catch (Exception e) {
+            throw new InitException ("Resolving paths failed: " ~ e.msg);
+    }
+        if (args.contains("paths")) {
+            paths.mdeDirectory.printPaths;
+            throw new InitException ("Paths requested");    // lazy way to stop
+        }
+        debug logger.trace ("Init: resolved paths successfully");
+    
-        /* Load options now. Don't load in a thread since:
-
-Most work is probably disk acces
-.
+ & most work is probably disk access
+It enables logging to be controlled by option
+
-        try {
-            Options.load();
@@ -139 +155 @@
-            throw new InitException ("Loading options failed: " ~ e.msg);
-        }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        //BEGIN Load dynamic libraries
@@ -161 +216 @@
-            throw new InitException ("Loading dynamic libraries failed (see above).");
-        }
+        debug logger.trace ("Init: dynamic libraries loaded");
-        //END Load dynamic libraries
-
-debug logger.trace ("Init: dynamic libraries loaded");
+//END Pre-init
+
-        
-        //BEGIN Init (stages init2, init4)
@@ -294 +350 @@
-            return false;                   // Done successfully
-        }
+    //END runStage...
+        
+        void printUsage (char[] progName) {
+            Cout ("mde [no version]").newline;
+            Cout ("Usage:").newline;
+            Cout (progName ~ ` [options]`).newline;
+            version(Windows)
+                    Cout (
+`  --base-path path Use path as the base (install) path (Windows only). It
+            should contain the "data" directory.`).newline;
+            Cout (
+`  --data-path path(s)  Add path(s) as a potential location for data files.
+            First path argument becomes the preffered location to
+            load data files from.
+  --conf-path path(s)   Add path(s) as a potential location for config files.
+            Configuration in the first path given take highest
+            priority.
+  --paths       Print all paths found and exit.
+  --quick-exit, -q  Exit immediately, without entering main loop.
+  --help, -h        Print this message.`).newline;
+        }
-    }
-    //END runStage...
-    
-    debug (mdeUnitTest) unittest {