Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] UI rewrite, code cleanup #188

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
ec3e305
Refactor tPressEnter inside CActConfigList into something more managable
BocuD Dec 31, 2024
c2c2350
Update gitignore to match current build configuration
BocuD Dec 31, 2024
84fe532
gitignore .idea folder
BocuD Dec 31, 2024
62e8a54
Fix some small syntax errors in DTXCreator source by converting half …
BocuD Dec 31, 2024
cf5cafe
Add english translation for pedal group settings
BocuD Dec 31, 2024
f5ac143
Remove unused non-localized and old constructor overloads for config …
BocuD Dec 31, 2024
b14eb81
Fix spacing in text
BocuD Dec 31, 2024
89d64fd
Use Unicode for log output
BocuD Dec 31, 2024
29800c7
Use CultureInfo.CurrentUILanguage instead of CurrentCulture
BocuD Dec 31, 2024
bd8a094
Comment out stageoption as it seems to not be used in any way anymore
BocuD Jan 2, 2025
487b57b
Add method to CItemBase to read from and write to configuration items
BocuD Jan 2, 2025
057f71b
Use newly created methods to greatly simplify configuration loading a…
BocuD Jan 2, 2025
d3cc724
Remove residual duplicate code for reading from / writing to config file
BocuD Jan 2, 2025
94e2ec0
Remove unused textures
BocuD Jan 2, 2025
14920b3
Split up CActConfigList into a partial class
BocuD Jan 2, 2025
2a79f60
Move a few more methods and members to their correct locations, updat…
BocuD Jan 2, 2025
5d58ece
Add english documentation to CCounter and rename remaining members
BocuD Jan 2, 2025
9b1a8ac
Update CStageTitle.cs
BocuD Jan 2, 2025
a57285b
Renaming various variables
BocuD Jan 3, 2025
cc19d05
Move Items into UI folder
BocuD Jan 3, 2025
03837cc
Fully remove unused Option stage
BocuD Jan 4, 2025
82b50d0
Remove some remnants of option stage, remove other unused code
BocuD Jan 4, 2025
960a814
Create new UI system base
BocuD Jan 4, 2025
0a1e2c6
Comment out some lines to prevent IDE warnings
BocuD Jan 4, 2025
e7bd355
Rename and document parts of CTexture to english
BocuD Jan 4, 2025
7584bc0
Use new UI rendering system for most StageConfig elements
BocuD Jan 4, 2025
aa15464
Remove temporary menu element movement
BocuD Jan 4, 2025
cbcd4fc
Rename refactoring of various elements
BocuD Jan 4, 2025
159dc72
Properly handle drawing elements with float position
BocuD Jan 5, 2025
b993941
FIx a type error
BocuD Jan 5, 2025
29cfa31
Add tDraw2DMatrix method to CTexture
BocuD Jan 5, 2025
7846ad9
Update new UI components to render using matrices
BocuD Jan 5, 2025
192b882
Update stage config to match matrix implementation
BocuD Jan 5, 2025
b031d64
Update quick config to use Action() instead of switch/case
BocuD Jan 7, 2025
1245c16
Rename refactoring in CActSelect
BocuD Jan 8, 2025
6aa1142
Load a fallback texture for UIImage and UITexture
BocuD Jan 8, 2025
3c69c4d
Correctly initialize size with constructor changes on UIImage
BocuD Jan 8, 2025
ce17126
Remove unused code from CStageStartup
BocuD Jan 9, 2025
d2670f9
Automatically update version and build number
BocuD Jan 9, 2025
5d5ccbd
Increment assembly version to v1.4.2
BocuD Jan 9, 2025
f5d66ec
Update dependency version for Newtonsoft.Json
BocuD Jan 9, 2025
c55cbfb
Rename refactor CActDFPFont
BocuD Jan 9, 2025
8b15162
Improve code structure and functionality for UIDrawables
BocuD Jan 9, 2025
6352959
Create UIDFPText to render text from an existing bitmap
BocuD Jan 9, 2025
26ffcf2
Move CActSelect and SortSongs to new UI system
BocuD Jan 9, 2025
70b209e
Update CStageConfig.cs
BocuD Jan 9, 2025
8c9858c
Remove unused folder class
BocuD Jan 9, 2025
f2aba2f
Remove unused using directives
BocuD Jan 9, 2025
11e1310
Remove include from project for Folder
BocuD Jan 12, 2025
a5b1349
Fully remove plugin system
BocuD Jan 12, 2025
ae7623b
Remove CDTXVersion
BocuD Jan 12, 2025
8cfc2b3
Remove unused code from CActSelectSongList
BocuD Jan 13, 2025
c90ff69
Greatly reduce code duplication for stage switching logic
BocuD Jan 13, 2025
6784125
Remove remaining reference to CDTXVersion
BocuD Jan 13, 2025
e125481
Dispose safely
BocuD Jan 15, 2025
225ea8a
Code deduplication and clean up in CActSelectSongList
BocuD Jan 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,14 @@ ModelManifest.xml
実行時フォルダ/Songs/*

# DTX specific files
実行時フォルダ/config.ini
実行時フォルダ/dtxmanialog.txt
実行時フォルダ/songlist.db
実行時フォルダ/songs.db
Runtime/config.ini
Runtime/dtxmanialog.txt
Runtime/songlist.db
Runtime/songs.db
Runtime/System/*
Runtime/DTXFiles/*
!Runtime/System/Sounds
!Runtime/System/Graphics

# IDE files
.idea/*
4 changes: 2 additions & 2 deletions DTXCreator/Code/00.App/CMainForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion DTXCreator/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions DTXMania/Code/App/CActFlushGPU.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Diagnostics;
using SharpDX.Direct3D9;
using FDK;
Expand Down
5 changes: 1 addition & 4 deletions DTXMania/Code/App/CCharacterConsole.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Drawing;
using System.Drawing;
using FDK;

namespace DTXMania
Expand Down
5 changes: 0 additions & 5 deletions DTXMania/Code/App/CCommandParse.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Diagnostics;
using System.IO;
using System.Threading;
using System.Text.RegularExpressions;
using FDK;
using DirectShowLib.DMO;

namespace DTXMania
{
Expand Down
2 changes: 0 additions & 2 deletions DTXMania/Code/App/CConfigIni.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System.Runtime.InteropServices;
using System.IO;
using System.Diagnostics;
using System.Web;
using FDK;

using SlimDXKey = SlimDX.DirectInput.Key;
Expand Down Expand Up @@ -2561,7 +2560,6 @@ public void tReadFromFile( string iniファイル名 )
StreamReader reader = new StreamReader( this.ConfigIniファイル名, Encoding.GetEncoding( "Shift_JIS" ) );
str = reader.ReadToEnd();
tReadFromString( str );
CDTXVersion version = new CDTXVersion( this.strDTXManiaのバージョン );
}
}

Expand Down
2 changes: 0 additions & 2 deletions DTXMania/Code/App/CConstants.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Runtime.InteropServices;

namespace DTXMania
Expand Down
6 changes: 0 additions & 6 deletions DTXMania/Code/App/CDTX2WAVmode.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

using System.Diagnostics;
using System.IO;
using System.Threading;
using FDK;

Expand Down
Loading