Split the sample in three source files + three header files, for improved

clarity. Now there is a 'life' module (main app), a 'game' module (game
logic) and a 'dialogs' module (guess what).

Also, speeded up drawing a lot.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in
index a2d5c4910c7593aa783b3b9263bad8665ce74d11..727a0349ef7abc9986453a2b7660b446267ebaa3 100644 (file)
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -15,7 +15,7 @@ program_dir = demos/life
 
 PROGRAM=life
 
 
 PROGRAM=life
 

-OBJECTS=$(PROGRAM).o
+OBJECTS=$(PROGRAM).o dialogs.o game.o

 
 include ../../src/makeprog.env
 
 
 include ../../src/makeprog.env
 

diff --git a/demos/life/dialogs.cpp b/demos/life/dialogs.cpp
new file mode 100644 (file)
index 0000000..9e01bbf
--- /dev/null
+++ b/demos/life/dialogs.cpp
@@ -0,0 +1,212 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        dialogs.cpp
+// Purpose:     Life! dialogs
+// Author:      Guillermo Rodriguez Garcia, <guille@iies.es>
+// Modified by:
+// Created:     Jan/2000
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000, Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ==========================================================================
+// declarations
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// headers
+// --------------------------------------------------------------------------
+
+#ifdef __GNUG__
+    #pragma implementation "dialogs.h"
+#endif
+
+// for compilers that support precompilation, includes "wx/wx.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// for all others, include the necessary headers
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+#include "wx/statline.h"
+#include "wx/spinctrl.h"
+
+#include "dialogs.h"
+#include "life.h"
+#include "game.h"
+
+// --------------------------------------------------------------------------
+// constants
+// --------------------------------------------------------------------------
+
+// IDs for the controls and the menu commands
+enum
+{
+    // listbox in samples dialog
+    ID_LISTBOX = 2001
+};
+
+// sample configurations
+#include "samples.inc"
+
+// --------------------------------------------------------------------------
+// event tables and other macros for wxWindows
+// --------------------------------------------------------------------------
+
+// Event tables
+BEGIN_EVENT_TABLE(LifeNewGameDialog, wxDialog)
+    EVT_BUTTON  (wxID_OK,    LifeNewGameDialog::OnOK)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(LifeSamplesDialog, wxDialog)
+    EVT_LISTBOX (ID_LISTBOX, LifeSamplesDialog::OnListBox)
+END_EVENT_TABLE()
+
+
+// ==========================================================================
+// implementation
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// LifeNewGameDialog
+// --------------------------------------------------------------------------
+
+LifeNewGameDialog::LifeNewGameDialog(wxWindow *parent, int *w, int *h)
+                 : wxDialog(parent, -1,
+                            _("New game"),
+                            wxDefaultPosition,
+                            wxDefaultSize,
+                            wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL)
+{
+    m_w = w;
+    m_h = h;
+
+    // spin ctrls
+    m_spinctrlw = new wxSpinCtrl( this, -1 );
+    m_spinctrlw->SetValue(*m_w);
+    m_spinctrlw->SetRange(LIFE_MIN, LIFE_MAX);
+
+    m_spinctrlh = new wxSpinCtrl( this, -1 );
+    m_spinctrlh->SetValue(*m_h);
+    m_spinctrlh->SetRange(LIFE_MIN, LIFE_MAX);
+
+    // component layout
+    wxBoxSizer *inputsizer1 = new wxBoxSizer( wxHORIZONTAL );
+    inputsizer1->Add( new wxStaticText(this, -1, _("Width")), 1, wxCENTRE | wxLEFT, 20);
+    inputsizer1->Add( m_spinctrlw, 2, wxCENTRE | wxLEFT | wxRIGHT, 20 );
+
+    wxBoxSizer *inputsizer2 = new wxBoxSizer( wxHORIZONTAL );
+    inputsizer2->Add( new wxStaticText(this, -1, _("Height")), 1, wxCENTRE | wxLEFT, 20);
+    inputsizer2->Add( m_spinctrlh, 2, wxCENTRE | wxLEFT | wxRIGHT, 20 );
+
+    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+    topsizer->Add( CreateTextSizer(_("Enter board dimensions")), 0, wxALL, 10 );
+    topsizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 10);
+    topsizer->Add( inputsizer1, 1, wxGROW | wxLEFT | wxRIGHT, 5 );
+    topsizer->Add( inputsizer2, 1, wxGROW | wxLEFT | wxRIGHT, 5 );
+    topsizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT | wxTOP, 10);
+    topsizer->Add( CreateButtonSizer(wxOK | wxCANCEL), 0, wxCENTRE | wxALL, 10);
+
+    // activate
+    SetSizer(topsizer);
+    SetAutoLayout(TRUE);
+    topsizer->SetSizeHints(this);
+    topsizer->Fit(this);
+    Centre(wxBOTH);
+}
+
+void LifeNewGameDialog::OnOK(wxCommandEvent& WXUNUSED(event))
+{
+    *m_w = m_spinctrlw->GetValue();
+    *m_h = m_spinctrlh->GetValue();
+
+    EndModal(wxID_OK);
+}
+
+// --------------------------------------------------------------------------
+// LifeSamplesDialog
+// --------------------------------------------------------------------------
+
+LifeSamplesDialog::LifeSamplesDialog(wxWindow *parent)
+                 : wxDialog(parent, -1,
+                            _("Sample games"),
+                            wxDefaultPosition,
+                            wxDefaultSize,
+                            wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL)
+{
+    m_value = 0;
+   
+    // create and populate the list of available samples
+    m_list = new wxListBox( this, ID_LISTBOX,
+        wxDefaultPosition,
+        wxDefaultSize,
+        0, NULL,
+        wxLB_SINGLE | wxLB_NEEDED_SB | wxLB_HSCROLL );
+
+    for (unsigned i = 0; i < (sizeof(g_shapes) / sizeof(LifeShape)); i++)
+        m_list->Append(g_shapes[i].m_name);
+
+    // descriptions
+    wxStaticBox *statbox = new wxStaticBox( this, -1, _("Description"));
+    m_life   = new Life( 16, 16 );
+    m_life->SetShape(g_shapes[0]);
+    m_canvas = new LifeCanvas( this, m_life, FALSE );
+    m_text   = new wxTextCtrl( this, -1,
+        g_shapes[0].m_desc,
+        wxDefaultPosition,
+        wxSize(300, 60),
+        wxTE_MULTILINE | wxTE_READONLY);
+
+    // layout components
+    wxStaticBoxSizer *sizer1 = new wxStaticBoxSizer( statbox, wxVERTICAL );
+    sizer1->Add( m_canvas, 2, wxGROW | wxCENTRE | wxALL, 5);
+    sizer1->Add( m_text, 1, wxGROW | wxCENTRE | wxALL, 5 );
+
+    wxBoxSizer *sizer2 = new wxBoxSizer( wxHORIZONTAL );
+    sizer2->Add( m_list, 0, wxGROW | wxCENTRE | wxALL, 5 );
+    sizer2->Add( sizer1, 1, wxGROW | wxCENTRE | wxALL, 5 );
+
+    wxBoxSizer *sizer3 = new wxBoxSizer( wxVERTICAL );
+    sizer3->Add( CreateTextSizer(_("Select one configuration")), 0, wxALL, 10 );
+    sizer3->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 10 );
+    sizer3->Add( sizer2, 1, wxGROW | wxCENTRE | wxALL, 5 );
+    sizer3->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 10 );
+    sizer3->Add( CreateButtonSizer(wxOK | wxCANCEL), 0, wxCENTRE | wxALL, 10 );
+
+    // activate
+    SetSizer(sizer3);
+    SetAutoLayout(TRUE);
+    sizer3->SetSizeHints(this);
+    sizer3->Fit(this);
+    Centre(wxBOTH);
+}
+
+LifeSamplesDialog::~LifeSamplesDialog()
+{
+    m_canvas->Destroy();
+    delete m_life;
+}
+
+int LifeSamplesDialog::GetValue()
+{
+    return m_value;
+}
+
+void LifeSamplesDialog::OnListBox(wxCommandEvent& event)
+{
+    if (event.GetSelection() != -1)
+    {
+        m_value = m_list->GetSelection();
+        m_text->SetValue(g_shapes[ event.GetSelection() ].m_desc);
+        m_life->SetShape(g_shapes[ event.GetSelection() ]);
+
+        m_canvas->DrawEverything(TRUE);     // force redraw everything
+        m_canvas->Refresh(FALSE);           // do not erase background
+    }
+}
+

