Commit: 31 - NeoFT.Workshop (svn)

FreeTrainの進化系を目指す

Commit MetaInfo

• Revision: 31 (tree)
• Time: 2015-03-21 21:26:31
• Author: c477

Log Message

ビュー周りの整備（途上） 終了確認

Change Summary

• modified: trunk/core/impl/game/GameImpl.cs
• modified: trunk/core/impl/view/GameViewPanel.cs
• modified: trunk/core/impl/view/GameViewFactory.cs
• modified: trunk/core/impl/view/ViewController.cs
• modified: trunk/core/debug/TestGame.cs
• modified: trunk/core/core/game/GameManager.cs
• modified: trunk/core/core/game/ViewCollection.cs
• modified: trunk/core/core/game/IGame.cs
• modified: trunk/core/core/view/IView.cs
• modified: trunk/NeoFT.suo

Incremental Difference

--- trunk/core/impl/game/GameImpl.cs	(revision 30)
+++ trunk/core/impl/game/GameImpl.cs	(revision 31)
@@ -4,6 +4,7 @@
 using nft.core.schedule;
 using nft.core;
 using nft.framework;
+using nft.util;
 
 namespace nft.impl.game
 {
@@ -20,8 +21,12 @@
         protected TerrainMapImpl terrains;
         protected IPointerHandler activeHandler;
         protected ViewCollection views;
+        protected bool modified;
+        protected bool closed;
 
         public GameImpl(string name, ITerrainMap map, Calendar cal) {
+            this.closed = false;
+            this.modified = true;
             if (cal == null) cal = Calendar.ActiveCalendar;
             this.name = name;
             this.calender = cal;
@@ -53,17 +58,42 @@
 			}
 		}
 
-		public void Close()
+		public virtual void Close()
 		{
-			// TODO:  GameImpl.Close 実装を追加します。
+            closed = true;
+            calender = null;
+            clock = null;
+            if (terrains != null) {
+                terrains.Dispose();
+                terrains = null;
+            }
+            if (views != null) {
+                views.CloseAll();
+                views = null;
+            }
 		}
 
+        public bool ConfirmClose() {
+            if (Closed) {
+                return true;
+            } else if(modified){
+                string text = I18n.T("GameManager", "Unsaved game data will be lost. Are you sure?");
+                modified = !UIUtil.ConfirmMessage(text, UIMessageType.warning, UIInformLevel.normal);
+            }
+            return !modified;
+        }
+
+        public bool Closed {
+            get {
+                return closed;
+            }
+        }
+
 		public bool Modified
 		{
 			get
 			{
-				// TODO:  GameImpl.Modified getter 実装を追加します。
-				return false;
+				return modified;
 			}
 		}
 

--- trunk/core/impl/view/GameViewPanel.cs	(revision 30)
+++ trunk/core/impl/view/GameViewPanel.cs	(revision 31)
@@ -49,8 +49,12 @@
         }
 
         public void Close() {
+            if (OnClose != null) OnClose(new ViewEventArgs(this));
             this.Dispose();
         }
+
+        public event ViewEventHandler OnClose;
+        public event ViewQueryEventHandler QueryClose;
         #endregion
 
         void OnTouchPanelScroll(object sender, ScrollEventArgs e) {
@@ -70,9 +74,33 @@
             Size szc = builder.ContentSize;
             InitScroll(szc, szu);
             renderPanel.EventTarget.MouseMove += new MouseEventHandler(EventTarget_MouseMove);
+            SetupCloseConfirmation();
             this.ResumeLayout(false);
         }
 
+        protected virtual void SetupCloseConfirmation() {
+            Control c = this;
+            Form f = null;
+            while (null == (f = c as Form)) {
+                c = c.Parent;
+                if (c == null) return; // 予期せぬ状況
+            }
+            f.FormClosing += new FormClosingEventHandler(OnClosing);
+        }
+
+        protected void OnClosing(object sender, FormClosingEventArgs e) {
+            if (QueryClose != null) {
+                ViewQueryEventArgs arg = new ViewQueryEventArgs(this);
+                QueryClose(arg);
+                e.Cancel = arg.Cancel;
+            }
+        }
+
+        protected override void Dispose(bool disposing) {
+            base.Dispose(disposing);
+            if (OnClose != null) OnClose(new ViewEventArgs(this));
+        }
+
         #region Designer generated
         private TouchPanel touchPanel;
         private RenderViewPanel renderPanel;

