Skip to content

Commit 251c34e

Browse files
jwmsftjwmsft
committed
move Visual Layer docs to from UWP to WinUI
1 parent cae4aa7 commit 251c34e

23 files changed

Lines changed: 154 additions & 98 deletions

‎.openpublishing.redirection.json‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11039,6 +11039,111 @@
1103911039
"source_path": "hub/apps/design/signature-experiences/iconography.md",
1104011040
"redirect_url": "/windows/apps/design/iconography",
1104111041
"redirect_document_id": false
11042+
},
11043+
{
11044+
"source_path": "uwp/composition/composition-animation.md",
11045+
"redirect_url": "/windows/apps/develop/composition/composition-animation",
11046+
"redirect_document_id": false
11047+
},
11048+
{
11049+
"source_path": "uwp/composition/composition-brushes.md",
11050+
"redirect_url": "/windows/apps/develop/composition/composition-brushes",
11051+
"redirect_document_id": false
11052+
},
11053+
{
11054+
"source_path": "uwp/composition/composition-effects.md",
11055+
"redirect_url": "/windows/apps/develop/composition/composition-effects",
11056+
"redirect_document_id": false
11057+
},
11058+
{
11059+
"source_path": "uwp/composition/composition-lighting.md",
11060+
"redirect_url": "/windows/apps/develop/composition/composition-lighting",
11061+
"redirect_document_id": false
11062+
},
11063+
{
11064+
"source_path": "uwp/composition/composition-native-interop.md",
11065+
"redirect_url": "/windows/apps/develop/composition/composition-native-interop",
11066+
"redirect_document_id": false
11067+
},
11068+
{
11069+
"source_path": "uwp/composition/composition-shadows.md",
11070+
"redirect_url": "/windows/apps/develop/composition/composition-shadows",
11071+
"redirect_document_id": false
11072+
},
11073+
{
11074+
"source_path": "uwp/composition/composition-tailoring.md",
11075+
"redirect_url": "/windows/apps/develop/composition/composition-tailoring",
11076+
"redirect_document_id": false
11077+
},
11078+
{
11079+
"source_path": "uwp/composition/composition-visual-tree.md",
11080+
"redirect_url": "/windows/apps/develop/composition/composition-visual-tree",
11081+
"redirect_document_id": false
11082+
},
11083+
{
11084+
"source_path": "uwp/composition/inertia-modifiers.md",
11085+
"redirect_url": "/windows/apps/develop/composition/inertia-modifiers",
11086+
"redirect_document_id": false
11087+
},
11088+
{
11089+
"source_path": "uwp/composition/input-driven-animations.md",
11090+
"redirect_url": "/windows/apps/develop/composition/input-driven-animations",
11091+
"redirect_document_id": false
11092+
},
11093+
{
11094+
"source_path": "uwp/composition/interaction-tracker-manipulations.md",
11095+
"redirect_url": "/windows/apps/develop/composition/interaction-tracker-manipulations",
11096+
"redirect_document_id": false
11097+
},
11098+
{
11099+
"source_path": "uwp/composition/natural-animations.md",
11100+
"redirect_url": "/windows/apps/develop/composition/natural-animations",
11101+
"redirect_document_id": false
11102+
},
11103+
{
11104+
"source_path": "uwp/composition/pointer-input-animations.md",
11105+
"redirect_url": "/windows/apps/develop/composition/pointer-input-animations",
11106+
"redirect_document_id": false
11107+
},
11108+
{
11109+
"source_path": "uwp/composition/relation-animations.md",
11110+
"redirect_url": "/windows/apps/develop/composition/relation-animations",
11111+
"redirect_document_id": false
11112+
},
11113+
{
11114+
"source_path": "uwp/composition/scroll-input-animations.md",
11115+
"redirect_url": "/windows/apps/develop/composition/scroll-input-animations",
11116+
"redirect_document_id": false
11117+
},
11118+
{
11119+
"source_path": "uwp/composition/source-modifiers.md",
11120+
"redirect_url": "/windows/apps/develop/composition/source-modifiers",
11121+
"redirect_document_id": false
11122+
},
11123+
{
11124+
"source_path": "uwp/composition/spring-animations.md",
11125+
"redirect_url": "/windows/apps/develop/composition/spring-animations",
11126+
"redirect_document_id": false
11127+
},
11128+
{
11129+
"source_path": "uwp/composition/time-animations.md",
11130+
"redirect_url": "/windows/apps/develop/composition/time-animations",
11131+
"redirect_document_id": false
11132+
},
11133+
{
11134+
"source_path": "uwp/composition/using-the-visual-layer-with-xaml.md",
11135+
"redirect_url": "/windows/apps/develop/composition/using-the-visual-layer-with-xaml",
11136+
"redirect_document_id": false
11137+
},
11138+
{
11139+
"source_path": "uwp/composition/visual-layer.md",
11140+
"redirect_url": "/windows/apps/develop/composition/visual-layer",
11141+
"redirect_document_id": false
11142+
},
11143+
{
11144+
"source_path": "uwp/composition/xaml-lighting.md",
11145+
"redirect_url": "/windows/apps/develop/composition/xaml-lighting",
11146+
"redirect_document_id": false
1104211147
}
1104311148
]
1104411149
}

