Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2024-11-28 01:10:53 +01:00
Code Releases Activity

Add system option for choosing Video Display Mode, also add keybind for cycling display modes (#605)

Browse Source
This commit is contained in:
DragonRatTiger / リュウコ 2024-04-22 04:30:06 -05:00 committed by GitHub
parent 9cc7324566
commit 3892385fa7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 113 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
OpenTaiko/src/Common/CConfigIni.cs
View File

@ -662,6 +662,17 @@ namespace TJAPlayer3
this.padToggleTrainingMode = value;
}
}
public CConfigIni.CKeyAssign.STKEYASSIGN[] CycleVideoDisplayMode
{
get
{
return this.padCycleVideoDisplayMode;
}
set
{
this.padCycleVideoDisplayMode = value;
}
}
public CConfigIni.CKeyAssign.STKEYASSIGN[] this[int index]
{
@ -818,6 +829,9 @@ namespace TJAPlayer3
case (int)EKeyConfigPad.ToggleTrainingMode:
return this.padToggleTrainingMode;
case (int)EKeyConfigPad.CycleVideoDisplayMode:
return this.padCycleVideoDisplayMode;
}
throw new IndexOutOfRangeException();
}
@ -1024,6 +1038,10 @@ namespace TJAPlayer3
case (int)EKeyConfigPad.ToggleTrainingMode:
this.padToggleTrainingMode = value;
return;
case (int)EKeyConfigPad.CycleVideoDisplayMode:
this.padCycleVideoDisplayMode = value;
return;
}
throw new IndexOutOfRangeException();
}
@ -1088,6 +1106,7 @@ namespace TJAPlayer3
private CConfigIni.CKeyAssign.STKEYASSIGN[] padToggleAutoP1;
private CConfigIni.CKeyAssign.STKEYASSIGN[] padToggleAutoP2;
private CConfigIni.CKeyAssign.STKEYASSIGN[] padToggleTrainingMode;
private CConfigIni.CKeyAssign.STKEYASSIGN[] padCycleVideoDisplayMode;
//-----------------
#endregion
}
@ -1960,6 +1979,7 @@ namespace TJAPlayer3
this.eダメージレベル = Eダメージレベル.普通;
this.bSTAGEFAILED有効 = true;
this.bAVI有効 = false;
this.eClipDispType = EClipDispType.背景のみ;
this.bBGA有効 = true;
this.n曲が選択されてからプレビュー音が鳴るまでのウェイトms = 1000;
this.n曲が選択されてからプレビュー画像が表示開始されるまでのウェイトms = 100;
@ -1989,10 +2009,10 @@ namespace TJAPlayer3
// 2018-08-28 twopointzero:
// There exists a particular large, well-known, well-curated, and
// regularly-updated collection of content for use with Taiko no
// Tatsujin simulators. A statistical analysis was performed on the
// the integrated loudness and true peak loudness of the thousands
// of songs within this collection as of late August 2018.
// regularly-updated collection of content for use with simulators.
// A statistical analysis was performed on the the integrated loudness
// and true peak loudness of the thousands of songs within this
// collection as of late August 2018.
//
// The analysis allows us to select a target loudness which
// results in the smallest total amount of loudness adjustment
@ -2966,6 +2986,9 @@ namespace TJAPlayer3
sw.Write( "ToggleTrainingMode=" );
this.tキーの書き出し( sw, this.KeyAssign.System.ToggleTrainingMode );
sw.WriteLine();
sw.Write( "CycleVideoDisplayMode=" );
this.tキーの書き出し( sw, this.KeyAssign.System.CycleVideoDisplayMode );
sw.WriteLine();
sw.WriteLine();
#endregion
@ -4238,6 +4261,10 @@ namespace TJAPlayer3
{
this.tキーの読み出しと設定( str4, this.KeyAssign.System.ToggleTrainingMode );
}
else if( str3.Equals( "CycleVideoDisplayMode" ) )
{
this.tキーの読み出しと設定( str4, this.KeyAssign.System.CycleVideoDisplayMode );
}
continue;
}
//-----------------------------
@ -4486,6 +4513,7 @@ SortSongs=K0126
ToggleAutoP1=K056
ToggleAutoP2=K057
ToggleTrainingMode=K060
CycleVideoDisplayMode=K058
";
t文字列から読み込み( strDefaultKeyAssign );
}

