Commit: 12 - NeoFT.Workshop (svn)

FreeTrainの進化系を目指す

Commit MetaInfo

• Revision: 12 (tree)
• Time: 2014-01-03 18:24:59
• Author: c477

Log Message

匿名コントリビューション CtbAnonymous の定義とサンプル実装

Change Summary

• modified: trunk/NeoFT.suo
• modified: trunk/plugins/system/plugin.xml
• modified: trunk/core/core_modules.xml
• added: trunk/core/contributions/graphics/CtbConditionFactory.cs
• added: trunk/core/debug/TestAnonymousCtb.cs
• modified: trunk/core/core/view/ISceneCondition.cs
• modified: trunk/core/NFT.Core.csproj
• modified: trunk/framework/NFT.Framework.csproj
• added: trunk/framework/framework/plugin/CtbAnonymousCtbFactory.cs
• normal: trunk

Incremental Difference

--- trunk/plugins/system/plugin.xml	(revision 11)
+++ trunk/plugins/system/plugin.xml	(revision 12)
@@ -15,6 +15,11 @@
     <name>TestBinaryModule</name>
     <class name="nft.debug.TestBinaryModule" codebase=".Core"/>
   </contribution>
+  <contribution type="factory" id="F_Anonymous">
+    <name>Anonymous</name>
+    <description>Independent contributions decrared without specific factroy.</description>
+    <implementation name="nft.framework.plugin.CtbAnonymousCtbFactory"/>
+  </contribution>
   <contribution type="factory" id="F_SubForm">
     <name>SubForm</name>
     <description>Child GUI forms</description>
@@ -269,6 +274,12 @@
 	<command menupath="HELP\DEBUG|TEST" />
 	</contribution-->
 
+  <contribution type="Anonymous" id="Test_CtbAnonymous">
+    <name>匿名コントリビューション</name>
+    <description>ファクトリ宣言を必要としない、孤立したコントリビューションのサンプル</description>
+    <class name="nft.debug.TestAnonymousCtb" codebase=".Core"/>
+  </contribution>
+
   <contribution type="Command" id="C_CreateNewMap">
     <name>新規マップ作成</name>
     <class name="nft.ui.core.CreateMapForm" codebase=".UI"/>

--- trunk/core/core_modules.xml	(revision 11)
+++ trunk/core/core_modules.xml	(revision 12)
@@ -14,4 +14,23 @@
     <class name="nft.ui.WinFormManager" codebase=".UI"/>
     <description>Form Manager based on System.Windows.Forms</description>
   </module>
+  <module name="Game Time Calendar">
+    <class name="nft.core.schedule.GameCalender" codebase=".Core"/>
+    <description>Calendar For Game World</description>
+    <preference>
+      <param name="UseRealDaysInMonth" type="Boolean">
+        <comment>If false, Each month have %SimpefiedDaysInMonth% days</comment>
+        <default>false</default>
+      </param>
+      <param name="SimplifiedDaysInMonth" type="Integer">
+        <comment>Not used if %UseRealDaysInMonth% is true</comment>
+        <default>7</default>
+      </param>
+      <param name="RevisonWeightForDaysInMonth" type="Float">
+        <note>Not used if UseRealDaysInMonth is true</note>
+        <!--Not used if UseRealDaysInMonth is true-->
+        <default>7</default>
+      </param>
+    </preference>
+  </module>
 </modules>
\ No newline at end of file

