ImageIndexを復帰
trunk/Nlgp1/Nlgp1.StageEditor/Notifies/ChipNotify.cs (diff) trunk/Nlgp1/Nlgp1.StageEditor/Notifies/ChipProperties/ChipProperty.cs (diff) trunk/Nlgp1/Nlgp1.StageEditor/Notifies/StageNotifyLoader.cs (diff) trunk/Nlgp1/Nlgp1.StageEditor/Viewers/ChipsetViewer.cs (diff) trunk/Nlgp1/Nlgp1.StageEditor/Viewers/MapViewer.cs (diff) trunk/Nlgp1/Nlgp1.StageEditor/Viewers/ChipPropertyViewer.cs (diff) trunk/Nlgp1/Nlgp1.StageEditor/Controllers/ChipsetViewerController.cs (diff) trunk/Nlgp1/Nlgp1.StageEditor/Program.cs (diff)| @@ -21,6 +21,10 @@ | ||
| 21 | 21 | get; |
| 22 | 22 | private set; |
| 23 | 23 | } |
| 24 | + public int ImageIndex { | |
| 25 | + get; | |
| 26 | + private set; | |
| 27 | + } | |
| 24 | 28 | public string Name { |
| 25 | 29 | get; |
| 26 | 30 | private set; |
| @@ -40,6 +44,7 @@ | ||
| 40 | 44 | |
| 41 | 45 | public ChipNotify( int index ) { |
| 42 | 46 | this.Index = index; |
| 47 | + this.ImageIndex = index; | |
| 43 | 48 | this.Type = ""; |
| 44 | 49 | this.Name = index.ToString(); |
| 45 | 50 | this.FrictionCoefficient = 1; |
| @@ -48,12 +53,13 @@ | ||
| 48 | 53 | |
| 49 | 54 | public void SetIndex( int index ) { |
| 50 | 55 | this.Index = index; |
| 56 | + this.ImageIndex = index; | |
| 51 | 57 | |
| 52 | 58 | OnPropertyChanged( "SetIndex" ); |
| 53 | 59 | } |
| 54 | 60 | |
| 55 | 61 | public void SetProperty( ChipProperty chipProperty ) { |
| 56 | - this.Index = chipProperty.Index; | |
| 62 | + this.ImageIndex = chipProperty.ImageIndex; | |
| 57 | 63 | this.Name = chipProperty.Name; |
| 58 | 64 | this.Type = chipProperty.Type; |
| 59 | 65 | this.FrictionCoefficient = chipProperty.FrictionCoefficient; |
| @@ -64,7 +70,8 @@ | ||
| 64 | 70 | |
| 65 | 71 | private class NoneChipNotify : ChipNotify { |
| 66 | 72 | public NoneChipNotify() |
| 67 | - : base( ChipsetImage.NoneIndex ) { | |
| 73 | + : base( NoneIndex ) { | |
| 74 | + this.ImageIndex = ChipsetImage.NoneIndex; | |
| 68 | 75 | this.Name = "EMPT"; |
| 69 | 76 | this.Type = ""; |
| 70 | 77 | this.FrictionCoefficient = 0; |
| @@ -9,6 +9,11 @@ | ||
| 9 | 9 | public class ChipProperty { |
| 10 | 10 | public int Index { |
| 11 | 11 | get; |
| 12 | + private set; | |
| 13 | + } | |
| 14 | + [Browsable( false )] | |
| 15 | + public int ImageIndex { | |
| 16 | + get; | |
| 12 | 17 | set; |
| 13 | 18 | } |
| 14 | 19 | public string Name { |
| @@ -31,6 +36,7 @@ | ||
| 31 | 36 | |
| 32 | 37 | public ChipProperty( ChipNotify chip ) { |
| 33 | 38 | this.Index = chip.Index; |
| 39 | + this.ImageIndex = chip.ImageIndex; | |
| 34 | 40 | this.Name = chip.Name; |
| 35 | 41 | this.Type = chip.Type; |
| 36 | 42 | this.FrictionCoefficient = chip.FrictionCoefficient; |
| @@ -51,7 +51,7 @@ | ||
| 51 | 51 | commonChipset.ToList().ForEach( commonChip => { |
| 52 | 52 | var chipProperty = new ChipProperty(); |
| 53 | 53 | //chipProperty.ID = commonChip.CellTypeID; |
| 54 | - chipProperty.Index = commonChip.Index; | |
| 54 | + chipProperty.ImageIndex = commonChip.Index; | |
| 55 | 55 | chipProperty.Name = commonChip.Name; |
| 56 | 56 | chipProperty.FrictionCoefficient = commonChip.FrictionCoefficient; |
| 57 | 57 | chipProperty.Type = ToStringFromChipType( commonChip.Type ); |
| @@ -142,7 +142,7 @@ | ||
| 142 | 142 | foreach( var chip in chipset ) { |
| 143 | 143 | var x = ( i % column ) * chipSize; |
| 144 | 144 | var y = ( i / column ) * chipSize; |
| 145 | - var imageNumber = chip.Index; | |
| 145 | + var imageNumber = chip.ImageIndex; | |
| 146 | 146 | var image = chipsetImage[imageNumber]; |
| 147 | 147 | if( image != null ) { |
| 148 | 148 | e.Graphics.DrawImage( image , x , y ); |
| @@ -413,7 +413,7 @@ | ||
| 413 | 413 | var x = (j - hScroll.Value) * chipSize; |
| 414 | 414 | var y = (i - vScroll.Value) * chipSize; |
| 415 | 415 | var chip = chipTable[chipIndex]; |
| 416 | - var imageIndex = chip.Index; | |
| 416 | + var imageIndex = chip.ImageIndex; | |
| 417 | 417 | var image = chipsetImage[imageIndex]; |
| 418 | 418 | graphics.DrawImage(image, x, y, chipSize, chipSize); |
| 419 | 419 | } |
| @@ -83,7 +83,7 @@ | ||
| 83 | 83 | #endregion |
| 84 | 84 | |
| 85 | 85 | private void UpdateView() { |
| 86 | - var imageNumber = CurrentChip.Index; | |
| 86 | + var imageNumber = CurrentChip.ImageIndex; | |
| 87 | 87 | this.ThumbImage.Image = chipImageSet[imageNumber]; |
| 88 | 88 | |
| 89 | 89 | if( CurrentChip == ChipNotify.None || |
| @@ -101,7 +101,7 @@ | ||
| 101 | 101 | return; |
| 102 | 102 | |
| 103 | 103 | this.chipImageSelectForm.LayerImage = chipImageSet; |
| 104 | - this.chipImageSelectForm.SelectedNumber = currentChip.Index; | |
| 104 | + this.chipImageSelectForm.SelectedNumber = currentChip.ImageIndex; | |
| 105 | 105 | |
| 106 | 106 | var result = chipImageSelectForm.ShowDialog(); |
| 107 | 107 | if( result != DialogResult.OK ) |
| @@ -108,7 +108,7 @@ | ||
| 108 | 108 | return; |
| 109 | 109 | |
| 110 | 110 | var propertyData = (ChipProperty)PropertyGrid.SelectedObject; |
| 111 | - propertyData.Index = chipImageSelectForm.SelectedNumber; | |
| 111 | + propertyData.ImageIndex = chipImageSelectForm.SelectedNumber; | |
| 112 | 112 | OnChipPropertyChanged( propertyData ); |
| 113 | 113 | } |
| 114 | 114 |
| @@ -9,7 +9,7 @@ | ||
| 9 | 9 | |
| 10 | 10 | namespace Nlgp1.StageEditor.Controllers |
| 11 | 11 | { |
| 12 | - public static class ChipsetViewerController | |
| 12 | + public static class ChipListViewerController | |
| 13 | 13 | { |
| 14 | 14 | public static void Setup(ChipsetViewer chipsetViewer, EditorNotify editor, StageNotify stage) |
| 15 | 15 | { |
| @@ -47,7 +47,7 @@ | ||
| 47 | 47 | StageEditorFormController.Setup( stageEditor , editor , stage ); |
| 48 | 48 | MapViewerController.Setup( stageEditor.MapViewer , editor , stage ); |
| 49 | 49 | ChipPropertyViewerController.Setup( stageEditor.ChipPropertyViewer , editor , stage ); |
| 50 | - ChipsetViewerController.Setup( stageEditor.ChipsetViewer , editor , stage ); | |
| 50 | + ChipListViewerController.Setup( stageEditor.ChipsetViewer , editor , stage ); | |
| 51 | 51 | LayersTabViewerController.Setup( stageEditor.LayersTabViewer , editor , stage ); |
| 52 | 52 | |
| 53 | 53 | stageEditor.Show(); |
biikame