3
OpenTaiko/src/Common/C定数.cs
View File

@ -196,6 +196,9 @@ namespace TJAPlayer3
ToggleAutoP2,
ToggleTrainingMode,
#endregion
#region [Gameplay/Training]
CycleVideoDisplayMode,
#endregion
MAX,
#endregion
UNKNOWN = EPad.UNKNOWN

5
OpenTaiko/src/I18N/CLang_en.cs
View File

@ -312,6 +312,9 @@ namespace TJAPlayer3
[10126] = "Always use normal gauge",
[10127] = "Always use normal gauge",
[10150] = "Video Playback Display Mode",
[10151] = "Change how videos are displayed\nin the background.",
[97] = "Capture",
[98] = "System key assign:\nAssign any key for screen capture.\n(You can only use keyboard. You can't\nuse gamepads.)",
[10128] = "Increase Volume",
@ -334,6 +337,8 @@ namespace TJAPlayer3
[10145] = "System key assign:\nAssign any key for toggling auto (P2).\n(You can only use keyboard. You can't\nuse gamepads.)",
[10146] = "Toggle Training Mode",
[10147] = "System key assign:\nAssign any key for toggling training mode.\n(You can only use keyboard. You can't\nuse gamepads.)",
[10152] = "Cycle Video Playback Display",
[10153] = "System key assign:\nAssign any key for cycling video playback\ndisplay modes.\n(You can only use keyboard. You can't\nuse gamepads.)",
[100] = "Taiko Mode",
[101] = "Dan-i Dojo",

18
OpenTaiko/src/I18N/CLang_es.cs
View File

@ -28,7 +28,7 @@ namespace TJAPlayer3
// [10148] = "Reload Songs (Hard Reload)",
// [10149] = "Clean the existing database and\n" +
// "reload the song folder from scratch.",
// Please translate the text above!
// Please translate the text above!
[6] = "Número de jugadores",
// [7] = "Cambia el número de jugadores.\nAjustarlo a 2 permite jugar\n canciones regulares a dos jugadores dividiendo\n la pantalla a la mitad.",
// Please update the translation above. Up to 5 players can be active at a time.
@ -170,6 +170,17 @@ namespace TJAPlayer3
"(Solo en modo de un jugador)",
[95] = "Ajustes de controles",
[96] = "Ajustes de los botones/pads que se usarán.",
// [10124] = "Use Extreme/Extra Transitions",
// [10125] = "Play a skin-defined animation\nwhile switching between\nExtreme & Extra.",
// [10126] = "Always use normal gauge",
// [10127] = "Always use normal gauge",
// [10150] = "Video Playback Display Mode",
// [10151] = "Change how videos are displayed\nin the background.",
// Please translate the text above!
[97] = "Captura",
[98] = "Botón para capturar:\nPara asignar una tecla a la captura de pantalla.\n (Solo puedes usar el teclado. No puedes\nusar un pad del tambor para tomar capturas.",
// [10128] = "Increase Volume",
@ -192,7 +203,10 @@ namespace TJAPlayer3
// [10145] = "System key assign:\nAssign any key for toggling auto (P2).\n(You can only use keyboard. You can't\nuse gamepads.)",
// [10146] = "Toggle Training Mode",
// [10147] = "System key assign:\nAssign any key for toggling training mode.\n(You can only use keyboard. You can't\nuse gamepads.)",
// Please translate the text above!
// [10152] = "Cycle Video Playback Display",
// [10153] = "System key assign:\nAssign any key for cycling video playback display modes.\n(You can only use keyboard. You can't\nuse gamepads.)",
// Please translate the text above!
[99] = "Rojo izquierdo",
[10000] = "Asigna un botón o un pad para\n el Don (rojo) izquierdo.",
[10001] = "Rojo derecho",

16
OpenTaiko/src/I18N/CLang_fr.cs
View File

