aboutsummaryrefslogtreecommitdiffstatsci
path: root/samples
diff options
context:
space:
mode:
Diffstat (limited to 'samples')
-rw-r--r--samples/Directory.Build.props13
-rw-r--r--samples/Model/main.cs4
-rw-r--r--samples/Textured/main.cs8
-rw-r--r--samples/TexturedCube/main.cs10
-rw-r--r--samples/Triangle/Triangle.csproj5
-rw-r--r--samples/deferred/main-crow.cs20
-rw-r--r--samples/deferred/main.cs20
-rw-r--r--samples/pbr/EnvironmentPipeline.cs10
-rw-r--r--samples/pbr/PbrPipeline.cs2
9 files changed, 49 insertions, 43 deletions
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
index 483cac6..3a38b39 100644
--- a/samples/Directory.Build.props
+++ b/samples/Directory.Build.props
@@ -13,6 +13,9 @@
<OutputType>Exe</OutputType>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<IncludeDefaultNoneItems>false</IncludeDefaultNoneItems>
+
+ <SpirVAdditionalIncludeDirectories>$(MSBuildThisFileDirectory)common\shaders</SpirVAdditionalIncludeDirectories>
+
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -22,21 +25,21 @@
<DefineConstants>NETSTANDARD;NETSTANDARD2_0;WITH_SHADOWS;_WITH_VKVG</DefineConstants>
</PropertyGroup>
- <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
+<!-- <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
<Reference Include="System" />
- </ItemGroup>
+ </ItemGroup> -->
<ItemGroup>
<ProjectReference Include="$(RootDirectory)vke\CVKL.csproj" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Vulkan" Version="0.1.4-beta" />
+ <PackageReference Include="SpirVTasks" Version="0.1.6-beta" />
+ <PackageReference Include="Vulkan" Version="0.1.4" />
</ItemGroup>
<ItemGroup>
<GLSLShader Include="shaders\**\*.frag;shaders\**\*.vert;shaders\**\*.comp;shaders\**\*.geom" />
</ItemGroup>
-
- <Import Project="$(RootDirectory)spirv.targets" />
+
</Project>
diff --git a/samples/Model/main.cs b/samples/Model/main.cs
index 73aca7c..5008afa 100644
--- a/samples/Model/main.cs
+++ b/samples/Model/main.cs
@@ -88,8 +88,8 @@ namespace ModelSample {
pipeline = new GraphicPipeline (cfg);
- helmet = new SimpleModel (presentQueue, "data/models/DamagedHelmet/glTF/DamagedHelmet.gltf");
- //helmet = new SimpleModel (presentQueue, "data/models/Hubble.glb");
+ helmet = new SimpleModel (presentQueue, "../data/models/DamagedHelmet/glTF/DamagedHelmet.gltf");
+ //helmet = new SimpleModel (presentQueue, "../data/models/Hubble.glb");
//helmet = new SimpleModel (presentQueue, "/mnt/devel/vulkan/Lugdunum/resources/models/Box.gltf");
diff --git a/samples/Textured/main.cs b/samples/Textured/main.cs
index 3f8a3b4..b11cef9 100644
--- a/samples/Textured/main.cs
+++ b/samples/Textured/main.cs
@@ -59,11 +59,11 @@ namespace Textured {
string[] imgPathes = {
"/mnt/devel/vulkan/VulkanExamples/data/models/voyager/voyager_rgba_unorm.ktx",
"/mnt/devel/vulkan/vulkanExUpstream/data/models/voyager/voyager_astc_8x8_unorm.ktx",
- "data/textures/rgba-reference.ktx",
+ "../data/textures/rgba-reference.ktx",
"/mnt/devel/vulkan/vulkanExUpstream/data/textures/trail_astc_8x8_unorm.ktx",
- "data/textures/texturearray_rocks_bc3_unorm.ktx",
- "data/textures/texture.jpg",
- "data/textures/tex256.jpg",
+ "../data/textures/texturearray_rocks_bc3_unorm.ktx",
+ "../data/textures/texture.jpg",
+ "../data/textures/tex256.jpg",
};
Program () : base () {
diff --git a/samples/TexturedCube/main.cs b/samples/TexturedCube/main.cs
index 2b98292..295334d 100644
--- a/samples/TexturedCube/main.cs
+++ b/samples/TexturedCube/main.cs
@@ -85,11 +85,11 @@ namespace TextureCube {
};
int currentImgIndex = 4;
string[] imgPathes = {
- "data/textures/uffizi_cube.ktx",
- "data/textures/papermill.ktx",
- "data/textures/cubemap_yokohama_bc3_unorm.ktx",
- "data/textures/gcanyon_cube.ktx",
- "data/textures/pisa_cube.ktx",
+ "../data/textures/uffizi_cube.ktx",
+ "../data/textures/papermill.ktx",
+ "../data/textures/cubemap_yokohama_bc3_unorm.ktx",
+ "../data/textures/gcanyon_cube.ktx",
+ "../data/textures/pisa_cube.ktx",
};
VkSampleCountFlags samples = VkSampleCountFlags.SampleCount1;
diff --git a/samples/Triangle/Triangle.csproj b/samples/Triangle/Triangle.csproj
index 63844b6..dbb4bc8 100644
--- a/samples/Triangle/Triangle.csproj
+++ b/samples/Triangle/Triangle.csproj
@@ -1,3 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(RootDirectory)netfx.props" />
-</Project> \ No newline at end of file
+ <PropertyGroup>
+ <IncludeDefaultNoneItems>false</IncludeDefaultNoneItems>
+ </PropertyGroup>
+</Project>
diff --git a/samples/deferred/main-crow.cs b/samples/deferred/main-crow.cs
index d265157..dd70624 100644
--- a/samples/deferred/main-crow.cs
+++ b/samples/deferred/main-crow.cs
@@ -111,20 +111,20 @@ namespace deferred {
}
string[] cubemapPathes = {
- "data/textures/papermill.ktx",
- "data/textures/cubemap_yokohama_bc3_unorm.ktx",
- "data/textures/gcanyon_cube.ktx",
- "data/textures/pisa_cube.ktx",
- "data/textures/uffizi_cube.ktx",
+ "../data/textures/papermill.ktx",
+ "../data/textures/cubemap_yokohama_bc3_unorm.ktx",
+ "../data/textures/gcanyon_cube.ktx",
+ "../data/textures/pisa_cube.ktx",
+ "../data/textures/uffizi_cube.ktx",
};
string[] modelPathes = {
//"/mnt/devel/gts/vkChess.net/data/models/chess.glb",
//"/home/jp/gltf/jaguar/scene.gltf",
- "data/models/DamagedHelmet/glTF/DamagedHelmet.gltf",
- "data/models/shadow.glb",
- "data/models/Hubble.glb",
- "data/models/MER_static.glb",
- "data/models/ISS_stationary.glb",
+ "../data/models/DamagedHelmet/glTF/DamagedHelmet.gltf",
+ "../data/models/shadow.glb",
+ "../data/models/Hubble.glb",
+ "../data/models/MER_static.glb",
+ "../data/models/ISS_stationary.glb",
};
int curModelIndex = 0;
diff --git a/samples/deferred/main.cs b/samples/deferred/main.cs
index d3a1297..e11bdf0 100644
--- a/samples/deferred/main.cs
+++ b/samples/deferred/main.cs
@@ -46,19 +46,19 @@ namespace deferred {
computeQ = new Queue (dev, VkQueueFlags.Compute);
}
string[] cubemapPathes = {
- "data/textures/papermill.ktx",
- "data/textures/cubemap_yokohama_bc3_unorm.ktx",
- "data/textures/gcanyon_cube.ktx",
- "data/textures/pisa_cube.ktx",
- "data/textures/uffizi_cube.ktx",
+ "../data/textures/papermill.ktx",
+ "../data/textures/cubemap_yokohama_bc3_unorm.ktx",
+ "../data/textures/gcanyon_cube.ktx",
+ "../data/textures/pisa_cube.ktx",
+ "../data/textures/uffizi_cube.ktx",
};
string[] modelPathes = {
//"/mnt/devel/gts/vkChess.net/data/models/chess.glb",
- "data/models/DamagedHelmet/glTF/DamagedHelmet.gltf",
- "data/models/shadow.glb",
- "data/models/Hubble.glb",
- "data/models/MER_static.glb",
- "data/models/ISS_stationary.glb",
+ "../data/models/DamagedHelmet/glTF/DamagedHelmet.gltf",
+ "../data/models/shadow.glb",
+ "../data/models/Hubble.glb",
+ "../data/models/MER_static.glb",
+ "../data/models/ISS_stationary.glb",
};
int curModelIndex = 0;
diff --git a/samples/pbr/EnvironmentPipeline.cs b/samples/pbr/EnvironmentPipeline.cs
index 40ac8a2..b259863 100644
--- a/samples/pbr/EnvironmentPipeline.cs
+++ b/samples/pbr/EnvironmentPipeline.cs
@@ -64,11 +64,11 @@ namespace CVKL {
#region skybox
public List<string> cubemapPathes = new List<string>() {
- "data/textures/papermill.ktx",
- "data/textures/cubemap_yokohama_bc3_unorm.ktx",
- "data/textures/gcanyon_cube.ktx",
- "data/textures/pisa_cube.ktx",
- "data/textures/uffizi_cube.ktx",
+ "../data/textures/papermill.ktx",
+ "../data/textures/cubemap_yokohama_bc3_unorm.ktx",
+ "../data/textures/gcanyon_cube.ktx",
+ "../data/textures/pisa_cube.ktx",
+ "../data/textures/uffizi_cube.ktx",
};
static float[] box_vertices = {
1.0f, 1.0f,-1.0f, // +X side
diff --git a/samples/pbr/PbrPipeline.cs b/samples/pbr/PbrPipeline.cs
index d62090e..852efd5 100644
--- a/samples/pbr/PbrPipeline.cs
+++ b/samples/pbr/PbrPipeline.cs
@@ -93,7 +93,7 @@ namespace CVKL {
uboMats = new HostBuffer (Dev, VkBufferUsageFlags.UniformBuffer, matrices, true);
string[] modelPathes = {
- "data/models/DamagedHelmet/glTF/DamagedHelmet.gltf",
+ "../data/models/DamagedHelmet/glTF/DamagedHelmet.gltf",
"/mnt/devel/vulkan/glTF-Sample-Models-master/2.0/Avocado/glTF/Avocado.gltf",
"/mnt/devel/vulkan/glTF-Sample-Models-master/2.0/BarramundiFish/glTF/BarramundiFish.gltf",
"/mnt/devel/vulkan/glTF-Sample-Models-master/2.0/BoomBoxWithAxes/glTF/BoomBoxWithAxes.gltf",
generated by cgit v1.3.1-4-g156e (git 2.54.0) at 2026-11-12 17:17:33 +0000