Skip to content

Commit 9c89a70

Browse files
authored
Merge pull request #2502 from LizCasey/v-elicas071118
More VS designers article content fixes.
2 parents 1a39319 + 5e23e08 commit 9c89a70

19 files changed

+133
-133
lines changed

docs/designers/shader-designer-nodes.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ manager: douge
1111
ms.workload:
1212
- "multiple"
1313
---
14-
# Shader Designer Nodes
14+
# Shader Designer nodes
1515
The articles in this section of the documentation contain information about the various Shader Designer nodes that you can use to create graphics effects.
1616

1717
## Nodes and node types
18-
The Shader Designer represents visual effects as a graph. These graphs are built from nodes that are specifically chosen and connected in precise ways to achieve the intended affect. Each node represents either a piece of information or a mathematical function, and the connections between them represent how the information flows through the graph to produce the result. The Shader Designer provides six different node types—filters, texture nodes, parameters, constants, utility nodes, and math nodes—and several individual nodes belong to each type. These nodes and node types are described in the other articles in this sectionsee the links at the end of this document.
18+
The Shader Designer represents visual effects as a graph. These graphs are built from nodes that are specifically chosen and connected in precise ways to achieve the intended effect. Each node represents either a piece of information or a mathematical function, and the connections between them represent how the information flows through the graph to produce the result. The Shader Designer provides six different node types—filters, texture nodes, parameters, constants, utility nodes, and math nodes—and several individual nodes belong to each type. These nodes and node types are described in the other articles in this section. For more information, see the links at the end of this document.
1919

2020
## Node structure
2121
All nodes are made up of a combination of common elements. Every node has at least one output terminal on its right-hand side (except the final color node, which represents the output of the shader). Nodes that represent calculations or texture samplers have input terminals on their left-hand sides, but nodes that represent information have no input terminals. Output terminals are connected to input terminals to move information from one node to another.
@@ -39,9 +39,9 @@ The articles in this section of the documentation contain information about the
3939

4040
|Title|Description|
4141
|-----------|-----------------|
42-
|[Constant Nodes](../designers/constant-nodes.md)|Describes nodes that you can use to represent literal values and interpolated vertex-state information in shader calculations. Because vertex-state is interpolated—and therefore, is different for each pixel—each pixel-shader instance receives a different version of the constant.|
43-
|[Parameter Nodes](../designers/parameter-nodes.md)|Describes nodes that you can use to represent camera position, material properties, lighting parameters, time, and other app-state information in shader calculations.|
44-
|[Texture Nodes](../designers/texture-nodes.md)|Describes the nodes that you can use to sample various texture types and geometries, and to produce or transform texture coordinates in common ways.|
45-
|[Math Nodes](../designers/math-nodes.md)|Describes the nodes that you can use to perform algebraic, logic, trigonometric, and other mathematical operations that map directly to HLSL instructions.|
46-
|[Utility Nodes](../designers/utility-nodes.md)|Describes the nodes that you can use to perform common lighting calculations and other common operations that do not map directly to HLSL instructions.|
47-
|[Filter Nodes](../designers/filter-nodes.md)|Describes the nodes that you can use to perform texture filtering and color filtering.|
42+
|[Constant nodes](../designers/constant-nodes.md)|Describes nodes that you can use to represent literal values and interpolated vertex-state information in shader calculations. Because vertex-state is interpolated—and therefore, is different for each pixel—each pixel-shader instance receives a different version of the constant.|
43+
|[Parameter nodes](../designers/parameter-nodes.md)|Describes nodes that you can use to represent camera position, material properties, lighting parameters, time, and other app-state information in shader calculations.|
44+
|[Texture nodes](../designers/texture-nodes.md)|Describes the nodes that you can use to sample various texture types and geometries, and to produce or transform texture coordinates in common ways.|
45+
|[Math nodes](../designers/math-nodes.md)|Describes the nodes that you can use to perform algebraic, logic, trigonometric, and other mathematical operations that map directly to HLSL instructions.|
46+
|[Utility nodes](../designers/utility-nodes.md)|Describes the nodes that you can use to perform common lighting calculations and other common operations that do not map directly to HLSL instructions.|
47+
|[Filter nodes](../designers/filter-nodes.md)|Describes the nodes that you can use to perform texture filtering and color filtering.|

docs/designers/shader-designer.md

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ The Shader Designer supports these shader formats:
2626

