patch debug - exec
This commit is contained in:
parent
fec593205b
commit
296e04692a
@ -288,9 +288,11 @@
|
|||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
<CopyFileToFolders Include="assets\Texture\sprite04.png">
|
<CopyFileToFolders Include="assets\Texture\sprite04.png">
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
<CopyFileToFolders Include="assets\Texture\stone01.png">
|
<CopyFileToFolders Include="assets\Texture\stone01.png">
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
<CopyFileToFolders Include="assets\Texture\stone01.tga">
|
<CopyFileToFolders Include="assets\Texture\stone01.tga">
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
||||||
@ -298,12 +300,15 @@
|
|||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
<CopyFileToFolders Include="assets\Texture\wall.png">
|
<CopyFileToFolders Include="assets\Texture\wall.png">
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
<CopyFileToFolders Include="assets\Texture\wall01.png">
|
<CopyFileToFolders Include="assets\Texture\wall01.png">
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
<CopyFileToFolders Include="assets\Texture\water01.png">
|
<CopyFileToFolders Include="assets\Texture\water01.png">
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
||||||
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
<CopyFileToFolders Include="assets\Texture\EmptyTexture.png">
|
<CopyFileToFolders Include="assets\Texture\EmptyTexture.png">
|
||||||
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\assets\Texture\</DestinationFolders>
|
||||||
|
@ -419,18 +419,6 @@
|
|||||||
<CopyFileToFolders Include="font01.tga">
|
<CopyFileToFolders Include="font01.tga">
|
||||||
<Filter>fonts</Filter>
|
<Filter>fonts</Filter>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
<CopyFileToFolders Include="sprite01.tga">
|
|
||||||
<Filter>Assets</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="sprite02.tga">
|
|
||||||
<Filter>Assets</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="sprite03.tga">
|
|
||||||
<Filter>Assets</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="sprite04.tga">
|
|
||||||
<Filter>Assets</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="Color.ps">
|
<CopyFileToFolders Include="Color.ps">
|
||||||
<Filter>shader</Filter>
|
<Filter>shader</Filter>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
@ -602,26 +590,38 @@
|
|||||||
<CopyFileToFolders Include="assets\Texture\sprite03.png">
|
<CopyFileToFolders Include="assets\Texture\sprite03.png">
|
||||||
<Filter>Assets\Texture</Filter>
|
<Filter>Assets\Texture</Filter>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
<CopyFileToFolders Include="assets\Texture\sprite04.png">
|
|
||||||
<Filter>Fichiers de ressources</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="assets\Texture\stone01.png">
|
|
||||||
<Filter>Fichiers de ressources</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="assets\Texture\wall.png">
|
|
||||||
<Filter>Fichiers de ressources</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="assets\Texture\wall01.png">
|
|
||||||
<Filter>Fichiers de ressources</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="assets\Texture\water01.png">
|
|
||||||
<Filter>Fichiers de ressources</Filter>
|
|
||||||
</CopyFileToFolders>
|
|
||||||
<CopyFileToFolders Include="assets\Model\OBJ\plane.obj">
|
<CopyFileToFolders Include="assets\Model\OBJ\plane.obj">
|
||||||
<Filter>Assets\Model\OBJ</Filter>
|
<Filter>Assets\Model\OBJ</Filter>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
<CopyFileToFolders Include="assets\Texture\EmptyTexture.png">
|
<CopyFileToFolders Include="assets\Texture\EmptyTexture.png">
|
||||||
<Filter>Assets\Texture</Filter>
|
<Filter>Assets\Texture</Filter>
|
||||||
</CopyFileToFolders>
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="assets\Texture\stone01.png">
|
||||||
|
<Filter>Assets\Texture</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="sprite01.tga">
|
||||||
|
<Filter>Assets\Texture</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="sprite02.tga">
|
||||||
|
<Filter>Assets\Texture</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="sprite03.tga">
|
||||||
|
<Filter>Assets\Texture</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="assets\Texture\sprite04.png">
|
||||||
|
<Filter>Assets\Texture</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="sprite04.tga">
|
||||||
|
<Filter>Assets\Texture</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="assets\Texture\wall.png">
|
||||||
|
<Filter>Assets\Texture</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="assets\Texture\wall01.png">
|
||||||
|
<Filter>Assets\Texture</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
|
<CopyFileToFolders Include="assets\Texture\water01.png">
|
||||||
|
<Filter>Assets\Texture</Filter>
|
||||||
|
</CopyFileToFolders>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
@ -5,7 +5,7 @@ Collapsed=0
|
|||||||
|
|
||||||
[Window][Khaotic Engine]
|
[Window][Khaotic Engine]
|
||||||
Pos=1180,27
|
Pos=1180,27
|
||||||
Size=396,566
|
Size=396,826
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000005,0
|
DockId=0x00000005,0
|
||||||
|
|
||||||
@ -45,7 +45,7 @@ Collapsed=0
|
|||||||
|
|
||||||
[Window][Render Window]
|
[Window][Render Window]
|
||||||
Pos=8,27
|
Pos=8,27
|
||||||
Size=1170,566
|
Size=1170,826
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000002,0
|
DockId=0x00000002,0
|
||||||
|
|
||||||
@ -85,7 +85,7 @@ DockSpace ID=0xCCBD8CF7 Window=0x3DA2F1DE Pos=8,27 Size=1568,826 Split=Y
|
|||||||
DockNode ID=0x0000000A Parent=0x00000007 SizeRef=395,411 Selected=0x031DC75C
|
DockNode ID=0x0000000A Parent=0x00000007 SizeRef=395,411 Selected=0x031DC75C
|
||||||
DockNode ID=0x00000008 Parent=0x0000000B SizeRef=1276,826 Split=X
|
DockNode ID=0x00000008 Parent=0x0000000B SizeRef=1276,826 Split=X
|
||||||
DockNode ID=0x00000002 Parent=0x00000008 SizeRef=878,826 CentralNode=1 Selected=0x9204953B
|
DockNode ID=0x00000002 Parent=0x00000008 SizeRef=878,826 CentralNode=1 Selected=0x9204953B
|
||||||
DockNode ID=0x00000005 Parent=0x00000008 SizeRef=396,826 Selected=0x0B098C4B
|
DockNode ID=0x00000005 Parent=0x00000008 SizeRef=396,826 Selected=0x9F035453
|
||||||
DockNode ID=0x0000000C Parent=0x0000000D SizeRef=1568,335 Selected=0x139FDA3F
|
DockNode ID=0x0000000C Parent=0x0000000D SizeRef=1568,335 Selected=0x139FDA3F
|
||||||
DockNode ID=0x0000000E Parent=0xCCBD8CF7 SizeRef=1568,258 Selected=0xAB74BEE9
|
DockNode ID=0x0000000E Parent=0xCCBD8CF7 SizeRef=1568,258 Selected=0xAB74BEE9
|
||||||
|
|
||||||
|
@ -522,7 +522,7 @@ void imguiManager::WidgetEngineSettingsWindow(ApplicationClass* app)
|
|||||||
|
|
||||||
void imguiManager::WidgetLogWindow(ApplicationClass* app)
|
void imguiManager::WidgetLogWindow(ApplicationClass* app)
|
||||||
{
|
{
|
||||||
ImGui::Begin("Log Window");
|
ImGui::Begin("Log Window" , &showLogWindow);
|
||||||
|
|
||||||
// Filtre de recherche
|
// Filtre de recherche
|
||||||
static ImGuiTextFilter filter;
|
static ImGuiTextFilter filter;
|
||||||
|
@ -48,12 +48,12 @@ public:
|
|||||||
bool m_EnableCelShading;
|
bool m_EnableCelShading;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool showObjectWindow = false;
|
bool showObjectWindow;
|
||||||
bool showTerrainWindow = false;
|
bool showTerrainWindow;
|
||||||
bool showLightWindow = false;
|
bool showLightWindow;
|
||||||
bool showShaderWindow = false;
|
bool showShaderWindow;
|
||||||
bool showEngineSettingsWindow = false;
|
bool showEngineSettingsWindow;
|
||||||
bool showLogWindow = false;
|
bool showLogWindow;
|
||||||
|
|
||||||
bool m_isPhyiscsEnabled = false;
|
bool m_isPhyiscsEnabled = false;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user