diff --git a/demos/life/dialogs.h b/demos/life/dialogs.h
new file mode 100644 (file)
index 0000000..4c503cf
--- /dev/null
+++ b/demos/life/dialogs.h
@@ -0,0 +1,92 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        dialogs.h
+// Purpose:     Life! dialogs
+// Author:      Guillermo Rodriguez Garcia, <guille@iies.es>
+// Modified by:
+// Created:     Jan/2000
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000, Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _LIFE_DIALOGS_H_
+#define _LIFE_DIALOGS_H_
+
+#ifdef __GNUG__
+    #pragma interface "dialogs.h"
+#endif
+
+// for compilers that support precompilation, includes "wx/wx.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// for all others, include the necessary headers
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+#include "wx/spinctrl.h"
+
+#include "life.h"
+#include "game.h"
+
+
+// sample configurations
+extern LifeShape g_shapes[];
+
+
+// --------------------------------------------------------------------------
+// LifeNewGameDialog
+// --------------------------------------------------------------------------
+
+class LifeNewGameDialog : public wxDialog
+{
+public:
+    // ctor
+    LifeNewGameDialog(wxWindow *parent, int *w, int *h);
+
+    // event handlers
+    void OnOK(wxCommandEvent& event);
+
+private:
+    // any class wishing to process wxWindows events must use this macro
+    DECLARE_EVENT_TABLE();
+
+    int        *m_w;
+    int        *m_h;
+    wxSpinCtrl *m_spinctrlw;
+    wxSpinCtrl *m_spinctrlh;
+};
+
+// --------------------------------------------------------------------------
+// LifeSamplesDialog
+// --------------------------------------------------------------------------
+
+class LifeSamplesDialog : public wxDialog
+{
+public:
+    // ctor and dtor
+    LifeSamplesDialog(wxWindow *parent);
+    ~LifeSamplesDialog();
+
+    // members
+    int GetValue();
+
+    // event handlers
+    void OnListBox(wxCommandEvent &event);
+
+private:
+    // any class wishing to process wxWindows events must use this macro
+    DECLARE_EVENT_TABLE();
+
+    int         m_value;
+    wxListBox  *m_list;
+    wxTextCtrl *m_text;
+    LifeCanvas *m_canvas;
+    Life       *m_life;
+};
+
+#endif  // _LIFE_DIALOGS_H_

diff --git a/demos/life/game.cpp b/demos/life/game.cpp
new file mode 100644 (file)
index 0000000..ce51d42
--- /dev/null
+++ b/demos/life/game.cpp
@@ -0,0 +1,226 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        game.cpp
+// Purpose:     Life! game logic
+// Author:      Guillermo Rodriguez Garcia, <guille@iies.es>
+// Modified by:
+// Created:     Jan/2000
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000, Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ==========================================================================
+// declarations
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// headers
+// --------------------------------------------------------------------------
+
+#ifdef __GNUG__
+    #pragma implementation "game.h"
+#endif
+
+// for compilers that support precompilation, includes "wx/wx.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// for all others, include the necessary headers
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+#include "game.h"
+
+// ==========================================================================
+// implementation
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// Life
+// --------------------------------------------------------------------------
+
+/* Format of the cell: (32 bit integer)
+ *
+ * 0yyyyyyy yyyyyy0x xxxxxxxxx xxx000ff
+ *
+ * y = y coordinate (13 bits)
+ * x = x coordinate (13 bits)
+ * f = flags (2 bits)
+ *
+ * OK, there is a reason for this, I promise :-). But I won't explain
+ * it now; it will be more clear when I implement the optimized life
+ * algorithm for large universes.
+ */
+
+Life::Life(int width, int height)
+{            
+    m_wrap = TRUE;
+    Create(width, height);
+}
+
+Life::~Life()
+{
+    Destroy();
+}
+
+void Life::Create(int width, int height)
+{
+    wxASSERT(width > 0 && height > 0 && m_cells.IsEmpty());
+
+    m_width = width;
+    m_height = height;
+
+    // preallocate memory to speed up initialization
+    m_cells.Alloc(m_width * m_height);
+    m_changed.Alloc(1000);
+
+    // add all cells
+    for (int j = 0; j < m_height; j++)
+        for (int i = 0; i < m_width; i++)
+            m_cells.Add( MakeCell(i, j, FALSE) );
+}
+
+void Life::Destroy()
+{
+    m_cells.Clear();
+    m_changed.Clear();
+}
+
+void Life::Clear()
+{
+    // set all cells in the array to dead
+    for (int j = 0; j < m_height; j++)
+        for (int i = 0; i < m_width; i++)
+            m_cells[j * m_width + i] &= ~CELL_ALIVE;
+}
+
+Cell Life::MakeCell(int i, int j, bool alive) const
+{
+    return (Cell)((j << 18) | (i << 5) | (alive? CELL_ALIVE : CELL_DEAD));
+}
+
+bool Life::IsAlive(int i, int j) const
+{
+    wxASSERT(i >= 0 && j >= 0 && i < m_width && j < m_height);
+
+    return (m_cells[j * m_width + i] & CELL_ALIVE);
+}
+
+bool Life::IsAlive(Cell c) const { return (c & CELL_ALIVE); };
+int  Life::GetX(Cell c) const    { return (c >> 5) & 0x1fff; };
+int  Life::GetY(Cell c) const    { return (c >> 18); };
+
+Cell Life::SetCell(int i, int j, bool alive)
+{
+    wxASSERT(i >= 0 && j >= 0 && i < m_width && j < m_height);
+
+    Cell c = MakeCell(i, j, alive);
+
+    m_cells[j * m_width + i] = c;
+    return c;
+}
+
+void Life::SetShape(LifeShape& shape)
+{
+    wxASSERT((m_width >= shape.m_width) && (m_height >= shape.m_height));
+
+    int i0  = (m_width - shape.m_width) / 2;
+    int j0  = (m_height - shape.m_height) / 2;
+    char *p = shape.m_data;
+
+    Clear();
+    for (int j = j0; j < j0 + shape.m_height; j++)
+        for (int i = i0; i < i0 + shape.m_width; i++)
+            SetCell(i, j, *(p++) == '*');
+}
+
+bool Life::NextTic()
+{
+    int i, j;
+
+    m_changed.Empty();
+
+    /* 1st pass. Find and mark deaths and births for this generation.
+     *
+     * Rules:
+     *   An organism with <= 1 neighbors will die due to isolation.
+     *   An organism with >= 4 neighbors will die due to starvation.
+     *   New organisms are born in cells with exactly 3 neighbors.
+     */
+    for (j = 0; j < m_height; j++)
+        for (i = 0; i < m_width; i++)
+        {
+            int neighbors = GetNeighbors(i, j);
+            bool alive    = IsAlive(i, j);
+
+            /* Set CELL_MARK if this cell must change, clear it
+             * otherwise. We cannot toggle the CELL_ALIVE bit yet
+             * because all deaths and births are simultaneous (it
+             * would affect neighbouring cells).
+             */
+            if ((!alive && neighbors == 3) ||
+                (alive && (neighbors <= 1 || neighbors >= 4)))
+            {
+                m_cells[j * m_width + i] |= CELL_MARK;
+                m_changed.Add( MakeCell(i, j, !alive) );
+            }
+            else
+                m_cells[j * m_width + i] &= ~CELL_MARK;
+        }
+
+    /* 2nd pass. Stabilize.
+     */
+    for (j = 0; j < m_height; j++)
+        for (i = 0; i < m_width; i++)
+        {
+            /* Toggle CELL_ALIVE for those cells marked in the
+             * previous pass. Do not clear the CELL_MARK bit yet;
+             * it is useful to know which cells have changed and
+             * thus must be updated in the screen.
+             */
+            if (m_cells[j * m_width + i] & CELL_MARK)
+                m_cells[j * m_width + i] ^= CELL_ALIVE;
+        }
+
+    return (!m_changed.IsEmpty());
+}
+
+int Life::GetNeighbors(int x, int y) const
+{
+    wxASSERT(x >= 0 && y >= 0 && x < m_width && y < m_height);
+
+    int neighbors = 0;
+
+    int i0 = (x)? (x - 1) : 0;
+    int j0 = (y)? (y - 1) : 0;
+    int i1 = (x < (m_width - 1))? (x + 1) : (m_width - 1);
+    int j1 = (y < (m_height - 1))? (y + 1) : (m_height - 1);
+
+    if (m_wrap && ( !x || !y || x == (m_width - 1) || y == (m_height - 1)))
+    {
+        // this is an outer cell and wraparound is on
+        for (int j = y - 1; j <= y + 1; j++)
+            for (int i = x - 1; i <= x + 1; i++)
+                if (IsAlive( ((i < 0)? (i + m_width ) : (i % m_width)),
+                             ((j < 0)? (j + m_height) : (j % m_height)) ))
+                     neighbors++;
+    }
+    else
+    {
+        // this is an inner cell, or wraparound is off
+        for (int j = j0; j <= j1; j++)
+            for (int i = i0; i <= i1; i++)
+                if (IsAlive(i, j))
+                     neighbors++;
+    }
+
+    // do not count ourselves
+    if (IsAlive(x, y)) neighbors--;
+
+    return neighbors;
+}
+

