Skip to content

Commit 6099564

Browse files
authored
Merge pull request #8154 from Unity-Technologies/internal/6000.0/staging
Internal/6000.0/staging
2 parents 7be0996 + 14a06e7 commit 6099564

876 files changed

Lines changed: 29428 additions & 8794 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Packages/com.unity.render-pipelines.core/.buginfo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
rule1:
2-
area: SRP Architecture & API
2+
area: SRP Foundation
33

44
rule2:
55
when:
Binary file not shown.
Binary file not shown.

Packages/com.unity.render-pipelines.core/Documentation~/Look-Dev-Environment-Library.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ An Environment Library is an Asset that contains a list of environments that you
44

55
<a name="Creation"></a>
66

7-
![](Images/LookDevEnvironmentLibrary1.png)
7+
![Environment Library asset.](Images/LookDevEnvironmentLibrary1.png)
88

99
## Creating an Environment Library
1010

@@ -26,13 +26,13 @@ To add, remove, or duplicate environments, use the toolbar at the bottom of the
2626

2727
| **Button** | **Function** | **Description** |
2828
| ------------------------------------------------------------ | ------------- | ------------------------------------------------------------ |
29-
| ![](Images/LookDevEnvironmentLibrary2.png) | **Add** | Click this button to add a new environment to the bottom of the list. |
30-
| ![](Images/LookDevEnvironmentLibrary3.png) | **Remove** | Click this button to remove the environment currently selected. Note that the environment that you have selected is the one with the blue frame. |
31-
| ![](Images/LookDevEnvironmentLibrary4.png) | **Duplicate** | Click this button to duplicate the currently selected environment and add it as a new environment to the bottom of the list. |
29+
| ![This button adds a new environment to the bottom of the list.](Images/LookDevEnvironmentLibrary2.png) | **Add** | Click this button to add a new environment to the bottom of the list. |
30+
| ![This button removes the currently selected environment.](Images/LookDevEnvironmentLibrary3.png) | **Remove** | Click this button to remove the environment currently selected. Note that the environment that you have selected is the one with the blue frame. |
31+
| ![This button duplicates the currently selected environment.](Images/LookDevEnvironmentLibrary4.png) | **Duplicate** | Click this button to duplicate the currently selected environment and add it as a new environment to the bottom of the list. |
3232

3333
## Properties
3434

35-
![](Images/LookDevEnvironmentLibrary5.png)
35+
![Environment Library properties](Images/LookDevEnvironmentLibrary5.png)
3636

3737
| **Property** | **Description** |
3838
| ------------------- | ------------------------------------------------------------ |

Packages/com.unity.render-pipelines.core/Documentation~/Look-Dev.md

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ Use the toolbar in the top-left of the window to change which viewing mode Look
4646

4747
### Single viewport
4848

49-
![](Images/LookDev1.png)
49+
![Buttons for switching between viewports 1 and 2.](Images/LookDev1.png)
5050

5151
By default, Look Dev displays a single viewport which contains the Prefab or GameObject you are working with. If you are in another viewing mode, you can click either the number **1** or number **2** button to go back to single view. Each button corresponds to a viewport in Look Dev. Select button **1** to use viewport 1, and button 2 to use viewport **2**.
5252

5353
<a name="MultiView"></a>
5454

5555
### Multi-viewport
5656

57-
![](Images/LookDev2.png)
57+
![Buttons for changing the multi-viewport mode.](Images/LookDev2.png)
5858

5959
Use multiple viewports to compare different environments and settings for the same Asset. You can arrange viewports:
6060

@@ -73,23 +73,21 @@ When using multiple viewports, it only makes sense to compare different Prefabs
7373

7474
Vertical and horizontal side-by-side viewports show an identical view of your Asset.
7575

76-
![](Images/LookDev3.png)
76+
![Vertical side-by-side viewport view.](Images/LookDev3.png)
7777

7878
##### Split-screen
7979

