OSDN Git Service

#36043 CDTXMania 内の app 以外の static メンバをインスタンスメンバにし、appを介してアクセスするように変更。CChipのメンバの多くをpr...
[dtxmania/dtxmania.git] / DTXManiaプロジェクト / コード / ステージ / 05.選曲 / CActSelectQuickConfig.cs
index 1f5cce8..7b20efa 100644 (file)
@@ -67,7 +67,7 @@ namespace DTXMania
                        }\r
                        #endregion\r
                        #region [ 個別 ScrollSpeed ]\r
-                       l.Add( new CItemInteger( "ScrollSpeed", 0, 1999, CDTXMania.ConfigIni.n譜面スクロール速度[ nInst ],\r
+                       l.Add( new CItemInteger( "ScrollSpeed", 0, 1999, CDTXMania.app.ConfigIni.n譜面スクロール速度[ nInst ],\r
                                "演奏時のドラム譜面のスクロールの\n" +\r
                                "速度を指定します。\n" +\r
                                "x0.5 ~ x1000.0 を指定可能です。",\r
@@ -77,7 +77,7 @@ namespace DTXMania
                                "(ScrollSpeed=x0.5 means half speed)" ) );\r
                        #endregion\r
                        #region [ 共通 Dark/Risky/PlaySpeed ]\r
-                       l.Add( new CItemList( "Dark", CItemBase.Eパネル種別.通常, (int) CDTXMania.ConfigIni.eDark,\r
+                       l.Add( new CItemList( "Dark", CItemBase.Eパネル種別.通常, (int) CDTXMania.app.ConfigIni.eDark,\r
                                "HALF: 背景、レーン、ゲージが表示\n" +\r
                                "されなくなります。\n" +\r
                                "FULL: さらに小節線、拍線、判定ラ\n" +\r
@@ -88,7 +88,7 @@ namespace DTXMania
                                "FULL: additionaly to HALF, bar/beat\n" +\r
                                " lines, hit bar, pads are disappeared.",\r
                                new string[] { "OFF", "HALF", "FULL" } ) );\r
-                       l.Add( new CItemInteger( "Risky", 0, 10, CDTXMania.ConfigIni.nRisky,\r
+                       l.Add( new CItemInteger( "Risky", 0, 10, CDTXMania.app.ConfigIni.nRisky,\r
                                "Riskyモードの設定:\n" +\r
                                "1以上の値にすると、その回数分の\n" +\r
                                "Poor/MissでFAILEDとなります。\n" +\r
@@ -101,7 +101,7 @@ namespace DTXMania
                                " the number of Poor/Miss times to be\n" +\r
                                " FAILED.\n" +\r
                                "Set 0 to disable Risky mode." ) );\r
-                       l.Add( new CItemInteger( "PlaySpeed", 5, 40, CDTXMania.ConfigIni.n演奏速度,\r
+                       l.Add( new CItemInteger( "PlaySpeed", 5, 40, CDTXMania.app.ConfigIni.n演奏速度,\r
                                "曲の演奏速度を、速くしたり遅くした\n" +\r
                                "りすることができます。\n" +\r
                                "(※一部のサウンドカードでは正しく\n" +\r
@@ -114,24 +114,24 @@ namespace DTXMania
                        #endregion\r
                        #region [ 個別 Sud/Hid ]\r
                        int nSuddenHidden;\r
-                       if ( CDTXMania.ConfigIni.eInvisible[ nInst ] != EInvisible.OFF )\r
+                       if ( CDTXMania.app.ConfigIni.eInvisible[ nInst ] != EInvisible.OFF )\r
                        {\r
-                               nSuddenHidden = (int) CDTXMania.ConfigIni.eInvisible[ nInst ] + 3;\r
+                               nSuddenHidden = (int) CDTXMania.app.ConfigIni.eInvisible[ nInst ] + 3;\r
                        }\r
                        else\r
                        {\r
-                               nSuddenHidden = ( ( CDTXMania.ConfigIni.bHidden[ nInst ] ) ? 2 : 0 ) + ( ( CDTXMania.ConfigIni.bSudden[ nInst ] ) ? 1 : 0 );\r
+                               nSuddenHidden = ( ( CDTXMania.app.ConfigIni.bHidden[ nInst ] ) ? 2 : 0 ) + ( ( CDTXMania.app.ConfigIni.bSudden[ nInst ] ) ? 1 : 0 );\r
                        }\r
                        l.Add( new CItemList( "Sud/Hid", CItemBase.Eパネル種別.通常, nSuddenHidden, "", "",\r
                                new string[] { "None", "Sudden", "Hidden", "Sud+Hid", "S-Invisible", "F-Invisible" } ) );\r
                        #endregion\r
             #region [ 個別 Ghost ]\r
-            l.Add( new CItemList("AUTO Ghost", CItemBase.Eパネル種別.通常, (int)CDTXMania.ConfigIni.eAutoGhost[ nInst ],\r
+            l.Add( new CItemList("AUTO Ghost", CItemBase.Eパネル種別.通常, (int)CDTXMania.app.ConfigIni.eAutoGhost[ nInst ],\r
                 "AUTOプレーのゴーストを指定します。\n",\r
                 "Specify Play Ghost data.\n",\r
                 new string[] {"Perfect", "Last Play", "Hi Skill", "Hi Score", "Online" }\r
                 ));\r
-            l.Add(new CItemList("Target Ghost", CItemBase.Eパネル種別.通常, (int)CDTXMania.ConfigIni.eTargetGhost[ nInst ],\r
+            l.Add(new CItemList("Target Ghost", CItemBase.Eパネル種別.通常, (int)CDTXMania.app.ConfigIni.eTargetGhost[ nInst ],\r
                 "ターゲットゴーストを指定します。\n",\r
                 "Specify Target Ghost data.\n",\r
                 new string[] {"None", "Perfect", "Last Play", "Hi Skill", "Hi Score", "Online" }\r
@@ -156,28 +156,28 @@ namespace DTXMania
                        int automode;\r
                        #region [ Drums ]\r
                        // "All Auto", "Auto HH", "Auto BD", "Custom", "OFF"\r
-                       if ( CDTXMania.ConfigIni.bドラムが全部オートプレイである )\r
+                       if ( CDTXMania.app.ConfigIni.bドラムが全部オートプレイである )\r
                        {\r
                                automode = 0;   // All Auto\r
                        }\r
-                       else if (       CDTXMania.ConfigIni.bAutoPlay.LC == false && CDTXMania.ConfigIni.bAutoPlay.HH == true &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.BD == false && CDTXMania.ConfigIni.bAutoPlay.SD == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.HT == false && CDTXMania.ConfigIni.bAutoPlay.LT == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.FT == false && CDTXMania.ConfigIni.bAutoPlay.CY == false )\r
+                       else if (       CDTXMania.app.ConfigIni.bAutoPlay.LC == false && CDTXMania.app.ConfigIni.bAutoPlay.HH == true &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.BD == false && CDTXMania.app.ConfigIni.bAutoPlay.SD == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.HT == false && CDTXMania.app.ConfigIni.bAutoPlay.LT == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.FT == false && CDTXMania.app.ConfigIni.bAutoPlay.CY == false )\r
                        {\r
                                automode = 1;   // Auto HH\r
                        }\r
-                       else if (       CDTXMania.ConfigIni.bAutoPlay.LC == false && CDTXMania.ConfigIni.bAutoPlay.HH == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.BD == true  && CDTXMania.ConfigIni.bAutoPlay.SD == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.HT == false && CDTXMania.ConfigIni.bAutoPlay.LT == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.FT == false && CDTXMania.ConfigIni.bAutoPlay.CY == false )\r
+                       else if (       CDTXMania.app.ConfigIni.bAutoPlay.LC == false && CDTXMania.app.ConfigIni.bAutoPlay.HH == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.BD == true  && CDTXMania.app.ConfigIni.bAutoPlay.SD == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.HT == false && CDTXMania.app.ConfigIni.bAutoPlay.LT == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.FT == false && CDTXMania.app.ConfigIni.bAutoPlay.CY == false )\r
                        {\r
                                automode = 2;   // Auto BD\r
                        }\r
-                       else if (       CDTXMania.ConfigIni.bAutoPlay.LC == false && CDTXMania.ConfigIni.bAutoPlay.HH == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.BD == false && CDTXMania.ConfigIni.bAutoPlay.SD == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.HT == false && CDTXMania.ConfigIni.bAutoPlay.LT == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.FT == false && CDTXMania.ConfigIni.bAutoPlay.CY == false )\r
+                       else if (       CDTXMania.app.ConfigIni.bAutoPlay.LC == false && CDTXMania.app.ConfigIni.bAutoPlay.HH == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.BD == false && CDTXMania.app.ConfigIni.bAutoPlay.SD == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.HT == false && CDTXMania.app.ConfigIni.bAutoPlay.LT == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.FT == false && CDTXMania.app.ConfigIni.bAutoPlay.CY == false )\r
                        {\r
                                automode = 4;   // OFF\r
                        }\r
@@ -189,27 +189,27 @@ namespace DTXMania
                        #endregion\r
                        #region [ Guitar ]\r
 // "OFF", "ON" \r
-//                     l.Add( ( CDTXMania.ConfigIni.bAutoPlay.Guitar == true ) ? 1 : 0 );\r
-//                     l.Add( ( CDTXMania.ConfigIni.bAutoPlay.Bass   == true ) ? 1 : 0 );\r
-                       if ( CDTXMania.ConfigIni.bギターが全部オートプレイである)\r
+//                     l.Add( ( CDTXMania.app.ConfigIni.bAutoPlay.Guitar == true ) ? 1 : 0 );\r
+//                     l.Add( ( CDTXMania.app.ConfigIni.bAutoPlay.Bass   == true ) ? 1 : 0 );\r
+                       if ( CDTXMania.app.ConfigIni.bギターが全部オートプレイである)\r
                        {\r
                                automode = 0;   // All Auto\r
                        }\r
-                       else if (       CDTXMania.ConfigIni.bAutoPlay.GtR == true && CDTXMania.ConfigIni.bAutoPlay.GtG == true &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.GtB == true && CDTXMania.ConfigIni.bAutoPlay.GtPick == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.GtW == false )\r
+                       else if (       CDTXMania.app.ConfigIni.bAutoPlay.GtR == true && CDTXMania.app.ConfigIni.bAutoPlay.GtG == true &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.GtB == true && CDTXMania.app.ConfigIni.bAutoPlay.GtPick == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.GtW == false )\r
                        {\r
                                automode = 1;   // Auto Neck\r
                        }\r
-                       else if (       CDTXMania.ConfigIni.bAutoPlay.GtR == false && CDTXMania.ConfigIni.bAutoPlay.GtG == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.GtB == false && CDTXMania.ConfigIni.bAutoPlay.GtPick == true &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.GtW == false )\r
+                       else if (       CDTXMania.app.ConfigIni.bAutoPlay.GtR == false && CDTXMania.app.ConfigIni.bAutoPlay.GtG == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.GtB == false && CDTXMania.app.ConfigIni.bAutoPlay.GtPick == true &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.GtW == false )\r
                        {\r
                                automode = 2;   // Auto Pick\r
                        }\r
-                       else if (       CDTXMania.ConfigIni.bAutoPlay.GtR == false && CDTXMania.ConfigIni.bAutoPlay.GtG == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.GtB == false && CDTXMania.ConfigIni.bAutoPlay.GtPick == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.GtW == false )\r
+                       else if (       CDTXMania.app.ConfigIni.bAutoPlay.GtR == false && CDTXMania.app.ConfigIni.bAutoPlay.GtG == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.GtB == false && CDTXMania.app.ConfigIni.bAutoPlay.GtPick == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.GtW == false )\r
                        {\r
                                automode = 4;   // OFF\r
                        }\r
@@ -220,25 +220,25 @@ namespace DTXMania
                        l.Add( automode );\r
                        #endregion\r
                        #region [ Bass ]\r
-                       if ( CDTXMania.ConfigIni.bベースが全部オートプレイである )\r
+                       if ( CDTXMania.app.ConfigIni.bベースが全部オートプレイである )\r
                        {\r
                                automode = 0;   // All Auto\r
                        }\r
-                       else if (       CDTXMania.ConfigIni.bAutoPlay.BsR == true && CDTXMania.ConfigIni.bAutoPlay.BsG == true &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.BsB == true && CDTXMania.ConfigIni.bAutoPlay.BsPick == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.BsW == false )\r
+                       else if (       CDTXMania.app.ConfigIni.bAutoPlay.BsR == true && CDTXMania.app.ConfigIni.bAutoPlay.BsG == true &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.BsB == true && CDTXMania.app.ConfigIni.bAutoPlay.BsPick == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.BsW == false )\r
                        {\r
                                automode = 1;   // Auto Neck\r
                        }\r
-                       else if (       CDTXMania.ConfigIni.bAutoPlay.BsR == false && CDTXMania.ConfigIni.bAutoPlay.BsG == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.BsB == false && CDTXMania.ConfigIni.bAutoPlay.BsPick == true &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.BsW == false )\r
+                       else if (       CDTXMania.app.ConfigIni.bAutoPlay.BsR == false && CDTXMania.app.ConfigIni.bAutoPlay.BsG == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.BsB == false && CDTXMania.app.ConfigIni.bAutoPlay.BsPick == true &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.BsW == false )\r
                        {\r
                                automode = 2;   // Auto Pick\r
                        }\r
-                       else if (       CDTXMania.ConfigIni.bAutoPlay.BsR == false && CDTXMania.ConfigIni.bAutoPlay.BsG == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.BsB == false && CDTXMania.ConfigIni.bAutoPlay.BsPick == false &&\r
-                                               CDTXMania.ConfigIni.bAutoPlay.BsW == false )\r
+                       else if (       CDTXMania.app.ConfigIni.bAutoPlay.BsR == false && CDTXMania.app.ConfigIni.bAutoPlay.BsG == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.BsB == false && CDTXMania.app.ConfigIni.bAutoPlay.BsPick == false &&\r
+                                               CDTXMania.app.ConfigIni.bAutoPlay.BsW == false )\r
                        {\r
                                automode = 4;   // OFF\r
                        }\r
@@ -323,7 +323,7 @@ namespace DTXMania
                                {\r
                                        this.tx文字列パネル.Dispose();\r
                                }\r
-                               this.tx文字列パネル = new CTexture( CDTXMania.app.Device, image, CDTXMania.TextureFormat );\r
+                               this.tx文字列パネル = new CTexture( CDTXMania.app.Device, image, CDTXMania.app.TextureFormat );\r
                                this.tx文字列パネル.vc拡大縮小倍率 = new Vector3( 1f, 1f, 1f );\r
                                image.Dispose();\r
                        }\r
@@ -350,48 +350,48 @@ namespace DTXMania
                                        break;\r
 \r
                                case (int) EOrder.ScrollSpeed:\r
-                                       CDTXMania.ConfigIni.n譜面スクロール速度[ nCurrentTarget ] = (int) GetObj現在値( (int) EOrder.ScrollSpeed );\r
+                                       CDTXMania.app.ConfigIni.n譜面スクロール速度[ nCurrentTarget ] = (int) GetObj現在値( (int) EOrder.ScrollSpeed );\r
                                        break;\r
 \r
                                case (int) EOrder.Dark:\r
                                        {\r
                                                Eダークモード d = (Eダークモード) GetIndex( (int) EOrder.Dark );\r
-                                               CDTXMania.ConfigIni.eDark = d;\r
+                                               CDTXMania.app.ConfigIni.eDark = d;\r
                                                SetValueToAllTarget( (int) EOrder.Dark, (int) d );              // 全楽器で共有する値のため、全targetに値を展開する\r
                                        }\r
                                        break;\r
                                case (int) EOrder.Risky:\r
                                        {\r
                                                int r = (int) GetObj現在値( (int) EOrder.Risky );\r
-                                               CDTXMania.ConfigIni.nRisky = r;\r
+                                               CDTXMania.app.ConfigIni.nRisky = r;\r
                                                SetValueToAllTarget( (int) EOrder.Risky, r );                   // 全楽器で共有する値のため、全targetに値を展開する\r
                                        }\r
                                        break;\r
                                case (int) EOrder.PlaySpeed:\r
-                                       CDTXMania.ConfigIni.n演奏速度 = (int) GetObj現在値( (int) EOrder.PlaySpeed );\r
+                                       CDTXMania.app.ConfigIni.n演奏速度 = (int) GetObj現在値( (int) EOrder.PlaySpeed );\r
                                        break;\r
                                case (int) EOrder.SuddenHidden:\r
                                        int sh = (int) GetIndex( (int) EOrder.SuddenHidden );\r
                                        if ( sh <= 3 )\r
                                        {\r
-                                               CDTXMania.ConfigIni.bSudden[ nCurrentTarget ] = ( ( sh & 1 ) > 0 ) ? true : false;\r
-                                               CDTXMania.ConfigIni.bHidden[ nCurrentTarget ] = ( ( sh & 2 ) > 0 ) ? true : false;\r
-                                               CDTXMania.ConfigIni.eInvisible[ nCurrentTarget ] = EInvisible.OFF;\r
+                                               CDTXMania.app.ConfigIni.bSudden[ nCurrentTarget ] = ( ( sh & 1 ) > 0 ) ? true : false;\r
+                                               CDTXMania.app.ConfigIni.bHidden[ nCurrentTarget ] = ( ( sh & 2 ) > 0 ) ? true : false;\r
+                                               CDTXMania.app.ConfigIni.eInvisible[ nCurrentTarget ] = EInvisible.OFF;\r
                                        }\r
                                        else\r
                                        {\r
-                                               CDTXMania.ConfigIni.bSudden[ nCurrentTarget ] = CDTXMania.ConfigIni.bHidden[ nCurrentTarget ] = false;\r
-                                               CDTXMania.ConfigIni.eInvisible[ nCurrentTarget ] = ( EInvisible ) ( sh - 3 );\r
+                                               CDTXMania.app.ConfigIni.bSudden[ nCurrentTarget ] = CDTXMania.app.ConfigIni.bHidden[ nCurrentTarget ] = false;\r
+                                               CDTXMania.app.ConfigIni.eInvisible[ nCurrentTarget ] = ( EInvisible ) ( sh - 3 );\r
                                        }\r
                                        break;\r
                 case (int) EOrder.AutoGhost: // #35411 chnmr0 AUTOゴーストデータ\r
                     EAutoGhostData gd = (EAutoGhostData)GetIndex((int)EOrder.AutoGhost);\r
-                    CDTXMania.ConfigIni.eAutoGhost[ nCurrentTarget ] = gd;\r
+                    CDTXMania.app.ConfigIni.eAutoGhost[ nCurrentTarget ] = gd;\r
                     break;\r
 \r
                 case (int)EOrder.TargetGhost: // #35411 chnmr0 ターゲットゴーストデータ\r
                     ETargetGhostData gtd = (ETargetGhostData)GetIndex((int)EOrder.TargetGhost);\r
-                    CDTXMania.ConfigIni.eTargetGhost[ nCurrentTarget ] = gtd;\r
+                    CDTXMania.app.ConfigIni.eTargetGhost[ nCurrentTarget ] = gtd;\r
                     break;\r
 \r
                                case (int) EOrder.ConfSet:                      // CONF-SET切り替え\r
@@ -448,7 +448,7 @@ namespace DTXMania
 \r
                                for ( int i = 0; i < str.Length; i++ )\r
                                {\r
-                                       CDTXMania.ConfigIni.bAutoPlay[ i + start ] = ( str[ i ] == 'A' ) ? true : false;\r
+                                       CDTXMania.app.ConfigIni.bAutoPlay[ i + start ] = ( str[ i ] == 'A' ) ? true : false;\r
                                }\r
                        }\r
                }\r
@@ -479,7 +479,7 @@ namespace DTXMania
                                                case 3: // Custom\r
                                                        for ( int i = 0; i < 8; i++ )\r
                                                        {\r
-                                                               s += ( CDTXMania.ConfigIni.bAutoPlay[ i ] ) ? "A" : "_";\r
+                                                               s += ( CDTXMania.app.ConfigIni.bAutoPlay[ i ] ) ? "A" : "_";\r
                                                        }\r
                                                        break;\r
                                                case 4: // OFF\r
@@ -510,7 +510,7 @@ namespace DTXMania
                                                        int len = (int) Eレーン.GtW - (int) Eレーン.GtR + 1;\r
                                                        for ( int i = p; i < p + len; i++ )\r
                                                        {\r
-                                                               s += ( CDTXMania.ConfigIni.bAutoPlay[ i ] ) ? "A" : "_";\r
+                                                               s += ( CDTXMania.app.ConfigIni.bAutoPlay[ i ] ) ? "A" : "_";\r
                                                        }\r
                                                        break;\r
                                                case 4: // OFF\r
@@ -552,7 +552,7 @@ namespace DTXMania
                                string pathパネル本体 = CSkin.Path( @"Graphics\ScreenSelect popup auto settings.png" );\r
                                if ( File.Exists( pathパネル本体 ) )\r
                                {\r
-                                       this.txパネル本体 = CDTXMania.tテクスチャの生成( pathパネル本体, true );\r
+                                       this.txパネル本体 = TextureFactory.tテクスチャの生成( pathパネル本体, true );\r
                                }\r
                                base.OnManagedリソースの作成();\r
                        }\r
@@ -561,8 +561,8 @@ namespace DTXMania
                {\r
                        if ( !base.b活性化してない )\r
                        {\r
-                               CDTXMania.tテクスチャの解放( ref this.txパネル本体 );\r
-                               CDTXMania.tテクスチャの解放( ref this.tx文字列パネル );\r
+                               TextureFactory.tテクスチャの解放( ref this.txパネル本体 );\r
+                               TextureFactory.tテクスチャの解放( ref this.tx文字列パネル );\r
                                base.OnManagedリソースの解放();\r
                        }\r
                }\r