Skip to content

Commit e4da644

Browse files
authored
[THS] IV Gallery 0.5.3
More of stuff in history description. ============================= THS inc 2021.
2 parents 3d70c40 + 217c604 commit e4da644

2,545 files changed

Lines changed: 95533 additions & 135018 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

App.config

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
44
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
55
</startup>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
11+
</dependentAssembly>
12+
</assemblyBinding>
13+
</runtime>
614
</configuration>

IV_D3X_Core.cs

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@ namespace IV_Gallery
2020
class DXCoreTest : IDisposable
2121
{
2222
public RenderForm DXWnd;
23-
bool first_d3x_inited = true;
24-
int Width = 1280;
25-
int Height = 720;
23+
private static string thsdev_iv_d3x_logo = IV_Gallery_Main_Menu.thsdev_iv_logo + " DirectX (D3X) Visualiser";
24+
public bool d3x_opened = false;
25+
public bool ivdx_shutdown_silent = false;
26+
private bool first_d3x_inited = true;
27+
static private int Width = 1280;
28+
static private int Height = 720;
2629
private D3D11.Device IVDXDevice;
2730
private D3D11.DeviceContext IVDXDeviceContext;
2831
private SwapChain IVswapChain;
@@ -52,7 +55,7 @@ public DXCoreTest()
5255

5356
public void Run()
5457
{
55-
if (!IV_Gallery_Main_Menu.d3x_opened)
58+
if (!d3x_opened)
5659
{
5760
IV_RUN_D3X_Window_Simple();
5861
}
@@ -150,12 +153,12 @@ private void IV3DXInitializeTriangle()
150153

151154
private void IV_INIT_D3X_Window()
152155
{
153-
DXWnd = new RenderForm("IV DirectX Render Window");
156+
DXWnd = new RenderForm(thsdev_iv_d3x_logo);
154157
DXWnd.ClientSize = new Size(Width, Height);
155158
DXWnd.AllowUserResizing = false;
156159
DXWnd.SuspendLayout();
157160
DXWnd.FormClosing += new System.Windows.Forms.FormClosingEventHandler(IV_DX_WND_Closed_Hook);
158-
IV_Gallery_Main_Menu.d3x_opened = true;
161+
d3x_opened = true;
159162
DXWnd.ResumeLayout(false);
160163
DXWnd.PerformLayout();
161164

@@ -192,11 +195,11 @@ private void IVD3X_Draw()
192195

193196
private void IV_DX_WND_Closed_Hook(object sender, FormClosingEventArgs e)
194197
{
195-
if (DXWnd.Visible && !IV_Gallery_Main_Menu.ivdx_shutdown_silent)
198+
if (DXWnd.Visible && !ivdx_shutdown_silent)
196199
{
197-
const string dlg_message =
198-
"Closing IV DirectX Window?";
199-
const string dlg_caption = "IV DirectX Manager";
200+
string dlg_message =
201+
"Close "+ thsdev_iv_d3x_logo + "?";
202+
string dlg_caption = thsdev_iv_d3x_logo;
200203
var dlg_result = MessageBox.Show(dlg_message, dlg_caption,
201204
MessageBoxButtons.YesNo,
202205
MessageBoxIcon.Warning);
@@ -209,13 +212,13 @@ private void IV_DX_WND_Closed_Hook(object sender, FormClosingEventArgs e)
209212
}
210213
else
211214
{
212-
IV_Gallery_Main_Menu.d3x_opened = false;
215+
d3x_opened = false;
213216
IV_Gallery_Checkers_Core.IVCheckerCore.iv_s_manager.ui_s_wnd_def_close.Play();
214217
}
215218
}
216219
else
217220
{
218-
IV_Gallery_Main_Menu.d3x_opened = false;
221+
d3x_opened = false;
219222
IV_Gallery_Checkers_Core.IVCheckerCore.iv_s_manager.ui_s_wnd_def_close.Play();
220223
}
221224
}

IV_Gallery.csproj

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
<IsWebBootstrapper>false</IsWebBootstrapper>
2828
<UseApplicationTrust>false</UseApplicationTrust>
2929
<BootstrapperEnabled>true</BootstrapperEnabled>
30+
<NuGetPackageImportStamp>
31+
</NuGetPackageImportStamp>
3032
</PropertyGroup>
3133
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3234
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -59,6 +61,12 @@
5961
<SpecificVersion>False</SpecificVersion>
6062
<HintPath>.\IV_Sound_Master.dll</HintPath>
6163
</Reference>
64+
<Reference Include="LibVLCSharp, Version=3.6.1.0, Culture=neutral, processorArchitecture=MSIL">
65+
<HintPath>packages\LibVLCSharp.3.6.1\lib\net471\LibVLCSharp.dll</HintPath>
66+
</Reference>
67+
<Reference Include="LibVLCSharp.WinForms, Version=3.6.1.0, Culture=neutral, processorArchitecture=MSIL">
68+
<HintPath>packages\LibVLCSharp.WinForms.3.6.1\lib\net40\LibVLCSharp.WinForms.dll</HintPath>
69+
</Reference>
6270
<Reference Include="SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
6371
<HintPath>packages\SharpDX.4.2.0\lib\net45\SharpDX.dll</HintPath>
6472
</Reference>
@@ -78,7 +86,20 @@
7886
<HintPath>packages\SharpDX.Mathematics.4.2.0\lib\net45\SharpDX.Mathematics.dll</HintPath>
7987
</Reference>
8088
<Reference Include="System" />
89+
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
90+
<HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
91+
</Reference>
8192
<Reference Include="System.Core" />
93+
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
94+
<HintPath>packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
95+
</Reference>
96+
<Reference Include="System.Numerics" />
97+
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
98+
<HintPath>packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
99+
</Reference>
100+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
101+
<HintPath>packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
102+
</Reference>
82103
<Reference Include="System.Xml.Linq" />
83104
<Reference Include="System.Data.DataSetExtensions" />
84105
<Reference Include="Microsoft.CSharp" />
@@ -90,6 +111,12 @@
90111
<Reference Include="System.Xml" />
91112
</ItemGroup>
92113
<ItemGroup>
114+
<Compile Include="IV_Media_Player.cs">
115+
<SubType>Form</SubType>
116+
</Compile>
117+
<Compile Include="IV_Media_Player.Designer.cs">
118+
<DependentUpon>IV_Media_Player.cs</DependentUpon>
119+
</Compile>
93120
<Compile Include="IV_VertexPosColor.cs" />
94121
<Compile Include="IV_D3X_Core.cs" />
95122
<Compile Include="IV_Gallery_Main_Menu.cs">
@@ -103,6 +130,9 @@
103130
<EmbeddedResource Include="IV_Gallery_Main_Menu.resx">
104131
<DependentUpon>IV_Gallery_Main_Menu.cs</DependentUpon>
105132
</EmbeddedResource>
133+
<EmbeddedResource Include="IV_Media_Player.resx">
134+
<DependentUpon>IV_Media_Player.cs</DependentUpon>
135+
</EmbeddedResource>
106136
<EmbeddedResource Include="Properties\Resources.resx">
107137
<Generator>ResXFileCodeGenerator</Generator>
108138
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -138,6 +168,7 @@
138168
<Content Include="iv_shaders_cache\gallery_test_vertexShader.hlsl">
139169
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
140170
</Content>
171+
<None Include="Resources\ths_z_nationF.png" />
141172
<Content Include="ths_icon.ico" />
142173
</ItemGroup>
143174
<ItemGroup>
@@ -153,4 +184,11 @@
153184
</BootstrapperPackage>
154185
</ItemGroup>
155186
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
187+
<Import Project="packages\VideoLAN.LibVLC.Windows.3.0.16\build\VideoLAN.LibVLC.Windows.targets" Condition="Exists('packages\VideoLAN.LibVLC.Windows.3.0.16\build\VideoLAN.LibVLC.Windows.targets')" />
188+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
189+
<PropertyGroup>
190+
<ErrorText>Данный проект ссылается на пакеты NuGet, отсутствующие на этом компьютере. Используйте восстановление пакетов NuGet, чтобы скачать их. Дополнительную информацию см. по адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}.</ErrorText>
191+
</PropertyGroup>
192+
<Error Condition="!Exists('packages\VideoLAN.LibVLC.Windows.3.0.16\build\VideoLAN.LibVLC.Windows.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\VideoLAN.LibVLC.Windows.3.0.16\build\VideoLAN.LibVLC.Windows.targets'))" />
193+
</Target>
156194
</Project>

IV_Gallery.exe

9.98 MB
Binary file not shown.

IV_Gallery_Checkers_Core.dll

1 KB
Binary file not shown.

IV_Gallery_Checkers_Core/IVCheckerCore.cs

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
//#define IV_G_CHECKERS_CORE_VER_04 //Old Version.
22
//#define IV_G_CHECKERS_CORE_VER_042 //Old Version.
33
//#define IV_G_CHECKERS_CORE_VER_042_with_05 //Old Version.
4-
#define IV_G_CHECKERS_CORE_VER_045
4+
//#define IV_G_CHECKERS_CORE_VER_045 //Old Version.
5+
#define IV_G_CHECKERS_CORE_VER_045_with_GALLERY_NEW_IVD3X_CORE
56

67
using System;
78
using System.Collections.Generic;
@@ -23,6 +24,8 @@ public class IVCheckerCore
2324
static public float iv_checker_dll_code_ver = 0.42f;
2425
#elif IV_G_CHECKERS_CORE_VER_045
2526
static public float iv_checker_dll_code_ver = 0.45f;
27+
#elif IV_G_CHECKERS_CORE_VER_045_with_GALLERY_NEW_IVD3X_CORE
28+
static public float iv_checker_dll_code_ver = 0.45f;
2629
#endif
2730
//IV Note: CheckersCore versions Indefier with main programm list:
2831
#if IV_G_CHECKERS_CORE_VER_04
@@ -35,6 +38,9 @@ public class IVCheckerCore
3538
#elif IV_G_CHECKERS_CORE_VER_045
3639
static public float[] supported_vers_p_and_iv_c_c = new float[12] { 0.35f, 0.35f, 0.4f, 0.38f, 0.4f, 0.45f, 0.42f,
3740
0.48f, 0.42f, 0.5f, iv_checker_dll_code_ver, 0.52f };
41+
#elif IV_G_CHECKERS_CORE_VER_045_with_GALLERY_NEW_IVD3X_CORE
42+
static public float[] supported_vers_p_and_iv_c_c = new float[14] { 0.35f, 0.35f, 0.4f, 0.38f, 0.4f, 0.45f, 0.42f,
43+
0.48f, 0.42f, 0.5f, 0.45f, 0.52f, iv_checker_dll_code_ver, 0.53f };
3844
#endif
3945
//IV Note: Core side Debug Mode parm:
4046
public bool debug_mode = false;
@@ -47,16 +53,19 @@ public class IVCheckerCore
4753
public static float iv_used_programm_ver = 0.1f;
4854
//IV Note: Variable for Hide AppInfo Button in main wnd:
4955
public static bool iv_ab_hide_hack = false;
56+
//IV Note: Variable for Show Music Player:
57+
public static bool iv_music_player_show_hack = false;
58+
public static bool iv_mp_showed = false;
5059
//IV Note: AppInfo Form variable for using that UI Component:
5160
static public IV_Checker_Core_AppInfo iv_app_inf_main = new IV_Checker_Core_AppInfo();
5261
//IV Note: IV_S_Library Core Loading:
5362
static public IV_Sound_Master.IVSMasterCore iv_s_manager = new IV_Sound_Master.IVSMasterCore();
5463
//IV Note: Text for about_page Programm information:
55-
static string last_genetaded_inf_for_about = iv_used_programm + " Programm Version - " + iv_used_programm_ver + " Used IV Library: "
56-
+ "1) IV Checker Core Version - " + iv_checker_dll_code_ver + " 2) IV Sound Master library Version - 0.1"
64+
static private string last_genetaded_inf_for_about = iv_used_programm + " Programm Version - " + iv_used_programm_ver + " Used IV Library: "
65+
+ "1) IV Checker Core Version - " + iv_checker_dll_code_ver + " 2) IV Sound Master library Version - " + IV_Sound_Master.IVSMasterCore.iv_s_master_ver
5766
+ " 3) IVD3X DirectX11 Visualiser (based on Sharp.DirectX)";
5867
//IV Note: Text for about_page Programm information with DEBUG_MODE_ENABLED:
59-
static string last_genetaded_inf_for_about_with_dbg = last_genetaded_inf_for_about + " DEBUG_MODE_ENABLED";
68+
static private string last_genetaded_inf_for_about_with_dbg = last_genetaded_inf_for_about + " DEBUG_MODE_ENABLED";
6069

6170

6271
//IV Note: Intreger Create Scenario for Save Release Progress Bar variables.
@@ -133,6 +142,8 @@ public void IV_Checker_Core_Release_Ver_Info(string main_programm_name = "FIXME_
133142
if(main_prog_ver == supported_vers_p_and_iv_c_c[9] && iv_checker_dll_code_ver == supported_vers_p_and_iv_c_c[8])
134143
#elif IV_G_CHECKERS_CORE_VER_045
135144
if(main_prog_ver == supported_vers_p_and_iv_c_c[11] && iv_checker_dll_code_ver == supported_vers_p_and_iv_c_c[10])
145+
#elif IV_G_CHECKERS_CORE_VER_045_with_GALLERY_NEW_IVD3X_CORE
146+
if (main_prog_ver == supported_vers_p_and_iv_c_c[13] && iv_checker_dll_code_ver == supported_vers_p_and_iv_c_c[12])
136147
#endif
137148
{
138149
checked_programm_ver = true;
@@ -188,10 +199,10 @@ public void IV_Checker_Core_Release_Ver_Info(string main_programm_name = "FIXME_
188199
/////////////////////////////////////////////
189200
//IV Note: void for Reload AboutPage Text.//
190201
///////////////////////////////////////////
191-
static void IV_Reload_AB_P_Text()
202+
static private void IV_Reload_AB_P_Text()
192203
{
193204
last_genetaded_inf_for_about = iv_used_programm + " Programm Version - " + iv_used_programm_ver + " Used IV Library: "
194-
+ "1) IV Checker Core Version - " + iv_checker_dll_code_ver + " 2) IV Sound Master library Version - 0.1"
205+
+ "1) IV Checker Core Version - " + iv_checker_dll_code_ver + " 2) IV Sound Master library Version - " + IV_Sound_Master.IVSMasterCore.iv_s_master_ver
195206
+ " 3) IVD3X DirectX11 Visualiser (based on Sharp.DirectX)";
196207
last_genetaded_inf_for_about_with_dbg = last_genetaded_inf_for_about + " DEBUG_MODE_ENABLED";
197208
}

IV_Gallery_Checkers_Core/IV_Checker_Core_AppInfo.Designer.cs

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

IV_Gallery_Checkers_Core/IV_Checker_Core_AppInfo.cs

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public partial class IV_Checker_Core_AppInfo : Form
1515
public IV_Checker_Core_AppInfo()
1616
{
1717
InitializeComponent();
18+
if (IV_CHECK_MP_Button() || IVCheckerCore.iv_mp_showed)
19+
IV_B_Music_Player.Visible = false;
1820
}
1921

2022
public bool iv_ab_closed_hook = false;
@@ -43,5 +45,34 @@ private void IV_T_Restart_Hook(object sender, EventArgs e)
4345
IV_T_CountDown_To_Restart.Enabled = false;
4446
Application.Restart();
4547
}
48+
49+
private bool IV_CHECK_MP_Button(bool force_status_on = false)
50+
{
51+
if (!force_status_on)
52+
{
53+
if (IVCheckerCore.iv_music_player_show_hack)
54+
return true;
55+
else
56+
return false;
57+
}
58+
else
59+
return force_status_on;
60+
}
61+
62+
public void IV_MP_Realise_Music_Button(bool skip_hack = false)
63+
{
64+
if(!skip_hack)
65+
IVCheckerCore.iv_music_player_show_hack = false;
66+
IV_B_Music_Player.Visible = true;
67+
}
68+
69+
private void IV_B_MP_Press_Hook(object sender, EventArgs e)
70+
{
71+
if (!IVCheckerCore.iv_music_player_show_hack)
72+
{
73+
IVCheckerCore.iv_music_player_show_hack = true;
74+
IV_B_Music_Player.Visible = false;
75+
}
76+
}
4677
}
4778
}

0 commit comments

Comments
 (0)