diff --git a/demos/life/game.h b/demos/life/game.h
new file mode 100644 (file)
index 0000000..e065990
--- /dev/null
+++ b/demos/life/game.h
@@ -0,0 +1,129 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        game.h
+// Purpose:     Life! game logic
+// Author:      Guillermo Rodriguez Garcia, <guille@iies.es>
+// Modified by:
+// Created:     Jan/2000
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000, Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _LIFE_GAME_H_
+#define _LIFE_GAME_H_
+
+#ifdef __GNUG__
+    #pragma interface "game.h"
+#endif
+
+// for compilers that support precompilation, includes "wx/wx.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// for all others, include the necessary headers
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+// --------------------------------------------------------------------------
+// constants
+// --------------------------------------------------------------------------
+
+// minimum and maximum table size, in each dimension
+#define LIFE_MIN 20
+#define LIFE_MAX 200
+
+// --------------------------------------------------------------------------
+// Cell and CellArray;
+// --------------------------------------------------------------------------
+
+typedef long        Cell;
+typedef wxArrayLong CellArray;
+
+// --------------------------------------------------------------------------
+// LifeShape
+// --------------------------------------------------------------------------
+
+class LifeShape
+{
+public:
+    LifeShape::LifeShape(wxString name,
+                         wxString desc,
+                         int width, int height, char *data,
+                         int fieldWidth = 20, int fieldHeight = 20,
+                         bool wrap = TRUE)
+    {
+        m_name        = name;
+        m_desc        = desc;
+        m_width       = width;
+        m_height      = height;
+        m_data        = data;
+        m_fieldWidth  = fieldWidth;
+        m_fieldHeight = fieldHeight;
+        m_wrap        = wrap;
+    }
+
+    wxString  m_name;
+    wxString  m_desc;
+    int       m_width;
+    int       m_height;
+    char     *m_data;
+    int       m_fieldWidth;
+    int       m_fieldHeight;
+    bool      m_wrap;
+};
+
+// --------------------------------------------------------------------------
+// Life
+// --------------------------------------------------------------------------
+
+class Life
+{
+public:
+    // ctor and dtor
+    Life(int width, int height);
+    ~Life();
+    void Create(int width, int height);
+    void Destroy();
+
+    // game field
+    inline int       GetWidth() const        { return m_width; };
+    inline int       GetHeight() const       { return m_height; };
+    inline void      SetBorderWrap(bool on)  { m_wrap = on; };
+
+    // cells
+    inline bool      IsAlive(int i, int j) const;
+    inline bool      IsAlive(Cell c) const;
+    inline int       GetX(Cell c) const;
+    inline int       GetY(Cell c) const;
+    const CellArray* GetCells() const        { return &m_cells; };
+    const CellArray* GetChangedCells() const { return &m_changed; };
+
+    // game logic
+    void Clear();
+    Cell SetCell(int i, int j, bool alive = TRUE);
+    void SetShape(LifeShape &shape);
+    bool NextTic();
+
+private:
+    int         GetNeighbors(int i, int j) const;
+    inline Cell MakeCell(int i, int j, bool alive) const;
+
+    enum CellFlags
+    {
+        CELL_DEAD    = 0x0000,  // is dead
+        CELL_ALIVE   = 0x0001,  // is alive
+        CELL_MARK    = 0x0002,  // will change / has changed
+    };
+
+    int       m_width;
+    int       m_height;
+    CellArray m_cells;
+    CellArray m_changed;
+    bool      m_wrap;
+};
+
+#endif  // _LIFE_GAME_H_

diff --git a/demos/life/life.cpp b/demos/life/life.cpp
index e14ab1b8414eaacacd20522a6093bcb1c25080c0..d03ad5e579eccb999fa16d5722ea1ea17d0f0f3d 100644 (file)
--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@@ -13,27 +13,15 @@
 // declarations
 // ==========================================================================
 
 // declarations
 // ==========================================================================
 

-// minimum and maximum table size, in each dimension
-#define LIFE_MIN 20
-#define LIFE_MAX 200
-
-// some shortcuts
-#define ADD_TOOL(a, b, c, d) \
-    toolBar->AddTool(a, b, wxNullBitmap, FALSE, -1, -1, (wxObject *)0, c, d)
-
-#define GET_FRAME() \
-    ((LifeFrame *) wxGetApp().GetTopWindow())
-

 // --------------------------------------------------------------------------
 // headers
 // --------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // --------------------------------------------------------------------------
 // headers
 // --------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma implementation "life.cpp"
-    #pragma interface "life.cpp"
+    #pragma implementation "life.h"

 #endif
 
 #endif
 

