#xxxxx 仮で組んだプログラムをコミットしていた分の差し替え。(外見的な違いはない)
branches/GITADORA風/DTXManiaプロジェクト/コード/ステージ/05.選曲/CActSelectInformation.cs (diff)
branches/GITADORA風/実行時フォルダ/DTXManiaGR.exe (diff)| @@ -36,13 +36,12 @@ | ||
| 36 | 36 | { |
| 37 | 37 | if( !base.b活性化してない ) |
| 38 | 38 | { |
| 39 | - string[,] infofiles = { // #25381 2011.6.4 yyagi | |
| 40 | - { @"Graphics\5_information.png", @"Graphics\5_information.png" }, | |
| 41 | - { @"Graphics\5_informatione.png", @"Graphics\5_informatione.png" } | |
| 39 | + string[] infofiles = { // #25381 2011.6.4 yyagi | |
| 40 | + @"Graphics\5_information.png" , | |
| 41 | + @"Graphics\5_informatione.png" | |
| 42 | 42 | }; |
| 43 | 43 | int c = ( CultureInfo.CurrentCulture.TwoLetterISOLanguageName == "ja" ) ? 0 : 1; |
| 44 | - this.txInfo[ 0 ] = CDTXMania.tテクスチャの生成( CSkin.Path( infofiles[ c, 0 ] ), false ); | |
| 45 | - this.txInfo[ 1 ] = CDTXMania.tテクスチャの生成( CSkin.Path( infofiles[ c, 1 ] ), false ); | |
| 44 | + this.txInfo = CDTXMania.tテクスチャの生成( CSkin.Path( infofiles[ c ] ), false ); | |
| 46 | 45 | base.OnManagedリソースの作成(); |
| 47 | 46 | } |
| 48 | 47 | } |
| @@ -50,8 +49,7 @@ | ||
| 50 | 49 | { |
| 51 | 50 | if( !base.b活性化してない ) |
| 52 | 51 | { |
| 53 | - CDTXMania.tテクスチャの解放( ref this.txInfo[ 0 ] ); | |
| 54 | - CDTXMania.tテクスチャの解放( ref this.txInfo[ 1 ] ); | |
| 52 | + CDTXMania.tテクスチャの解放( ref this.txInfo ); | |
| 55 | 53 | base.OnManagedリソースの解放(); |
| 56 | 54 | } |
| 57 | 55 | } |
| @@ -79,9 +77,9 @@ | ||
| 79 | 77 | { |
| 80 | 78 | STINFO stinfo = this.stInfo[ this.n画像Index上 ]; |
| 81 | 79 | Rectangle rectangle = new Rectangle( stinfo.pt左上座標.X, stinfo.pt左上座標.Y + ( (int) ( 42.0 * n現在の割合 ) ), 240, Convert.ToInt32(42.0 * (1.0 - n現在の割合)) ); |
| 82 | - if( this.txInfo[ stinfo.nTexture番号 ] != null ) | |
| 80 | + if( this.txInfo != null ) | |
| 83 | 81 | { |
| 84 | - this.txInfo[ stinfo.nTexture番号 ].t2D描画( CDTXMania.app.Device, 4, 0, rectangle ); | |
| 82 | + this.txInfo.t2D描画( CDTXMania.app.Device, 4, 0, rectangle ); | |
| 85 | 83 | } |
| 86 | 84 | } |
| 87 | 85 | if( this.n画像Index下 >= 0 ) |
| @@ -88,9 +86,9 @@ | ||
| 88 | 86 | { |
| 89 | 87 | STINFO stinfo = this.stInfo[ this.n画像Index下 ]; |
| 90 | 88 | Rectangle rectangle = new Rectangle( stinfo.pt左上座標.X, stinfo.pt左上座標.Y, 240, (int) ( 42.0 * n現在の割合 ) ); |
| 91 | - if( this.txInfo[ stinfo.nTexture番号 ] != null ) | |
| 89 | + if( this.txInfo != null ) | |
| 92 | 90 | { |
| 93 | - this.txInfo[ stinfo.nTexture番号 ].t2D描画( CDTXMania.app.Device, 4, 0 + ( (int) ( 42.0 * ( 1.0 - n現在の割合 ) ) ), rectangle ); | |
| 91 | + this.txInfo.t2D描画( CDTXMania.app.Device, 4, 0 + ( (int) ( 42.0 * ( 1.0 - n現在の割合 ) ) ), rectangle ); | |
| 94 | 92 | } |
| 95 | 93 | } |
| 96 | 94 | } |
| @@ -98,9 +96,9 @@ | ||
| 98 | 96 | { |
| 99 | 97 | STINFO stinfo = this.stInfo[ this.n画像Index下 ]; |
| 100 | 98 | Rectangle rectangle = new Rectangle( stinfo.pt左上座標.X, stinfo.pt左上座標.Y, 240, 42 ); |
| 101 | - if( this.txInfo[ stinfo.nTexture番号 ] != null ) | |
| 99 | + if( this.txInfo != null ) | |
| 102 | 100 | { |
| 103 | - this.txInfo[ stinfo.nTexture番号 ].t2D描画( CDTXMania.app.Device, 4, 0, rectangle ); | |
| 101 | + this.txInfo.t2D描画( CDTXMania.app.Device, 4, 0, rectangle ); | |
| 104 | 102 | } |
| 105 | 103 | } |
| 106 | 104 | } |
| @@ -115,11 +113,9 @@ | ||
| 115 | 113 | [StructLayout( LayoutKind.Sequential )] |
| 116 | 114 | private struct STINFO |
| 117 | 115 | { |
| 118 | - public int nTexture番号; | |
| 119 | 116 | public Point pt左上座標; |
| 120 | - public STINFO( int nTexture番号, int x, int y ) | |
| 117 | + public STINFO( int x, int y ) | |
| 121 | 118 | { |
| 122 | - this.nTexture番号 = nTexture番号; | |
| 123 | 119 | this.pt左上座標 = new Point( x, y ); |
| 124 | 120 | } |
| 125 | 121 | } |
| @@ -127,9 +123,17 @@ | ||
| 127 | 123 | private CCounter ctスクロール用; |
| 128 | 124 | private int n画像Index下; |
| 129 | 125 | private int n画像Index上; |
| 130 | - private readonly STINFO[] stInfo = new STINFO[] { new STINFO(0, 0, 0 * 42), new STINFO(0, 0, 1 * 42), new STINFO(0, 0, 2 * 42), new STINFO(0, 0, 3 * 42), new STINFO(0, 0, 4 * 42), new STINFO(0, 0, 5 * 42), new STINFO(0, 0, 6 * 42), new STINFO(0, 0, 7 * 42) }; | |
| 131 | - | |
| 132 | - private CTexture[] txInfo = new CTexture[ 2 ]; | |
| 126 | + private readonly STINFO[] stInfo = new STINFO[] { | |
| 127 | + new STINFO(0, 0 * 42), | |
| 128 | + new STINFO(0, 1 * 42), | |
| 129 | + new STINFO(0, 2 * 42), | |
| 130 | + new STINFO(0, 3 * 42), | |
| 131 | + new STINFO(0, 4 * 42), | |
| 132 | + new STINFO(0, 5 * 42), | |
| 133 | + new STINFO(0, 6 * 42), | |
| 134 | + new STINFO(0, 7 * 42) | |
| 135 | + }; | |
| 136 | + private CTexture txInfo; | |
| 133 | 137 | //----------------- |
| 134 | 138 | #endregion |
| 135 | 139 | } |
Fork