Merge branch 'main' of https://github.com/0auBSQ/OpenTaiko
This commit is contained in:
commit
0812e39350
FDK/src/04.Graphics
OpenTaiko/src/Stages
@ -78,6 +78,7 @@ namespace FDK
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
bDrawing = false;
|
||||||
close = true;
|
close = true;
|
||||||
cts?.Cancel();
|
cts?.Cancel();
|
||||||
while (DS != DecodingState.Stopped) ;
|
while (DS != DecodingState.Stopped) ;
|
||||||
@ -102,6 +103,8 @@ namespace FDK
|
|||||||
CTimer.Reset();
|
CTimer.Reset();
|
||||||
CTimer.Resume();
|
CTimer.Resume();
|
||||||
this.bPlaying = true;
|
this.bPlaying = true;
|
||||||
|
bDrawing = true;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PauseControl()
|
public void PauseControl()
|
||||||
@ -122,6 +125,7 @@ namespace FDK
|
|||||||
{
|
{
|
||||||
CTimer.Pause();
|
CTimer.Pause();
|
||||||
this.bPlaying = false;
|
this.bPlaying = false;
|
||||||
|
bDrawing = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void InitRead()
|
public void InitRead()
|
||||||
@ -329,6 +333,7 @@ namespace FDK
|
|||||||
|
|
||||||
//for play
|
//for play
|
||||||
public bool bPlaying { get; private set; } = false;
|
public bool bPlaying { get; private set; } = false;
|
||||||
|
public bool bDrawing { get; private set; } = false;
|
||||||
private CTimer CTimer;
|
private CTimer CTimer;
|
||||||
private AVRational Framerate;
|
private AVRational Framerate;
|
||||||
private CTexture lastTexture;
|
private CTexture lastTexture;
|
||||||
|
@ -391,10 +391,13 @@ namespace TJAPlayer3
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
this.rCurrentlySelectedSong.rParentNode.bIsOpenFolder = false;
|
|
||||||
// Reindex the parent node
|
// Reindex the parent node
|
||||||
this.rCurrentlySelectedSong.rParentNode.Openindex = rCurrentlySelectedSong.rParentNode.list子リスト.IndexOf(this.rCurrentlySelectedSong);
|
List<CSongListNode> currentSongList = flattenList(TJAPlayer3.Songs管理.list曲ルート, true);
|
||||||
|
this.rCurrentlySelectedSong.rParentNode.Openindex = currentSongList.IndexOf(this.rCurrentlySelectedSong) - currentSongList.IndexOf(this.rCurrentlySelectedSong.rParentNode.list子リスト[0]);
|
||||||
|
this.rCurrentlySelectedSong.rParentNode.bIsOpenFolder = false;
|
||||||
tChangeSong(-this.rCurrentlySelectedSong.rParentNode.Openindex);
|
tChangeSong(-this.rCurrentlySelectedSong.rParentNode.Openindex);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.t現在選択中の曲を元に曲バーを再構成する();
|
this.t現在選択中の曲を元に曲バーを再構成する();
|
||||||
|
@ -44,9 +44,9 @@ namespace TJAPlayer3
|
|||||||
|
|
||||||
public unsafe int t進行描画( int x, int y )
|
public unsafe int t進行描画( int x, int y )
|
||||||
{
|
{
|
||||||
if ( !base.IsDeActivated )
|
if ( !base.IsDeActivated)
|
||||||
{
|
{
|
||||||
if (this.rVD == null)
|
if (this.rVD == null || !rVD.bDrawing)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
this.rVD.GetNowFrame(ref this.tx描画用);
|
this.rVD.GetNowFrame(ref this.tx描画用);
|
||||||
|
@ -7,6 +7,7 @@ using FDK;
|
|||||||
using FDK.ExtensionMethods;
|
using FDK.ExtensionMethods;
|
||||||
using TJAPlayer3;
|
using TJAPlayer3;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Silk.NET.Core;
|
||||||
|
|
||||||
namespace TJAPlayer3
|
namespace TJAPlayer3
|
||||||
{
|
{
|
||||||
@ -5576,6 +5577,7 @@ namespace TJAPlayer3
|
|||||||
{
|
{
|
||||||
this.actAVI.Seek(0);
|
this.actAVI.Seek(0);
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user