Commit: 30 - NeoFT.Workshop (svn)

FreeTrainの進化系を目指す

Commit MetaInfo

• Revision: 30 (tree)
• Time: 2015-03-20 11:23:21
• Author: c477

Log Message

ビュー周りの整備（途上）

Change Summary

• modified: trunk/framework/TODO.txt
• modified: trunk/framework/debug/TestViewDrawer.cs
• modified: trunk/framework/res/about.html
• modified: trunk/framework/framework/drawing/IViewDrawer.cs
• modified: trunk/NeoFT.suo
• added: trunk/core/core/game/PointerEventArgs.cs
• modified: trunk/core/core/game/IGame.cs
• modified: trunk/core/core/game/GameManager.cs
• added: trunk/core/core/game/ViewCollection.cs
• modified: trunk/core/core/game/IQuarterView.cs
• added: trunk/core/core/game/IPointerHandler.cs
• added: trunk/core/core/view/IView.cs
• added: trunk/core/core/view/IGameViewFactory.cs
• modified: trunk/core/core/view/ITargetSelector.cs
• added: trunk/core/core/structure/StructureCollection.cs
• modified: trunk/core/core/structure/Lot.cs
• modified: trunk/core/NFT.Core.csproj
• modified: trunk/core/core_modules.xml
• modified: trunk/core/impl/game/TerrainMapImpl.cs
• modified: trunk/core/impl/game/GameImpl.cs
• modified: trunk/core/impl/view/GameViewPanel.cs
• added: trunk/core/impl/view/GameViewFactory.cs
• added: trunk/core/impl/selectors/CubeSelectorBase.cs

Incremental Difference

--- trunk/framework/TODO.txt	(revision 29)
+++ trunk/framework/TODO.txt	(revision 30)
@@ -1,5 +1,5 @@
 ・凹型(interior)/凸型(exterior)に分かれた３Ｄオブジェクト（線路など用）
-・選択ＵＩの基本、ステータス表示の基本 InputController<-*SitePicker 見た目=skin
+・選択ＵＩの基本、ステータス表示の基本 IInputHandler-ITargetSelector<-*SitePicker 見た目=skin
 ・[済]MRT昼夜同時描画/HitTest用マップ
 
 ◎開発メモ

--- trunk/framework/debug/TestViewDrawer.cs	(revision 29)
+++ trunk/framework/debug/TestViewDrawer.cs	(revision 30)
@@ -22,7 +22,7 @@
             surface = null;
         }
 
