Changeset 19

Timestamp:

Nov 17, 2004, 9:49:10 PM (19 years ago)

Author:

altba\rryu

Message:

FaceDefクラスにマーカーとタイトルパターンの読み込み処理を追加した。

Location:

trunk

Files:

• MacFaceFloat/ConfigurationForm.cs (modified) (1 diff)
• MacFaceFloat/MainForm.cs (modified) (1 diff)
• MacFaceLibrary/FaceDef.cs (modified) (8 diffs)

trunk/MacFaceFloat/ConfigurationForm.cs

@@ -386 +386 @@
                         {
                                 FaceDef faceDef = new FaceDef(path);
-                                Image image = faceDef.PatternImage(FaceDef.PatternSuite.Normal, 10);
-                                imageListFacePreviews.Images.Add(image);
+                                imageListFacePreviews.Images.Add(faceDef.TitleImage());
 
                                 ListViewItem item = listViewFaces.Items.Add(faceDef.Title, imageListFacePreviews.Images.Count-1);

trunk/MacFaceFloat/MainForm.cs

@@ -213 +213 @@
                                 Graphics g = this.Graphics;
                                 g.Clear(Color.FromArgb(0, 0, 0, 0));
-                                _currentFaceDef.DrawPattern(g, FaceDef.PatternSuite.Normal, usage/10);
+                                _currentFaceDef.DrawPatternImage(g, FaceDef.PatternSuite.Normal, usage/10, FaceDef.MarkerNone);
                                 this.Update();
                         }

trunk/MacFaceLibrary/FaceDef.cs

@@ -25 +25 @@
                 }
 
-                public enum MarkerBitMask
-                {
-                        None    = 0x00,
-                        PageIn  = 0x01,
-                        PageOut = 0x02
-                }
+                public const int MarkerNone    = 0x00;
+                public const int MarkerPageIn  = 0x01;
+                public const int MarkerPageOut = 0x02;
 
                 private const string FaceDefName = "faceDef.plist";
                 private const int PatternCols = 11;
                 private const int PatternRows = 3;
+                private const int ImageWidth = 128;
+                private const int ImageHeight = 128;
 
                 private string _path;
@@ -44 +43 @@
                 private Part[] _parts;
                 private Part[][][] _patternSuites;
-                private Part[] _makers;
+                private Part[] _markers;
+                private Part[] _titlePattern;
 
 
@@ -72 +72 @@
 
 
-                        // Part ‚ð“ǂݍž‚ށB
-                        ArrayList partDefList = def["parts"] as ArrayList;
+                        // ƒp[ƒc‚̓ǂݍž‚Ý
+                        ArrayList partDefList = (ArrayList)def["parts"];
                         if (partDefList == null) 
                         {
@@ -82 +82 @@
                         for (int i = 0; i < partDefList.Count; i++)
                         {
-                                Hashtable partDef = partDefList[i] as Hashtable;
-                                string filename = partDef["filename"] as String;
+                                Hashtable partDef = (Hashtable)partDefList[i];
+                                string filename = (String)partDef["filename"];
                                 int x = (int)partDef["pos x"];
                                 int y = (int)partDef["pos y"];
@@ -89 +89 @@
                         }
 
+                        // ƒpƒ^[ƒ“‚̓ǂݍž‚Ý
                         ArrayList suiteDefList = (ArrayList)def["pattern"];
                         _patternSuites = new Part[PatternRows][][];
@@ -107 +108 @@
                                 _patternSuites[i] = suite;
                         }
+
+                        // ƒ}[ƒJ[‚̓ǂݍž‚Ý
+                        ArrayList markerDefList = (ArrayList)def["markers"];
+                        _markers = new Part[markerDefList.Count];
+                        for (int i = 0; i < markerDefList.Count; i++)
+                        {
+                                _markers[i] = _parts[(int)markerDefList[i]];
+                        }
+
+                        // ƒ^ƒCƒgƒ‹ƒpƒ^[ƒ“‚̓ǂݍž‚Ý
+                        ArrayList titlePatternDef = (ArrayList)def["title pattern"];
+                        _titlePattern = new Part[titlePatternDef.Count];
+                        for (int i = 0; i < titlePatternDef.Count; i++) 
+                        {
+                                _titlePattern[i] = _parts[(int)titlePatternDef[i]];
+                        }
                 }
 
@@ -134 +151 @@
                 }
 
-                public void DrawPattern(Graphics g, PatternSuite suite, int no)
-                {
-                        Part[] pattern = _patternSuites[(int)suite][no];
-                        foreach (Part part in pattern)
+                public Image TitleImage()
+                {
+                        Bitmap image = new Bitmap(ImageWidth, ImageHeight);
+                        Graphics g = Graphics.FromImage(image);
+
+                        foreach (Part part in _titlePattern)
                         {
                                 g.DrawImage(part.Image,
@@ -143 +162 @@
                                         part.Image.Size.Width, part.Image.Size.Height);
                         }
-                }
-
-                public Image PatternImage(PatternSuite suite, int no)
-                {
-                        Bitmap image = new Bitmap(128, 128);
+
+                        g.Dispose();
+                        return image;
+                }
+
+                public void DrawPatternImage(Graphics g, PatternSuite suite, int no, int markers)
+                {
+                        Part[] pattern = _patternSuites[(int)suite][no];
+                        foreach (Part part in pattern)
+                        {
+                                g.DrawImage(part.Image,
+                                        part.Point.X, part.Point.Y,
+                                        part.Image.Size.Width, part.Image.Size.Height);
+                        }
+
+                        if (markers != 0) {
+                                for (int i = 0; i < 8; i++)
+                                {
+                                        if ((markers & (1 << i)) != 0)
+                                        {
+                                                Part part = _markers[i];
+                                                g.DrawImage(part.Image,
+                                                        part.Point.X, part.Point.Y,
+                                                        part.Image.Size.Width, part.Image.Size.Height);
+                                        }
+                                }
+                        }
+                }
+
+                public Image PatternImage(PatternSuite suite, int no, int markers)
+                {
+                        Bitmap image = new Bitmap(ImageWidth, ImageHeight);
                         Graphics g = Graphics.FromImage(image);
-                        DrawPattern(g, suite, no);
+                        DrawPatternImage(g, suite, no, markers);
                         g.Dispose();
                         return image;