uwp/composition/composition-animation.md renamed to hub/apps/develop/composition/composition-animation.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ As a developer creating experiences at the Windows UI layer, you have access to
4747
4848
| Animation concept | Description |
4949
| ----------------- | ----------- |
50-
| [Time-based motion with KeyFrameAnimations](time-animations.md) | KeyFrameAnimations are used to directly control the entirety of a motion experience over a period of time. Developers describing a motion’s start, end, interpolation in between, and duration in a traditional keyframed fashion. |
51-
| [Relative motion with ExpressionAnimations](relation-animations.md) | ExpressionAnimations are used to describe how a motion of one object’s property should be driven relative to another object’s property. Developers define a mathematical equation that defines the reference-based relationship. |
50+
| [Time-based motion with KeyFrameAnimations](../../../../uwp/composition/time-animations.md) | KeyFrameAnimations are used to directly control the entirety of a motion experience over a period of time. Developers describing a motion’s start, end, interpolation in between, and duration in a traditional keyframed fashion. |
51+
| [Relative motion with ExpressionAnimations](../../../../uwp/composition/relation-animations.md) | ExpressionAnimations are used to describe how a motion of one object’s property should be driven relative to another object’s property. Developers define a mathematical equation that defines the reference-based relationship. |
5252
| ImplicitAnimations | These animations are trigger-based and are defined separately from core app logic. ImplicitAnimations are used to describe how and when animations occur as a response to direct property changes. |
53-
| [Input-driven motion with Input Animations](input-driven-animations.md) | Input Animations covers a set of scenarios that enable developers to describe manipulation-based motion via touch or other input modalities. These animations are driven based on active user input or gestures. |
54-
| [Physics-based motion with NaturalMotionAnimations](natural-animations.md) | NaturalMotionAnimations are used to describe natural and familiar motion experiences based on real-world force driven motion. Rather than defining time, developers define characteristics of the motion (for example, damping ratio for Springs) |
53+
| [Input-driven motion with Input Animations](../../../../uwp/composition/input-driven-animations.md) | Input Animations covers a set of scenarios that enable developers to describe manipulation-based motion via touch or other input modalities. These animations are driven based on active user input or gestures. |
54+
| [Physics-based motion with NaturalMotionAnimations](../../../../uwp/composition/natural-animations.md) | NaturalMotionAnimations are used to describe natural and familiar motion experiences based on real-world force driven motion. Rather than defining time, developers define characteristics of the motion (for example, damping ratio for Springs) |

