Skip to content

Commit 699b8d4

Browse files
urasmusEvergreen
authored andcommitted
Shorten Surface Cache file paths to avoid too long paths on Windows
1 parent bb518a9 commit 699b8d4

23 files changed

+16
-16
lines changed

Packages/com.unity.render-pipelines.core/Runtime/Lighting/SurfaceCache/SurfaceCacheWorld.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public AccelStructAdapter GetAccelerationStructure()
149149

150150
public void RemoveInstance(InstanceHandle instance)
151151
{
152-
_rayTracingAccelerationStructure.RemoveInstance(instance.ToInt());
152+
_rayTracingAccelerationStructure.RemoveInstance(instance.Value);
153153
_instanceHandleSet.Remove(instance);
154154
}
155155

@@ -193,18 +193,18 @@ public InstanceHandle AddInstance(
193193
}
194194

195195
InstanceHandle instance = _instanceHandleSet.Add();
196-
_rayTracingAccelerationStructure.AddInstance(instance.ToInt(), mesh, localToWorldMatrix, masks, materialIndices, isOpaque, 0);
196+
_rayTracingAccelerationStructure.AddInstance(instance.Value, mesh, localToWorldMatrix, masks, materialIndices, isOpaque, 0);
197197
return instance;
198198
}
199199

200200
public void UpdateInstanceTransform(InstanceHandle instance, Matrix4x4 localToWorldMatrix)
201201
{
202-
_rayTracingAccelerationStructure.UpdateInstanceTransform(instance.ToInt(), localToWorldMatrix);
202+
_rayTracingAccelerationStructure.UpdateInstanceTransform(instance.Value, localToWorldMatrix);
203203
}
204204

205205
public void UpdateInstanceMask(InstanceHandle instance, Span<uint> perSubMeshMask)
206206
{
207-
_rayTracingAccelerationStructure.UpdateInstanceMask(instance.ToInt(), perSubMeshMask);
207+
_rayTracingAccelerationStructure.UpdateInstanceMask(instance.Value, perSubMeshMask);
208208
}
209209

210210
public void UpdateInstanceMaterials(InstanceHandle instance, Span<MaterialHandle> materials)
@@ -215,7 +215,7 @@ public void UpdateInstanceMaterials(InstanceHandle instance, Span<MaterialHandle
215215
_materialPool.GetMaterialInfo(materials[i].Value, out materialIndices[i], out bool isTransmissive);
216216
}
217217

218-
_rayTracingAccelerationStructure.UpdateInstanceMaterialIDs(instance.ToInt(), materialIndices);
218+
_rayTracingAccelerationStructure.UpdateInstanceMaterialIDs(instance.Value, materialIndices);
219219
}
220220

221221
public LightHandle[] AddLights(Span<LightDescriptor> lightDescs)

Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGlobalIlluminationStripper.cs renamed to Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGIStripper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ static bool IsSurfaceCacheEnabled(List<UniversalRenderPipelineAsset> urpAssets)
2121

2222
foreach (var rendererFeature in rendererData.rendererFeatures)
2323
{
24-
if (rendererFeature is SurfaceCacheGlobalIlluminationRendererFeature { isActive: true })
24+
if (rendererFeature is SurfaceCacheGIRendererFeature { isActive: true })
2525
return true;
2626
}
2727
}

Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGlobalIlluminationStripper.cs.meta renamed to Packages/com.unity.render-pipelines.universal/Editor/BuildProcessors/GraphicsSettingsStrippers/SurfaceCacheGIStripper.cs.meta

File renamed without changes.

Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/SurfaceCacheGlobalIlluminationEditor.cs renamed to Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/SurfaceCacheGIEditor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
namespace UnityEditor.Rendering.Universal
88
{
9-
[CustomEditor(typeof(SurfaceCacheGlobalIlluminationRendererFeature))]
10-
internal class SurfaceCacheGlobalIlluminationEditor : Editor
9+
[CustomEditor(typeof(SurfaceCacheGIRendererFeature))]
10+
internal class SurfaceCacheGIEditor : Editor
1111
{
1212
private bool m_IsInitialized;
1313

Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/SurfaceCacheGlobalIlluminationEditor.cs.meta renamed to Packages/com.unity.render-pipelines.universal/Editor/RendererFeatures/SurfaceCacheGIEditor.cs.meta

File renamed without changes.

Packages/com.unity.render-pipelines.universal/Editor/ShaderBuildPreprocessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ internal static ShaderFeatures GetSupportedShaderFeaturesFromRendererFeatures(re
867867

868868
#if SURFACE_CACHE
869869
// Surface Cache GI...
870-
SurfaceCacheGlobalIlluminationRendererFeature surfaceCacheFeature = rendererFeature as SurfaceCacheGlobalIlluminationRendererFeature;
870+
SurfaceCacheGIRendererFeature surfaceCacheFeature = rendererFeature as SurfaceCacheGIRendererFeature;
871871
if(surfaceCacheFeature != null)
872872
{
873873
shaderFeatures |= ShaderFeatures.SurfaceCache;

Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature.meta renamed to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature.meta

File renamed without changes.

Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/Debug.compute renamed to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/Debug.compute

File renamed without changes.

Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/Debug.compute.meta renamed to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/Debug.compute.meta

File renamed without changes.

Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGlobalIlluminationRendererFeature/FallbackMaterial.mat renamed to Packages/com.unity.render-pipelines.universal/Runtime/RendererFeatures/SurfaceCacheGIRendererFeature/FallbackMaterial.mat

File renamed without changes.

0 commit comments

Comments
 (0)