-// for compilers that support precompilation, includes "wx/wx.h".
+// for compilers that support precompilation, includes "wx/wx.h"

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -46,7 +34,10 @@
 #endif
 
 #include "wx/statline.h"
 #endif
 
 #include "wx/statline.h"

-#include "wx/spinctrl.h"
+
+#include "life.h"
+#include "game.h"
+#include "dialogs.h"

 
 // --------------------------------------------------------------------------
 // resources
 
 // --------------------------------------------------------------------------
 // resources


@@ -62,233 +53,6 @@
     #include "bitmaps/stop.xpm"
 #endif
 
     #include "bitmaps/stop.xpm"
 #endif
 

-// --------------------------------------------------------------------------
-// classes
-// --------------------------------------------------------------------------
-
-class Life;
-class LifeShape;
-class LifeCanvas;
-class LifeTimer;
-class LifeFrame;
-class LifeApp;
-class LifeNewGameDialog;
-class LifeSamplesDialog;
-
-// --------------------------------------------------------------------------
-// non-GUI classes
-// --------------------------------------------------------------------------
-
-// Life
-class Life
-{
-public:
-    // ctors and dtors
-    Life(int width, int height);
-    ~Life();
-    void Create(int width, int height);
-    void Destroy();
-
-    // accessors
-    inline int  GetWidth()  const { return m_width; };
-    inline int  GetHeight() const { return m_height; };
-    inline bool IsAlive(int x, int y) const;
-    inline bool HasChanged(int x, int y) const;
-
-    // flags
-    void SetBorderWrap(bool on);
-
-    // game logic
-    void Clear();
-    void SetCell(int x, int y, bool alive = TRUE);
-    void SetShape(LifeShape &shape);
-    bool NextTic();
-
-private:
-    enum CellFlags {
-        CELL_DEAD    = 0x0000,  // is dead
-        CELL_ALIVE   = 0x0001,  // is alive
-        CELL_MARK    = 0x0002,  // will change / has changed
-    };
-    typedef int Cell;
-
-    int GetNeighbors(int x, int y) const;
-    inline void SetCell(int x, int y, Cell status);
-
-    int   m_width;
-    int   m_height;
-    Cell *m_cells;
-    bool  m_wrap;
-};
-
-// LifeShape
-class LifeShape
-{
-public:
-    LifeShape::LifeShape(wxString name,
-                         wxString desc,
-                         int width, int height, char *data,
-                         int fieldWidth = 20, int fieldHeight = 20,
-                         bool wrap = TRUE)
-    {
-        m_name        = name;
-        m_desc        = desc;
-        m_width       = width;
-        m_height      = height;
-        m_data        = data;
-        m_fieldWidth  = fieldWidth;
-        m_fieldHeight = fieldHeight;
-        m_wrap        = wrap;
-    }
-
-    wxString  m_name;
-    wxString  m_desc;
-    int       m_width;
-    int       m_height;
-    char     *m_data;
-    int       m_fieldWidth;
-    int       m_fieldHeight;
-    bool      m_wrap;
-};
-
-// --------------------------------------------------------------------------
-// GUI classes
-// --------------------------------------------------------------------------
-
-// Life canvas
-class LifeCanvas : public wxScrolledWindow
-{
-public:
-    // ctor and dtor
-    LifeCanvas(wxWindow* parent, Life* life, bool interactive = TRUE);
-    ~LifeCanvas();
-
-    // member functions
-    void Reset();
-    void DrawEverything(bool force = FALSE);
-    void DrawCell(int i, int j);
-    void DrawCell(int i, int j, wxDC &dc);
-    inline int CellToCoord(int i) const { return (i * m_cellsize); };
-    inline int CoordToCell(int x) const { return ((x >= 0)? (x / m_cellsize) : -1); };
-
-    // event handlers
-    void OnPaint(wxPaintEvent& event);
-    void OnMouse(wxMouseEvent& event);
-    void OnSize(wxSizeEvent& event);
-
-private:
-    // any class wishing to process wxWindows events must use this macro
-    DECLARE_EVENT_TABLE()
-
-    enum MouseStatus {
-        MOUSE_NOACTION,
-        MOUSE_DRAWING,
-        MOUSE_ERASING
-    };
-
-    Life        *m_life;
-    wxBitmap    *m_bmp;
-    int          m_height;
-    int          m_width;
-    int          m_cellsize;
-    wxCoord      m_xoffset;
-    wxCoord      m_yoffset;
-    MouseStatus  m_status;
-    bool         m_interactive;
-};
-
-// Life timer
-class LifeTimer : public wxTimer
-{
-public:
-    void Notify();
-};
-
-// Life main frame
-class LifeFrame : public wxFrame
-{
-public:
-    // ctor and dtor
-    LifeFrame();
-    ~LifeFrame();
-
-    // member functions
-    void UpdateInfoText();
-
-    // event handlers
-    void OnMenu(wxCommandEvent& event);
-    void OnNewGame(wxCommandEvent& event);
-    void OnSamples(wxCommandEvent& event);
-    void OnStart();
-    void OnStop();
-    void OnTimer();
-    void OnSlider(wxScrollEvent& event);
-
-private:
-    // any class wishing to process wxWindows events must use this macro
-    DECLARE_EVENT_TABLE()
-
-    Life         *m_life;
-    LifeTimer    *m_timer;
-    LifeCanvas   *m_canvas;
-    wxStaticText *m_text;
-    bool          m_running;
-    long          m_interval;
-    long          m_tics;
-};
-
-// Life new game dialog
-class LifeNewGameDialog : public wxDialog
-{
-public:
-    // ctor
-    LifeNewGameDialog(wxWindow *parent, int *w, int *h);
-
-    // event handlers
-    void OnOK(wxCommandEvent& event);
-
-private:
-    // any class wishing to process wxWindows events must use this macro
-    DECLARE_EVENT_TABLE();
-
-    int        *m_w;
-    int        *m_h;
-    wxSpinCtrl *m_spinctrlw;
-    wxSpinCtrl *m_spinctrlh;
-};
-
-// Life sample configurations dialog
-class LifeSamplesDialog : public wxDialog
-{
-public:
-    // ctor and dtor
-    LifeSamplesDialog(wxWindow *parent);
-    ~LifeSamplesDialog();
-
-    // members
-    int GetValue();
-
-    // event handlers
-    void OnListBox(wxCommandEvent &event);
-
-private:
-    // any class wishing to process wxWindows events must use this macro
-    DECLARE_EVENT_TABLE();
-
-    int         m_value;
-    wxListBox  *m_list;
-    wxTextCtrl *m_text;
-    LifeCanvas *m_canvas;
-    Life       *m_life;
-};
-
-// Life app
-class LifeApp : public wxApp
-{
-public:
-    virtual bool OnInit();
-};
-

 // --------------------------------------------------------------------------
 // constants
 // --------------------------------------------------------------------------
 // --------------------------------------------------------------------------
 // constants
 // --------------------------------------------------------------------------


@@ -308,16 +72,9 @@ enum
     ID_WRAP,
 
     // speed selection slider
     ID_WRAP,
 
     // speed selection slider

-    ID_SLIDER,
-
-    // listbox in samples dialog
-    ID_LISTBOX
+    ID_SLIDER

 };
 
 };
 

-
-// built-in sample games
-#include "samples.inc"
-

 // --------------------------------------------------------------------------
 // event tables and other macros for wxWindows
 // --------------------------------------------------------------------------
 // --------------------------------------------------------------------------
 // event tables and other macros for wxWindows
 // --------------------------------------------------------------------------