2727
|Format Name|File Extension|Supported Operations (View, Edit, Export)|
2828
|-----------------|--------------------|-------------------------------------------------|
29-
|Directed Graph Shader Language|.dgsl|View, Edit|
30-
|HLSL Shader (source code)|.hlsl|Export|
31-
|HLSL Shader (bytecode)|.cso|Export|
32-
|C++ header (HLSL bytecode array)|.h|Export|
29+
|Directed Graph Shader Language|*.dgsl*|View, Edit|
30+
|HLSL Shader (source code)|*.hlsl*|Export|
31+
|HLSL Shader (bytecode)|*.cso*|Export|
32+
|C++ header (HLSL bytecode array)|*.h*|Export|
3333

34-
## Get Started
34+
## Get started
3535

3636
This section describes how to add a DGSL shader to your [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] project and provides basic information to help you get started.
3737

3838
### To add a DGSL shader to your project
3939

40-
1. In **Solution Explorer**, open the shortcut menu for the project that you want to add the shader to, and then choose **Add** > **New Item**.
40+
1. In **Solution Explorer**, open the shortcut menu for the project to which you want to add the shader, and then choose **Add** > **New Item**.
4141

4242
2. In the **Add New Item** dialog box, under **Installed**, select **Graphics**, and then select **Visual Shader Graph (.dgsl)**.
4343

@@ -68,8 +68,8 @@ This table describes the items on the **Shader Designer Mode** toolbar, which ar
6868
|Toolbar Item|Description|
6969
|------------------|-----------------|
7070
|**Select**|Enables interaction with nodes and edges in the graph. In this mode, you can select nodes and move or delete them, and you can establish edges or break them.|
71-
|**Pan**|Enables movement of a shader graph relative to the window frame. To pan, select a point on the design surface and move it around.<br /><br /> In **Select** mode, you can press and hold Ctrl to activate **Pan** mode temporarily.|
72-
|**Zoom**|Enables the display of more or less shader-graph detail relative to the window frame. In **Zoom** mode, select a point on the design surface and then move it right or down to zoom in, or left or up to zoom out.<br /><br /> In **Select** mode, you can press and hold Ctrl to zoom in or out by using the mouse wheel.|
71+
|**Pan**|Enables movement of a shader graph relative to the window frame. To pan, select a point on the design surface and move it around.<br /><br /> In **Select** mode, you can press and hold **Ctrl** to activate **Pan** mode temporarily.|
72+
|**Zoom**|Enables the display of more or less shader-graph detail relative to the window frame. In **Zoom** mode, select a point on the design surface and then move it right or down to zoom in, or left or up to zoom out.<br /><br /> In **Select** mode, you can press and hold **Ctrl** to zoom in or out by using the mouse wheel.|
7373
|**Zoom to Fit**|Displays the full shader graph in the window frame.|
7474
|**Real-Time Rendering Mode**|When real-time rendering is enabled, [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] redraws the design surface, even when no user action is performed. This mode is useful when you work with shaders that change over time.|
7575
|**Preview with sphere**|When enabled, a model of a sphere is used to preview the shader. Only one preview shape at a time can be enabled.|
@@ -80,7 +80,7 @@ This table describes the items on the **Shader Designer Mode** toolbar, which ar
8080
|**Preview with plane**|When enabled, a model of a plane is used to preview the shader. Only one preview shape at a time can be enabled.|
8181
|**Toolbox**|Alternately shows or hides the **Toolbox**.|
8282
|**Properties**|Alternatively shows or hides the **Properties** window.|
83-
|**Advanced**|Contains advanced commands and options.<br /><br /> **Export**: Enables the export of a shader in several formats.<br /><br /> **Export As**: Exports the shader as either HLSL source code or as compiled shader bytecode. For more information about how to export shaders, see [How to: Export a Shader](../designers/how-to-export-a-shader.md).<br /><br /> **Graphics Engines**: Enables the selection of the renderer that is used to display the design surface.<br /><br /> **Render with D3D11**: Uses Direct3D 11 to render the Shader Designer design surface.<br /><br /> **Render with D3D11WARP**: Uses Direct3D 11 Windows Advanced Rasterization Platform (WARP) to render the Shader Designer design surface.<br /><br /> **View**: Enables the selection of additional information about the Shader Designer.<br /><br /> **Frame Rate**: When enabled, displays the current frame rate in the upper-right corner of the design surface. The frame rate is the number of frames that are drawn per second. This option is useful when you enable the **Real-Time Rendering Mode** option.|
83+
|**Advanced**|Contains advanced commands and options.<br /><br /> **Export**: Enables the export of a shader in several formats.<br /><br /> **Export As**: Exports the shader as either HLSL source code or as compiled shader bytecode. For more information about how to export shaders, see [How to: Export a shader](../designers/how-to-export-a-shader.md).<br /><br /> **Graphics Engines**: Enables the selection of the renderer that is used to display the design surface.<br /><br /> **Render with D3D11**: Uses Direct3D 11 to render the Shader Designer design surface.<br /><br /> **Render with D3D11WARP**: Uses Direct3D 11 Windows Advanced Rasterization Platform (WARP) to render the Shader Designer design surface.<br /><br /> **View**: Enables the selection of additional information about the Shader Designer.<br /><br /> **Frame Rate**: When enabled, displays the current frame rate in the upper-right corner of the design surface. The frame rate is the number of frames that are drawn per second. This option is useful when you enable the **Real-Time Rendering Mode** option.|
8484