uwp/composition/composition-brushes.md renamed to hub/apps/develop/composition/composition-brushes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ When working with the Visual layer, a CompositionBrush must be used to paint the
3232
- [Related Topics](./composition-brushes.md#related-topics)
3333

3434
## Prerequisites
35-
This overview assumes that you are familiar with the structure of a basic Composition application, as described in the [Visual layer overview](visual-layer.md).
35+
This overview assumes that you are familiar with the structure of a basic Composition application, as described in the [Visual layer overview](../../../../uwp/composition/visual-layer.md).
3636

3737
## Paint with a CompositionBrush
3838

@@ -259,7 +259,7 @@ _effectVisual.Brush = _effectBrush;
259259
_effectVisual.Size = new Vector2(156, 156);
260260
```
261261

262-
For more information on creating an Effect using CompositionBrushes see [Effects in Visual layer](./composition-effects.md)
262+
For more information on creating an Effect using CompositionBrushes see [Effects in Visual layer](../../../../uwp/composition/composition-effects.md)
263263

264264
### Paint with a CompositionBrush with opacity mask applied
265265

@@ -472,6 +472,6 @@ The following table provides a list of scenarios and whether XAML or Composition
472472

473473
## Related Topics
474474

475-
[Composition native DirectX and Direct2D interop with BeginDraw and EndDraw](composition-native-interop.md)
475+
[Composition native DirectX and Direct2D interop with BeginDraw and EndDraw](../../../../uwp/composition/composition-native-interop.md)
476476

477477
[XAML brush interop with XamlCompositionBrushBase](/windows/apps/design/style/brushes#xamlcompositionbrushbase)

uwp/composition/composition-effects.md renamed to hub/apps/develop/composition/composition-effects.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.localizationpriority: medium
1111

1212
The [**Windows.UI.Composition**](/uwp/api/Windows.UI.Composition) APIs allows real-time effects to be applied to images and UI with animatable effect properties. In this overview, we’ll run through the functionality available that allows effects to be applied to a composition visual.
1313

14-
To support [Universal Windows Platform (UWP)](../get-started/universal-application-platform-guide.md) consistency for developers describing effects in their applications, composition effects leverage Win2D’s IGraphicsEffect interface to use effect descriptions via the [Microsoft.Graphics.Canvas.Effects](https://microsoft.github.io/Win2D/WinUI2/html/N_Microsoft_Graphics_Canvas_Effects.htm) Namespace.
14+
To support [Universal Windows Platform (UWP)](../../../../uwp/get-started/universal-application-platform-guide.md) consistency for developers describing effects in their applications, composition effects leverage Win2D’s IGraphicsEffect interface to use effect descriptions via the [Microsoft.Graphics.Canvas.Effects](https://microsoft.github.io/Win2D/WinUI2/html/N_Microsoft_Graphics_Canvas_Effects.htm) Namespace.
1515

1616
Brush effects are used to paint areas of an application by applying effects to a set of existing images. Windows 10 composition effect APIs are focused on Sprite Visuals. The SpriteVisual allows for flexibility and interplay in color, image and effect creation. The SpriteVisual is a composition visual type that can fill a 2D rectangle with a brush. The visual defines the bounds of the rectangle and the brush defines the pixels used to paint the rectangle.
1717

@@ -230,8 +230,8 @@ LoadImage(surfaceBrush);
230230
- [Microsoft – Composition GitHub](https://github.com/microsoft/WindowsCompositionSamples)
231231
- [**Windows.UI.Composition**](/uwp/api/Windows.UI.Composition)
232232
- [Composition Overview](https://blogs.windows.com/buildingapps/2015/12/08/awaken-your-creativity-with-the-new-windows-ui-composition/)
233-
- [Visual Tree Basics](composition-visual-tree.md)
234-
- [Composition Brushes](composition-brushes.md)
233+
- [Visual Tree Basics](../../../../uwp/composition/composition-visual-tree.md)
234+
- [Composition Brushes](../../../../uwp/composition/composition-brushes.md)
235235
- [XamlCompositionBrushBase](/uwp/api/windows.ui.xaml.media.xamlcompositionbrushbase)
236-
- [Animation Overview](composition-animation.md)
237-
- [Composition native DirectX and Direct2D interoperation with BeginDraw and EndDraw](composition-native-interop.md)
236+
- [Animation Overview](../../../../uwp/composition/composition-animation.md)
237+
- [Composition native DirectX and Direct2D interoperation with BeginDraw and EndDraw](../../../../uwp/composition/composition-native-interop.md)

uwp/composition/composition-lighting.md renamed to hub/apps/develop/composition/composition-lighting.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.localizationpriority: medium
1111
The Windows.UI.Composition APIs enable you to create real-time animations and effects. Composition Lighting enables 3D lighting in 2D applications. In this overview, we will run through the functionality of how to setup composition lights, identify visuals to receive each light, and use effects to define materials for your content.
1212

1313
> [!NOTE]
14-
> To read how [XamlLight](/uwp/api/windows.ui.xaml.media.xamllight) objects apply [CompositionLights](/uwp/api/Windows.UI.Composition.CompositionLight) to illuminate XAML UIElements, see [XAML lighting](xaml-lighting.md).
14+
> To read how [XamlLight](/uwp/api/windows.ui.xaml.media.xamllight) objects apply [CompositionLights](/uwp/api/Windows.UI.Composition.CompositionLight) to illuminate XAML UIElements, see [XAML lighting](../../../../uwp/composition/xaml-lighting.md).
1515
1616
Composition lighting lets you create interesting UI by allowing:
1717

@@ -77,7 +77,7 @@ Depending on the type of light used, a light can have properties for attenuation
7777

7878
Property | Description
7979
--- | ---
80-
**Color** | The [Color](/uwp/api/windows.ui.color) of the light. Lighting color values are defined by [D3D](../graphics-concepts/light-properties.md) Diffuse, Ambient, and Specular that defines the color being emitted. Lighting uses RGBA values for lights; the alpha color component is not used.
80+
**Color** | The [Color](/uwp/api/windows.ui.color) of the light. Lighting color values are defined by [D3D](../../../../uwp/graphics-concepts/light-properties.md) Diffuse, Ambient, and Specular that defines the color being emitted. Lighting uses RGBA values for lights; the alpha color component is not used.
8181
**Direction** | The direction of light. The direction in which the light is pointing is specified relative to its [CoordinateSpace](/uwp/api/windows.ui.composition.distantlight.coordinatespace) Visual.
8282
**Coordinate Space** | Every Visual has an implicit 3D coordinate space. X direction is from left to right. Y direction is from top to bottom. Z direction is a point out of the plane. The original point of this coordinate is the upper-left corner of the visual, and the unit is Device Independent Pixel (DIP). A light's offset defined in this coordinate.
8383
**Inner and Outer Cones** | Spotlights emit a cone of light that has two parts: a bright inner cone and an outer cone. Composition allows you control over inner and outer cone angles and color.
@@ -157,8 +157,8 @@ CompositionBrush CreateNormalMapBrush(ICompositionSurface normalMapImage)
157157
## Related articles
158158

159159
- [Creating Materials and Lights in the Visual Layer](https://blogs.windows.com/buildingapps/2017/08/04/creating-materials-lights-visual-layer/)
160-
- [Lighting Overview](../graphics-concepts/lighting-overview.md)
160+
- [Lighting Overview](../../../../uwp/graphics-concepts/lighting-overview.md)
161161
- [CompositionCapabilities API](/uwp/api/windows.ui.composition.compositioncapabilities)
162-
- [Mathematics of Lighting](../graphics-concepts/mathematics-of-lighting.md)
162+
- [Mathematics of Lighting](../../../../uwp/graphics-concepts/mathematics-of-lighting.md)
163163
- [SceneLightingEffect](/uwp/api/windows.ui.composition.effects.scenelightingeffect)
164164
- [WindowsCompositionSamples GitHub Repo](https://github.com/microsoft/WindowsCompositionSamples)

uwp/composition/composition-native-interop.md renamed to hub/apps/develop/composition/composition-native-interop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
533533
## C++/CX usage example
534534

535535
> [!NOTE]
536-
> This code example exists to help you maintain your C++/CX application. But we recommend that you use [C++/WinRT](../cpp-and-winrt-apis/intro-to-using-cpp-with-winrt.md) for new applications. C++/WinRT is an entirely standard modern C++17 language projection for Windows Runtime (WinRT) APIs, implemented as a header-file-based library, and designed to provide you with first-class access to the modern Windows API.
536+
> This code example exists to help you maintain your C++/CX application. But we recommend that you use [C++/WinRT](../../../../uwp/cpp-and-winrt-apis/intro-to-using-cpp-with-winrt.md) for new applications. C++/WinRT is an entirely standard modern C++17 language projection for Windows Runtime (WinRT) APIs, implemented as a header-file-based library, and designed to provide you with first-class access to the modern Windows API.
537537
538538
The C++/CX code example below omits the DirectWrite and Direct2D parts of the example.
539539

uwp/composition/composition-shadows.md renamed to hub/apps/develop/composition/composition-shadows.md

File renamed without changes.

uwp/composition/composition-tailoring.md renamed to hub/apps/develop/composition/composition-tailoring.md

File renamed without changes.

uwp/composition/composition-visual-tree.md renamed to hub/apps/develop/composition/composition-visual-tree.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ There are several visual types that make up the visual tree structure plus a bas
2727
- [**RedirectVisual**](/uwp/api/Windows.UI.Composition.RedirectVisual) – derives from [**ContainerVisual**](/uwp/api/Windows.UI.Composition.ContainerVisual). The visual gets its content from another visual.<br/>(_Introduced in Windows 10, version 1809, SDK 17763._)
2828
- [**SceneVisual**](/uwp/api/windows.ui.composition.scenes.scenevisual) – derives from [**ContainerVisual**](/uwp/api/Windows.UI.Composition.ContainerVisual). A container visual for the nodes of a 3D scene.<br/>(_Introduced in Windows 10, version 1903, SDK 18362._)
2929

30-
You can apply content and effects to SpriteVisuals using the [**CompositionBrush**](/uwp/api/Windows.UI.Composition.CompositionBrush) and its subclasses including the [**CompositionColorBrush**](/uwp/api/Windows.UI.Composition.CompositionColorBrush), [**CompositionSurfaceBrush**](/uwp/api/Windows.UI.Composition.CompositionSurfaceBrush) and [**CompositionEffectBrush**](/uwp/api/Windows.UI.Composition.CompositionEffectBrush). To learn more about brushes see [**CompositionBrush Overview**](./composition-brushes.md).
30+
You can apply content and effects to SpriteVisuals using the [**CompositionBrush**](/uwp/api/Windows.UI.Composition.CompositionBrush) and its subclasses including the [**CompositionColorBrush**](/uwp/api/Windows.UI.Composition.CompositionColorBrush), [**CompositionSurfaceBrush**](/uwp/api/Windows.UI.Composition.CompositionSurfaceBrush) and [**CompositionEffectBrush**](/uwp/api/Windows.UI.Composition.CompositionEffectBrush). To learn more about brushes see [**CompositionBrush Overview**](../../../../uwp/composition/composition-brushes.md).
3131

3232
## The CompositionVisual Sample
3333

uwp/composition/inertia-modifiers.md renamed to hub/apps/develop/composition/inertia-modifiers.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ In this article, we take a deeper dive into how to use an InteractionTracker’s
1414

1515
Here, we assume that you're familiar with the concepts discussed in these articles:
1616

17-
- [Input-driven animations](input-driven-animations.md)
18-
- [Custom manipulation experiences with InteractionTracker](interaction-tracker-manipulations.md)
19-
- [Relation based animations](relation-animations.md)
17+
- [Input-driven animations](../../../../uwp/composition/input-driven-animations.md)
18+
- [Custom manipulation experiences with InteractionTracker](../../../../uwp/composition/interaction-tracker-manipulations.md)
19+
- [Relation based animations](../../../../uwp/composition/relation-animations.md)
2020

2121
## What are snap points and why are they useful?
2222

0 commit comments

Comments
 (0)