OSDN -- 开发和下载开源软件
简体中文翻译状态 translation status for zh
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

提交

标签
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

修订版a64e3b764d50b7ef247442ba674c58a5f5ea0902 (tree)
时间2018-07-26 00:15:31
作者yyagi <yyagi.dtxmania@gmai...>
Commiteryyagi

Log Message

#38362 FullAVI有効時の、動画の表示座標指定機能を追加。ただしまだ難あり。

更改概述

  • delete: "DTXMania/\343\202\263\343\203\274\343\203\211/\343\202\271\343\203\206\343\203\274\343\202\270/04.\343\202\263\343\203\263\343\203\225\343\202\243\343\202\260/CActConfigList.cs"
  • delete: "DTXMania/\343\202\263\343\203\274\343\203\211/\343\202\271\343\203\206\343\203\274\343\202\270/04.\343\202\263\343\203\263\343\203\225\343\202\243\343\202\260/CConfigXml.cs"
  • delete: "DTXMania/\343\202\263\343\203\274\343\203\211/\343\202\271\343\203\206\343\203\274\343\202\270/07.\346\274\224\345\245\217/CAct\346\274\224\345\245\217AVI.cs"
  • delete: "DTXMania/\343\202\263\343\203\274\343\203\211/\343\202\271\343\203\206\343\203\274\343\202\270/07.\346\274\224\345\245\217/CStage\346\274\224\345\245\217\347\224\273\351\235\242\345\205\261\351\200\232.cs"
  • delete: "DTXMania/\343\202\263\343\203\274\343\203\211/\345\205\250\344\275\223/CDTXMania.cs"
  • modified: DTXMania/Properties/AssemblyInfo.cs (diff)
  • modified: RuntimeResources/System/resources.csv (diff)
  • modified: RuntimeResources/System/resources.xlsx (diff)

差异