@ -153,6 +153,17 @@ namespace TJAPlayer3
[96] = "Menu pour l'assignation des \ntouches en jeu.",
[97] = "Capture d'écran",
[98] = "Assigner la touche pour le \ncapture d'écran.",
// [10124] = "Use Extreme/Extra Transitions",
// [10125] = "Play a skin-defined animation\nwhile switching between\nExtreme & Extra.",
// [10126] = "Always use normal gauge",
// [10127] = "Always use normal gauge",
// [10150] = "Video Playback Display Mode",
// [10151] = "Change how videos are displayed\nin the background.",
// Please translate the text above!
// [10128] = "Increase Volume",
// [10129] = "System key assign:\nAssign any key for increasing music volume.\n(You can only use keyboard. You can't\nuse gamepads.)",
// [10130] = "Decrease Volume",
@ -173,7 +184,10 @@ namespace TJAPlayer3
// [10145] = "System key assign:\nAssign any key for toggling auto (P2).\n(You can only use keyboard. You can't\nuse gamepads.)",
// [10146] = "Toggle Training Mode",
// [10147] = "System key assign:\nAssign any key for toggling training mode.\n(You can only use keyboard. You can't\nuse gamepads.)",
// Please translate the text above!
// [10152] = "Cycle Video Playback Display",
// [10153] = "System key assign:\nAssign any key for cycling video playback display modes.\n(You can only use keyboard. You can't\nuse gamepads.)",
// Please translate the text above!
[99] = "Rouge gauche",
[10000] = "Assignation de la touche \nRouge gauche pour le tambour.",
[10001] = "Rouge droit",

8
OpenTaiko/src/I18N/CLang_jp.cs
View File

@ -237,7 +237,9 @@ namespace TJAPlayer3
// [10145] = "System key assign:\nAssign any key for toggling auto (P2).\n(You can only use keyboard. You can't\nuse gamepads.)",
// [10146] = "Toggle Training Mode",
// [10147] = "System key assign:\nAssign any key for toggling training mode.\n(You can only use keyboard. You can't\nuse gamepads.)",
// Please translate the text above!
// [10152] = "Cycle Video Playback Display",
// [10153] = "System key assign:\nAssign any key for cycling video playback display modes.\n(You can only use keyboard. You can't\nuse gamepads.)",
// Please translate the text above!
[99] = "LeftRed",
[9992] = "太鼓の数字がアニメーションしなくなります\n" +
@ -405,6 +407,10 @@ namespace TJAPlayer3
[10126] = "ゲージをNormalに固定",
[10127] = "ゲージをNormalに固定します",
// [10150] = "Video Playback Display Mode",
// [10151] = "Change how videos are displayed\nin the background.",
// Please translate the text above!
[100] = "演奏ゲーム",
[101] = "段位道場",

13
OpenTaiko/src/I18N/CLang_zh.cs
View File

@ -241,7 +241,9 @@ namespace TJAPlayer3
// [10145] = "System key assign:\nAssign any key for toggling auto (P2).\n(You can only use keyboard. You can't\nuse gamepads.)",
// [10146] = "Toggle Training Mode",
// [10147] = "System key assign:\nAssign any key for toggling training mode.\n(You can only use keyboard. You can't\nuse gamepads.)",
// Please translate the text above!
// [10152] = "Cycle Video Playback Display",
// [10153] = "System key assign:\nAssign any key for cycling video playback display modes.\n(You can only use keyboard. You can't\nuse gamepads.)",
// Please translate the text above!
[99] = "左红",
[9994] = "材质加载方式：\n" +
"启动时不会未响应。\n" +
@ -380,11 +382,14 @@ namespace TJAPlayer3
[10123] = "分配玩家 5 康加鼓按键",
[10124] = "表里谱面切换动画效果",
[10125] = "播放由皮肤定义的表里谱面切换动画效果。",
[10125] = "播放由皮肤定义的表里谱面切换动画效果。",
[10126] = "总是使用默认规格（魂条）",
[10127] = "总是使用默认规格（魂条）",
[10127] = "总是使用默认规格（魂条）",
// [10150] = "Video Playback Display Mode",
// [10151] = "Change how videos are displayed\nin the background.",
// Please translate the text above!
[100] = "演奏模式",
[101] = "段位道场",

25
OpenTaiko/src/Stages/04.Config/CActConfigList.cs
View File