@@ -342,14 +99,6 @@ BEGIN_EVENT_TABLE(LifeCanvas, wxScrolledWindow)
     EVT_MOUSE_EVENTS   (            LifeCanvas::OnMouse)
 END_EVENT_TABLE()
 
     EVT_MOUSE_EVENTS   (            LifeCanvas::OnMouse)
 END_EVENT_TABLE()
 

-BEGIN_EVENT_TABLE(LifeNewGameDialog, wxDialog)
-    EVT_BUTTON         (wxID_OK,    LifeNewGameDialog::OnOK)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(LifeSamplesDialog, wxDialog)
-    EVT_LISTBOX        (ID_LISTBOX, LifeSamplesDialog::OnListBox)
-END_EVENT_TABLE()
-

 
 // Create a new application object
 IMPLEMENT_APP(LifeApp)
 
 // Create a new application object
 IMPLEMENT_APP(LifeApp)


@@ -358,6 +107,13 @@ IMPLEMENT_APP(LifeApp)
 // implementation
 // ==========================================================================
 
 // implementation
 // ==========================================================================
 

+// some shortcuts
+#define ADD_TOOL(a, b, c, d) \
+    toolBar->AddTool(a, b, wxNullBitmap, FALSE, -1, -1, (wxObject *)0, c, d)
+
+#define GET_FRAME() \
+    ((LifeFrame *) wxGetApp().GetTopWindow())
+

 // --------------------------------------------------------------------------
 // LifeApp
 // --------------------------------------------------------------------------
 // --------------------------------------------------------------------------
 // LifeApp
 // --------------------------------------------------------------------------


@@ -406,7 +162,6 @@ LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(50, 50))
     menuGame->Append(ID_WRAP, _("&Wraparound\tCtrl-W"), _("Wrap around borders"), TRUE);
     menuGame->Check (ID_WRAP, TRUE);
 
     menuGame->Append(ID_WRAP, _("&Wraparound\tCtrl-W"), _("Wrap around borders"), TRUE);
     menuGame->Check (ID_WRAP, TRUE);
 

-

     wxMenuBar *menuBar = new wxMenuBar();
     menuBar->Append(menuFile, _("&File"));
     menuBar->Append(menuGame, _("&Game"));
     wxMenuBar *menuBar = new wxMenuBar();
     menuBar->Append(menuFile, _("&File"));
     menuBar->Append(menuGame, _("&Game"));


@@ -432,21 +187,22 @@ LifeFrame::LifeFrame() : wxFrame((wxFrame *)0, -1, _("Life!"), wxPoint(50, 50))
     CreateStatusBar(2);
     SetStatusText(_("Welcome to Life!"));
 
     CreateStatusBar(2);
     SetStatusText(_("Welcome to Life!"));
 

-    // panel
-    wxPanel *panel = new wxPanel(this, -1);
-

     // game
     // game

-    m_life     = new Life(20, 20);
-    m_canvas   = new LifeCanvas(panel, m_life);
-    m_timer    = new LifeTimer();
-    m_interval = 500;
-    m_tics     = 0;
-    m_text     = new wxStaticText(panel, -1, "");
+    wxPanel *panel = new wxPanel(this, -1);
+    m_life         = new Life(20, 20);
+    m_canvas       = new LifeCanvas(panel, m_life);
+    m_timer        = new LifeTimer();
+    m_interval     = 500;
+    m_tics         = 0;
+    m_text         = new wxStaticText(panel, -1, "");

     UpdateInfoText();
 
     // slider
     UpdateInfoText();
 
     // slider

-    wxSlider *slider = new wxSlider(panel, ID_SLIDER, 5, 1, 10,
-        wxDefaultPosition, wxSize(200, -1), wxSL_HORIZONTAL | wxSL_AUTOTICKS);
+    wxSlider *slider = new wxSlider(panel, ID_SLIDER,
+        5, 1, 10,
+        wxDefaultPosition,
+        wxSize(200, -1),
+        wxSL_HORIZONTAL | wxSL_AUTOTICKS);

 
     // component layout
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
 
     // component layout
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);


@@ -718,10 +474,11 @@ void LifeCanvas::DrawEverything(bool force)
     dc.BeginDrawing();
 
     // draw cells
     dc.BeginDrawing();
 
     // draw cells

-    for (int j = 0; j < m_life->GetHeight(); j++)
-        for (int i = 0; i < m_life->GetWidth(); i++)
-            if (force || m_life->HasChanged(i, j))
-                DrawCell(i, j, dc);
+    const CellArray *cells =
+        force? m_life->GetCells() : m_life->GetChangedCells();
+
+    for (unsigned i = 0; i < cells->GetCount(); i++)
+        DrawCell(cells->Item(i), dc);

 
     // bounding rectangle (always drawn - better than clipping region)
     dc.SetPen(*wxBLACK_PEN);
 
     // bounding rectangle (always drawn - better than clipping region)
     dc.SetPen(*wxBLACK_PEN);


@@ -732,7 +489,7 @@ void LifeCanvas::DrawEverything(bool force)
     dc.SelectObject(wxNullBitmap);
 }
 
     dc.SelectObject(wxNullBitmap);
 }
 

-void LifeCanvas::DrawCell(int i, int j)
+void LifeCanvas::DrawCell(Cell c)

 {
     wxMemoryDC dc;
 
 {
     wxMemoryDC dc;
 


@@ -740,20 +497,20 @@ void LifeCanvas::DrawCell(int i, int j)
     dc.BeginDrawing();
 
     dc.SetClippingRegion(1, 1, m_width - 2, m_height - 2);
     dc.BeginDrawing();
 
     dc.SetClippingRegion(1, 1, m_width - 2, m_height - 2);

-    DrawCell(i, j, dc);
+    DrawCell(c, dc);

 
     dc.EndDrawing();
     dc.SelectObject(wxNullBitmap);
 }
 
 
     dc.EndDrawing();
     dc.SelectObject(wxNullBitmap);
 }
 

-void LifeCanvas::DrawCell(int i, int j, wxDC &dc)
+void LifeCanvas::DrawCell(Cell c, wxDC &dc)

 {
 {

-    if (m_life->IsAlive(i, j))
+    if (m_life->IsAlive(c))

     {
         dc.SetPen(*wxBLACK_PEN);
         dc.SetBrush(*wxBLACK_BRUSH);
     {
         dc.SetPen(*wxBLACK_PEN);
         dc.SetBrush(*wxBLACK_BRUSH);

-        dc.DrawRectangle(CellToCoord(i),
-                         CellToCoord(j),
+        dc.DrawRectangle(CellToCoord( m_life->GetX(c) ),
+                         CellToCoord( m_life->GetY(c) ),

                          m_cellsize,
                          m_cellsize);
     }
                          m_cellsize,
                          m_cellsize);
     }


@@ -761,14 +518,14 @@ void LifeCanvas::DrawCell(int i, int j, wxDC &dc)
     {
         dc.SetPen(*wxLIGHT_GREY_PEN);
         dc.SetBrush(*wxTRANSPARENT_BRUSH);
     {
         dc.SetPen(*wxLIGHT_GREY_PEN);
         dc.SetBrush(*wxTRANSPARENT_BRUSH);

-        dc.DrawRectangle(CellToCoord(i),
-                         CellToCoord(j),
+        dc.DrawRectangle(CellToCoord( m_life->GetX(c) ),
+                         CellToCoord( m_life->GetY(c) ),

                          m_cellsize,
                          m_cellsize);
         dc.SetPen(*wxWHITE_PEN);
         dc.SetBrush(*wxWHITE_BRUSH);
                          m_cellsize,
                          m_cellsize);
         dc.SetPen(*wxWHITE_PEN);
         dc.SetBrush(*wxWHITE_BRUSH);

-        dc.DrawRectangle(CellToCoord(i) + 1,
-                         CellToCoord(j) + 1,
+        dc.DrawRectangle(CellToCoord( m_life->GetX(c) ) + 1,
+                         CellToCoord( m_life->GetY(c) ) + 1,

                          m_cellsize - 1,
                          m_cellsize - 1);
     }
                          m_cellsize - 1,
                          m_cellsize - 1);
     }


@@ -855,8 +612,7 @@ void LifeCanvas::OnMouse(wxMouseEvent& event)
             ((m_status == MOUSE_DRAWING) && !alive))
         {
             wxRect rect(x, y, m_cellsize + 1, m_cellsize + 1);
             ((m_status == MOUSE_DRAWING) && !alive))
         {
             wxRect rect(x, y, m_cellsize + 1, m_cellsize + 1);

-            m_life->SetCell(i, j, !alive);
-            DrawCell(i, j);
+            DrawCell( m_life->SetCell(i, j, !alive) );

             Refresh(FALSE, &rect);
         }
     }
             Refresh(FALSE, &rect);
         }
     }


