From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Sat, 18 Jul 2020 18:47:53 +0000 (+0200)
Subject: debug
X-Git-Tag: v0.1.21
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=5302c976c70df99880fbf2136bb86312f595c327;p=jp%2Fvke.net.git

debug
---

diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
index d18a95f..f90c8ce 100644
--- a/samples/Directory.Build.props
+++ b/samples/Directory.Build.props
@@ -19,7 +19,7 @@
 		
 		<RestoreAdditionalProjectSources Condition="Exists('$(SolutionDir)build\$(Configuration)\')">$(SolutionDir)build\$(Configuration)\</RestoreAdditionalProjectSources>
 		
-		<DefineConstants>_WITH_SHADOWS;_WITH_VKVG</DefineConstants>
+		<DefineConstants>WITH_SHADOWS;_WITH_VKVG</DefineConstants>
 	</PropertyGroup>
     		
 	<ItemGroup Condition=" '$(Configuration)|$(Platform)' != 'BuildPackages|AnyCPU' ">
diff --git a/samples/DistanceFieldFontTest/Program.cs b/samples/DistanceFieldFontTest/Program.cs
index 52b55e0..d59227c 100644
--- a/samples/DistanceFieldFontTest/Program.cs
+++ b/samples/DistanceFieldFontTest/Program.cs
@@ -68,7 +68,7 @@ namespace DistanceFieldFontTest {
 
 			cmds = cmdPool.AllocateCommandBuffer(swapChain.ImageCount);
 
-			font = new BMFont (Utils.DataDirectory + "font.fnt");
+			font = new BMFont (System.IO.Path.Combine (vke.samples.Utils.DataDirectory, "font.fnt"));
 
 			vbo = new GPUBuffer<float> (dev, VkBufferUsageFlags.VertexBuffer | VkBufferUsageFlags.TransferDst, 1024);
 			ibo = new GPUBuffer<ushort> (dev, VkBufferUsageFlags.IndexBuffer | VkBufferUsageFlags.TransferDst, 2048);
diff --git a/samples/deferred/DeferredPbrRenderer.cs b/samples/deferred/DeferredPbrRenderer.cs
index 8327b20..0c9d079 100644
--- a/samples/deferred/DeferredPbrRenderer.cs
+++ b/samples/deferred/DeferredPbrRenderer.cs
@@ -288,7 +288,7 @@ namespace deferred {
 #if WITH_SHADOWS
 				cfg.AddShader (dev, VkShaderStageFlags.Fragment, "#shaders.compose_with_shadows.frag.spv", constants);
 #else
-				cfg.AddShader (VkShaderStageFlags.Fragment, "#shaders.compose.frag.spv", constants);
+				cfg.AddShader (dev, VkShaderStageFlags.Fragment, "#shaders.compose.frag.spv", constants);
 #endif
 				composePipeline = new GraphicPipeline (cfg);
 			}
diff --git a/samples/deferred/deferred.csproj b/samples/deferred/deferred.csproj
index 06dbc9e..0b82185 100644
--- a/samples/deferred/deferred.csproj
+++ b/samples/deferred/deferred.csproj
@@ -4,12 +4,6 @@
 		<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 		<!--    <EnableDefaultNoneItems>false</EnableDefaultNoneItems>     -->
 	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-		<DefineConstants>TRACE;NETSTANDARD;NETSTANDARD2_0;MEMORY_POOLS;WITH_SHADOWS;_WITH_VKVG;DEBUG;NETFRAMEWORK;NET472</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugCrow|AnyCPU' ">
-		<DefineConstants>TRACE;DEBUG;NETSTANDARD;NETSTANDARD2_0;MEMORY_POOLS;WITH_SHADOWS;_WITH_VKVG</DefineConstants>
-	</PropertyGroup>
 	<ItemGroup>
 		<Compile Include="DeferredPbrRenderer.cs;shadowMapRenderer.cs" />
 	</ItemGroup>
diff --git a/vke.net.sln b/vke.net.sln
index 38f81d5..9c4d85c 100644
--- a/vke.net.sln
+++ b/vke.net.sln
@@ -48,12 +48,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "deferred", "samples\deferre
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "pbr", "samples\pbr\pbr.csproj", "{7EB2430B-6BC0-4AE9-B1FA-57C3DB2AE1C5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "glow", "samples\glow\glow.csproj", "{82947B19-1EFA-4DF9-8BB8-56B0B48F3FBE}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "crowWin", "samples\crowWin\crowWin.csproj", "{A05AAF6C-E925-4EF1-B051-A6DDA5BCB536}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CrowWindow", "addons\CrowWindow\CrowWindow.csproj", "{5AE929DA-4EA2-4BD9-BA38-7258AA9D2E4D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vkeEditor", "samples\vkeEditor\vkeEditor.csproj", "{FE08BCF0-8254-4ECC-8D7F-D425E82FEAD4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		BuildPackages|Any CPU = BuildPackages|Any CPU
@@ -204,16 +204,6 @@ Global
 		{7EB2430B-6BC0-4AE9-B1FA-57C3DB2AE1C5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7EB2430B-6BC0-4AE9-B1FA-57C3DB2AE1C5}.ReleaseSpirVTasks|Any CPU.ActiveCfg = Release|Any CPU
 		{7EB2430B-6BC0-4AE9-B1FA-57C3DB2AE1C5}.ReleaseSpirVTasks|Any CPU.Build.0 = Release|Any CPU
-		{82947B19-1EFA-4DF9-8BB8-56B0B48F3FBE}.BuildPackages|Any CPU.ActiveCfg = Release|Any CPU
-		{82947B19-1EFA-4DF9-8BB8-56B0B48F3FBE}.BuildPackages|Any CPU.Build.0 = Release|Any CPU
-		{82947B19-1EFA-4DF9-8BB8-56B0B48F3FBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{82947B19-1EFA-4DF9-8BB8-56B0B48F3FBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{82947B19-1EFA-4DF9-8BB8-56B0B48F3FBE}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
-		{82947B19-1EFA-4DF9-8BB8-56B0B48F3FBE}.DebugCrow|Any CPU.Build.0 = Debug|Any CPU
-		{82947B19-1EFA-4DF9-8BB8-56B0B48F3FBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{82947B19-1EFA-4DF9-8BB8-56B0B48F3FBE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{82947B19-1EFA-4DF9-8BB8-56B0B48F3FBE}.ReleaseSpirVTasks|Any CPU.ActiveCfg = Debug|Any CPU
-		{82947B19-1EFA-4DF9-8BB8-56B0B48F3FBE}.ReleaseSpirVTasks|Any CPU.Build.0 = Debug|Any CPU
 		{A05AAF6C-E925-4EF1-B051-A6DDA5BCB536}.BuildPackages|Any CPU.ActiveCfg = Release|Any CPU
 		{A05AAF6C-E925-4EF1-B051-A6DDA5BCB536}.BuildPackages|Any CPU.Build.0 = Release|Any CPU
 		{A05AAF6C-E925-4EF1-B051-A6DDA5BCB536}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -234,6 +224,16 @@ Global
 		{5AE929DA-4EA2-4BD9-BA38-7258AA9D2E4D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5AE929DA-4EA2-4BD9-BA38-7258AA9D2E4D}.ReleaseSpirVTasks|Any CPU.ActiveCfg = Debug|Any CPU
 		{5AE929DA-4EA2-4BD9-BA38-7258AA9D2E4D}.ReleaseSpirVTasks|Any CPU.Build.0 = Debug|Any CPU
+		{FE08BCF0-8254-4ECC-8D7F-D425E82FEAD4}.BuildPackages|Any CPU.ActiveCfg = Release|Any CPU
+		{FE08BCF0-8254-4ECC-8D7F-D425E82FEAD4}.BuildPackages|Any CPU.Build.0 = Release|Any CPU
+		{FE08BCF0-8254-4ECC-8D7F-D425E82FEAD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE08BCF0-8254-4ECC-8D7F-D425E82FEAD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE08BCF0-8254-4ECC-8D7F-D425E82FEAD4}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE08BCF0-8254-4ECC-8D7F-D425E82FEAD4}.DebugCrow|Any CPU.Build.0 = Debug|Any CPU
+		{FE08BCF0-8254-4ECC-8D7F-D425E82FEAD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE08BCF0-8254-4ECC-8D7F-D425E82FEAD4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE08BCF0-8254-4ECC-8D7F-D425E82FEAD4}.ReleaseSpirVTasks|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE08BCF0-8254-4ECC-8D7F-D425E82FEAD4}.ReleaseSpirVTasks|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -252,9 +252,9 @@ Global
 		{8185163E-A67C-4C0E-8548-67E2A9F16309} = {16439374-B8DB-4643-8116-EB3358B49A12}
 		{D9A41382-444E-44ED-B638-3D8F06F2FBC2} = {16439374-B8DB-4643-8116-EB3358B49A12}
 		{7EB2430B-6BC0-4AE9-B1FA-57C3DB2AE1C5} = {16439374-B8DB-4643-8116-EB3358B49A12}
-		{82947B19-1EFA-4DF9-8BB8-56B0B48F3FBE} = {16439374-B8DB-4643-8116-EB3358B49A12}
 		{A05AAF6C-E925-4EF1-B051-A6DDA5BCB536} = {16439374-B8DB-4643-8116-EB3358B49A12}
 		{5AE929DA-4EA2-4BD9-BA38-7258AA9D2E4D} = {4AA67AB0-C331-4CB2-9C00-B74F5DE31658}
+		{FE08BCF0-8254-4ECC-8D7F-D425E82FEAD4} = {16439374-B8DB-4643-8116-EB3358B49A12}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1360F94D-CF3C-4121-A8D7-E227F41668F1}