From 04c3b9fad2d5011b9c15a749b05b3c7ab8b6c0c6 Mon Sep 17 00:00:00 2001 From: assiduous Date: Mon, 31 Jul 2023 15:18:53 -0700 Subject: [PATCH] Added Tutorial03 for DotNet --- .github/workflows/build-windows.yml | 5 +++++ DiligentSamples | 2 +- README.md | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 1c2b23ba7..0813bedce 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -47,6 +47,7 @@ jobs: cmake_generator: ["Visual Studio 17 2022"] cmake_args: ["-DDILIGENT_BUILD_TESTS=ON"] platform: ["Win32"] + build_args: ["-- -restore"] include: - name: "Win10-Dev" @@ -55,6 +56,7 @@ jobs: build_type: "RelWithDebInfo" cmake_generator: "Visual Studio 17 2022" cmake_args: "-DDILIGENT_BUILD_CORE_TESTS=ON -DDILIGENT_BUILD_TOOLS_TESTS=ON -DDILIGENT_DEVELOPMENT=ON" + build_args: "-- -restore" - name: "Win8.1" platform: "Win32" @@ -62,6 +64,7 @@ jobs: build_type: "Release" cmake_generator: "Visual Studio 17 2022" cmake_args: "-DDILIGENT_BUILD_CORE_TESTS=ON -DDILIGENT_BUILD_TOOLS_TESTS=ON -DCMAKE_SYSTEM_VERSION=8.1" + build_args: "-- -restore" - name: "Win10-Ninja" platform: "Win32" @@ -127,6 +130,8 @@ jobs: id: build if: success() uses: DiligentGraphics/github-action/build@v1 + with: + build-args: ${{ matrix.build_args }} # Core tests - name: DiligentCoreTest diff --git a/DiligentSamples b/DiligentSamples index c8d21cf2d..4a7d2d6dd 160000 --- a/DiligentSamples +++ b/DiligentSamples @@ -1 +1 @@ -Subproject commit c8d21cf2d6e17ccc6c90c4c1df992f5fbd29335b +Subproject commit 4a7d2d6dd4d0e1ca104dd7a928dad4439b5b1b6b diff --git a/README.md b/README.md index 2c096583c..8166f2500 100644 --- a/README.md +++ b/README.md @@ -170,6 +170,7 @@ Build prerequisites: * Windows SDK 10.0.17763.0 or later (10.0.19041.0 is required for mesh shaders) * C++ build tools * Visual C++ ATL Support +* .NET SDK Use either CMake GUI or command line tool to generate build files. For example, to generate [Visual Studio 2022](https://visualstudio.microsoft.com/) 64-bit solution and project files in *build/Win64* folder, @@ -851,6 +852,7 @@ descriptions (compile shaders for target platforms, define internal resource lay | [02 - Cube](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial02_Cube) | ![](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial02_Cube/Animation_Small.gif) | This tutorial demonstrates how to render an actual 3D object, a cube. It shows how to load shaders from files, create and use vertex, index and uniform buffers. | | [03 - Texturing](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial03_Texturing) | ![](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial03_Texturing/Animation_Small.gif) | This tutorial demonstrates how to apply a texture to a 3D object. It shows how to load a texture from file, create shader resource binding object and how to sample a texture in the shader. | | [03 - Texturing-C](https://github.com/DiligentGraphics/DiligentSamples/tree/master/Tutorials/Tutorial03_Texturing-C) | ![](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial03_Texturing/Animation_Small.gif) | This tutorial is identical to Tutorial03, but is implemented using C API. | +| [03 - Texturing-DotNet](https://github.com/DiligentGraphics/DiligentSamples/tree/master/Tutorials/Tutorial03_Texturing-DotNet) | ![](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial03_Texturing/Animation_Small.gif) | This tutorial demonstrates how to use the Diligent Engine API in .NET applications. | | [04 - Instancing](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial04_Instancing) | ![](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial04_Instancing/Animation_Small.gif) | This tutorial demonstrates how to use instancing to render multiple copies of one object using unique transformation matrix for every copy. | | [05 - Texture Array](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial05_TextureArray) | ![](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial05_TextureArray/Animation_Small.gif) | This tutorial demonstrates how to combine instancing with texture arrays to use unique texture for every instance. | | [06 - Multithreading](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial06_Multithreading) | ![](https://github.com/DiligentGraphics/DiligentSamples/blob/master/Tutorials/Tutorial06_Multithreading/Animation_Small.gif) | This tutorial shows how to generate command lists in parallel from multiple threads. |