8080
In a split-screen view, there is a red/blue manipulation Gizmo that separates the two viewports. For information on how to use this Gizmo, see [Using the manipulation Gizmo](#ManipulationGizmo).
8181

82-
![](Images/LookDev4.png)
82+
![Split-screen viewport view.](Images/LookDev4.png)
8383

8484
#### Multi-viewport Camera
8585

8686
By default, Look Dev synchronizes the camera movement for both views. To decouple the Cameras from one another, and manipulate them independently, click the **Synchronized Cameras** button in-between the two numbered Camera buttons.
8787

88-
![](Images/LookDev5.png)
89-
9088
To align the cameras with each other, or reset them, click on the drop-down arrow next to the viewport **2** icon:
9189

92-
![](Images/LookDev6.png)
90+
![Drop-down options of multi-viewport cameras.](Images/LookDev6.png)
9391

9492
<a name="ManipulationGizmo"></a>
9593

@@ -101,13 +99,11 @@ The manipulation Gizmo represents the separation plane between the two viewports
10199

102100
To move the separator, click and drag the straight line of the Gizmo to the location you want.
103101

104-
![](Images/LookDev7.png)
105-
106102
#### Changing the orientation and length
107103

108104
To change the orientation and length of the manipulator Gizmo, click and drag the circle at either end of the manipulator. Changing the length of the Gizmo lets you set the orientation and [blending](#Blending) values more precisely.
109105

110-
![](Images/LookDev8.png))
106+
![Click and drag the circle at either end of the gizmo to change its orientation and length.](Images/LookDev8.png)
111107

112108
#### Changing the split in increments
113109

@@ -121,7 +117,7 @@ The central white circle on the separator allows you to blend between the two vi
121117

122118
The white circle automatically snaps back into the center when you drag it back. This helps you get back to the default blending value quickly.
123119

124-
![](Images/LookDev9.png)
120+
![The white circle on the separator lets you change the blending behavior.](Images/LookDev9.png)
125121

126122
### HDRI environments in Look Dev
127123

Packages/com.unity.render-pipelines.core/Documentation~/Rendering-Debugger.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public class CustomDebugPanel : MonoBehaviour
127127

128128
Add the script to a GameObject. You should see a new **My Custom Panel** panel in the **Rendering Debugger** window.
129129

130-
![](Images/rendering-debugger.png)
130+
![Screenshot of the Rendering Debugger window showing a new custom panel.](Images/rendering-debugger.png)
131131

132132
### Add a control to an existing panel
133133

Packages/com.unity.render-pipelines.core/Documentation~/View-Lighting-Tool.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ Use the **Orbit** and **Elevation** to control the orientation of the light, in
1717

1818
You can use the **Anchor Position Override** to provide a GameObject’s [Transform](https://docs.unity3d.com/ScriptReference/Transform.html) as an anchor point for the Light. This is useful if you want the Light to follow a specific GameObject in the Scene.
1919

20-
![](Images/LightAnchorAnimation.gif)
20+
<video title="A light uses the main camera as the reference GamObject that controls the rotation of the light. The light rotates synchronously with the camera." src="Images/videos/light-anchor-animation.mp4" width="100%" height="auto" autoplay="true" loop="true" controls></video>
2121

2222
**Note**: The above example uses the Main Camera as the reference Camera that adjusts the light rotation. The Common presets might create a different result in the Scene View if your view isn't aligned with the Main Camera.
2323

2424
You can set a **Position Offset** for this custom Anchor. This is useful if the Transform position of the custom Anchor isn't centered appropriately for the light to orbit correctly around the custom Anchor.
2525

26-
![](Images/LightAnchor0.png)
26+
![Light Anchor component screenshot. Orbit and Elevation properties display example values that change the orientation of a light.](Images/LightAnchor0.png)
2727

2828

2929
The Light Anchor component also includes a list of **Presets** that you can use to set the Light's orientation relative to the main Camera.

Packages/com.unity.render-pipelines.core/Documentation~/add-custom-graphics-setting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class MySettings : IRenderPipelineGraphicsSettings
3737
public Material myMaterial;
3838
}
3939
```
40-
![](Images/customsettings-addsetting.png)<br/>
40+
![Screenshot of the Project Settings window. The Graphics section contains the new custom settings from the example script.](Images/customsettings-addsetting.png)<br/>
4141
The **Edit** > **Project Settings** > **Graphics** window with the new custom setting from the example script.
4242

4343
## Set the default asset for a reference property

Packages/com.unity.render-pipelines.core/Documentation~/add-custom-graphics-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class MySettings : IRenderPipelineGraphicsSettings
3737
}
3838
```
3939

40-
![](Images/customsettings-settingsgroup.png)<br/>
40+
![Screenshot of the Project Settings window. The Graphics section contains the new custom settings group from the example script.](Images/customsettings-settingsgroup.png)<br/>
4141
The **Edit** > **Project Settings** > **Graphics** window with the new custom settings group from the example script.
4242

4343
## Change the display order of settings groups

Packages/com.unity.render-pipelines.core/Documentation~/adding-properties.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ For example:
3030

3131
Unity shows the new properties in the **Core Render Pipeline** settings section:
3232

33-
![](Images/core_render_pipeline_preference_provider.png)
33+
![Screenshot of the Preferences window showing the new properties in the Core Render Pipeline settings section.](Images/core_render_pipeline_preference_provider.png)

0 commit comments

Comments
 (0)