Patedam/Juliet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Patedam/Juliet:00036950d68896b50df6ca9d7079a646278f7119
Branches Tags
Patedam/Juliet:main
...
compare: Patedam/Juliet:2d76955cfeaf5891192cfad9541c4ee71fa53c6f
Branches Tags
Patedam/Juliet:main
2 Commits
00036950d6 ... 2d76955cfe
Author SHA1 Message Date
Patedam 2d76955cfe removing include 2026-08-02 19:46:40 -04:00
Patedam 40cb95bc40 fix generate to move imgui vc project out of imgui folder to stop confusing git 2026-08-02 19:46:08 -04:00
6 changed files with 21 additions and 22 deletions
Expand all files Collapse all files
External/Imgui
Vendored
+1 -1
Submodule External/Imgui updated: a9e7a8c880...9b7699f325
Juliet.sln
+1 -1
View File
@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcx
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game", "Game\Game.vcxproj", "{b568a67e-05a1-9907-ff4b-a129119528bd}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Game", "Game\Game.vcxproj", "{b568a67e-05a1-9907-ff4b-a129119528bd}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "External\imgui\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "Intermediate\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Juliet/src/Graphics/D3D12/D3D12Buffer.cpp
-1
View File
@@ -2,7 +2,6 @@
#include <Core/Logging/LogManager.h> #include <Core/Logging/LogManager.h>
#include <Core/Logging/LogTypes.h> #include <Core/Logging/LogTypes.h>
#include <Core/Memory/Allocator.h>
#include <Graphics/D3D12/D3D12CommandList.h> #include <Graphics/D3D12/D3D12CommandList.h>
#include <Graphics/D3D12/D3D12DescriptorHeap.h> #include <Graphics/D3D12/D3D12DescriptorHeap.h>
#include <Graphics/D3D12/D3D12GraphicsDevice.h> #include <Graphics/D3D12/D3D12GraphicsDevice.h>
JulietShaderCompiler.sln
+1 -1
View File
@@ -6,7 +6,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JulietShaderCompiler", "Jul
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{a93aa30f-8f29-02fe-57e2-cd3626948b68}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{a93aa30f-8f29-02fe-57e2-cd3626948b68}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "External\imgui\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "Intermediate\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Romeo.sln
+1 -1
View File
@@ -6,7 +6,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Romeo", "Romeo\Romeo.vcxpro
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{a93aa30f-8f29-02fe-57e2-cd3626948b68}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Juliet", "Juliet\Juliet.vcxproj", "{a93aa30f-8f29-02fe-57e2-cd3626948b68}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "External\imgui\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImGui", "Intermediate\ImGui.vcxproj", "{652d3fea-b417-1d5e-9f79-3f32e9604ddc}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
misc/Generate.bat
+15 -15
View File
@@ -31,22 +31,22 @@ if exist "%PLAN%" del /f /q "%PLAN%"
>>"%PLAN%" echo INCLUDE_SEARCH $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler; >>"%PLAN%" echo INCLUDE_SEARCH $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;
>>"%PLAN%" echo DEBUG_CMD ..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil >>"%PLAN%" echo DEBUG_CMD ..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil
>>"%PLAN%" echo PROJECT ImGui External\imgui >>"%PLAN%" echo PROJECT ImGui Intermediate
>>"%PLAN%" echo EXTRA_DEF IMGUI_API=__declspec(dllexport); >>"%PLAN%" echo EXTRA_DEF IMGUI_API=__declspec(dllexport);
>>"%PLAN%" echo PROJECT_SRC External\imgui\imgui.cpp >>"%PLAN%" echo PROJECT_SRC ..\External\imgui\imgui.cpp
>>"%PLAN%" echo PROJECT_SRC External\imgui\imgui_demo.cpp >>"%PLAN%" echo PROJECT_SRC ..\External\imgui\imgui_demo.cpp
>>"%PLAN%" echo PROJECT_SRC External\imgui\imgui_draw.cpp >>"%PLAN%" echo PROJECT_SRC ..\External\imgui\imgui_draw.cpp
>>"%PLAN%" echo PROJECT_SRC External\imgui\imgui_tables.cpp >>"%PLAN%" echo PROJECT_SRC ..\External\imgui\imgui_tables.cpp
>>"%PLAN%" echo PROJECT_SRC External\imgui\imgui_widgets.cpp >>"%PLAN%" echo PROJECT_SRC ..\External\imgui\imgui_widgets.cpp
>>"%PLAN%" echo PROJECT_SRC External\imgui\backends\imgui_impl_win32.cpp >>"%PLAN%" echo PROJECT_SRC ..\External\imgui\backends\imgui_impl_win32.cpp
>>"%PLAN%" echo PROJECT_SRC External\imgui\backends\imgui_impl_dx12.cpp >>"%PLAN%" echo PROJECT_SRC ..\External\imgui\backends\imgui_impl_dx12.cpp
>>"%PLAN%" echo PROJECT_SRC External\imgui\imgui.h >>"%PLAN%" echo PROJECT_SRC ..\External\imgui\imgui.h
>>"%PLAN%" echo PROJECT_SRC External\imgui\imgui_internal.h >>"%PLAN%" echo PROJECT_SRC ..\External\imgui\imgui_internal.h
>>"%PLAN%" echo PROJECT_SRC External\imgui\imstb_rectpack.h >>"%PLAN%" echo PROJECT_SRC ..\External\imgui\imstb_rectpack.h
>>"%PLAN%" echo PROJECT_SRC External\imgui\imstb_textedit.h >>"%PLAN%" echo PROJECT_SRC ..\External\imgui\imstb_textedit.h
>>"%PLAN%" echo PROJECT_SRC External\imgui\imstb_truetype.h >>"%PLAN%" echo PROJECT_SRC ..\External\imgui\imstb_truetype.h
>>"%PLAN%" echo PROJECT_SRC External\imgui\backends\imgui_impl_win32.h >>"%PLAN%" echo PROJECT_SRC ..\External\imgui\backends\imgui_impl_win32.h
>>"%PLAN%" echo PROJECT_SRC External\imgui\backends\imgui_impl_dx12.h >>"%PLAN%" echo PROJECT_SRC ..\External\imgui\backends\imgui_impl_dx12.h
>>"%PLAN%" echo SOLUTION Juliet >>"%PLAN%" echo SOLUTION Juliet
>>"%PLAN%" echo SLN_PROJ JulietApp >>"%PLAN%" echo SLN_PROJ JulietApp