-        protected override void DrawCore(ISurfaceOld surfDest, Graphics g, IView owner, Rectangle rctDest, Region requestSrc) {
+        protected override void DrawCore(ISurfaceOld surfDest, Graphics g, IView_old owner, Rectangle rctDest, Region requestSrc) {
             if (surface != null) {
                 IGraphicManagerOld gm = GlobalModules.GraphicManagerOld;
                 DrawParams dp = new DrawParams(surfDest, rctDest.Location);
@@ -42,7 +42,7 @@
             }
         }
 
-        public override void Attach(IView view) {
+        public override void Attach(IView_old view) {
             base.Attach(view);
             imgRef.AddRef();
             if (surface == null) {
@@ -51,7 +51,7 @@
             }
         }
 
-        public override void Detach(IView view) {
+        public override void Detach(IView_old view) {
             base.Detach(view);
             imgRef.ReleaseRef();
             if (AttachedViewCount == 0) {

--- trunk/framework/res/about.html	(revision 29)
+++ trunk/framework/res/about.html	(revision 30)
@@ -16,7 +16,7 @@
 			<div align="right">cCopyright by <a href="mailto:[e-mail]">C477</a> and <a href="mailto:[e-mail]">
 					K.Kawaguchi</a> et al, 2002-
 				<br>
-				<a href="http://www.rocket.ne.jp/%7Enao/">http://www.rocket.ne.jp/~nao</a>
+				<a href="http://sourceforge.jp/users/c477/pf/NeoFT.Workshop/wiki/FrontPage">http://sourceforge.jp/users/c477/pf/NeoFT.Workshop/wiki/FrontPage</a>
 			</div>
 			<hr align="left" size="0">
 			<strong>NeoFT</strong> is a free software, many codes and resources are 

--- trunk/framework/framework/drawing/IViewDrawer.cs	(revision 29)
+++ trunk/framework/framework/drawing/IViewDrawer.cs	(revision 30)
@@ -10,10 +10,11 @@
     /// <summary>
     /// IDrawableView is drawing delegate for DrawablePanel
 	/// </summary>
-    public interface IViewDrawer : IDisposable{
-        void Attach(IView view);
-        void Detach(IView view);
-        void Draw(Graphics g, IView owner, Rectangle destArea, Region requestSrc);
+    [Obsolete]
+    public interface IViewDrawer_old : IDisposable{
+        void Attach(IView_old view);
+        void Detach(IView_old view);
+        void Draw(Graphics g, IView_old owner, Rectangle destArea, Region requestSrc);
         Size ContentSize { get; }
         Size ScrollUnit { get; }
     }
@@ -21,7 +22,8 @@
     /// <summary>
     /// the container of IViewDrawer should implements IView
     /// </summary>
-    public interface IView {
+    [Obsolete]
+    public interface IView_old {
         /// <summary>
         /// visible area of IViewDrawer content on this IView.
         /// </summary>
@@ -52,8 +54,8 @@
     /// <summary>
     /// Abstract class of IViewDrawer
     /// </summary>
-    public abstract class ViewDrawerBase : IViewDrawer{
-        protected List<IView> views = new List<IView>(4);
+    public abstract class ViewDrawerBase : IViewDrawer_old{
+        protected List<IView_old> views = new List<IView_old>(4);
         protected ISurfaceOld backSurface;
         protected bool doubleBuffered = true;
       
@@ -62,19 +64,19 @@
 
         public abstract Size ScrollUnit { get; }
 
-        public virtual void Attach(IView view) {
+        public virtual void Attach(IView_old view) {
             if (!views.Contains(view)) {
                 views.Add(view);
             }
         }
 
-        public virtual void Detach(IView view) {
+        public virtual void Detach(IView_old view) {
             if (views.Contains(view)) {
                 views.Remove(view);
             }
         }
 
-        public virtual void Draw(Graphics g, IView owner, Rectangle destArea, Region requestSrc) {
+        public virtual void Draw(Graphics g, IView_old owner, Rectangle destArea, Region requestSrc) {
             if (DoubleBuffered) {
                 if (OffscreenSurface == null) {
                     backSurface = PrepareOffscreenSurface();
@@ -109,12 +111,12 @@
         }
 
         protected virtual void NotifyUpdated(Region updateRgn, bool callbackImmediately) {
-            foreach (IView vw in views) {
+            foreach (IView_old vw in views) {
                 vw.NotifyUpdate(updateRgn, callbackImmediately);
             }
         }
 
-        protected abstract void DrawCore(ISurfaceOld surfDest, Graphics g, IView owner, Rectangle rctDest, Region requestSrc);
+        protected abstract void DrawCore(ISurfaceOld surfDest, Graphics g, IView_old owner, Rectangle rctDest, Region requestSrc);
 
         public bool DoubleBuffered {
             get { return doubleBuffered; }

--- trunk/core/core/game/PointerEventArgs.cs	(nonexistent)
+++ trunk/core/core/game/PointerEventArgs.cs	(revision 30)
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Forms;
+using nft.framework.drawing;
+
+namespace nft.core.game {
+    public class PointerEventArgs : EventArgs{
+        protected MouseEventArgs eventOrg;
+        protected IGame game;
+        protected ISurface surface;
+
+        public PointerEventArgs(IGame gm, ISurface surf) {
+            this.game = gm;
+            this.surface = surf;
+        }
+
+        public IGame Game {
+            get {
+                return game;
+            }
+        }
+
+        public ISurface Surface {
+            get {
+                return surface;
+            }
+        }
+
+        public MouseEventArgs OriginalEventArgs {
+            get {
+                return eventOrg;
+            }
+        }
+    }
+}

--- trunk/core/core/game/IGame.cs	(revision 29)
+++ trunk/core/core/game/IGame.cs	(revision 30)
@@ -19,6 +19,8 @@
 		Clock Clock {get;}
 		IClimateController ClimateController {get;}
 		string Name {get;set;}
+        IPointerHandler ActiveController {get; set;}
 		//World world {get;}
+        ViewCollection Views {get;}
 	}
 }

--- trunk/core/core/game/GameManager.cs	(revision 29)
+++ trunk/core/core/game/GameManager.cs	(revision 30)
@@ -11,6 +11,8 @@
 using nft.framework.drawing;
 using System.Drawing;
 using nft.impl.view;
+using nft.core.view;
+using nft.core.geometry;
 
 namespace nft.core.game
 {
@@ -57,8 +59,7 @@
 			_curGame = newgame;
             _curMode = mode;
 			//theFrame.SetSubTitle(  );
-            GameViewPanel f = new GameViewPanel((GameImpl)_curGame);
-            theFrame.AddView(_curGame.Name, f);            
+            _curGame.Views.OpenNew();
 			_curGame.Start();
 		}
 

--- trunk/core/core/game/ViewCollection.cs	(nonexistent)
+++ trunk/core/core/game/ViewCollection.cs	(revision 30)
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using nft.core.view;
+using nft.core.geometry;
+using nft.framework;
+
+namespace nft.core.game {
+    public class ViewCollection : IEnumerable<IView>{
+        static protected IGameViewFactory ViewFactory {
+            get {
+                return GlobalModules.GetModule(typeof(IGameViewFactory)) as IGameViewFactory;
+            }
+        }
+        
+        protected List<IView> views;
+        protected IGame game;
+        public ViewCollection(IGame _game) {
+            game = _game;
+            views = new List<IView>();
+        }
+
+        public IGame Game {
+            get {
+                return game;
+            }
+        }
+
+        public virtual IView ActiveView {
+            get {
+                return views.Count > 0 ? views[0] : null;
+            }
+            set {
+                if (value != null) {
+                    SetActive(value);
+                }
+            }
+        }
+
+        public IView OpenNew() {
+            IView v = CreateView();
+            if (Add(v)) {
+                return v;
+            }else{
+                v.Close();
+                return null;
+            }
+        }
+
+        public void CloseAll() {
+            foreach (IView v in views) {
+                v.Close();
+            }
+            views.Clear();
+        }
+
+#region protected methods for override
+        protected virtual bool Add(IView v) {            
+            SetActive(v);
+            return true;
+        }
+
+        protected virtual bool Remove(IView v) {
+            return views.Remove(v);
+        }
+
+        protected virtual void SetActive(IView v) {
+            if (views.Contains(v)) {
+                views.Remove(v);
+            }
+            views.Insert(0, v);
+        }
+
+        protected virtual IView CreateView() {
+            return ViewFactory.Create(game, Location.UNPLACED);
+        }
+#endregion
+
+        #region IEnumerable implementation
+        public IEnumerator<IView>  GetEnumerator()
+        {
+            return views.GetEnumerator();
+        }
+
+        System.Collections.IEnumerator  System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+        #endregion
+    }
+}

--- trunk/core/core/game/IQuarterView.cs	(revision 29)
+++ trunk/core/core/game/IQuarterView.cs	(revision 30)
@@ -7,10 +7,11 @@
 using nft.framework.drawing;
 
 namespace nft.core.game {
+    [Obsolete]
     public interface IQuarterView {
         ViewFactor ViewFactor { get; }
         Control TargetControl { get; }
-        Location GetHitSprite(IView v, Point pt, out object tag);
+        Location GetHitSprite(IView_old v, Point pt, out object tag);
         /*
         Location ConvertMousePos(IView v, Point pt);
         Location ConvertMousePos(IView v, Point pt, int unitHeight);

--- trunk/core/core/game/IPointerHandler.cs	(nonexistent)
+++ trunk/core/core/game/IPointerHandler.cs	(revision 30)
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace nft.core.game {
+    public interface IPointerHandler {
+        void OnAttach(IGame g);
+        void OnDetach(IGame g);
+        void OnMouseButtonDown(PointerEventArgs args);
+        void OnMouseButtonUp(PointerEventArgs args);
+        void OnMouseMove(PointerEventArgs args);
+    }
+}

--- trunk/core/core/view/IView.cs	(nonexistent)
+++ trunk/core/core/view/IView.cs	(revision 30)
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using nft.impl.view;
+using nft.core.geometry;
+
+namespace nft.core.view {
+    public interface IView {
+        SceneBuilder SceneBuilder {
+            get;
+        }
+
+        InterCardinalDirection UpperDirection {
+            get;
+            set;
+        }
+
+        void Close();
+    }
+}

--- trunk/core/core/view/IGameViewFactory.cs	(nonexistent)
+++ trunk/core/core/view/IGameViewFactory.cs	(revision 30)
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using nft.framework;
+using nft.core.game;
+using nft.core.geometry;
+
+namespace nft.core.view {
+    public interface IGameViewFactory : IGlobalModule{
+        IView Create(IGame game, Location center);
+        IView Create(IGame game, Location center, int width, int height);
+    }
+}

--- trunk/core/core/view/ITargetSelector.cs	(revision 29)
+++ trunk/core/core/view/ITargetSelector.cs	(revision 30)
@@ -19,7 +19,7 @@
             this.status = stat;
         }
 
-        EventTypes Status {
+        EventTypes EventType {
             get {
                 return status;
             }

--- trunk/core/core/structure/StructureCollection.cs	(nonexistent)
+++ trunk/core/core/structure/StructureCollection.cs	(revision 30)
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using nft.core.geometry;
+
+namespace nft.core.structure {
+    public class StructureCollection {
+        protected List<Lot> list;
+
+        public StructureCollection() {
+        }
+
+        public void Add(Lot l) {
+            list.Add(l);
+        }
+
+        public void Remove(Lot l) {
+            list.Remove(l);
+        }
+
+        public List<Lot> GetCollidings(Lot l) {
+            List<Lot> result = new List<Lot>();
+            foreach (Lot l2 in list) {
+                if (l2 == l) continue;
+                if (l2.IsCollide(l)) {
+                    // TODO more detalied evaluations.
+                    result.Add(l2);
+                }
+            }
+            return result;
+        }
+
+        public StructuresEnumerator GetEnumeratorForView(Rect3D region) {
+            return new StructuresEnumerator(this, region);
+        }
+
+        public class StructuresEnumerator : IEnumerable<Lot> {
+            StructureCollection lots;
+            Rect3D region;
+            internal protected StructuresEnumerator(StructureCollection lots, Rect3D region) {
+                this.lots = lots;
+                this.region = region;
+            }
+
+            public IEnumerator<Lot> GetEnumerator() {
+                foreach(Lot l in lots.list){
+                    if(region.IsIntersect(l.Bounds)){
+                        yield return l;
+                    }
+                }
+                yield break;
+            }
+
+            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
+                return GetEnumerator();
+            }
+        }
+        public class PlanarStructuresEnumerator : IEnumerable<Lot> {
+            StructureCollection lots;
+            Rect3D region;
+            internal protected PlanarStructuresEnumerator(StructureCollection lots, Rect3D region) {
+                this.lots = lots;
+                this.region = region;
+            }
+
+            public IEnumerator<Lot> GetEnumerator() {
+                foreach (Lot l in lots.list) {
+                    Rect3D r3d = l.Bounds;
+                    if (region.X>r3d.X2 || region.X2<r3d.X || region.Y>r3d.Y2 || region.Y2<r3d.Y) {
+                        continue; // Planar area (x,y) is outside of region
+                    }
+                    yield return l;
+                }
+            }
+
+            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
+                return GetEnumerator();
+            }
+        }
+    }
+    
+
+}

--- trunk/core/core/structure/Lot.cs	(revision 29)
+++ trunk/core/core/structure/Lot.cs	(revision 30)
@@ -25,5 +25,21 @@
 		public readonly object Category;
 		public readonly int Level;
 		public readonly Rect3D Bounds;
+
+        public virtual bool IsCollide(Lot other) {
+            return Bounds.IsIntersect(other.Bounds) && other.IsCollideDetail(this);
+        }
+
+        /// <summary>
+        /// This method will called for advanced collision check,
+        /// and sholud be called ONLY when 'other' collide with the bounds of this lot.
+        /// So the simplest way is 'return true' if inside of this bounds is completely exclusive.
+        /// Or override in inherited class to implement complexed collision check.
+        /// </summary>
+        /// <param name="other"></param>
+        /// <returns></returns>
+        internal protected virtual bool IsCollideDetail(Lot other) {
+            return true;
+        }
 	}
 }

--- trunk/core/core_modules.xml	(revision 29)
+++ trunk/core/core_modules.xml	(revision 30)
@@ -14,6 +14,10 @@
     <class name="nft.ui.WinFormManager" codebase=".UI"/>
     <description>Form Manager based on System.Windows.Forms</description>
   </module>
+  <module name="Game View Factory">
+    <class name="nft.impl.view.GameViewFactory" codebase=".Core"/>
+    <description>Default Game View Factory which produces GameViewPanel (based on System.Windows.Forms)</description>
+  </module>
   <module name="Game Time Calendar">
     <class name="nft.core.schedule.Calendar" codebase=".Core"/>
     <description>Calendar For Game World</description>

--- trunk/core/impl/game/TerrainMapImpl.cs	(revision 29)
+++ trunk/core/impl/game/TerrainMapImpl.cs	(revision 30)
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using ICDir = nft.core.geometry.InterCardinalDirection;
 using ITerrainPiece = nft.core.geometry.ITerrainPiece;
+using nft.core.structure;
 
 namespace nft.impl.game
 {
@@ -12,8 +13,8 @@
 	/// <summary>
 	/// TerrainMapImplは実際に地形データを配列に展開して保持する。
 	/// </summary>
-	[Serializable]
-	public class TerrainMapImpl : ITerrainMap {
+    [Serializable]
+    public class TerrainMapImpl : ITerrainMap {
         protected delegate bool DiscontinuousChecker(TerrainMapImpl map, int x, int y);
         static protected DiscontinuousChecker[] checker;
         static TerrainMapImpl() {
@@ -28,9 +29,11 @@
         protected short[,] water;
         protected int heightOffset;
         protected Size3D size;
+        protected StructureCollection structures = new StructureCollection();
 
-        public TerrainMapImpl(ITerrainMap source) : 
-            this(source, new Rectangle(0,0,source.Size.sx, source.Size.sy)) {}
+        public TerrainMapImpl(ITerrainMap source) :
+            this(source, new Rectangle(0, 0, source.Size.sx, source.Size.sy)) {
+        }
 
         public TerrainMapImpl(ITerrainMap source, Rectangle region) {
             this.heightOffset = source.HeightOffset;
@@ -42,8 +45,8 @@
             }
             this.size = new Size3D(sx, sy, source.Size.sz);
             this.hmap = new TerrainPiecePair[sx, sy];
-			int ox = region.Left;
-			int oy = region.Top;
+            int ox = region.Left;
+            int oy = region.Top;
 
             for (int x = 0; x < sx; x++) {
                 for (int y = 0; y < sy; y++) {
@@ -50,7 +53,7 @@
                     hmap[x, y] = TerrainPiecePair.CreatePair(source, ox + x, oy + y, 1.0, CreatePiece);
                 }
             }
-		}
+        }
 
         protected virtual TerrainPieceE CreatePiece(int ne, int nw, int sw, int se) {
             return new TerrainPieceE(ne, nw, sw, se);
@@ -60,19 +63,23 @@
             Dispose(false);
         }
 
-		#region ITerrainMap メンバ
-		public Size3D Size { get{ return size; } }
+        #region ITerrainMap メンバ
+        public Size3D Size {
+            get {
+                return size;
+            }
+        }
 
-		public int Height(int x, int y) {
+        public int Height(int x, int y) {
             TerrainPiecePair pair = this[x, y];
             if (pair != null) {
                 return (short)pair.MeanHeight;
             } else {
-				string t = string.Format("Height({0},{1}): argument out of range.",x,y);
-				Debug.WriteLine(t);
-				return -1;
-			}
-		}
+                string t = string.Format("Height({0},{1}): argument out of range.", x, y);
+                Debug.WriteLine(t);
+                return -1;
+            }
+        }
 
         public int DetailedHeight(double x, double y) {
             throw new NotImplementedException();
@@ -90,7 +97,11 @@
             }
         }
 
-        public bool IsDetailedHeight { get { return false; } }
+        public bool IsDetailedHeight {
+            get {
+                return false;
+            }
+        }
 
         public int WaterDepth(int x, int y) {
             try {
@@ -103,21 +114,34 @@
         }
 
         public int HeightOffset {
-            get { return heightOffset; }
+            get {
+                return heightOffset;
+            }
         }
 
         #endregion
 
+        public StructureCollection Structures {
+            get {
+                return structures;
+            }
+        }
+
+        public void GetObjectEnumerator(Rect3D hint, out IEnumerable<TerrainPiecePair> terrains, out IEnumerable<Lot> structures) {
+            terrains = new TerrainPairEnumerator(this, hint);
+            structures = this.structures.GetEnumeratorForView(hint);
+        }
+
         public IEnumerable<ITerrainPiece> this[int x, int y, ICDir viewupper] {
             get {
                 try {
                     return hmap[x, y].GetPieces(viewupper);
                 } catch (IndexOutOfRangeException) {
-                    Debug.WriteLine("The location (" + x + ", y=" + y + ") is OUTSIDE of the map{ size:(" + hmap.GetUpperBound(0) + "," + hmap.GetUpperBound(1)+")}");
+                    Debug.WriteLine("The location (" + x + ", y=" + y + ") is OUTSIDE of the map{ size:(" + hmap.GetUpperBound(0) + "," + hmap.GetUpperBound(1) + ")}");
                     return NullEnumerator();
                 }
             }
-		}
+        }
 
         [Obsolete]
         public bool IsCliffedBounds(Direction4 cellside, int x, int y) {
@@ -142,7 +166,7 @@
 		}
 		protected Rectangle[] districts;		
         */
-        
+
         // for fail safe
         static protected IEnumerable<ITerrainPiece> NullEnumerator() {
             yield break;
@@ -198,7 +222,7 @@
         }
 
         static protected bool IsEastSideDiscontinuous(TerrainMapImpl map, int x, int y) {
-            if ( y < 0 || y >= map.Size.sy || x < 0 || map.Size.sx - x <= 1)
+            if (y < 0 || y >= map.Size.sy || x < 0 || map.Size.sx - x <= 1)
                 return true;
             try {
                 TerrainPiecePair p1 = map[x, y];
@@ -244,5 +268,29 @@
             }
         }
         #endregion
+
+        public class TerrainPairEnumerator : IEnumerable<TerrainPiecePair> {
+            TerrainMapImpl map;
+            Rect3D region;
+            internal protected TerrainPairEnumerator(TerrainMapImpl map, Rect3D region) {
+                this.map = map;
+                this.region = region;
+            }
+
+            public IEnumerator<TerrainPiecePair> GetEnumerator() {
+                int x2 = region.X2;
+                int y2 = region.Y2;
+                for (int y = region.Y; y < y2; y++) {
+                    for (int x = region.X; x < x2; x++) {
+                        yield return map.hmap[x, y];
+                    }
+                }
+            }
+
+            System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
+                return GetEnumerator();
+            }
+        }
+
     }
 }

--- trunk/core/impl/game/GameImpl.cs	(revision 29)
+++ trunk/core/impl/game/GameImpl.cs	(revision 30)
@@ -18,6 +18,8 @@
 
 		protected string name;
         protected TerrainMapImpl terrains;
+        protected IPointerHandler activeHandler;
+        protected ViewCollection views;
 
         public GameImpl(string name, ITerrainMap map, Calendar cal) {
             if (cal == null) cal = Calendar.ActiveCalendar;
@@ -28,6 +30,7 @@
                 this.terrains = (TerrainMapImpl)map;
             else 
                 this.terrains = new TerrainMapImpl(map);
+            this.views = new ViewCollection(this);
         }
 
         public GameImpl(ITerrainMap map, Calendar cal)
@@ -87,6 +90,25 @@
 			set{ name = value; }
 		}
 
-		#endregion
-	}
+        public IPointerHandler ActiveController {
+            get {
+                return activeHandler;
+            }
+            set {
+                if (activeHandler != null) {
+                    activeHandler.OnDetach(this);
+                }
+                activeHandler = value;
+                activeHandler.OnAttach(this);
+            }
+        }
+
+        public ViewCollection Views {
+            get {
+                return views;
+            }
+        }
+        #endregion
+
+    }
 }

--- trunk/core/impl/view/GameViewPanel.cs	(revision 29)
+++ trunk/core/impl/view/GameViewPanel.cs	(revision 30)
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using nft.framework.drawing;
 using nft.impl.game;
 using nft.core.geometry;
 using nft.core;
@@ -10,10 +9,12 @@
 using System.Drawing;
 using System.Windows.Forms;
 using nft.core.game;
+using nft.core.view;
+using nft.framework.drawing;
 
 namespace nft.impl.view
 {
-    public class GameViewPanel : UserControl
+    public class GameViewPanel : UserControl, IView
     {
         SceneBuilder builder;
         bool prepared;
@@ -34,6 +35,7 @@
             }
         }
 
+        #region IView implementations
         public SceneBuilder SceneBuilder {
             get { return builder; }
         }
@@ -46,6 +48,11 @@
             }
         }
 
+        public void Close() {
+            this.Dispose();
+        }
+        #endregion
+
         void OnTouchPanelScroll(object sender, ScrollEventArgs e) {
             UpdateScrollParams(false);
         }
@@ -184,6 +191,7 @@
         protected override void OnPaintBackground(PaintEventArgs e) {
         }
         #endregion
+
     }
 
     /// <summary>

--- trunk/core/impl/view/GameViewFactory.cs	(nonexistent)
+++ trunk/core/impl/view/GameViewFactory.cs	(revision 30)
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using nft.framework;
+using nft.core.view;
+using nft.ui.mainframe;
+using nft.impl.game;
+using nft.core.geometry;
+
+namespace nft.impl.view {
+    public class GameViewFactory : IGameViewFactory {
+        protected MainFrame MainFrame {
+            get {
+                return Main.mainFrame as MainFrame;
+            }
+        }
+
+        public GameViewFactory(ParamsReader node) {
+        }
+
+        #region IGameViewFactory implementation
+        public Type RegistType {
+            get {
+                return typeof(IGameViewFactory);
+            }
+        }
+
+        public IView Create(core.game.IGame game, Location center) {
+            GameViewPanel f = new GameViewPanel((GameImpl)game);
+            MainFrame.AddView(game.Name, f);
+            if (center != Location.UNPLACED) {
+                // TODO scroll to the initial location
+            }
+            return f;
+        }
+
+        public IView Create(core.game.IGame game, Location center, int width, int height) {
+            throw new NotImplementedException();
+        }
+        #endregion
+    }
+}

--- trunk/core/impl/selectors/CubeSelectorBase.cs	(nonexistent)
+++ trunk/core/impl/selectors/CubeSelectorBase.cs	(revision 30)
@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using nft.core.view;
+using nft.impl.game;
+using nft.core.game;
+
+namespace nft.impl.selectors {
+    public class CubeSelectorBase : ITargetSelector, IPointerHandler {
+        IGame game;
+        public CubeSelectorBase() {
+        }
+
+        protected TerrainMapImpl TerrainMap {
+            get {
+                return ((GameImpl)game).TerrainMap;
+            }
+        }
+
+        #region ITargetSelector implementation
+        public int MaxPhases {
+            get {
+                return 1;
+            }
+        }
+
+        public int CurrentPhase {
+            get {
+                return 1;
+            }
+        }
+
+        public object CurrentSelection {
+            get {
+                throw new NotImplementedException();
+            }
+        }
+
+        public event TargetSelectorEvent OnSelectionChanged;
+
+        public event TargetSelectorEvent OnPhaseChanged;
+
+        public event TargetSelectorEvent OnViewChanged;
+        #endregion
+
+        #region IPointerHandler implementation
+        public void OnAttach(IGame g) {
+            this.game = g;
+        }
+
+        public void OnDetach(IGame g) {
+            this.game = null;
+        }
+
+        public void OnMouseButtonDown(PointerEventArgs args) {
+            throw new NotImplementedException();
+        }
+
+        public void OnMouseButtonUp(PointerEventArgs args) {
+            throw new NotImplementedException();
+        }
+
+        public void OnMouseMove(PointerEventArgs args) {
+            throw new NotImplementedException();
+        }
+        #endregion
+    }
+}