diff --git a/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugUIHandlerCanvasEditor.cs b/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugUIHandlerCanvasEditor.cs
index 5e2c2b21ec4..dc3b0b25685 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugUIHandlerCanvasEditor.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugUIHandlerCanvasEditor.cs
@@ -60,7 +60,7 @@ void OnEnable()
{
var prefab = list.serializedProperty.GetArrayElementAtIndex(list.index).FindPropertyRelative("prefab").objectReferenceValue as GameObject;
if (prefab)
- EditorGUIUtility.PingObject(prefab.gameObject);
+ EditorGUIUtility.PingObject(prefab);
}
};
}
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Gizmo/HierarchicalSphere.cs b/Packages/com.unity.render-pipelines.core/Editor/Gizmo/HierarchicalSphere.cs
index 75bb33fb7c9..6cc1278191f 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Gizmo/HierarchicalSphere.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/Gizmo/HierarchicalSphere.cs
@@ -125,7 +125,7 @@ public void DrawHull(bool filled)
if (filled)
{
material.SetPass(0);
- Matrix4x4 drawMatrix = Matrix4x4.TRS((Vector3)Handles.matrix.GetColumn(3), Quaternion.identity, Vector3.one * radius * 2f);
+ Matrix4x4 drawMatrix = Matrix4x4.TRS((Vector3)Handles.matrix.GetColumn(3), Quaternion.identity, 2f * radius * Vector3.one);
Graphics.DrawMeshNow(k_MeshSphere, drawMatrix);
}
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/CoreLightEditorUtilities.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/CoreLightEditorUtilities.cs
index 1feb37ca587..e894846f35f 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Lighting/CoreLightEditorUtilities.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/CoreLightEditorUtilities.cs
@@ -315,7 +315,7 @@ static void DrawHandleLabel(Vector3 handlePosition, string labelText, float offs
var style = new GUIStyle { normal = { background = Texture2D.whiteTexture } };
GUI.color = new Color(0.82f, 0.82f, 0.82f, 1);
- labelPosition = handlePosition + Handles.inverseMatrix.MultiplyVector(Vector3.up) * HandleUtility.GetHandleSize(handlePosition) * offsetFromHandle;
+ labelPosition = handlePosition + HandleUtility.GetHandleSize(handlePosition) * offsetFromHandle * Handles.inverseMatrix.MultiplyVector(Vector3.up);
Handles.Label(labelPosition, labelText, style);
}
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.Invalidation.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.Invalidation.cs
index 22224736b52..720a0682c72 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.Invalidation.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.Invalidation.cs
@@ -57,7 +57,7 @@ static int ReadProbeIndex(int x, int y, int z, int dataWidth, int dataHeight)
static bool NeighbourhoodIsEmptySpace(Vector3 pos, float searchDistance, Bounds boundsToCheckAgainst)
{
- Vector3 halfExtents = Vector3.one * searchDistance * 0.5f;
+ Vector3 halfExtents = 0.5f * searchDistance * Vector3.one;
Vector3 brickCenter = pos + halfExtents;
Collider[] colliders = Physics.OverlapBox(brickCenter, halfExtents);
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbePlacement.cs b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbePlacement.cs
index 4d090d75eec..f330cd4c786 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbePlacement.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbePlacement.cs
@@ -261,8 +261,8 @@ public static Brick[] SubdivideCell(Bounds cellBounds, ProbeSubdivisionContext s
bool IsParentBrickInProbeVolume(Vector3Int parentSubCellPos, float minBrickSize, int brickSize)
{
- Vector3 center = (Vector3)parentSubCellPos * minBrickSize + Vector3.one * brickSize * minBrickSize / 2.0f;
- Bounds parentAABB = new Bounds(center, Vector3.one * brickSize * minBrickSize);
+ Vector3 center = (Vector3)parentSubCellPos * minBrickSize + brickSize * minBrickSize * Vector3.one / 2.0f;
+ Bounds parentAABB = new Bounds(center, brickSize * minBrickSize * Vector3.one);
bool generateParentBrick = false;
foreach (var probeVolume in probeVolumes)
diff --git a/Packages/com.unity.render-pipelines.core/Editor/LookDev/CameraController.cs b/Packages/com.unity.render-pipelines.core/Editor/LookDev/CameraController.cs
index a2271c88f3c..119ab19302a 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/LookDev/CameraController.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/LookDev/CameraController.cs
@@ -313,7 +313,7 @@ Vector3 GetMotionDirection()
m_FlySpeedAccelerated = 9;
else
m_FlySpeedAccelerated *= Mathf.Pow(k_FlyAcceleration, deltaTime);
- result = m_MotionDirection.normalized * m_FlySpeedAccelerated * speed * deltaTime;
+ result = deltaTime * m_FlySpeedAccelerated * speed * m_MotionDirection.normalized;
return result;
}
diff --git a/Packages/com.unity.render-pipelines.core/Editor/LookDev/CameraState.cs b/Packages/com.unity.render-pipelines.core/Editor/LookDev/CameraState.cs
index e813437b9ae..5e48081b9f8 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/LookDev/CameraState.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/LookDev/CameraState.cs
@@ -78,8 +78,8 @@ internal Vector3 QuickReprojectionWithFixedFOVOnPivotPlane(Rect screen, Vector2
screenPoint.x * 2f / screen.width - 1f,
screenPoint.y * 2f / screen.height - 1f);
return pivot
- - up * verticalDistance * normalizedScreenPoint.y
- - right * verticalDistance * aspect * normalizedScreenPoint.x;
+ - normalizedScreenPoint.y * verticalDistance * up
+ - aspect * normalizedScreenPoint.x * verticalDistance * right;
}
//Pivot is always on center axis by construction
@@ -92,8 +92,7 @@ internal Vector3 QuickProjectPivotInScreen(Rect screen)
/// The camera to update
public void UpdateCamera(Camera camera)
{
- camera.transform.rotation = rotation;
- camera.transform.position = position;
+ camera.transform.SetPositionAndRotation(position, rotation);
camera.nearClipPlane = nearClip;
camera.farClipPlane = farClip;
camera.fieldOfView = fieldOfView;
diff --git a/Packages/com.unity.render-pipelines.core/Editor/LookDev/ComparisonGizmoController.cs b/Packages/com.unity.render-pipelines.core/Editor/LookDev/ComparisonGizmoController.cs
index 9d8a9b56ab9..3e59e606fe1 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/LookDev/ComparisonGizmoController.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/LookDev/ComparisonGizmoController.cs
@@ -211,7 +211,7 @@ void SelectGizmoZone(Vector2 normalizedMousePosition)
if (absDistanceToPlane < ComparisonGizmoState.thicknessSelected)
selected = Selected.PlaneSeparator;
- Vector2 circleCenter = m_State.center + side * orthoPlaneNormal * m_State.length;
+ Vector2 circleCenter = m_State.center + m_State.length * side * orthoPlaneNormal;
float d = Vector2.Distance(normalizedMousePosition, circleCenter);
if (d <= ComparisonGizmoState.circleRadiusSelected)
selected = side > 0.0f ? Selected.NodeFirstView : Selected.NodeSecondView;
diff --git a/Packages/com.unity.render-pipelines.core/Editor/LookDev/Stage.cs b/Packages/com.unity.render-pipelines.core/Editor/LookDev/Stage.cs
index b900ec544d6..35cf5845895 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/LookDev/Stage.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/LookDev/Stage.cs
@@ -104,8 +104,7 @@ public void MoveIntoStage(GameObject gameObject, Vector3 position, Quaternion ro
return;
SceneManager.MoveGameObjectToScene(gameObject, m_PreviewScene);
- gameObject.transform.position = position;
- gameObject.transform.rotation = rotation;
+ gameObject.transform.SetPositionAndRotation(position, rotation);
if (persistent)
m_PersistentGameObjects.Add(gameObject);
else
@@ -195,16 +194,13 @@ static void InitAddedObjectsRecursively(GameObject go)
go.hideFlags = HideFlags.HideAndDontSave;
go.layer = k_PreviewCullingLayerIndex;
- var meshRenderer = go.GetComponent();
- if (meshRenderer != null)
+ if (go.TryGetComponent(out var meshRenderer))
meshRenderer.lightProbeUsage = UnityEngine.Rendering.LightProbeUsage.Off;
- var skinnedMeshRenderer = go.GetComponent();
- if (skinnedMeshRenderer != null)
+ if (go.TryGetComponent(out var skinnedMeshRenderer))
skinnedMeshRenderer.lightProbeUsage = UnityEngine.Rendering.LightProbeUsage.Off;
- var lineRenderer = go.GetComponent();
- if (lineRenderer != null)
+ if (go.TryGetComponent(out var lineRenderer))
lineRenderer.lightProbeUsage = UnityEngine.Rendering.LightProbeUsage.Off;
var volumes = go.GetComponents();
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeComponentEditor.cs b/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeComponentEditor.cs
index 0e358ee486b..0743238878b 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeComponentEditor.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeComponentEditor.cs
@@ -91,7 +91,7 @@ internal bool visible
if (RenderPipelineManager.currentPipeline == null)
return false;
- if (!pipelineTypes.Any())
+ if (pipelineTypes.Length == 0)
return true;
return pipelineTypes.Contains(RenderPipelineManager.currentPipeline.GetType());
diff --git a/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeComponentProvider.cs b/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeComponentProvider.cs
index e61718d786e..cef67498eb5 100644
--- a/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeComponentProvider.cs
+++ b/Packages/com.unity.render-pipelines.core/Editor/Volume/VolumeComponentProvider.cs
@@ -62,7 +62,7 @@ public void CreateComponentTree(List tree)
var volumeComponentTypesFiltered =
VolumeManager.GetSupportedVolumeComponents(currentPipeline.GetType());
- if (volumeComponentTypesFiltered.Any())
+ if (volumeComponentTypesFiltered.Count > 0)
{
var rootNode = new PathNode();
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Camera/CameraSwitcher.cs b/Packages/com.unity.render-pipelines.core/Runtime/Camera/CameraSwitcher.cs
index 8da9abdbfde..797952f168a 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Camera/CameraSwitcher.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Camera/CameraSwitcher.cs
@@ -106,12 +106,10 @@ void SetCameraIndex(int index)
// If we witch back to the original camera, put back the transform in it.
if (m_CurrentCamera == m_OriginalCamera)
{
- m_OriginalCamera.transform.position = m_OriginalCameraPosition;
- m_OriginalCamera.transform.rotation = m_OriginalCameraRotation;
+ m_OriginalCamera.transform.SetPositionAndRotation(m_OriginalCameraPosition, m_OriginalCameraRotation);
}
- transform.position = m_CurrentCamera.transform.position;
- transform.rotation = m_CurrentCamera.transform.rotation;
+ transform.SetPositionAndRotation(m_CurrentCamera.transform.position, m_CurrentCamera.transform.rotation);
}
}
}
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Camera/FreeCamera.cs b/Packages/com.unity.render-pipelines.core/Runtime/Camera/FreeCamera.cs
index c59592ac042..fcea66e617e 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Camera/FreeCamera.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Camera/FreeCamera.cs
@@ -194,9 +194,9 @@ void Update()
float moveSpeed = Time.deltaTime * m_MoveSpeed;
if (fire1 || leftShiftBoost && leftShift)
moveSpeed *= m_Turbo;
- transform.position += transform.forward * moveSpeed * inputVertical;
- transform.position += transform.right * moveSpeed * inputHorizontal;
- transform.position += Vector3.up * moveSpeed * inputYAxis;
+ transform.position += inputVertical * moveSpeed * transform.forward;
+ transform.position += inputHorizontal * moveSpeed * transform.right;
+ transform.position += inputYAxis * moveSpeed * Vector3.up;
}
}
}
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/Prefabs/Scripts/DebugUIHandlerContainer.cs b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/Prefabs/Scripts/DebugUIHandlerContainer.cs
index 0eb4aa61712..089c281bf13 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/Prefabs/Scripts/DebugUIHandlerContainer.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/Prefabs/Scripts/DebugUIHandlerContainer.cs
@@ -56,8 +56,7 @@ List GetActiveChildren()
if (!t.gameObject.activeInHierarchy)
continue;
- var c = t.GetComponent();
- if (c != null)
+ if (t.TryGetComponent(out var c))
list.Add(c);
}
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/Prefabs/Scripts/DebugUIHandlerObjectPopupField.cs b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/Prefabs/Scripts/DebugUIHandlerObjectPopupField.cs
index 649f67279a1..d884fd80639 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/Prefabs/Scripts/DebugUIHandlerObjectPopupField.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/Prefabs/Scripts/DebugUIHandlerObjectPopupField.cs
@@ -29,7 +29,7 @@ private void ChangeSelectedObject()
return;
var elementsArray = elements.ToArray();
- var count = elementsArray.Count();
+ var count = elementsArray.Length;
if (m_Index >= count)
{
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/Prefabs/Scripts/DebugUIHandlerWidget.cs b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/Prefabs/Scripts/DebugUIHandlerWidget.cs
index 4d78428f16e..1400bc631bd 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Debugging/Prefabs/Scripts/DebugUIHandlerWidget.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Debugging/Prefabs/Scripts/DebugUIHandlerWidget.cs
@@ -108,13 +108,7 @@ public virtual void OnDecrement(bool fast) { }
/// Previous widget UI handler, parent if there is none.
public virtual DebugUIHandlerWidget Previous()
{
- if (previousUIHandler != null)
- return previousUIHandler;
-
- if (parentUIHandler != null)
- return parentUIHandler;
-
- return null;
+ return previousUIHandler != null ? previousUIHandler : parentUIHandler;
}
///
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs
index 37b9b4515b9..1e3a221399b 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeSceneData.cs
@@ -314,8 +314,7 @@ public void OnBeforeSerialize()
serializedProfiles.Add(item);
}
- foreach (var set in bakingSets)
- serializedBakingSets.Add(set);
+ serializedBakingSets.AddRange(bakingSets);
}
internal BakingSet CreateNewBakingSet(string name)
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/PostProcessing/LensFlareCommonSRP.cs b/Packages/com.unity.render-pipelines.core/Runtime/PostProcessing/LensFlareCommonSRP.cs
index 3c741e20fee..e6489f8d2c6 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/PostProcessing/LensFlareCommonSRP.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/PostProcessing/LensFlareCommonSRP.cs
@@ -247,10 +247,10 @@ float Fwt(float d, float l)
return l * l / (d * (d * d + l * l));
}
- Vector3 p1Global = lightPositionWS + lightSide * lightWidth * 0.5f;
- Vector3 p2Global = lightPositionWS - lightSide * lightWidth * 0.5f;
- Vector3 p1Front = lightPositionWS + cam.transform.right * lightWidth * 0.5f;
- Vector3 p2Front = lightPositionWS - cam.transform.right * lightWidth * 0.5f;
+ Vector3 p1Global = lightPositionWS + 0.5f * lightWidth * lightSide;
+ Vector3 p2Global = lightPositionWS - 0.5f * lightWidth * lightSide;
+ Vector3 p1Front = lightPositionWS + 0.5f * lightWidth * cam.transform.right;
+ Vector3 p2Front = lightPositionWS - 0.5f * lightWidth * cam.transform.right;
Vector3 p1World = cam.transform.InverseTransformPoint(p1Global);
Vector3 p2World = cam.transform.InverseTransformPoint(p2Global);
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Utilities/CoreUtils.cs b/Packages/com.unity.render-pipelines.core/Runtime/Utilities/CoreUtils.cs
index c336f0d5f47..9613946c2c5 100644
--- a/Packages/com.unity.render-pipelines.core/Runtime/Utilities/CoreUtils.cs
+++ b/Packages/com.unity.render-pipelines.core/Runtime/Utilities/CoreUtils.cs
@@ -890,7 +890,7 @@ static string GetTextureAutoName(int width, int height, string format, TextureDi
temp = string.Format("{0}x{1}{2}_{3}", width, height, mips ? "_Mips" : "", format);
else
temp = string.Format("{0}x{1}x{2}{3}_{4}", width, height, depth, mips ? "_Mips" : "", format);
- temp = String.Format("{0}_{1}_{2}", name == "" ? "Texture" : name, (dim == TextureDimension.None) ? "" : dim.ToString(), temp);
+ temp = String.Format("{0}_{1}_{2}", name?.Length == 0 ? "Texture" : name, (dim == TextureDimension.None) ? "" : dim.ToString(), temp);
return temp;
}
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/RemoveRange.Extensions.Tests.cs b/Packages/com.unity.render-pipelines.core/Tests/Editor/RemoveRange.Extensions.Tests.cs
index fc45f514c29..6b62deb0bfa 100644
--- a/Packages/com.unity.render-pipelines.core/Tests/Editor/RemoveRange.Extensions.Tests.cs
+++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/RemoveRange.Extensions.Tests.cs
@@ -24,8 +24,7 @@ bool ItemInRangeAreRemovedAfterRemoveRange(TList list, int startIndex, in
{
using (ListPool.Get(out var copy))
{
- foreach (int integer in list)
- copy.Add(integer);
+ copy.AddRange(list);
if (list.TryRemoveElementsInRange(startIndex, count, out var exception))
{
diff --git a/Packages/com.unity.render-pipelines.core/Tests/Editor/Volumes/VolumeComponentTests.cs b/Packages/com.unity.render-pipelines.core/Tests/Editor/Volumes/VolumeComponentTests.cs
index d76b2221d75..e910f6ca2ab 100644
--- a/Packages/com.unity.render-pipelines.core/Tests/Editor/Volumes/VolumeComponentTests.cs
+++ b/Packages/com.unity.render-pipelines.core/Tests/Editor/Volumes/VolumeComponentTests.cs
@@ -113,7 +113,7 @@ public string[] AdditionalProperties(Type volumeComponentType)
.ToArray();
var notAdditionalParameters = editor.GetField("m_VolumeNotAdditionalParameters") as List;
- Assert.True(fields.Count() + notAdditionalParameters.Count == component.parameters.Count);
+ Assert.True(fields.Length + notAdditionalParameters.Count == component.parameters.Count);
ScriptableObject.DestroyImmediate(component);
@@ -153,9 +153,9 @@ public void TestHandleParameterDecorators()
editor.GetField("m_Parameters") as List<(GUIContent displayName, int displayOrder,
SerializedDataParameter param)>;
- Assert.True(parameters != null && parameters.Count() == k_ExpectedResults.Count());
+ Assert.True(parameters != null && parameters.Count == k_ExpectedResults.Length);
- for (int i = 0; i < k_ExpectedResults.Count(); ++i)
+ for (int i = 0; i < k_ExpectedResults.Length; ++i)
{
var property = parameters[i].param;
var title = new GUIContent(parameters[i].displayName);