--- trunk/core/impl/view/GameViewFactory.cs	(revision 30)
+++ trunk/core/impl/view/GameViewFactory.cs	(revision 31)
@@ -6,6 +6,7 @@
 using nft.ui.mainframe;
 using nft.impl.game;
 using nft.core.geometry;
+using System.Windows.Forms;
 
 namespace nft.impl.view {
     public class GameViewFactory : IGameViewFactory {

--- trunk/core/impl/view/ViewController.cs	(revision 30)
+++ trunk/core/impl/view/ViewController.cs	(revision 31)
@@ -11,6 +11,7 @@
 using System.Drawing;
 
 namespace nft.impl.view {
+    [Obsolete]
     public class ViewController {
 
         public static ICommandEntity_Old GetRotateRightCommand(String id){

--- trunk/core/debug/TestGame.cs	(revision 30)
+++ trunk/core/debug/TestGame.cs	(revision 31)
@@ -14,8 +14,9 @@
 namespace nft.debug
 {
 	/// <summary>
-	/// TestGame の概要の説明です。
+    /// 使われてません
 	/// </summary>
+    [Obsolete]
 	public class TestGame : ICommandEntity_Old
 	{
 		static TestGame theInstance;

--- trunk/core/core/game/GameManager.cs	(revision 30)
+++ trunk/core/core/game/GameManager.cs	(revision 31)
@@ -40,15 +40,21 @@
 		protected GameManager(MainFrame mainFrame)
 		{
 			this.theFrame = mainFrame;
-			theFrame.Closing+=new System.ComponentModel.CancelEventHandler(theFrame_Closing);
             theFrame.ActiveViewChanged += new EventHandler<EventArgs>(theFrame_ActiveViewChanged);
 		}
 
 		public IGameMode CurrentMode { get{ return _curMode; } }
 		public IGame CurrentGame { get{ return _curGame; } }
-        public void SetGame(IGame newgame, IGameMode mode, bool prompt)
+        [Obsolete]
+        public void SetGame(IGame newgame, IGameMode mode, bool prompt){}
+
+        public void NewGameFromMap(ITerrainMap map, IGameMode mode, bool prompt) {
+            NewGameFromMap(null, map, Calendar.ActiveCalendar, mode, prompt);
+        }
+
+        public virtual void NewGameFromMap(string name, ITerrainMap map, Calendar cal, IGameMode mode, bool prompt)
 		{
-			if( _curGame==newgame ) return;
+            IGame newgame = CreateGame(name, map, cal);
 			if(_curGame != null)
 			{
 				if( prompt )
@@ -63,33 +69,26 @@
 			_curGame.Start();
 		}
 
+        protected virtual IGame CreateGame(string name, ITerrainMap map, Calendar cal) {
+            if(name==null || name.Length == 0) name = I18n.T("GameManager", "NewGame");
+            return new GameImpl(name, map, cal);
+        }
+
         public event EventHandler ActiveViewChanged;
 
+        /// 使われてない.
+        [Obsolete]
         public GameViewPanel ActiveView {
             get {
-                GameViewPanel gvp = theFrame.ActiveView as GameViewPanel;
-                if (gvp != null) {
-                    //MapViewDrawer drawer = dp.ViewDrawer as MapViewDrawer;
-                    return gvp;
+                if (CurrentGame != null) {
+                    return CurrentGame.Views.ActiveView as GameViewPanel;
                 } else {
                     return null;
                 }
-                throw new NotImplementedException();
             }
         }
 
-        public void NewGameFromMap(ITerrainMap map, IGameMode mode, bool prompt) {
-            if (_curGame != null) {
-                if (prompt)
-                    if (!ConfirmCloseGame()) return;
-                    else
-                        _curGame.Close();
-            }
-            _curGame = null;            
-            SetGame(new GameImpl(map, Calendar.ActiveCalendar), mode, false);
-        }
-
-		/// <summary>
+        /// <summary>
 		/// Starts a new game
 		/// </summary>
 		protected void newGame() 
@@ -124,13 +123,7 @@
 			bool b = true;
 			if(_curGame!=null && _curGame.Modified) 
 			{
-                string text = I18n.T("Unsaved game data will be lost. Are you sure?");
-				b = UIUtil.ConfirmMessage(text,UIMessageType.warning,UIInformLevel.normal);
-				if( b )
-				{
-					_curGame.Close();
-					_curGame=null;
-				}
+                b = _curGame.ConfirmClose();
 			}
 			return b;
 		}
@@ -261,10 +254,5 @@
             }
         }
 
-		private void theFrame_Closing(object sender, System.ComponentModel.CancelEventArgs e)
-		{			
-			e.Cancel = !ConfirmCloseGame();
-		}
-
     }
 }

--- trunk/core/core/game/ViewCollection.cs	(revision 30)
+++ trunk/core/core/game/ViewCollection.cs	(revision 31)
@@ -4,6 +4,7 @@
 using nft.core.view;
 using nft.core.geometry;
 using nft.framework;
+using System.Windows.Forms;
 
 namespace nft.core.game {
     public class ViewCollection : IEnumerable<IView>{
@@ -15,6 +16,8 @@
         
         protected List<IView> views;
         protected IGame game;
+        protected IView current;
+
         public ViewCollection(IGame _game) {
             game = _game;
             views = new List<IView>();
@@ -28,7 +31,7 @@
 
         public virtual IView ActiveView {
             get {
-                return views.Count > 0 ? views[0] : null;
+                return current;
             }
             set {
                 if (value != null) {
@@ -37,9 +40,21 @@
             }
         }
 
+        public virtual IView PrimaryView {
+            get {
+                return views.Count>0 ? views[0] : null;
+            }
+            /*
+            set {
+                throw new NotImplementedException();
+            }
+             */
+        }
+
         public IView OpenNew() {
             IView v = CreateView();
             if (Add(v)) {
+                SetActive(v);
                 return v;
             }else{
                 v.Close();
@@ -56,7 +71,7 @@
 
 #region protected methods for override
         protected virtual bool Add(IView v) {            
-            SetActive(v);
+            views.Add(v);
             return true;
         }
 
@@ -66,14 +81,35 @@
 
         protected virtual void SetActive(IView v) {
             if (views.Contains(v)) {
-                views.Remove(v);
+                current = v;
+            } else {
+                throw new InvalidOperationException("The view is not a member of collection.");
             }
-            views.Insert(0, v);
         }
 
         protected virtual IView CreateView() {
-            return ViewFactory.Create(game, Location.UNPLACED);
+            IView v = ViewFactory.Create(game, Location.UNPLACED);            
+            v.OnClose += new ViewEventHandler(OnViewClose);
+            v.QueryClose += new ViewQueryEventHandler(QueryViewClose);
+            return v;
         }
+
+        protected virtual void OnViewClose(ViewEventArgs ea) {
+            IView v = ea.View;
+            v.OnClose -= new ViewEventHandler(OnViewClose);
+            v.QueryClose -= new ViewQueryEventHandler(OnViewClose);
+            if (PrimaryView == v && !game.Closed) {
+                game.Close();
+            }
+            Remove(v);
+        }
+
+        protected virtual void QueryViewClose(ViewQueryEventArgs ea) {
+            IView v = ea.View;
+            if (PrimaryView == v) {
+                ea.Cancel = !game.ConfirmClose();
+            }
+        }
 #endregion
 
         #region IEnumerable implementation

--- trunk/core/core/game/IGame.cs	(revision 30)
+++ trunk/core/core/game/IGame.cs	(revision 31)
@@ -14,6 +14,7 @@
 	{
 		void Start();
 		void Close();
+        bool Closed {get;}
 		// if false, no need to save the game.
 		bool Modified {get;}
 		Clock Clock {get;}
@@ -22,5 +23,7 @@
         IPointerHandler ActiveController {get; set;}
 		//World world {get;}
         ViewCollection Views {get;}
-	}
+        //Return if prepare for close the game.
+        bool ConfirmClose();
+    }
 }

--- trunk/core/core/view/IView.cs	(revision 30)
+++ trunk/core/core/view/IView.cs	(revision 31)
@@ -5,7 +5,12 @@
 using nft.core.geometry;
 
 namespace nft.core.view {
+    public delegate void ViewEventHandler(ViewEventArgs ea);
+    public delegate void ViewQueryEventHandler(ViewQueryEventArgs ea);
     public interface IView {
+        event ViewEventHandler OnClose;
+        event ViewQueryEventHandler QueryClose;
+
         SceneBuilder SceneBuilder {
             get;
         }
@@ -17,4 +22,18 @@
 
         void Close();
     }
+
+    public class ViewEventArgs : EventArgs {
+        public readonly IView View;
+        public ViewEventArgs(IView v) {
+            View = v;
+        }
+    }
+
+    public class ViewQueryEventArgs : ViewEventArgs {
+        public bool Cancel;
+        public ViewQueryEventArgs(IView v): base(v) {
+            Cancel = false;
+        }
+    }
 }