--- trunk/core/contributions/graphics/CtbConditionFactory.cs	(nonexistent)
+++ trunk/core/contributions/graphics/CtbConditionFactory.cs	(revision 12)
@@ -0,0 +1,48 @@
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Drawing;
+using System.Reflection;
+using System.Xml;
+using nft.framework;
+using nft.framework.plugin;
+using nft.core.game;
+using nft.core.geometry;
+using nft.core.structure;
+using nft.util;
+using nft.framework.drawing;
+using System.Text;
+using System.IO;
+using System.Collections.Generic;
+using nft.core.view;
+
+namespace nft.contributions.graphics
+{
+	/// <summary>
+	/// CtbCliffTextureFactory の概要の説明です。
+	/// </summary>
+    public class CtbDefaultSceneConditionFactory : CtbCustomCtbFactory, IConditionFactory
+	{
+        public CtbDefaultSceneConditionFactory(Plugin p, ParamsReader contrib)
+            : base(p, contrib) {
+        }
+
+        protected override Contribution Create(Plugin owner, ParamsReader e)
+        {
+            ParamsReader src = e["src"];
+            if(!src.IsNull){                
+                e.OverWrite("name","Image:"+src.InnerText);
+            } else {
+                e.OverWrite("name","<unknown>");
+            }
+            return new CtbImageResource(owner, e);
+        }
+
+
+
+        public ISceneCondition CreateCondition(ParamsReader reader)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

--- trunk/core/debug/TestAnonymousCtb.cs	(nonexistent)
+++ trunk/core/debug/TestAnonymousCtb.cs	(revision 12)
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using nft.framework.plugin;
+using nft.framework;
+using System.Diagnostics;
+
+namespace nft.debug
+{
+    public class TestAnonymousCtb : CtbAnonymous
+    {
+        public TestAnonymousCtb(Plugin owner, ParamsReader contrib):base(owner, contrib) {
+            Debug.WriteLine("TestAnonymousCtb instance created.");
+        }
+    }
+}

--- trunk/core/core/view/ISceneCondition.cs	(revision 11)
+++ trunk/core/core/view/ISceneCondition.cs	(revision 12)
@@ -3,6 +3,7 @@
 using System.Text;
 using nft.framework.drawing;
 using nft.framework;
+using nft.core.schedule;
 
 namespace nft.core.view
 {
@@ -14,7 +15,8 @@
 
     public interface ISceneParams
     {
-        DateTime Datetime { get; }
+        //DateTime Datetime { get; }
+        Time Time { get; }
         Object Weather { get; }
         ZoomScale ZoomScale { get; }
     }
@@ -21,7 +23,10 @@
 
     public interface IConditionFactory
     {
+        string Name { get; }
+
         ISceneCondition CreateCondition(ParamsReader reader);
+
     }
 
     public interface ISceneCondition

--- trunk/framework/framework/plugin/CtbAnonymousCtbFactory.cs	(nonexistent)
+++ trunk/framework/framework/plugin/CtbAnonymousCtbFactory.cs	(revision 12)
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Xml;
+using nft.util;
+using System.Diagnostics;
+
+namespace nft.framework.plugin {
+    /// <summary>
+    /// Instantiate a Contribution class by custom method (maybe according to the description of XML element)
+    /// The Contribution should be an instance of specified baseType.
+    /// <seealso cref="CustomContributionFactory"/>
+    /// </summary>
+    [PrimitiveContribution]
+    public sealed class CtbAnonymousCtbFactory : Contribution, IContributionFactory {
+        public CtbAnonymousCtbFactory(Plugin p, ParamsReader e)
+            : base(p, e) {
+        }
+
+        #region IContributionFactory メンバ
+        public Type OutputType { get { return typeof(CtbAnonymous); } }
+
+        public Contribution load(Plugin owner, ParamsReader reader) {
+            Type required = OutputType;
+            Type t = PluginUtil.loadTypeFromManifest(reader["class"]);
+            if (!t.IsSubclassOf(required))
+            {
+                string templ = Main.resources["xml.class_cast_error"].stringValue;
+                object[] a2 = new object[] { t.FullName, required.Name, reader.SourceURI };
+                throw new InvalidCastException(string.Format(templ, a2));
+            }
+            CtbAnonymous result = null;
+            try
+            {
+                // give XmlNode as first argument of constructor.
+                result = Activator.CreateInstance(t, new object[] { reader }) as CtbAnonymous;
+            }
+            catch (Exception e)
+            {
+                Debug.WriteLine(e.Message);
+                Debug.WriteLine(e.StackTrace);
+                string templ = Main.resources["xml.class_load_error"].stringValue;
+                throw new Exception(string.Format(templ, t.FullName, reader.SourceURI), e);
+            }
+            return result;
+        }
+        #endregion
+    }
+
+    public class CtbAnonymous : Contribution {
+        public CtbAnonymous(Plugin owner, ParamsReader contrib)
+            : base(owner, contrib)
+        { 
+        }
+    }
+}