@@ -872,311 +628,3 @@ void LifeCanvas::OnSize(wxSizeEvent& event)
     // allow default processing
     event.Skip();
 }
     // allow default processing
     event.Skip();
 }

-
-// --------------------------------------------------------------------------
-// LifeNewGameDialog
-// --------------------------------------------------------------------------
-
-LifeNewGameDialog::LifeNewGameDialog(wxWindow *parent, int *w, int *h)
-                 : wxDialog(parent, -1,
-                            _("New game"),
-                            wxDefaultPosition,
-                            wxDefaultSize,
-                            wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL)
-{
-    m_w = w;
-    m_h = h;
-
-    // spin ctrls
-    m_spinctrlw = new wxSpinCtrl( this, -1 );
-    m_spinctrlw->SetValue(*m_w);
-    m_spinctrlw->SetRange(LIFE_MIN, LIFE_MAX);
-
-    m_spinctrlh = new wxSpinCtrl( this, -1 );
-    m_spinctrlh->SetValue(*m_h);
-    m_spinctrlh->SetRange(LIFE_MIN, LIFE_MAX);
-
-    // component layout
-    wxBoxSizer *inputsizer1 = new wxBoxSizer( wxHORIZONTAL );
-    inputsizer1->Add( new wxStaticText(this, -1, _("Width")), 1, wxCENTRE | wxLEFT, 20);
-    inputsizer1->Add( m_spinctrlw, 2, wxCENTRE | wxLEFT | wxRIGHT, 20 );
-
-    wxBoxSizer *inputsizer2 = new wxBoxSizer( wxHORIZONTAL );
-    inputsizer2->Add( new wxStaticText(this, -1, _("Height")), 1, wxCENTRE | wxLEFT, 20);
-    inputsizer2->Add( m_spinctrlh, 2, wxCENTRE | wxLEFT | wxRIGHT, 20 );
-
-    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
-    topsizer->Add( CreateTextSizer(_("Enter board dimensions")), 0, wxALL, 10 );
-    topsizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 10);
-    topsizer->Add( inputsizer1, 1, wxGROW | wxLEFT | wxRIGHT, 5 );
-    topsizer->Add( inputsizer2, 1, wxGROW | wxLEFT | wxRIGHT, 5 );
-    topsizer->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT | wxTOP, 10);
-    topsizer->Add( CreateButtonSizer(wxOK | wxCANCEL), 0, wxCENTRE | wxALL, 10);
-
-    // activate
-    SetSizer(topsizer);
-    SetAutoLayout(TRUE);
-    topsizer->SetSizeHints(this);
-    topsizer->Fit(this);
-    Centre(wxBOTH);
-}
-
-void LifeNewGameDialog::OnOK(wxCommandEvent& WXUNUSED(event))
-{
-    *m_w = m_spinctrlw->GetValue();
-    *m_h = m_spinctrlh->GetValue();
-
-    EndModal(wxID_OK);
-}
-
-// --------------------------------------------------------------------------
-// LifeSamplesDialog
-// --------------------------------------------------------------------------
-
-LifeSamplesDialog::LifeSamplesDialog(wxWindow *parent)
-                 : wxDialog(parent, -1,
-                            _("Sample games"),
-                            wxDefaultPosition,
-                            wxDefaultSize,
-                            wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL)
-{
-    m_value = 0;
-   
-    // create and populate the list of available samples
-    m_list = new wxListBox( this, ID_LISTBOX,
-        wxDefaultPosition,
-        wxDefaultSize,
-        0, NULL,
-        wxLB_SINGLE | wxLB_NEEDED_SB | wxLB_HSCROLL );
-
-    for (unsigned i = 0; i < (sizeof(g_shapes) / sizeof(LifeShape)); i++)
-        m_list->Append(g_shapes[i].m_name);
-
-    // descriptions
-    wxStaticBox *statbox = new wxStaticBox( this, -1, _("Description"));
-    m_life   = new Life( 16, 16 );
-    m_life->SetShape(g_shapes[0]);
-    m_canvas = new LifeCanvas( this, m_life, FALSE );
-    m_text   = new wxTextCtrl( this, -1,
-        g_shapes[0].m_desc,
-        wxDefaultPosition,
-        wxSize(300, 60),
-        wxTE_MULTILINE | wxTE_READONLY);
-
-    // layout components
-    wxStaticBoxSizer *sizer1 = new wxStaticBoxSizer( statbox, wxVERTICAL );
-    sizer1->Add( m_canvas, 2, wxGROW | wxCENTRE | wxALL, 5);
-    sizer1->Add( m_text, 1, wxGROW | wxCENTRE | wxALL, 5 );
-
-    wxBoxSizer *sizer2 = new wxBoxSizer( wxHORIZONTAL );
-    sizer2->Add( m_list, 0, wxGROW | wxCENTRE | wxALL, 5 );
-    sizer2->Add( sizer1, 1, wxGROW | wxCENTRE | wxALL, 5 );
-
-    wxBoxSizer *sizer3 = new wxBoxSizer( wxVERTICAL );
-    sizer3->Add( CreateTextSizer(_("Select one configuration")), 0, wxALL, 10 );
-    sizer3->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 10 );
-    sizer3->Add( sizer2, 1, wxGROW | wxCENTRE | wxALL, 5 );
-    sizer3->Add( new wxStaticLine(this, -1), 0, wxGROW | wxLEFT | wxRIGHT, 10 );
-    sizer3->Add( CreateButtonSizer(wxOK | wxCANCEL), 0, wxCENTRE | wxALL, 10 );
-
-    // activate
-    SetSizer(sizer3);
-    SetAutoLayout(TRUE);
-    sizer3->SetSizeHints(this);
-    sizer3->Fit(this);
-    Centre(wxBOTH);
-}
-
-LifeSamplesDialog::~LifeSamplesDialog()
-{
-    m_canvas->Destroy();
-    delete m_life;
-}
-
-int LifeSamplesDialog::GetValue()
-{
-    return m_value;
-}
-
-void LifeSamplesDialog::OnListBox(wxCommandEvent& event)
-{
-    if (event.GetSelection() != -1)
-    {
-        m_value = m_list->GetSelection();
-        m_text->SetValue(g_shapes[ event.GetSelection() ].m_desc);
-        m_life->SetShape(g_shapes[ event.GetSelection() ]);
-
-        m_canvas->DrawEverything(TRUE);     // force redraw everything
-        m_canvas->Refresh(FALSE);           // do not erase background
-    }
-}
-
-// --------------------------------------------------------------------------
-// Life
-// --------------------------------------------------------------------------
-
-Life::Life(int width, int height)
-{            
-    m_wrap   = TRUE;
-    m_cells  = NULL;
-    Create(width, height);
-}
-
-Life::~Life()
-{
-    Destroy();
-}
-
-void Life::Create(int width, int height)
-{
-    wxASSERT(width > 0 && height > 0);
-
-    m_width  = width;
-    m_height = height;
-    m_cells  = new Cell[m_width * m_height];
-    Clear();
-}
-
-void Life::Destroy()
-{
-    delete[] m_cells;
-}
-
-void Life::Clear()
-{
-    for (int i = 0; i < m_width * m_height; i++)
-        m_cells[i] = CELL_DEAD;
-}
-
-bool Life::IsAlive(int x, int y) const
-{
-    wxASSERT(x >= 0 && y >= 0 && x < m_width && y < m_height);
-
-    return (m_cells[y * m_width + x] & CELL_ALIVE);
-}
-
-bool Life::HasChanged(int x, int y) const
-{
-    wxASSERT(x >= 0 && y >= 0 && x < m_width && y < m_height);
-
-    return (m_cells[y * m_width + x] & CELL_MARK) != 0;
-}
-
-void Life::SetBorderWrap(bool on)
-{
-    m_wrap = on;
-}
-
-void Life::SetCell(int x, int y, bool alive)
-{
-    wxASSERT(x >= 0 && y >= 0 && x < m_width && y < m_height);
-
-    m_cells[y * m_width + x] = (alive? CELL_ALIVE : CELL_DEAD);
-}
-
-void Life::SetShape(LifeShape& shape)
-{
-    wxASSERT((m_width >= shape.m_width) && (m_height >= shape.m_height));
-
-    int x0  = (m_width - shape.m_width) / 2;
-    int y0  = (m_height - shape.m_height) / 2;
-    char *p = shape.m_data;
-
-    Clear();
-    for (int j = y0; j < y0 + shape.m_height; j++)
-        for (int i = x0; i < x0 + shape.m_width; i++)
-            SetCell(i, j, *(p++) == '*');
-}
-
-bool Life::NextTic()
-{
-    long changed = 0;
-    int  i, j;
-
-    /* 1st pass. Find and mark deaths and births for this generation.
-     *
-     * Rules:
-     *   An organism with <= 1 neighbors will die due to isolation.
-     *   An organism with >= 4 neighbors will die due to starvation.
-     *   New organisms are born in cells with exactly 3 neighbors.
-     */
-    for (j = 0; j < m_height; j++)
-        for (i = 0; i < m_width; i++)
-        {
-            int neighbors = GetNeighbors(i, j);
-            bool alive    = IsAlive(i, j);
-
-            /* Set CELL_MARK if this cell must change, clear it
-             * otherwise. We cannot toggle the CELL_ALIVE bit yet
-             * because all deaths and births are simultaneous (it
-             * would affect neighbouring cells).
-             */
-            if ((!alive && neighbors == 3) ||
-                (alive && (neighbors <= 1 || neighbors >= 4)))
-                m_cells[j * m_width + i] |= CELL_MARK;
-            else
-                m_cells[j * m_width + i] &= ~CELL_MARK;
-        }
-
-    /* 2nd pass. Stabilize.
-     */
-    for (j = 0; j < m_height; j++)
-        for (i = 0; i < m_width; i++)
-        {
-            /* Toggle CELL_ALIVE for those cells marked in the
-             * previous pass. Do not clear the CELL_MARK bit yet;
-             * it is useful to know which cells have changed and
-             * thus must be updated in the screen.
-             */
-            if (m_cells[j * m_width + i] & CELL_MARK)
-            {
-                m_cells[j * m_width + i] ^= CELL_ALIVE;
-                changed++;
-            }
-        }
-
-    return (changed != 0);
-}
-
-int Life::GetNeighbors(int x, int y) const
-{
-    wxASSERT(x >= 0 && y >= 0 && x < m_width && y < m_height);
-
-    int neighbors = 0;
-
-    int i0 = (x)? (x - 1) : 0;
-    int j0 = (y)? (y - 1) : 0;
-    int i1 = (x < (m_width - 1))? (x + 1) : (m_width - 1);
-    int j1 = (y < (m_height - 1))? (y + 1) : (m_height - 1);
-
-    if (m_wrap && ( !x || !y || x == (m_width - 1) || y == (m_height - 1)))
-    {
-        // this is an outer cell and wraparound is on
-        for (int j = y - 1; j <= y + 1; j++)
-            for (int i = x - 1; i <= x + 1; i++)
-                if (IsAlive( ((i < 0)? (i + m_width ) : (i % m_width)),
-                             ((j < 0)? (j + m_height) : (j % m_height)) ))
-                     neighbors++;
-    }
-    else
-    {
-        // this is an inner cell, or wraparound is off
-        for (int j = j0; j <= j1; j++)
-            for (int i = i0; i <= i1; i++)
-                if (IsAlive(i, j))
-                     neighbors++;
-    }
-
-    // do not count ourselves
-    if (IsAlive(x, y)) neighbors--;
-
-    return neighbors;
-}
-
-void Life::SetCell(int x, int y, Cell status)
-{
-    wxASSERT(x >= 0 && y >= 0 && x < m_width && y < m_height);
-
-    m_cells[y * m_width + x] = status;
-}
-