8585
> [!TIP]
8686
> You can choose the **Advanced** button to run the last command again.
@@ -95,7 +95,7 @@ Use **Select** mode to add, remove, reposition, connect, and configure nodes. He
9595

9696
- To add a node to the graph, select it in the **Toolbox** and then move it to the design surface.
9797

98-
- To remove a node from the graph, select it and then press Delete.
98+
- To remove a node from the graph, select it and then press **Delete**.
9999

100100
- To reposition a node, select it and then move it to a new location.
101101

@@ -151,39 +151,39 @@ To rotate the shape, press and hold **Alt**, and then select any point on the de
151151

152152
Before you can use a shader in your app, you have to export it in a format that DirectX understands.
153153

154-
You can export shaders as HLSL source code or as compiled shader bytecode. HLSL source code is exported to a text file that has an .hlsl file name extension. Shader bytecode can be exported either to a raw binary file that has a .cso file name extension, or to a C++ header (.h) file that encodes the shader bytecode into an array.
154+
You can export shaders as HLSL source code or as compiled shader bytecode. HLSL source code is exported to a text file that has an *.hlsl* file name extension. Shader bytecode can be exported either to a raw binary file that has a *.cso* file name extension, or to a C++ header (*.h*) file that encodes the shader bytecode into an array.
155155

156-
For more information about how to export shaders, see [How to: Export a Shader](../designers/how-to-export-a-shader.md).
156+
For more information about how to export shaders, see [How to: Export a shader](../designers/how-to-export-a-shader.md).
157157

158158
## Keyboard shortcuts
159159

