diff --git a/CHANGELOG.md b/CHANGELOG.md index d637e6e8e..19dd2c7f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,9 @@ # changelog ## 0.33 +**Undo/Redo**\ Update hlslpp from 3.4 to 3.5.2\ Update Vulkan SDK to 1.3.290.0\ -Undo/Redo ## 0.32 diff --git a/build_all.bat b/build_all.bat new file mode 100644 index 000000000..7f943df5e --- /dev/null +++ b/build_all.bat @@ -0,0 +1,32 @@ +@echo off + +:: Locate Visual Studio installation and MSBuild path using vswhere +for /f "tokens=*" %%i in ('"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe') do set msbuild_path=%%i + +:: Check if MSBuild was found +if not defined msbuild_path ( + echo MSBuild.exe not found! + exit /b 1 +) + +:: Set your solution file name +set solution=vgframework.sln + +:: List of configurations and platforms to build +set configurations=Debug Release Final +set platforms="Win64 DX12" "Win64 Vulkan" "ARM64EC DX12" "ARM64EC Vulkan" + +:: Loop through each configuration +for %%c in (%configurations%) do ( + :: Loop through each platform + for %%p in (%platforms%) do ( + echo Building Configuration: %%c, Platform: %%p + "%msbuild_path%" %solution% /p:Configuration=%%c /p:Platform=%%p /m + if errorlevel 1 ( + echo Build failed for Configuration: %%c, Platform: %%p + exit /b 1 + ) + ) +) + +echo Build completed for all configurations and platforms. \ No newline at end of file diff --git a/imgui.ini b/imgui.ini index 40fd48389..907663c11 100644 --- a/imgui.ini +++ b/imgui.ini @@ -252,8 +252,8 @@ Size=860,400 Collapsed=0 [Window][Delete GameObject] -Pos=1055,636 -Size=450,96 +Pos=1048,636 +Size=464,96 Collapsed=0 [Window][ About] @@ -1983,7 +1983,7 @@ Size=366,70 Collapsed=0 [Window][Load Prefab##Load Prefab] -Pos=530,340 +Pos=850,484 Size=860,400 Collapsed=0 @@ -2288,6 +2288,32 @@ Size=374,220 Collapsed=0 DockId=0x00000023,0 +[Window][Save As##MaterialResource_0x000002BC8D36F4A0##Save As##MaterialResource_0x000002BC8D36F4A0] +Pos=850,484 +Size=860,400 +Collapsed=0 + +[Window][Open##MaterialResource_0x000002BC8D36F4A0##Open##MaterialResource_0x000002BC8D36F4A0] +Pos=850,484 +Size=860,400 +Collapsed=0 + +[Window][Open##MaterialResource_0x000002BC8D36F578##Open##MaterialResource_0x000002BC8D36F578] +Pos=850,484 +Size=860,400 +Collapsed=0 + +[Window][### VGF_Boy] +Pos=1270,44 +Size=916,1106 +Collapsed=0 +DockId=0x0000001A,1 + +[Window][Open##MaterialResource_0x000001E887743798##Open##MaterialResource_0x000001E887743798] +Pos=850,484 +Size=860,400 +Collapsed=0 + [Table][0xC9935533,3] Column 0 Weight=1.0000 Column 1 Weight=1.0000 @@ -2723,6 +2749,98 @@ Column 0 Width=96 Column 1 Width=96 Column 2 Weight=1.0000 +[Table][0x7C769448,3] +RefScale=14 +Column 0 Width=96 +Column 1 Width=96 +Column 2 Weight=1.0000 + +[Table][0xE5E82B06,3] +RefScale=14 +Column 0 Width=96 +Column 1 Width=96 +Column 2 Weight=1.0000 + +[Table][0x3F9C1AD2,3] +RefScale=14 +Column 0 Width=96 +Column 1 Width=96 +Column 2 Weight=1.0000 + +[Table][0xD47D1256,3] +RefScale=14 +Column 0 Width=96 +Column 1 Width=96 +Column 2 Weight=1.0000 + +[Table][0x2E52F508,3] +RefScale=14 +Column 0 Width=96 +Column 1 Width=96 +Column 2 Weight=1.0000 + +[Table][0xB999CE82,3] +RefScale=14 +Column 0 Width=96 +Column 1 Width=96 +Column 2 Weight=1.0000 + +[Table][0x5AC56CCF,3] +RefScale=14 +Column 0 Width=96 +Column 1 Width=96 +Column 2 Weight=1.0000 + +[Table][0x2904BCAA,3] +RefScale=14 +Column 0 Width=96 +Column 1 Width=96 +Column 2 Weight=1.0000 + +[Table][0xB93B8327,4] +RefScale=14 +Column 0 Sort=0v + +[Table][0xF7DC8DE6,4] +RefScale=14 +Column 0 Sort=0v + +[Table][0x4EA4E3F3,4] +RefScale=14 +Column 0 Sort=0v + +[Table][0xAAD18C40,3] +RefScale=14 +Column 0 Width=96 +Column 1 Width=96 +Column 2 Weight=1.0000 + +[Table][0x8BF28FCE,4] +RefScale=14 +Column 0 Sort=0v + +[Table][0x48379345,4] +RefScale=14 +Column 0 Sort=0v + +[Table][0xFFF9F119,3] +RefScale=14 +Column 0 Width=96 +Column 1 Width=96 +Column 2 Weight=1.0000 + +[Table][0x28AD2B8B,3] +RefScale=14 +Column 0 Width=96 +Column 1 Width=96 +Column 2 Weight=1.0000 + +[Table][0x678E830F,3] +RefScale=14 +Column 0 Width=96 +Column 1 Width=96 +Column 2 Weight=1.0000 + [Docking][Data] DockNode ID=0x0000001B Pos=517,135 Size=821,613 Selected=0x766639F3 DockSpace ID=0x09EF459F Pos=0,24 Size=1920,1056 Split=X @@ -2740,7 +2858,7 @@ DockSpace ID=0x2C5EF6DB Window=0x83199EB2 Pos=0,22 Size=2560,134 DockNode ID=0x0000000E Parent=0x2C5EF6DB SizeRef=348,1347 Split=Y Selected=0xEEE51BEA DockNode ID=0x00000015 Parent=0x0000000E SizeRef=373,1128 Split=Y Selected=0xEEE51BEA DockNode ID=0x00000008 Parent=0x00000015 SizeRef=373,152 Selected=0xA22FBBDD - DockNode ID=0x00000013 Parent=0x00000015 SizeRef=373,976 Selected=0xA8F56998 + DockNode ID=0x00000013 Parent=0x00000015 SizeRef=373,976 Selected=0xEEE51BEA DockNode ID=0x00000016 Parent=0x0000000E SizeRef=373,219 Selected=0xDA3EABFC DockNode ID=0x0000000F Parent=0x2C5EF6DB SizeRef=2210,1347 Split=X DockNode ID=0x00000005 Parent=0x0000000F SizeRef=1834,1347 Split=Y Selected=0xD5F5E73A diff --git a/package.bat b/package.bat index b00bdebb3..0ff95da17 100644 --- a/package.bat +++ b/package.bat @@ -31,4 +31,5 @@ del *.pdb cd .. cd .. del package.bat +del build_all.bat diff --git a/src/application/WinMain.cpp b/src/application/WinMain.cpp index f406aa431..36c797d13 100644 --- a/src/application/WinMain.cpp +++ b/src/application/WinMain.cpp @@ -117,7 +117,7 @@ ATOM MyRegisterClass(HINSTANCE hInstance) wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = hInstance; - wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON2)); + wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_APPICON)); wcex.hCursor = LoadCursor(NULL, IDC_ARROW); wcex.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); wcex.lpszMenuName = nullptr; diff --git a/src/application/application.rc b/src/application/application.rc index f8f784a90..32633b28d 100644 Binary files a/src/application/application.rc and b/src/application/application.rc differ diff --git a/src/application/icon2.ico b/src/application/icon.ico similarity index 100% rename from src/application/icon2.ico rename to src/application/icon.ico diff --git a/src/application/icon1.ico b/src/application/icon1.ico deleted file mode 100644 index e361bd734..000000000 Binary files a/src/application/icon1.ico and /dev/null differ diff --git a/src/application/icon3.ico b/src/application/icon3.ico deleted file mode 100644 index 622366b56..000000000 Binary files a/src/application/icon3.ico and /dev/null differ diff --git a/src/application/icon4.ico b/src/application/icon4.ico deleted file mode 100644 index 333848256..000000000 Binary files a/src/application/icon4.ico and /dev/null differ diff --git a/src/application/icon5.ico b/src/application/icon5.ico deleted file mode 100644 index 184650b16..000000000 Binary files a/src/application/icon5.ico and /dev/null differ diff --git a/src/application/resource.h b/src/application/resource.h index 7120e8e1e..16cfd16b9 100644 --- a/src/application/resource.h +++ b/src/application/resource.h @@ -2,8 +2,7 @@ // Microsoft Visual C++ generated include file. // Used by application.rc // -#define IDI_ICON1 101 -#define IDI_ICON2 102 +#define IDI_APPICON 101 // Next default values for new objects // diff --git a/vgframework.sln b/vgframework.sln index a83aa3766..677e153c9 100644 --- a/vgframework.sln +++ b/vgframework.sln @@ -196,6 +196,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vulkan", "Vulkan", "{A5BEB8 .github\workflows\ARM64EC_Vulkan_Release.yml = .github\workflows\ARM64EC_Vulkan_Release.yml EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "batch", "batch", "{4E477101-4D7A-4D13-AE06-9F27F1965883}" + ProjectSection(SolutionItems) = preProject + build_all.bat = build_all.bat + clean.bat = clean.bat + package.bat = package.bat + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM64EC DX12 = Debug|ARM64EC DX12