diff --git a/demos/life/life.h b/demos/life/life.h
new file mode 100644 (file)
index 0000000..946e848
--- /dev/null
+++ b/demos/life/life.h
@@ -0,0 +1,136 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        life.h
+// Purpose:     The game of life, created by J. H. Conway
+// Author:      Guillermo Rodriguez Garcia, <guille@iies.es>
+// Modified by:
+// Created:     Jan/2000
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000, Guillermo Rodriguez Garcia
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _LIFE_APP_H_
+#define _LIFE_APP_H_
+
+#ifdef __GNUG__
+    #pragma interface "life.h"
+#endif
+
+// for compilers that support precompilation, includes "wx/wx.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// for all others, include the necessary headers
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+#include "game.h"
+
+// --------------------------------------------------------------------------
+// LifeCanvas
+// --------------------------------------------------------------------------
+
+class LifeCanvas : public wxScrolledWindow
+{
+public:
+    // ctor and dtor
+    LifeCanvas(wxWindow* parent, Life* life, bool interactive = TRUE);
+    ~LifeCanvas();
+
+    // member functions
+    void Reset();
+    void DrawEverything(bool force = FALSE);
+    void DrawCell(Cell c);
+    void DrawCell(Cell c, wxDC &dc);
+    inline int CellToCoord(int i) const { return (i * m_cellsize); };
+    inline int CoordToCell(int x) const { return ((x >= 0)? (x / m_cellsize) : -1); };
+
+    // event handlers
+    void OnPaint(wxPaintEvent& event);
+    void OnMouse(wxMouseEvent& event);
+    void OnSize(wxSizeEvent& event);
+
+private:
+    // any class wishing to process wxWindows events must use this macro
+    DECLARE_EVENT_TABLE()
+
+    enum MouseStatus
+    {
+        MOUSE_NOACTION,
+        MOUSE_DRAWING,
+        MOUSE_ERASING
+    };
+
+    Life        *m_life;
+    wxBitmap    *m_bmp;
+    int          m_height;
+    int          m_width;
+    int          m_cellsize;
+    wxCoord      m_xoffset;
+    wxCoord      m_yoffset;
+    MouseStatus  m_status;
+    bool         m_interactive;
+};
+
+// --------------------------------------------------------------------------
+// LifeTimer
+// --------------------------------------------------------------------------
+
+// Life timer
+class LifeTimer : public wxTimer
+{
+public:
+    void Notify();
+};
+
+// --------------------------------------------------------------------------
+// LifeFrame
+// --------------------------------------------------------------------------
+
+class LifeFrame : public wxFrame
+{
+public:
+    // ctor and dtor
+    LifeFrame();
+    ~LifeFrame();
+
+    // member functions
+    void UpdateInfoText();
+
+    // event handlers
+    void OnMenu(wxCommandEvent& event);
+    void OnNewGame(wxCommandEvent& event);
+    void OnSamples(wxCommandEvent& event);
+    void OnStart();
+    void OnStop();
+    void OnTimer();
+    void OnSlider(wxScrollEvent& event);
+
+private:
+    // any class wishing to process wxWindows events must use this macro
+    DECLARE_EVENT_TABLE()
+
+    Life         *m_life;
+    LifeTimer    *m_timer;
+    LifeCanvas   *m_canvas;
+    wxStaticText *m_text;
+    bool          m_running;
+    long          m_interval;
+    long          m_tics;
+};
+
+// --------------------------------------------------------------------------
+// LifeApp
+// --------------------------------------------------------------------------
+
+class LifeApp : public wxApp
+{
+public:
+    virtual bool OnInit();
+};
+
+#endif  // _LIFE_APP_H_

