Changeset 86:79d816b3e2d2

Timestamp:

09/12/08 12:36:14 (4 months ago)

Author:

Diggory Hardy <diggory.hardy@gmail.com>

branch:

default

Message:

New InitStage? system, Screen & Screen.Drawable, separate testing and guiDemo binaries.

This (and the previous) commit are the result of several quite significant changes to mde. All the unittests run, but it hasn't had a huge amount of testing so don't be surprised if bugs show up.

Files:

• codeDoc/jobs.txt (modified) (1 diff)
• mde/file/deserialize.d (modified) (1 diff)
• mde/file/mergetag/Writer.d (modified) (3 diffs)
• mde/file/serialize.d (modified) (1 diff)
• mde/font/FontTexture.d (modified) (1 diff)
• mde/font/font.d (modified) (6 diffs)
• mde/gui/WidgetManager.d (modified) (3 diffs)
• mde/input/Config.d (modified) (1 diff)
• mde/input/joystick.d (modified) (1 diff)
• mde/lookup/Options.d (modified) (4 diffs)
• mde/mde.d (modified) (2 diffs)
• mde/setup/Init.d (modified) (4 diffs)
• mde/setup/Screen.d (modified) (7 diffs)

codeDoc/jobs.txt

@@ -4 +4 @@
-
-In progress:
-
-
-
-
+
-CircularIterator
-unittest again!

mde/file/deserialize.d

@@ -526 +526 @@
-        } catch (Exception e) {
-            r = true;
-            logger.trace ("Exception caught: "~e.msg);
-        }
-        return r;

mde/file/mergetag/Writer.d

@@ -163 +163 @@
-        _path = path;
-        _dataset = ds;
-        foreach (i,s; _dataset.sec)
-            debug logger.trace ("sec ID length: {}", i.length);
-    }
-//END CTOR / DTOR
@@ -181 +179 @@
-        
-        try {
-            debug logger.trace ("W.w: 1");
-            FileConduit conduit;    // actual conduit; don't use directly when there's content in the buffer
-            IBuffer buffer;     // write strings directly to this (use opCall(void[]) )
-            
-            debug logger.trace ("W.w: 2");
-            // Open a conduit on the file:
-            conduit = new FileConduit (_path, FileConduit.WriteCreate);
-            scope(exit) conduit.close();
-            
-            debug logger.trace ("W.w: 3");
-            buffer = new Buffer(conduit);   // And a buffer
-            scope(exit) buffer.flush();
-            
-            debug logger.trace ("W.w: 4");
-            // Write the header:
-            buffer ("{MT" ~ MTFormatVersion.CurrentString ~ "}" ~ Eol);
-            debug logger.trace ("W.w: 5");
-            if (_dataset.header !is null) writeSection (buffer, _dataset.header);
-        
-            debug logger.trace ("W.w: 6");
-            // Write the rest:
-            foreach (ID id, IDataSection sec; _dataset.sec) {
-                debug logger.trace ("W.w: 71");
-                writeSectionIdentifier (buffer, id);
-                debug logger.trace ("W.w: 72");
-                writeSection (buffer, sec);
-            }
-            
-            debug logger.trace ("W.w: 8");
-            buffer.flush();
-            
-            debug logger.trace ("W.w: 9");
-        }
-        catch (IOException e) {
@@ -223 +211 @@
-        
-    private void writeSectionIdentifier (IBuffer buffer, ID id) {
-        debug logger.trace ("W.wSI: 0");
-        debug logger.trace ("W.wSI: id ({})",id.length);
-        debug logger.trace ("W.wSI: Eol ({})",Eol.length);
-        char[] tp = "{" ~ cast(char[])id ~ "}" ~ Eol;
-        debug logger.trace ("W.wSI: 0.1");
-        debug logger.trace ("W.wSI: string ({}): {}",tp.length, tp);
-        buffer (tp);
-        debug logger.trace ("W.wSI: 1");
-    }
-    

mde/file/serialize.d

@@ -312 +312 @@
-        } catch (Exception e) {
-            r = true;
-            logger.trace ("Exception caught: "~e.msg);
-        }
-        return r;

mde/font/FontTexture.d

@@ -330 +330 @@
-        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);

mde/font/font.d

