From 159852524af55b7fef8070902b0c85db8a8c7608 Mon Sep 17 00:00:00 2001 From: 0auBSQ <58159635+0auBSQ@users.noreply.github.com> Date: Sat, 18 Feb 2023 04:32:08 +0900 Subject: [PATCH] Base code for render image support for Characters and puchicharas on heya --- TJAPlayer3/Stages/01.StartUp/CPuchichara.cs | 4 ++++ TJAPlayer3/Stages/01.StartUp/TextureLoader.cs | 7 ++++++- TJAPlayer3/Stages/11.Heya/CStageHeya.cs | 10 +++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/TJAPlayer3/Stages/01.StartUp/CPuchichara.cs b/TJAPlayer3/Stages/01.StartUp/CPuchichara.cs index bc3f779a..8fd06b40 100644 --- a/TJAPlayer3/Stages/01.StartUp/CPuchichara.cs +++ b/TJAPlayer3/Stages/01.StartUp/CPuchichara.cs @@ -12,6 +12,7 @@ namespace TJAPlayer3 class CPuchichara { public CTexture tx; + public CTexture render; public CSkin.Cシステムサウンド welcome; public DBPuchichara.PuchicharaData metadata; public DBUnlockables.CUnlockConditions unlock; @@ -28,6 +29,9 @@ namespace TJAPlayer3 tx.vc拡大縮小倍率 = new SharpDX.Vector3(TJAPlayer3.Skin.Game_PuchiChara_Scale[0]); } + // Heya render + render = TJAPlayer3.Tx.TxCAbsolute($@"{path}\Render.png"); + // Puchichara welcome sfx welcome = new CSkin.Cシステムサウンド($@"{path}\Welcome.ogg", false, false, true, ESoundGroup.Voice); diff --git a/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs b/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs index 4aa88ae2..7849cebe 100644 --- a/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs +++ b/TJAPlayer3/Stages/01.StartUp/TextureLoader.cs @@ -1019,6 +1019,7 @@ namespace TJAPlayer3 Heya_Center_Menu_Box = TxC(HEYA + @"Center_Menu_Box.png"); Heya_Center_Menu_Box_Slot = TxC(HEYA + @"Center_Menu_Box_Slot.png"); Heya_Side_Menu = TxC(HEYA + @"Side_Menu.png"); + Heya_Render_Field = TxC(HEYA + @"Render_Field.png"); Heya_Box = TxC(HEYA + @"Box.png"); Heya_Lock = TxC(HEYA + @"Lock.png"); @@ -1032,6 +1033,7 @@ namespace TJAPlayer3 TJAPlayer3.Skin.Characters_Ptn = charaDirs.Length; Characters_Heya_Preview = new CTexture[TJAPlayer3.Skin.Characters_Ptn]; + Characters_Heya_Render = new CTexture[TJAPlayer3.Skin.Characters_Ptn]; Characters = new CCharacter[TJAPlayer3.Skin.Characters_Ptn]; Characters_Normal = new CTexture[TJAPlayer3.Skin.Characters_Ptn][]; @@ -1139,6 +1141,7 @@ namespace TJAPlayer3 for (int i = 0; i < TJAPlayer3.Skin.Characters_Ptn; i++) { Characters_Heya_Preview[i] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @"\Normal\0.png"); + Characters_Heya_Render[i] = TxCGlobal(CHARACTERS + TJAPlayer3.Skin.Characters_DirName[i] + @"Render.png"); Characters[i] = new CCharacter(charaDirs[i]); } @@ -2246,6 +2249,7 @@ namespace TJAPlayer3 Heya_Center_Menu_Box_Slot, Heya_Side_Menu, Heya_Box, + Heya_Render_Field, Heya_Lock; #endregion @@ -2279,7 +2283,8 @@ namespace TJAPlayer3 Characters_Result_Failed_In, Characters_Result_Normal; - public CTexture[] Characters_Heya_Preview; + public CTexture[] Characters_Heya_Preview, + Characters_Heya_Render; public CCharacter[] Characters; #endregion diff --git a/TJAPlayer3/Stages/11.Heya/CStageHeya.cs b/TJAPlayer3/Stages/11.Heya/CStageHeya.cs index d0d1bc3c..d04968f7 100644 --- a/TJAPlayer3/Stages/11.Heya/CStageHeya.cs +++ b/TJAPlayer3/Stages/11.Heya/CStageHeya.cs @@ -190,9 +190,17 @@ namespace TJAPlayer3 ScrollCounter.t進行(); Background.Update(); - Background.Draw(); + Background.Draw(); //TJAPlayer3.Tx.Heya_Background.t2D描画(TJAPlayer3.app.Device, 0, 0); + #region [Render field] + + if (iCurrentMenu == 0 || iCurrentMenu == 1) TJAPlayer3.Tx.Heya_Render_Field?.t2D描画(TJAPlayer3.app.Device, 0, 0); + if (iCurrentMenu == 0) TJAPlayer3.Tx.Puchichara[iPuchiCharaCurrent].render?.t2D描画(TJAPlayer3.app.Device, 0, 0); + if (iCurrentMenu == 1) TJAPlayer3.Tx.Characters_Heya_Render[iCharacterCurrent]?.t2D描画(TJAPlayer3.app.Device, 0, 0); + + #endregion + #region [Menus display] #region [Main menu (Side bar)]