diff --git a/demos/life/makefile.b32 b/demos/life/makefile.b32
index 22869de03c9a41b580e59d3c5cb59ae631436c62..051d35b22fdeee03742eaf8a5b27a74f2c9bd711 100644 (file)
--- a/demos/life/makefile.b32
+++ b/demos/life/makefile.b32
@@ -10,7 +10,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=life
 WXDIR = $(WXWIN)
 
 TARGET=life

-OBJECTS = $(TARGET).obj
+OBJECTS = $(TARGET).obj dialogs.obj game.obj

 
 !include $(WXDIR)\src\makeprog.b32
 
 
 !include $(WXDIR)\src\makeprog.b32
 

diff --git a/demos/life/makefile.bcc b/demos/life/makefile.bcc
index 2b70fcfb01127d6a4059f1b0bfd088d19bbabf1f..e7ac35af2662ba2e8c95eb97c1422e185be7daf6 100644 (file)
--- a/demos/life/makefile.bcc
+++ b/demos/life/makefile.bcc
@@ -13,7 +13,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=life
 WXDIR = $(WXWIN)
 
 TARGET=life

-OBJECTS=$(TARGET).obj
+OBJECTS=$(TARGET).obj dialogs.obj game.obj

 
 !include $(WXDIR)\src\makeprog.bcc
 
 
 !include $(WXDIR)\src\makeprog.bcc
 

diff --git a/demos/life/makefile.dos b/demos/life/makefile.dos
index 6d660900e3864207edeeb318e4e93b3d92342814..c042c700cf873802425be2156588ed7d2b544887 100644 (file)
--- a/demos/life/makefile.dos
+++ b/demos/life/makefile.dos
@@ -11,7 +11,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=life
 WXDIR = $(WXWIN)
 
 TARGET=life

-OBJECTS = $(TARGET).obj
+OBJECTS = $(TARGET).obj dialogs.obj game.obj

 
 !include $(WXDIR)\src\makeprog.msc
 
 
 !include $(WXDIR)\src\makeprog.msc
 

diff --git a/demos/life/makefile.g95 b/demos/life/makefile.g95
index 909171297fd0dfa99d6d743d1eb0e3560731424a..16127c981a457a23da83a7f2f47407920778c69b 100644 (file)
--- a/demos/life/makefile.g95
+++ b/demos/life/makefile.g95
@@ -10,7 +10,7 @@
 WXDIR = ../..
 
 TARGET=life
 WXDIR = ../..
 
 TARGET=life

-OBJECTS = $(TARGET).o
+OBJECTS = $(TARGET).o dialogs.o game.o

 
 include $(WXDIR)/src/makeprog.g95
 
 
 include $(WXDIR)/src/makeprog.g95
 

diff --git a/demos/life/makefile.unx b/demos/life/makefile.unx
index c90364860520dc1f616717a25b1e940cd7a73da8..8b8c3669d4fe3fc3594a4243171a55b16a8b2856 100644 (file)
--- a/demos/life/makefile.unx
+++ b/demos/life/makefile.unx
@@ -17,7 +17,7 @@ CC = gcc
 
 PROGRAM = life
 
 
 PROGRAM = life
 

-OBJECTS = $(PROGRAM).o
+OBJECTS = $(PROGRAM).o dialogs.o game.o

 
 # implementation
 
 
 # implementation
 

diff --git a/demos/life/makefile.vc b/demos/life/makefile.vc
index 2e9f094ac0bdfa2eb207924f9f655296613156d4..1f8314a8dd99d40f0fda22486e14c41a5727a116 100644 (file)
--- a/demos/life/makefile.vc
+++ b/demos/life/makefile.vc
@@ -12,7 +12,7 @@
 WXDIR = $(WXWIN)
 
 PROGRAM=life
 WXDIR = $(WXWIN)
 
 PROGRAM=life

-OBJECTS = $(PROGRAM).obj
+OBJECTS = $(PROGRAM).obj dialogs.obj game.obj

 
 !include $(WXDIR)\src\makeprog.vc
 
 
 !include $(WXDIR)\src\makeprog.vc
 

diff --git a/demos/life/makefile.wat b/demos/life/makefile.wat
index b9592303119c9948b2ca969a1d9d41a3480d1738..4ee7d9205cd33ad1d9e9394a918611543fd856c1 100644 (file)
--- a/demos/life/makefile.wat
+++ b/demos/life/makefile.wat
@@ -8,7 +8,7 @@
 WXDIR = $(%WXWIN)
 
 PROGRAM = life
 WXDIR = $(%WXWIN)
 
 PROGRAM = life

-OBJECTS = $(PROGRAM).obj
+OBJECTS = $(PROGRAM).obj dialogs.obj game.obj

 
 !include $(WXDIR)\src\makeprog.wat
 
 
 !include $(WXDIR)\src\makeprog.wat
 

diff --git a/demos/life/samples.inc b/demos/life/samples.inc
index d218418705ac0512dfb888f77bb342006886713a..41425e856a09b392acdd97833fbec853613a29f5 100644 (file)
--- a/demos/life/samples.inc
+++ b/demos/life/samples.inc
@@ -145,9 +145,9 @@ LifeShape g_shapes[] =
                "......*......"
                "......*.....*"
                ".....***....*"
                "......*......"
                "......*.....*"
                ".....***....*"

-               "....*   *...*"
-               ".****   ****."
-               "*...*   *...."
+               "....*...*...*"
+               ".****...****."
+               "*...*...*...."

                "*....***....."
                "*.....*......"
                "......*......"
                "*....***....."
                "*.....*......"
                "......*......"