Max/thomasasfk_drs2dd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Replace tqdm with alive-progress

Browse Source 
Co-authored-by: 12932 <68835423+12932@users.noreply.github.com>
This commit is contained in:
544146
2023-09-16 14:20:00 +01:00
co-authored by 12932
parent d9201a7d48
commit 7c910c395a
9 changed files with 77 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DanceDashLaunchHelper/DanceDashLaunchHelper.csproj
+2 -2
View File
@@ -14,11 +14,11 @@
<PackageReference Include="BepInEx.Core" Version="5.*" />
<PackageReference Include="BepInEx.PluginInfoProps" Version="1.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="all" />
</ItemGroup>
<ItemGroup>
<Reference Include="DDVR">
<HintPath>..\Dance Dash_Data\Managed\DDVR.dll</HintPath>
DanceDashLaunchHelper/Folder.DotSettings.user
+1 -1
View File
@@ -1,4 +1,4 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=D_003A_005Cgames_005Csteamapps_005Ccommon_005CDance_0020Dash_005CDance_0020Dash_005FData_005CManaged_005CDDVR_002Edll/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=D_003A_005Cgames_005Csteamapps_005Ccommon_005CDance_0020Dash_005CDance_0020Dash_005FData_005CManaged_005CUnityEngine_002Edll/@EntryIndexedValue">True</s:Boolean>
<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer /&gt;</s:String></wpf:ResourceDictionary>
<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer /&gt;</s:String></wpf:ResourceDictionary>
DanceDashLaunchHelper/NuGet.Config
+1 -1
View File
@@ -3,4 +3,4 @@
<packageSources>
<add key="BepInEx" value="https://nuget.bepinex.dev/v3/index.json" />
</packageSources>
</configuration>
</configuration>
DanceDashLaunchHelper/Plugin.cs
+5 -5
View File
@@ -22,7 +22,7 @@ namespace DanceDashLaunchHelper
}
}
// when we first start the game, we set the ready button to be interactable & click it programmatically
[HarmonyPatch(typeof(ControllerSwitchUI), "Start")]
class ControllerSwitchUI_Start_Patch
@@ -49,7 +49,7 @@ namespace DanceDashLaunchHelper
Traverse.Create(__instance).Method("OnToggleHpChange", true).GetValue();
}
}
// this patch is bad, it hijacks init and toggles the albums and invokes them as true, happens to
// toggle on the last album (custom songs) purely based on the order of execution, but again, this sucks
[HarmonyPatch(typeof(VolListItem), "Init")]
@@ -63,7 +63,7 @@ namespace DanceDashLaunchHelper
__instance.Invoke(true);
}
}
// hijacks the ost selection happening as a side effect of VolListItem_Init_Patch, and clicks the play button
[HarmonyPatch(typeof(PanelSelect), "OnSelectOst")]
class PanelSelect_OnSelectOst_Patch
@@ -135,5 +135,5 @@ namespace DanceDashLaunchHelper
return false;
}
}
}
}
DanceDashLaunchHelper/README.md
+1 -1
View File
@@ -1,4 +1,4 @@
# DanceDashLaunchHelper
- Read comments in [Plugin.cs](Plugin.cs)
- First time writing one of these so todo on the README
- First time writing one of these so todo on the README
README.md
+2 -2
View File
@@ -35,7 +35,7 @@ python -m pip install -r requirements.txt
pre-commit install
```
---
---
Usage:
@@ -45,4 +45,4 @@ yt-dlp -f bv[ext=webm] https://youtu.be/o7I0scmptmo -o "drs_video.webm"
# grab song-id from "resources\data.json" or https://arcade-songs.zetaraku.dev/drs/
.venv/Scripts/python drs2dd.py "drs_video.webm" --song-id "BOOMBAYAH-JP Ver.-"
```
```
drs2dd.py
+62 -57
View File
@@ -6,14 +6,13 @@ import os
from dataclasses import asdict
import cv2
from alive_progress import alive_bar
from loguru import logger
from tqdm import tqdm
from model.dancedash import create_note_sphere
from model.dancedash import DDBeatMap
from model.dancedash import LEFT_NOTE
from model.dancedash import RIGHT_NOTE
from util import ORDER_COUNT_PER_BEAT
from util import crop_frame
from util import find_l
from util import find_r
@@ -21,6 +20,7 @@ from util import find_stage
from util import get_song_metadata_remote
from util import map_position_to_dd_x
from util import NOTE_SEARCH_AREA
from util import ORDER_COUNT_PER_BEAT
from util import SIGN_SEARCH_AREA
from util import WORKING_RESOLUTION
@@ -36,75 +36,80 @@ def extract_spheres_from_drs_video(video_path: str, bpm: int): # noqa
duration_seconds = total_frames / video_fps
bps = bpm / 60
pbar = tqdm(total=total_frames, desc='Finding stage')
logger.info(f'Starting to process video: {video_path}')
logger.info(f'Total frames: {total_frames}')
with alive_bar(
total=total_frames,
title='Finding stage',
bar='notes',
spinner='notes',
) as bar:
logger.info(f'Starting to process video: {video_path}')
logger.info(f'Total frames: {total_frames}')
stage_found = False
while not stage_found:
pbar.update(1)
ret, frame = cap.read()
if not ret:
raise ValueError('Unable to find stage.')
stage_found = False
while not stage_found:
bar()
ret, frame = cap.read()
if not ret:
raise ValueError('Unable to find stage.')
frame_number = cap.get(cv2.CAP_PROP_POS_FRAMES)
if int(frame_number % 5) != 0:
continue
frame_number = cap.get(cv2.CAP_PROP_POS_FRAMES)
if int(frame_number % 5) != 0:
continue
frame = cv2.resize(frame, WORKING_RESOLUTION)
search_area = crop_frame(frame, *SIGN_SEARCH_AREA)
stage_found = find_stage(search_area)
frame = cv2.resize(frame, WORKING_RESOLUTION)
search_area = crop_frame(frame, *SIGN_SEARCH_AREA)
stage_found = find_stage(search_area)
pbar.set_description('Finding notes')
bar.title = 'Finding notes'
frames_since_l = 0
frames_since_r = 0
frames_since_l = 0
frames_since_r = 0
spheres = []
while True:
pbar.update(1)
spheres = []
while True:
bar()
ret, frame = cap.read()
if not ret:
break
ret, frame = cap.read()
if not ret:
break
frame = cv2.resize(frame, WORKING_RESOLUTION)
# frame_number = cap.get(cv2.CAP_PROP_POS_FRAMES)
current_position_seconds = cap.get(cv2.CAP_PROP_POS_MSEC) / 1000.0
frame = cv2.resize(frame, WORKING_RESOLUTION)
current_position_seconds = cap.get(cv2.CAP_PROP_POS_MSEC) / 1000.0
# float between 0 and 1 representing the time in the song
progress_percentage = current_position_seconds / duration_seconds
# float between 0 and 1 representing the time in the song
progress_percentage = current_position_seconds / duration_seconds
frames_since_l -= 1
frames_since_r -= 1
frames_since_l -= 1
frames_since_r -= 1
note_order = int(bps * current_position_seconds * ORDER_COUNT_PER_BEAT)
search_area = crop_frame(frame, *NOTE_SEARCH_AREA)
if frames_since_l < 1:
if left := find_l(search_area):
frames_since_l = 5
note = create_note_sphere( # noqa
progress_percentage,
map_position_to_dd_x(left[0]),
note_order,
LEFT_NOTE,
)
spheres.append(note)
note_order = int(
bps * current_position_seconds *
ORDER_COUNT_PER_BEAT,
)
search_area = crop_frame(frame, *NOTE_SEARCH_AREA)
if frames_since_l < 1:
if left := find_l(search_area):
frames_since_l = 5
note = create_note_sphere( # noqa
progress_percentage,
map_position_to_dd_x(left[0]),
note_order,
LEFT_NOTE,
)
spheres.append(note)
if frames_since_r < 1:
if right := find_r(search_area):
frames_since_r = 5
note = create_note_sphere( # noqa
progress_percentage,
map_position_to_dd_x(right[0]),
note_order,
RIGHT_NOTE,
)
spheres.append(note)
if frames_since_r < 1:
if right := find_r(search_area):
frames_since_r = 5
note = create_note_sphere( # noqa
progress_percentage,
map_position_to_dd_x(right[0]),
note_order,
RIGHT_NOTE,
)
spheres.append(note)
pbar.close()
cap.release()
return spheres
model/dancedash.py
+2 -1
View File
@@ -117,7 +117,8 @@ class DDBeatMap:
),
beatSubs=beat_subs,
BPM=bpm,
songStartOffset=-0.4, # -0.4 is arbitrary, figure out a better value. (because we detect notes early)
# -0.4 is arbitrary, figure out a better value. (because we detect notes early)
songStartOffset=-0.4,
NPS='0.0',
developerMode=False,
noteSpeed=1.0,
requirements.txt
+1 -1
View File
@@ -6,5 +6,5 @@ opencv-python~=4.8.0.74
numpy~=1.25.2
Pillow~=10.0.0
loguru
tqdm
alive-progress
requests