@@ -131 +131 @@
-        /** Cleanup: delete all fonts. */
-        StageState cleanup () {
-
+ (each has an FT_Face object needing to be freed)
-            foreach (fs; fonts)
-                delete fs;
-
-
-
-
+
-            FT_Done_FreeType (library); // free the library
-            
@@ -227 +224 @@
-     * This function will only actually update the cache if it is invalid, caused either by the
-     * font being changed or if cache.cacheVer < 0. */
-
+
+
+
+
-        try {
-            fontTex.updateCache (face, str, cache);
@@ -260 +260 @@
-     * of a text block is to use a TextBlock cache and update it, either with this function or with
-     * the updateBlock function. */
-
+
+
+
+
-        try {
-            fontTex.drawCache (face, str, cache, x, y, col);
@@ -268 +271 @@
-    }
-    /** ditto */
-
+
+
+
+
-        try {
-            // Using the cache method for one-time use is slightly less than optimal, but doing so
@@ -284 +290 @@
-     * Set the alpha by calling glColor*() first. See FontTexture.drawCacheA()'s documentation for
-     * details. */
-
+
+
+
+
-        try {
-            fontTex.drawCacheA (face, str, cache, x, y, col);
@@ -298 +307 @@
-    
-    ~this () {
-        debug logger.trace ("{}.~this: start", this);
-        FT_Done_Face (face);
-        debug logger.trace ("{}.~this: done", this);
-    }
-    

mde/gui/WidgetManager.d

@@ -51 +51 @@
- * Aside from the IWidgetManager methods, this class should be thread-safe.
- *************************************************************************************************/
-
+I
-    /** Construct a new widget manager.
-     * 
@@ -75 +75 @@
-    /** Draw the gui. */
-    void draw() {
-        debug logger.trace ("drawing; w,h = {},{}",w,h);
-        synchronized(mutex)
-            if (child)
@@ -118 +117 @@
-    
-    
-
+I
-        mutex.lock;
-        scope(exit) mutex.unlock;

mde/input/Config.d

@@ -162 +162 @@
-            else debug logger.error ("Ended up with DataSection of wrong type; this should never happen.");
-        }
-        
-        debug (MDE_CONFIG_DUMP) {
-            logger.trace ("Loaded {} config sections.", configs.length);
-            foreach (id, cfg; configs) {
-                logger.trace ("Section " ~ id ~
-                ":\n\tbutton:\t\t" ~ parseFrom!(uint[][][uint])(cfg.button) ~
-                "\n\taxis:\t\t" ~ parseFrom!(uint[][][uint])(cfg.axis) ~
-                "\n\trelMotion:\t" ~ parseFrom!(uint[][][uint])(cfg.relMotion) );
-            }
-        }
-    }
-    

mde/input/joystick.d

@@ -55 +55 @@
-    foreach (js; joysticks) {
-        // FIXME: This sometimes causes a SIGSEGV (Address boundary error) when init fails.
-        debug logger.trace ("Closing joysticks (this sometimes fails when mde exits prematurely)");
-        if(js !is null) SDL_JoystickClose(js);  // only close if successfully opened
-        debug logger.trace ("Done closing joysticks");
-    }
-    return StageState.INACTIVE;

mde/lookup/Options.d

@@ -137 +137 @@
-            assert (((cast(ID) i) in subClasses) is null);  // Don't allow a silent replacement
-        } body {
-            debug logger.trace ("Adding Options subClass: "~i);
-            subClasses[cast(ID) i] = c;
-        }
@@ -170 +169 @@
-        void save () {
-            if (!changed) return;   // no changes to save
-
-
-
-
-
-
+
+
-            DataSet ds = new DataSet();
- {
+
-                ds.sec[id] = subOpts.optionChanges;
-                debug logger.trace ("Saving options section: "~id);
-            }
-            foreach (i,s; ds.sec)
-                debug logger.trace ("sec ID length: {}", i.length);
-            debug logger.trace ("0");
-            
-            // Read locally-stored options
@@ -190 +180 @@
-                reader = confDir.makeMTReader (fileName, PRIORITY.HIGH_ONLY, ds);
-                reader.dataSecCreator = delegate IDataSection(ID id) {
-trace ("New section to save ignored
+warn ("New section appearing in options.mtt during save (ignored & overwritten)
-                    return null;    // All recognised sections are already in the dataset.
-                };
@@ -202 +192 @@
-        
-            try {
-                debug logger.trace ("1");
-                IWriter writer;
-
-
-
-
-
-
-
+
+
-            } catch (Exception e) {
-                logger.error ("Saving options aborted: "~e.msg);

mde/mde.d

@@ -31 +31 @@
-import tango.time.Clock;                // Clock.now()
-import tango.util.log.Log : Log, Logger;
-
+                   // These modules contain unittests which wouldn't be run otherwise.
-    import mde.file.ssi;
-    import mde.file.mergetag.mdeUT;
-}
-
+//BEGIN A simple drawable to print a message in the window.
+import mde.font.font;
+class SimpleDrawable : Screen.IDrawable {
+    this () {
+        msg = "Welcome to mde.\nThis executable is only for testing, and\nas such doesn't do anything interesting.";
+        debug msg ~= "\nRunning in debug mode.";
+        font = FontStyle.get("default");// get the default or fallback font
+    }
+    void sizeEvent (int,int) {};        // Don't care what the size is
+    void draw () {
+        font.textBlock (16,32, msg, textCache, Colour.WHITE);
+    }
+    char[] msg;
+    FontStyle font;
+    TextBlock textCache;
+}
+//END A simple drawable to print a message in the window.
+
+
-int main(char[][] args)
-{
+    Logger logger = Log.getLogger ("mde.mde");
+    
-    // If compiled with unittests, notify that they completed and exit:
-    debug (mdeUnitTest) {
-        Logger logger = Log.getLogger ("mde.mde");
-        logger.info ("Compiled unittests have completed; terminating.");
-        return 0;
@@ -46 +66 @@
-    
-    scope Init init = new Init(args);   // initialize mde
+    
+    // Note: must create the drawable after init, since it uses font (initialized in init).
+    Screen.addDrawable (new SimpleDrawable);    // a drawable to print a message.
-    
-    // Make sure pollInterval has a sane value. FIXME: get Options class to enforce range

mde/setup/Init.d

@@ -258 +258 @@
-            }
-        }
-        debug logger.trace ("Added {} init/cleanup stages", toRun.size);
-        int numWorking = miscOpts.numThreads;
-        bool abortInit = false;
@@ -276 +275 @@
-         * When notified, threads start at 1. */
-        void initThreadFct () {
-            debug logger.trace ("initThreadFct: starting");
-            try {       // created as a thread - must not throw exceptions
-            InitStage* stage;
@@ -347 +345 @@
-            }
-            toRunC.notifyAll(); // Most likely if we're exiting, we should make sure others aren't waiting.
-            debug logger.trace ("initThreadFct: returning");
-            return;
-        }
@@ -397 +394 @@
-    
-    debug (mdeUnitTest) unittest {
-        logger.trace ("Starting unittest");
-        
-        auto realInit = stages;         // backup the real init stages
-        stages = new typeof(stages);    // an empty test-bed

mde/setup/Screen.d

@@ -36 +36 @@
-    // TYPES (these mustn't be static):
-    /** Interface for anything hooking into the screen for drawing, etc. */
-
+I
-        /** Called on window creation and whenever the window manager resizes the window, before
-         * the new size is set. The new size is passed.
@@ -64 +64 @@
-            throw new InitException ("SDL Initialization failed");
-        }
-        debug logger.trace ("SDL initialised");
-        return StageState.ACTIVE;
-    }
@@ -100 +99 @@
-        
-        // Open a window
-        debug logger.trace ("Opening a window (this can crash if the libraries are messed up)");
-        if (setWindow (w, h)) {
-            throw new InitException ("Failed to open a window");
@@ -170 +168 @@
-    }
-    
-
+I
-     *
-
-
-
+
+
+
+
-        drawables ~= d;
-    }
@@ -182 +181 @@
-        glClear(GL_COLOR_BUFFER_BIT);
-        
-
+I
-            d.draw;
-        
-
-
-
-
+
-        
-        // Error check:
@@ -207 +203 @@
-            d.sizeEvent (w,h);
-        
-
+//
-        if (SDL_SetVideoMode (w, h, 32, flags) is null) {
-            logger.fatal ("Unable to set video mode:");
@@ -264 +260 @@
-private:
-    uint flags = 0;
-
+I
-    Logger logger;
-    OptionsVideo vidOpts;