@ -135,6 +135,21 @@ namespace TJAPlayer3
CLangManager.LangInstance.GetString(23));
this.list項目リスト.Add( this.iSystemAVI );
if (CLangManager.fetchLang() == "ja")
{
this.iSystemAVIDisplayMode = new CItemList(CLangManager.LangInstance.GetString(10150), CItemList.Eパネル種別.通常, (int)TJAPlayer3.ConfigIni.eClipDispType,
CLangManager.LangInstance.GetString(10151),
new string[] {"OFF","背景のみ","ウィンドウ","両方"});
this.list項目リスト.Add( this.iSystemAVIDisplayMode );
}
else
{
this.iSystemAVIDisplayMode = new CItemList(CLangManager.LangInstance.GetString(10150), CItemList.Eパネル種別.通常, (int)TJAPlayer3.ConfigIni.eClipDispType,
CLangManager.LangInstance.GetString(10151),
new string[] {"None","Full","Mini","Both"});
this.list項目リスト.Add( this.iSystemAVIDisplayMode );
}
this.iSystemBGA = new CItemToggle(CLangManager.LangInstance.GetString(10024), TJAPlayer3.ConfigIni.bBGA有効,
CLangManager.LangInstance.GetString(24));
this.list項目リスト.Add( this.iSystemBGA );
@ -662,6 +677,10 @@ namespace TJAPlayer3
{
TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.ToggleTrainingMode);
}
else if ( this.list項目リスト[ this.n現在の選択項目 ] == this.iKeyAssignSystemCycleVideoDisplayMode )
{
TJAPlayer3.stageコンフィグ.tパッド選択通知( EKeyConfigPart.SYSTEM, EKeyConfigPad.CycleVideoDisplayMode);
}
#endregion
else
{
@ -836,6 +855,9 @@ namespace TJAPlayer3
this.iKeyAssignSystemToggleTrainingMode = new CItemBase(CLangManager.LangInstance.GetString(10146),
CLangManager.LangInstance.GetString(10147));
this.list項目リスト.Add( this.iKeyAssignSystemToggleTrainingMode);
this.iKeyAssignSystemCycleVideoDisplayMode = new CItemBase(CLangManager.LangInstance.GetString(10152),
CLangManager.LangInstance.GetString(10153));
this.list項目リスト.Add( this.iKeyAssignSystemCycleVideoDisplayMode);
OnListMenuの初期化();
this.n現在の選択項目 = 0;
@ -1524,6 +1546,7 @@ namespace TJAPlayer3
private CItemBase iKeyAssignSystemToggleAutoP1;
private CItemBase iKeyAssignSystemToggleAutoP2;
private CItemBase iKeyAssignSystemToggleTrainingMode;
private CItemBase iKeyAssignSystemCycleVideoDisplayMode;
private CItemBase iKeyAssignSystemReturnToMenu; // #24609
private CItemBase iKeyAssignDrumsReturnToMenu;
@ -1574,6 +1597,7 @@ namespace TJAPlayer3
private CItemInteger iSystemSongPlaybackLevel;
private CItemInteger iSystemKeyboardSoundLevelIncrement;
private CItemToggle iSystemAVI;
private CItemList iSystemAVIDisplayMode;
private CItemToggle iSystemBGA;
private CItemInteger iSystemBGAlpha;
private CItemToggle iSystemBGMSound;
@ -1740,6 +1764,7 @@ namespace TJAPlayer3
TJAPlayer3.ConfigIni.b垂直帰線待ちを行う = this.iSystemVSyncWait.bON;
TJAPlayer3.ConfigIni.bBufferedInputs = this.iSystemBufferedInput.bON;
TJAPlayer3.ConfigIni.bAVI有効 = this.iSystemAVI.bON;
TJAPlayer3.ConfigIni.eClipDispType = (EClipDispType)this.iSystemAVIDisplayMode.n現在選択されている項目番号;
TJAPlayer3.ConfigIni.bBGA有効 = this.iSystemBGA.bON;
// CDTXMania.ConfigIni.bGraph有効 = this.iSystemGraph.bON;#24074 2011.01.23 comment-out ikanick オプション(Drums)へ移行
TJAPlayer3.ConfigIni.n曲が選択されてからプレビュー音が鳴るまでのウェイトms = this.iSystemPreviewSoundWait.n現在の値;

2
OpenTaiko/src/Stages/07.Game/CStage演奏画面共通.cs
View File

@ -3351,7 +3351,7 @@ namespace TJAPlayer3
TJAPlayer3.ConfigIni.bJudgeCountDisplay = false;
}
if ( keyboard.KeyPressed( (int)SlimDXKeys.Key.F5 ) )
if ( TJAPlayer3.ConfigIni.KeyAssign.KeyIsPressed(TJAPlayer3.ConfigIni.KeyAssign.System.CycleVideoDisplayMode) )
{
switch( TJAPlayer3.ConfigIni.eClipDispType )
{