--- a/DTXMania/Properties/AssemblyInfo.cs
+++ b/DTXMania/Properties/AssemblyInfo.cs
@@ -33,8 +33,8 @@ using System.Resources;
3333 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
3434 // 既定値にすることができます:
3535 // [assembly: AssemblyVersion("1.0.*")]
36-[assembly: AssemblyVersion("112.0.0.0")]
37-[assembly: AssemblyFileVersion("112.0.0.0")]
36+[assembly: AssemblyVersion("113.0.0.0")]
37+[assembly: AssemblyFileVersion("113.0.0.0")]
3838 [assembly: NeutralResourcesLanguageAttribute("ja-JP")]
3939
4040 // このアセンブリは「ライブラリ」である（難読化ツールへの指示）。
--- "a/DTXMania/\343\202\263\343\203\274\343\203\211/\343\202\271\343\203\206\343\203\274\343\202\270/04.\343\202\263\343\203\263\343\203\225\343\202\243\343\202\260/CActConfigList.cs"
+++ "b/DTXMania/\343\202\263\343\203\274\343\203\211/\343\202\271\343\203\206\343\203\274\343\202\270/04.\343\202\263\343\203\263\343\203\225\343\202\243\343\202\260/CActConfigList.cs"
@@ -270,6 +270,9 @@ namespace DTXMania
270270 list項目リスト.Add(CDTXMania.Instance.ConfigIni.cdMovieY.DrOnly);
271271 list項目リスト.Add(CDTXMania.Instance.ConfigIni.cdMovieX.GBOnly);
272272 list項目リスト.Add(CDTXMania.Instance.ConfigIni.cdMovieY.GBOnly);
273+ list項目リスト.Add(CDTXMania.Instance.ConfigIni.bForceFullMovieCentering.Both);
274+ list項目リスト.Add(CDTXMania.Instance.ConfigIni.cdForceFullMovieX.Both);
275+ list項目リスト.Add(CDTXMania.Instance.ConfigIni.cdForceFullMovieY.Both);
273276 list項目リスト.Add(CDTXMania.Instance.ConfigIni.nBGAlpha);
274277 list項目リスト.Add(CDTXMania.Instance.ConfigIni.nShowLagType);
275278 list項目リスト.Add(CDTXMania.Instance.ConfigIni.eJudgePriority);
--- "a/DTXMania/\343\202\263\343\203\274\343\203\211/\343\202\271\343\203\206\343\203\274\343\202\270/04.\343\202\263\343\203\263\343\203\225\343\202\243\343\202\260/CConfigXml.cs"
+++ "b/DTXMania/\343\202\263\343\203\274\343\203\211/\343\202\271\343\203\206\343\203\274\343\202\270/04.\343\202\263\343\203\263\343\203\225\343\202\243\343\202\260/CConfigXml.cs"
@@ -356,6 +356,12 @@ namespace DTXMania
356356 public STDGBSValue<COptionInteger> nSuddenFrom;
357357 [DataMember]
358358 public STDGBSValue<COptionInteger> nHiddenFrom;
359+ [DataMember(Order = 113)]
360+ public STInstValue<COptionInteger> cdForceFullMovieX; // #38362 2018.7.19 add yyagi
361+ [DataMember(Order = 113)]
362+ public STInstValue<COptionInteger> cdForceFullMovieY; // #38362 2018.7.19 add yyagi
363+ [DataMember(Order = 113)]
364+ public STInstValue<COptionBool> bForceFullMovieCentering; // #38362 2018.7.19 add yyagi
359365
360366
361367 public int GetLaneX(ELane e)
@@ -660,6 +666,23 @@ namespace DTXMania
660666 cdMovieY.DrOnly = new COptionInteger(128);
661667 cdMovieY.GBOnly = new COptionInteger(128);
662668
669+ #region [ #38362 ForcedFullScreen X, Y, flag ]
670+ cdForceFullMovieX = new STInstValue<COptionInteger>();
671+ cdForceFullMovieX.Both = new COptionInteger(0);
672+ cdForceFullMovieX.DrOnly = new COptionInteger(0);
673+ cdForceFullMovieX.GBOnly = new COptionInteger(0);
674+
675+ cdForceFullMovieY = new STInstValue<COptionInteger>();
676+ cdForceFullMovieY.Both = new COptionInteger(0);
677+ cdForceFullMovieY.DrOnly = new COptionInteger(0);
678+ cdForceFullMovieY.GBOnly = new COptionInteger(0);
679+
680+ bForceFullMovieCentering = new STInstValue<COptionBool>();
681+ bForceFullMovieCentering.Both = new COptionBool(true);
682+ bForceFullMovieCentering.DrOnly = new COptionBool(true);
683+ bForceFullMovieCentering.GBOnly = new COptionBool(true);
684+ #endregion
685+
663686 cdComboX = new STDGBSValue<STInstValue<COptionInteger>>();
664687 cdComboX.Drums = new STInstValue<COptionInteger>();
665688 cdComboX.Drums.Both = new COptionInteger(cdInstX.Drums.Both + (72 * 5 + 85 * 2 + 99) / 2);
@@ -906,6 +929,18 @@ namespace DTXMania
906929 cdMovieY.Both.Initialize("strCfgDispMovieYBoth", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);
907930 cdMovieY.GBOnly.Initialize("strCfgDispMovieYGB", 0, 1 + SampleFramework.GameWindowSize.Height, crdStep);
908931
932+ cdForceFullMovieX.DrOnly.Initialize("strCfgForceFullMovieXDr", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);
933+ cdForceFullMovieX.Both.Initialize("strCfgForceFullMovieXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);
934+ cdForceFullMovieX.GBOnly.Initialize("strCfgForceFullMovieXGB", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);
935+
936+ cdForceFullMovieY.DrOnly.Initialize("strCfgForceFullMovieYDr", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);
937+ cdForceFullMovieY.Both.Initialize("strCfgForceFullMovieYBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);
938+ cdForceFullMovieY.GBOnly.Initialize("strCfgForceFullMovieYGB", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);
939+
940+ bForceFullMovieCentering.DrOnly.Initialize("strCfgForceFullMovieCenteringDr");
941+ bForceFullMovieCentering.Both.Initialize("strCfgForceFullMovieCenteringBoth");
942+ bForceFullMovieCentering.GBOnly.Initialize("strCfgForceFullMovieCenteringGB");
943+
909944 cdComboX.Drums.Both.Initialize("strCfgDispDrComboXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);
910945 cdComboX.Drums.DrOnly.Initialize("strCfgDispDrComboXDr", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);
911946 cdComboX.Guitar.Both.Initialize("strCfgDispGtComboXBoth", 0, 1 + SampleFramework.GameWindowSize.Width, crdStep);
--- "a/DTXMania/\343\202\263\343\203\274\343\203\211/\343\202\271\343\203\206\343\203\274\343\202\270/07.\346\274\224\345\245\217/CAct\346\274\224\345\245\217AVI.cs"
+++ "b/DTXMania/\343\202\263\343\203\274\343\203\211/\343\202\271\343\203\206\343\203\274\343\202\270/07.\346\274\224\345\245\217/CAct\346\274\224\345\245\217AVI.cs"
@@ -36,9 +36,22 @@ namespace DTXMania
3636 /// </remarks>
3737 public bool bIsPreviewMovie
3838 {
39- get;
40- set;
39+ get
40+ {
41+ return _bIsPreviewMovie;
42+ }
43+ set
44+ {
45+ _bIsPreviewMovie = value;
46+ if (value == true)
47+ {
48+ this.bFullScreenMovieCentering = true;
49+ }
50+ }
4151 }
52+ private bool _bIsPreviewMovie;
53+
54+
4255 public bool bHasBGA
4356 {
4457 get;
@@ -49,6 +62,22 @@ namespace DTXMania
4962 get;
5063 set;
5164 }
65+ public bool bFullScreenMovieCentering
66+ {
67+ get;
68+ set;
69+ }
70+ public int nFullScreenMovieX
71+ {
72+ get;
73+ set;
74+ }
75+ public int nFullScreenMovieY
76+ {
77+ get;
78+ set;
79+ }
80+
5281
5382 public void PrepareProperSizeTexture(int width, int height)
5483 {
@@ -244,8 +273,16 @@ namespace DTXMania
244273 );
245274 magX = cmg.magX;
246275 magY = cmg.magY;
247- xx = cmg.px;
248- yy = cmg.py;
276+ if (bFullScreenMovieCentering)
277+ {
278+ xx = cmg.px;
279+ yy = cmg.py;
280+ }
281+ else
282+ {
283+ xx = nFullScreenMovieX;
284+ yy = nFullScreenMovieY;
285+ }
249286 }
250287
251288 this.tx描画用.vc拡大縮小倍率.X = magX;
--- "a/DTXMania/\343\202\263\343\203\274\343\203\211/\343\202\271\343\203\206\343\203\274\343\202\270/07.\346\274\224\345\245\217/CStage\346\274\224\345\245\217\347\224\273\351\235\242\345\205\261\351\200\232.cs"
+++ "b/DTXMania/\343\202\263\343\203\274\343\203\211/\343\202\271\343\203\206\343\203\274\343\202\270/07.\346\274\224\345\245\217/CStage\346\274\224\345\245\217\347\224\273\351\235\242\345\205\261\351\200\232.cs"
@@ -3107,10 +3107,20 @@ namespace DTXMania
31073107 {
31083108 this.actAVI.bHasBGA = true;
31093109 }
3110- if (pChip.eチャンネル番号 == EChannel.MovieFull || CDTXMania.Instance.ConfigIni.bFullAVI)
3110+ if (CDTXMania.Instance.ConfigIni.bFullAVI)
31113111 {
3112- this.actAVI.bFullScreenMovie = true;
3112+ this.actAVI.bFullScreenMovieCentering = CDTXMania.Instance.ConfigIni.bForceFullMovieCentering.Both;
3113+ if (!this.actAVI.bFullScreenMovieCentering)
3114+ {
3115+ this.actAVI.nFullScreenMovieX = CDTXMania.Instance.ConfigIni.cdForceFullMovieX.Both;
3116+ this.actAVI.nFullScreenMovieY = CDTXMania.Instance.ConfigIni.cdForceFullMovieY.Both;
3117+ }
3118+ if (pChip.eチャンネル番号 == EChannel.MovieFull || CDTXMania.Instance.ConfigIni.bFullAVI)
3119+ {
3120+ this.actAVI.bFullScreenMovie = true;
3121+ }
31133122 }
3123+
31143124 switch (pChip.eAVI種別)
31153125 {
31163126 case EAVIType.AVI:
--- "a/DTXMania/\343\202\263\343\203\274\343\203\211/\345\205\250\344\275\223/CDTXMania.cs"
+++ "b/DTXMania/\343\202\263\343\203\274\343\203\211/\345\205\250\344\275\223/CDTXMania.cs"
@@ -25,11 +25,11 @@ namespace DTXMania
2525 {
2626 // プロパティ
2727 #region [ properties ]
28- public static readonly string VERSION = "112(180301)";
28+ public static readonly string VERSION = "113(180801)";
2929 public static readonly string SLIMDXDLL = "c_net20x86_Jun2010";
3030 public static readonly string D3DXDLL = "d3dx9_43.dll"; // June 2010
31- //public static readonly string D3DXDLL = "d3dx9_42.dll"; // February 2010
32- //public static readonly string D3DXDLL = "d3dx9_41.dll"; // March 2009
31+ //public static readonly string D3DXDLL = "d3dx9_42.dll"; // February 2010
32+ //public static readonly string D3DXDLL = "d3dx9_41.dll"; // March 2009
3333 private static CDTXMania instance = new CDTXMania();
3434
3535 public static CDTXMania Instance
Binary files a/RuntimeResources/System/resources.csv and b/RuntimeResources/System/resources.csv differ
Binary files a/RuntimeResources/System/resources.xlsx and b/RuntimeResources/System/resources.xlsx differ