Skip to content

Commit 580671b

Browse files
EvgeniiGEvgeniiG
committed
2 parents 52473b5 + 2e9d053 commit 580671b

182 files changed

Lines changed: 41517 additions & 26120 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.

‎Assets/BasicRenderPipelineTutorial/BasicRenderPipeline.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ private static void SetupLightShaderVariables(VisibleLight[] lights, ScriptableR
119119
lightPositions[i] = new Vector4(pos.x, pos.y, pos.z, 1);
120120
}
121121
// attenuation set in a way where distance attenuation can be computed:
122-
// float lengthSq = dot(toLight, toLight);
123-
// float atten = 1.0 / (1.0 + lengthSq * LightAtten[i].z);
122+
// float lengthSq = dot(toLight, toLight);
123+
// float atten = 1.0 / (1.0 + lengthSq * LightAtten[i].z);
124124
// and spot cone attenuation:
125-
// float rho = max (0, dot(normalize(toLight), SpotDirection[i].xyz));
126-
// float spotAtt = (rho - LightAtten[i].x) * LightAtten[i].y;
127-
// spotAtt = saturate(spotAtt);
125+
// float rho = max (0, dot(normalize(toLight), SpotDirection[i].xyz));
126+
// float spotAtt = (rho - LightAtten[i].x) * LightAtten[i].y;
127+
// spotAtt = saturate(spotAtt);
128128
// and the above works for all light types, i.e. spot light code works out
129129
// to correct math for point & directional lights as well.
130130

‎Assets/BasicRenderPipelineTutorial/BasicRenderPipelineShader.shader‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ Shader "BasicRenderPipeline/Standard"
88
{
99
// Properties is just a copy of Standard.shader. Our example shader does not use all of them,
1010
// but the inspector UI expects all these to exist.
11-
Properties
12-
{
13-
_Color("Color", Color) = (1,1,1,1)
14-
_MainTex("Albedo", 2D) = "white" {}
15-
_Cutoff("Alpha Cutoff", Range(0.0, 1.0)) = 0.5
16-
_Glossiness("Smoothness", Range(0.0, 1.0)) = 0.5
17-
_GlossMapScale("Smoothness Scale", Range(0.0, 1.0)) = 1.0
18-
[Enum(Metallic Alpha,0,Albedo Alpha,1)] _SmoothnessTextureChannel ("Smoothness texture channel", Float) = 0
19-
[Gamma] _Metallic("Metallic", Range(0.0, 1.0)) = 0.0
20-
_MetallicGlossMap("Metallic", 2D) = "white" {}
21-
[ToggleOff] _SpecularHighlights("Specular Highlights", Float) = 1.0
22-
[ToggleOff] _GlossyReflections("Glossy Reflections", Float) = 1.0
23-
_BumpScale("Scale", Float) = 1.0
24-
_BumpMap("Normal Map", 2D) = "bump" {}
25-
_Parallax ("Height Scale", Range (0.005, 0.08)) = 0.02
26-
_ParallaxMap ("Height Map", 2D) = "black" {}
27-
_OcclusionStrength("Strength", Range(0.0, 1.0)) = 1.0
28-
_OcclusionMap("Occlusion", 2D) = "white" {}
29-
_EmissionColor("Color", Color) = (0,0,0)
30-
_EmissionMap("Emission", 2D) = "white" {}
31-
_DetailMask("Detail Mask", 2D) = "white" {}
32-
_DetailAlbedoMap("Detail Albedo x2", 2D) = "grey" {}
33-
_DetailNormalMapScale("Scale", Float) = 1.0
34-
_DetailNormalMap("Normal Map", 2D) = "bump" {}
11+
Properties
12+
{
13+
_Color("Color", Color) = (1,1,1,1)
14+
_MainTex("Albedo", 2D) = "white" {}
15+
_Cutoff("Alpha Cutoff", Range(0.0, 1.0)) = 0.5
16+
_Glossiness("Smoothness", Range(0.0, 1.0)) = 0.5
17+
_GlossMapScale("Smoothness Scale", Range(0.0, 1.0)) = 1.0
18+
[Enum(Metallic Alpha,0,Albedo Alpha,1)] _SmoothnessTextureChannel ("Smoothness texture channel", Float) = 0
19+
[Gamma] _Metallic("Metallic", Range(0.0, 1.0)) = 0.0
20+
_MetallicGlossMap("Metallic", 2D) = "white" {}
21+
[ToggleOff] _SpecularHighlights("Specular Highlights", Float) = 1.0
22+
[ToggleOff] _GlossyReflections("Glossy Reflections", Float) = 1.0
23+
_BumpScale("Scale", Float) = 1.0
24+
_BumpMap("Normal Map", 2D) = "bump" {}
25+
_Parallax ("Height Scale", Range (0.005, 0.08)) = 0.02
26+
_ParallaxMap ("Height Map", 2D) = "black" {}
27+
_OcclusionStrength("Strength", Range(0.0, 1.0)) = 1.0
28+
_OcclusionMap("Occlusion", 2D) = "white" {}
29+
_EmissionColor("Color", Color) = (0,0,0)
30+
_EmissionMap("Emission", 2D) = "white" {}
31+
_DetailMask("Detail Mask", 2D) = "white" {}
32+
_DetailAlbedoMap("Detail Albedo x2", 2D) = "grey" {}
33+
_DetailNormalMapScale("Scale", Float) = 1.0
34+
_DetailNormalMap("Normal Map", 2D) = "bump" {}
3535
[Enum(UV0,0,UV1,1)] _UVSec("UV Set for secondary textures", Float) = 0
3636
[HideInInspector] _Mode("__mode", Float) = 0.0
3737
[HideInInspector] _SrcBlend("__src", Float) = 1.0
@@ -220,8 +220,8 @@ half4 frag(v2f i) : SV_Target
220220
}
221221

222222
ENDCG
223-
}
224-
}
223+
}
224+
}
225225

226-
CustomEditor "StandardShaderGUI"
226+
CustomEditor "StandardShaderGUI"
227227
}

‎Assets/Editor/Tests/RenderloopTests/RenderPipelineTestFixture.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class RenderLoopTestFixtureInstance : RenderPipeline
2020
private static TestDelegate s_Callback;
2121

2222
private static RenderLoopTestFixture m_Instance;
23-
23+
2424
public override void Render(ScriptableRenderContext renderContext, Camera[] cameras)
2525
{
2626
base.Render(renderContext, cameras);

‎Assets/LowEndMobilePipeline/Editor/LegacyShadersToLowEndUpgrader.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Collections.Generic;
1+
using System.Collections.Generic;
22

33
namespace UnityEditor.Experimental.Rendering.LowendMobile
44
{

0 commit comments

Comments
 (0)