160160
|Command|Keyboard shortcuts|
161161
|-------------|------------------------|
162-
|Switch to **Select** mode|Ctrl+G, Gtrl+Q<br /><br /> S|
163-
|Switch to **Zoom** mode|Ctrl+G, Ctrl+Z<br /><br /> Z|
164-
|Switch to **Pan** mode|Ctrl+G, Ctrl+P<br /><br /> K|
165-
|Select all|Ctrl+A|
166-
|Delete the current selection|Delete|
167-
|Cancel the current selection|Escape|
168-
|Zoom in|Ctrl+Mouse wheel forward<br /><br /> Plus Sign (+)|
169-
|Zoom out|Ctrl-Mouse wheel backward<br /><br /> Minus Sign (-)|
170-
|Pan the design surface up|Mouse wheel backward<br /><br /> PageDown|
171-
|Pan the design surface down|Mouse wheel forward<br /><br /> PageUp|
172-
|Pan the design surface left|Shift+Mouse wheel backward<br /><br /> Mouse wheel left<br /><br /> Shift+PageDown|
173-
|Pan the design surface right|Shift+Mouse wheel forward<br /><br /> Mouse wheel right<br /><br /> Shift+PageUp|
174-
|Move the keyboard focus to another node|The Arrow keys|
175-
|Select the node that has keyboard focus (adds the node to the selection group)|Shift+Spacebar|
176-
|Toggle selection of the node that has keyboard focus|Ctrl+Spacebar|
177-
|Toggle current selection (if no nodes are selected, select the node that has keyboard focus)|Spacebar|
178-
|Move the current selection up|Shift+Up Arrow|
179-
|Move the current selection down|Shift+Down Arrow|
180-
|Move the current selection left|Shift+Left Arrow|
181-
|Move current selection right|Shift+Right Arrow.|
162+
|Switch to **Select** mode|**Ctrl**+**G**, **Ctrl**+**Q**<br /><br /> **S**|
163+
|Switch to **Zoom** mode|**Ctrl**+**G**, **Ctrl**+**Z**<br /><br /> **Z**|
164+
|Switch to **Pan** mode|**Ctrl**+**G**, **Ctrl**+**P**<br /><br /> **K**|
165+
|Select all|**Ctrl**+**A**|
166+
|Delete the current selection|**Delete**|
167+
|Cancel the current selection|**Escape** (**Esc**)|
168+
|Zoom in|**Ctrl**+**Mouse wheel forward**<br /><br /> Plus Sign (**+**)|
169+
|Zoom out|**Ctrl**+**Mouse wheel backward**<br /><br /> Minus Sign (**-**)|
170+
|Pan the design surface up|**Mouse wheel backward**<br /><br /> **PageDown**|
171+
|Pan the design surface down|**Mouse wheel forward**<br /><br /> **PageUp**|
172+
|Pan the design surface left|**Shift**+**Mouse wheel backward**<br /><br /> **Mouse wheel left**<br /><br /> **Shift**+**PageDown**|
173+
|Pan the design surface right|**Shift**+**Mouse wheel forward**<br /><br /> **Mouse wheel right**<br /><br /> **Shift**+**PageUp**|
174+
|Move the keyboard focus to another node|The **Arrow** keys|
175+
|Select the node that has keyboard focus (adds the node to the selection group)|**Shift**+**Spacebar**|
176+
|Toggle selection of the node that has keyboard focus|**Ctrl**+**Spacebar**|
177+
|Toggle current selection (if no nodes are selected, select the node that has keyboard focus)|**Spacebar**|
178+
|Move the current selection up|**Shift**+**Up Arrow**|
179+
|Move the current selection down|**Shift**+**Down Arrow**|
180+
|Move the current selection left|**Shift**+**Left Arrow**|
181+
|Move current selection right|**Shift**+**Right Arrow**.|
182182

183183
## Related topics
184184

185185
|Title|Description|
186186
|-----------|-----------------|
187-
|[Working with 3D Assets for Games and Apps](../designers/working-with-3-d-assets-for-games-and-apps.md)|Provides an overview of the [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] tools that you can use to work with textures and images, 3D models, and shader effects.|
187+
|[Working with 3D assets for games and apps](../designers/working-with-3-d-assets-for-games-and-apps.md)|Provides an overview of the [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] tools that you can use to work with textures and images, 3D models, and shader effects.|
188188
|[Image Editor](../designers/image-editor.md)|Describes how to use the [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] Image Editor to work with textures and images.|
189189
|[Model Editor](../designers/model-editor.md)|Describes how to use the [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] Model Editor to work with 3D models.|

docs/designers/the-visual-studio-image-library.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ manager: douge
1919
ms.workload:
2020
- "multiple"
2121
---
22-
# The Visual Studio Image Library
22+
# The Visual Studio image library
2323

2424
The Visual Studio Image Library contains application images that appear in Microsoft Visual Studio, Microsoft Windows, the Office system and other Microsoft software. This set of over 1,000 images can be used to create applications that look visually consistent with Microsoft software.
2525

26-
[Download the Visual Studio Image Library](http://go.microsoft.com/fwlink/p/?LinkId=275090)
26+
[Download the Visual Studio image library](http://go.microsoft.com/fwlink/p/?LinkId=275090)
2727

28-
The image library is divided into five categories: Common Elements, Actions, Annotations, Icons and Objects. Readme files are included in the PDF format for the Common Elements and Icon types. They contain information about how to use these images appropriately in your applications.
28+
The image library is divided into five categories: Common Elements, Actions, Annotations, Icons, and Objects. Readme files are included in the PDF format for the Common Elements and Icon types. They contain information about how to use these images appropriately in your applications.
2929

3030
## See also
3131

3232
- [Install Visual Studio](../install/install-visual-studio.md)
33-
- [Images, Bitmaps, and Metafiles](/dotnet/framework/winforms/advanced/images-bitmaps-and-metafiles)
33+
- [Images, bitmaps, and metafiles](/dotnet/framework/winforms/advanced/images-bitmaps-and-metafiles)

0 commit comments

Comments
 (0)