if( this.txクリップパネル != null )
{
- switch( CDTXMania.ConfigIni.eMovieClipMode )
+ if( CDTXMania.ConfigIni.bWindowClipMode )
{
- case EMovieClipMode.Window:
- case EMovieClipMode.Both:
+ int[] nClipPos = new int[] { 854, 142, 0, 0 };
+ int[] nPanelPos = new int[] { 854, 142, 0, 0 };
+ float fClipRatio = ( (float)this.rAVI.avi.nフレーム幅 / (float)this.rAVI.avi.nフレーム高さ );
+ float fResizeRatio = 1.0f;
+ if( CDTXMania.ConfigIni.bDrums有効 )
+ {
+ if( CDTXMania.ConfigIni.bGraph.Drums )
{
- int[] nClipPos = new int[] { 854, 142, 0, 0 };
- int[] nPanelPos = new int[] { 854, 142, 0, 0 };
- float fClipRatio = ( (float)this.rAVI.avi.nフレーム幅 / (float)this.rAVI.avi.nフレーム高さ );
- float fResizeRatio = 1.0f;
- if( CDTXMania.ConfigIni.bDrums有効 )
- {
- if( CDTXMania.ConfigIni.bGraph.Drums )
- {
- nClipPos = new int[] { 2, 402, 0, 0 };
- nPanelPos = new int[] { 2, 402, 0, 0 };
- nClipPos[ 0 ] += 7;
- nClipPos[ 1 ] += 156;
- if( fClipRatio >= 1.77f ) //16:9
- fResizeRatio = 260.0f / this.rAVI.avi.nフレーム幅;
-
- nClipPos[ 0 ] += (int)( ( 260.0f - ( this.rAVI.avi.nフレーム幅 * fResizeRatio ) ) / 2.0f );
- nClipPos[ 1 ] -= (int)( ( ( this.rAVI.avi.nフレーム高さ * fResizeRatio ) ) / 2.0f );
- }
- else
- {
- nClipPos[ 0 ] += 5;
- nClipPos[ 1 ] += 30;
- if( fClipRatio >= 1.77f ) //16:9
- fResizeRatio = 416.0f / this.rAVI.avi.nフレーム幅;
- }
- }
- else
- {
+ nClipPos = new int[] { 2, 402, 0, 0 };
+ nPanelPos = new int[] { 2, 402, 0, 0 };
+ nClipPos[ 0 ] += 7;
+ nClipPos[ 1 ] += 156;
+ if( fClipRatio >= 1.77f ) //16:9
+ fResizeRatio = 260.0f / this.rAVI.avi.nフレーム幅;
+
+ nClipPos[ 0 ] += (int)( ( 260.0f - ( this.rAVI.avi.nフレーム幅 * fResizeRatio ) ) / 2.0f );
+ nClipPos[ 1 ] -= (int)( ( ( this.rAVI.avi.nフレーム高さ * fResizeRatio ) ) / 2.0f );
+ }
+ else
+ {
+ nClipPos[ 0 ] += 5;
+ nClipPos[ 1 ] += 30;
+ if( fClipRatio >= 1.77f ) //16:9
+ fResizeRatio = 416.0f / this.rAVI.avi.nフレーム幅;
+ }
+ }
+ else
+ {
- }
+ }
- this.txクリップパネル.t2D描画( CDTXMania.app.Device, nPanelPos[ 0 ], nPanelPos[ 1 ] );
- this.tx描画用.vc拡大縮小倍率 = new Vector3( fResizeRatio, fResizeRatio, 1.0f );
- this.tx描画用.t2D描画( CDTXMania.app.Device, nClipPos[ 0 ], nClipPos[ 1 ] );
- }
- break;
+ this.txクリップパネル.t2D描画( CDTXMania.app.Device, nPanelPos[ 0 ], nPanelPos[ 1 ] );
+ this.tx描画用.vc拡大縮小倍率 = new Vector3( fResizeRatio, fResizeRatio, 1.0f );
+ this.tx描画用.t2D描画( CDTXMania.app.Device, nClipPos[ 0 ], nClipPos[ 1 ] );
}
-
+ #region[ 古いの ]
+ //switch( CDTXMania.ConfigIni.eMovieClipMode )
+ //{
+ // case EMovieClipMode.Window:
+ // case EMovieClipMode.Both:
+ // {
+ // int[] nClipPos = new int[] { 854, 142, 0, 0 };
+ // int[] nPanelPos = new int[] { 854, 142, 0, 0 };
+ // float fClipRatio = ( (float)this.rAVI.avi.nフレーム幅 / (float)this.rAVI.avi.nフレーム高さ );
+ // float fResizeRatio = 1.0f;
+ // if( CDTXMania.ConfigIni.bDrums有効 )
+ // {
+ // if( CDTXMania.ConfigIni.bGraph.Drums )
+ // {
+ // nClipPos = new int[] { 2, 402, 0, 0 };
+ // nPanelPos = new int[] { 2, 402, 0, 0 };
+ // nClipPos[ 0 ] += 7;
+ // nClipPos[ 1 ] += 156;
+ // if( fClipRatio >= 1.77f ) //16:9
+ // fResizeRatio = 260.0f / this.rAVI.avi.nフレーム幅;
+
+ // nClipPos[ 0 ] += (int)( ( 260.0f - ( this.rAVI.avi.nフレーム幅 * fResizeRatio ) ) / 2.0f );
+ // nClipPos[ 1 ] -= (int)( ( ( this.rAVI.avi.nフレーム高さ * fResizeRatio ) ) / 2.0f );
+ // }
+ // else
+ // {
+ // nClipPos[ 0 ] += 5;
+ // nClipPos[ 1 ] += 30;
+ // if( fClipRatio >= 1.77f ) //16:9
+ // fResizeRatio = 416.0f / this.rAVI.avi.nフレーム幅;
+ // }
+ // }
+ // else
+ // {
+
+ // }
+
+ // this.txクリップパネル.t2D描画( CDTXMania.app.Device, nPanelPos[ 0 ], nPanelPos[ 1 ] );
+ // this.tx描画用.vc拡大縮小倍率 = new Vector3( fResizeRatio, fResizeRatio, 1.0f );
+ // this.tx描画用.t2D描画( CDTXMania.app.Device, nClipPos[ 0 ], nClipPos[ 1 ] );
+ // }
+ // break;
+ //}
+ #endregion
}
}
if( this.txクリップパネル != null )
{
- switch( CDTXMania.ConfigIni.eMovieClipMode )
+ if( CDTXMania.ConfigIni.bWindowClipMode )
{
- case EMovieClipMode.Window:
- case EMovieClipMode.Both:
+ int[] nClipPos = new int[] { 854, 142, 0, 0 };
+ int[] nPanelPos = new int[] { 854, 142, 0, 0 };
+ float fClipRatio = ( (float)this.rAVI.avi.nフレーム幅 / (float)this.rAVI.avi.nフレーム高さ );
+ float fResizeRatio = 1.0f;
+ float fResizeRatio2 = 1.0f;
+ if( CDTXMania.ConfigIni.bDrums有効 )
+ {
+ //if( CDTXMania.ConfigIni.bGraph.Drums )
+ //{
+ // nClipPos = new int[] { 2, 402, 0, 0 };
+ // nPanelPos = new int[] { 2, 402, 0, 0 };
+ // nClipPos[ 0 ] += 7;
+ // nClipPos[ 1 ] += 156;
+ // if( fClipRatio >= 1.77f ) //16:9
+ // {
+ // fResizeRatio = 260.0f / this.rAVI.avi.nフレーム幅;
+ // //fResizeRatio = 260.0f / this.rAVI.avi.nフレーム幅;
+ // }
+
+ // nClipPos[ 0 ] += (int)( ( 260.0f - ( this.rAVI.avi.nフレーム幅 * fResizeRatio ) ) / 2.0f );
+ // nClipPos[ 1 ] -= (int)( ( ( this.rAVI.avi.nフレーム高さ * fResizeRatio ) ) / 2.0f );
+ //}
+ //else
{
- int[] nClipPos = new int[] { 854, 142, 0, 0 };
- int[] nPanelPos = new int[] { 854, 142, 0, 0 };
- float fClipRatio = ( (float)this.rAVI.avi.nフレーム幅 / (float)this.rAVI.avi.nフレーム高さ );
- float fResizeRatio = 1.0f;
- float fResizeRatio2 = 1.0f;
- if( CDTXMania.ConfigIni.bDrums有効 )
+ nClipPos[ 0 ] += 5;
+ nClipPos[ 1 ] += 30;
+ if( fClipRatio >= 1.77f ) //16:9
{
- //if( CDTXMania.ConfigIni.bGraph.Drums )
- //{
- // nClipPos = new int[] { 2, 402, 0, 0 };
- // nPanelPos = new int[] { 2, 402, 0, 0 };
- // nClipPos[ 0 ] += 7;
- // nClipPos[ 1 ] += 156;
- // if( fClipRatio >= 1.77f ) //16:9
- // {
- // fResizeRatio = 260.0f / this.rAVI.avi.nフレーム幅;
- // //fResizeRatio = 260.0f / this.rAVI.avi.nフレーム幅;
- // }
-
- // nClipPos[ 0 ] += (int)( ( 260.0f - ( this.rAVI.avi.nフレーム幅 * fResizeRatio ) ) / 2.0f );
- // nClipPos[ 1 ] -= (int)( ( ( this.rAVI.avi.nフレーム高さ * fResizeRatio ) ) / 2.0f );
- //}
- //else
- {
- nClipPos[ 0 ] += 5;
- nClipPos[ 1 ] += 30;
- if( fClipRatio >= 1.77f ) //16:9
- {
- fResizeRatio = 277.0f / this.rAVI.avi.nフレーム幅;
- fResizeRatio2 = 155.0f / this.rAVI.avi.nフレーム高さ;
- }
- }
+ fResizeRatio = 277.0f / this.rAVI.avi.nフレーム幅;
+ fResizeRatio2 = 155.0f / this.rAVI.avi.nフレーム高さ;
}
- else
- {
+ }
+ }
+ else
+ {
- }
+ }
- Matrix mat = Matrix.Identity;
-
- mat *= SlimDX.Matrix.Scaling( fResizeRatio, fResizeRatio2 + 0.08f, 0);
- mat *= SlimDX.Matrix.RotationY( C変換.DegreeToRadian( 30 ) );
- mat *= SlimDX.Matrix.Translation( 450, -80, 0 );
+ Matrix mat = Matrix.Identity;
- //this.txクリップパネル.t2D描画( CDTXMania.app.Device, nPanelPos[ 0 ], nPanelPos[ 1 ] );
- //this.tx描画用.vc拡大縮小倍率 = new Vector3( fResizeRatio, fResizeRatio, 1.0f );
- //this.tx描画用.t2D描画( CDTXMania.app.Device, nClipPos[ 0 ], nClipPos[ 1 ] );
- this.tx描画用.t3D上下反転描画( CDTXMania.app.Device, mat );
- }
- break;
- }
+ mat *= SlimDX.Matrix.Scaling( fResizeRatio, fResizeRatio2 + 0.08f, 0);
+ mat *= SlimDX.Matrix.RotationY( C変換.DegreeToRadian( 30 ) );
+ mat *= SlimDX.Matrix.Translation( 450, -80, 0 );
+ //this.txクリップパネル.t2D描画( CDTXMania.app.Device, nPanelPos[ 0 ], nPanelPos[ 1 ] );
+ //this.tx描画用.vc拡大縮小倍率 = new Vector3( fResizeRatio, fResizeRatio, 1.0f );
+ //this.tx描画用.t2D描画( CDTXMania.app.Device, nClipPos[ 0 ], nClipPos[ 1 ] );
+ this.tx描画用.t3D上下反転描画( CDTXMania.app.Device, mat );
+ }
+ #region[ 古いの ]
+ //switch( CDTXMania.ConfigIni.eMovieClipMode )
+ //{
+ // case EMovieClipMode.Window:
+ // case EMovieClipMode.Both:
+ // {
+ // int[] nClipPos = new int[] { 854, 142, 0, 0 };
+ // int[] nPanelPos = new int[] { 854, 142, 0, 0 };
+ // float fClipRatio = ( (float)this.rAVI.avi.nフレーム幅 / (float)this.rAVI.avi.nフレーム高さ );
+ // float fResizeRatio = 1.0f;
+ // float fResizeRatio2 = 1.0f;
+ // if( CDTXMania.ConfigIni.bDrums有効 )
+ // {
+ // //if( CDTXMania.ConfigIni.bGraph.Drums )
+ // //{
+ // // nClipPos = new int[] { 2, 402, 0, 0 };
+ // // nPanelPos = new int[] { 2, 402, 0, 0 };
+ // // nClipPos[ 0 ] += 7;
+ // // nClipPos[ 1 ] += 156;
+ // // if( fClipRatio >= 1.77f ) //16:9
+ // // {
+ // // fResizeRatio = 260.0f / this.rAVI.avi.nフレーム幅;
+ // // //fResizeRatio = 260.0f / this.rAVI.avi.nフレーム幅;
+ // // }
+
+ // // nClipPos[ 0 ] += (int)( ( 260.0f - ( this.rAVI.avi.nフレーム幅 * fResizeRatio ) ) / 2.0f );
+ // // nClipPos[ 1 ] -= (int)( ( ( this.rAVI.avi.nフレーム高さ * fResizeRatio ) ) / 2.0f );
+ // //}
+ // //else
+ // {
+ // nClipPos[ 0 ] += 5;
+ // nClipPos[ 1 ] += 30;
+ // if( fClipRatio >= 1.77f ) //16:9
+ // {
+ // fResizeRatio = 277.0f / this.rAVI.avi.nフレーム幅;
+ // fResizeRatio2 = 155.0f / this.rAVI.avi.nフレーム高さ;
+ // }
+ // }
+ // }
+ // else
+ // {
+
+ // }
+
+ // Matrix mat = Matrix.Identity;
+
+ // mat *= SlimDX.Matrix.Scaling( fResizeRatio, fResizeRatio2 + 0.08f, 0);
+ // mat *= SlimDX.Matrix.RotationY( C変換.DegreeToRadian( 30 ) );
+ // mat *= SlimDX.Matrix.Translation( 450, -80, 0 );
+
+ // //this.txクリップパネル.t2D描画( CDTXMania.app.Device, nPanelPos[ 0 ], nPanelPos[ 1 ] );
+ // //this.tx描画用.vc拡大縮小倍率 = new Vector3( fResizeRatio, fResizeRatio, 1.0f );
+ // //this.tx描画用.t2D描画( CDTXMania.app.Device, nClipPos[ 0 ], nClipPos[ 1 ] );
+ // this.tx描画用.t3D上下反転描画( CDTXMania.app.Device, mat );
+ // }
+ // break;
+ //}
+ #endregion
}
}
public bool bJudgeCountDisp;
public bool bSkillModeを自動切替えする;
public bool bXPerfect判定を有効にする;
+ public bool bWindowClipMode;
public EMovieClipMode eMovieClipMode;
public ESkillType eSkillMode;
this.bJudgeCountDisp = false;
this.bSkillModeを自動切替えする = true;
this.bXPerfect判定を有効にする = false;
+ this.bWindowClipMode = false;
this.b曲名表示をdefのものにする = true;
this.eHHOGraphics = Eタイプ.A;
this.eJudgeAnimeType = Eタイプ.B;
this.eLaneType = Eタイプ.A;
this.eLBDGraphics = Eタイプ.A;
- this.eMovieClipMode = EMovieClipMode.OFF;
+ this.eMovieClipMode = EMovieClipMode.FullScreen;
this.eNamePlateType = Eタイプ.A;
this.eRDPosition = ERDPosition.RCRD;
this.eSkillMode = ESkillType.DTXMania;
sw.WriteLine( "; BGAの表示(0:OFF, 1:ON)" );
sw.WriteLine( "BGA={0}", this.bBGA有効 ? 1 : 0 );
sw.WriteLine();
- sw.WriteLine( "; クリップの表示位置(0:OFF, 1:ON)" );
- sw.WriteLine( "MovieClipMode={0}", (int)this.eMovieClipMode );
+ //sw.WriteLine( "; クリップの表示位置(0:OFF, 1:FullScreen, 2:Window, 3:FullScreen + Window)" );
+ //sw.WriteLine( "MovieClipMode={0}", (int)this.eMovieClipMode );
+ //sw.WriteLine();
+ sw.WriteLine( "; クリップのウィンドウ表示(0:OFF, 1:ON)" );
+ sw.WriteLine( "WindowClipDisp={0}", this.bWindowClipMode ? 1 : 0 );
sw.WriteLine();
#endregion
#region [ フィルイン ]
{
this.bBGA有効 = C変換.bONorOFF( str4[ 0 ] );
}
- else if( str3.Equals( "MovieClipMode" ) )
- {
- this.eMovieClipMode = (EMovieClipMode) C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 3, (int) this.eMovieClipMode );
- }
+ //else if( str3.Equals( "MovieClipMode" ) )
+ //{
+ // this.eMovieClipMode = (EMovieClipMode) C変換.n値を文字列から取得して範囲内に丸めて返す( str4, 0, 3, (int) this.eMovieClipMode );
+ //}
+ else if ( str3.Equals( "WindowClipDisp" ) )
+ {
+ this.bWindowClipMode = C変換.bONorOFF( str4[ 0 ] );
+ }
#endregion
#region [ フィルイン関係 ]
else if ( str3.Equals( "FillInEffect" ) )