Skip to content

Commit 78ee098

Browse files
julienf-unityGitHub Enterprise
authored andcommitted
Misc small fixes (#36)
* Fix strips outputs, spawnIndex and default metallic value * Increase threshold in particle strip unlit test
1 parent 2f49340 commit 78ee098

File tree

5 files changed

+80
-6
lines changed

5 files changed

+80
-6
lines changed

TestProjects/VisualEffectGraph/Assets/AllTests/VFXTests/GraphicsTests/ParticleStripUnlit.unity

Lines changed: 72 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RenderSettings:
4343
--- !u!157 &3
4444
LightmapSettings:
4545
m_ObjectHideFlags: 0
46-
serializedVersion: 11
46+
serializedVersion: 12
4747
m_GIWorkflowMode: 1
4848
m_GISettings:
4949
serializedVersion: 2
@@ -98,7 +98,7 @@ LightmapSettings:
9898
m_TrainingDataDestination: TrainingData
9999
m_LightProbeSampleCountMultiplier: 4
100100
m_LightingDataAsset: {fileID: 0}
101-
m_UseShadowmask: 1
101+
m_LightingSettings: {fileID: 0}
102102
--- !u!196 &4
103103
NavMeshSettings:
104104
serializedVersion: 2
@@ -118,6 +118,8 @@ NavMeshSettings:
118118
manualTileSize: 0
119119
tileSize: 256
120120
accuratePlacement: 0
121+
maxJobWorkers: 0
122+
preserveTilesOutsideBounds: 0
121123
debug:
122124
m_Flags: 0
123125
m_NavMeshData: {fileID: 0}
@@ -152,7 +154,7 @@ MonoBehaviour:
152154
m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3}
153155
m_Name:
154156
m_EditorClassIdentifier:
155-
m_Version: 6
157+
m_Version: 7
156158
m_ObsoleteRenderingPath: 0
157159
m_ObsoleteFrameSettings:
158160
overrides: 0
@@ -210,6 +212,12 @@ MonoBehaviour:
210212
SMAAQuality: 2
211213
dithering: 1
212214
stopNaNs: 0
215+
taaSharpenStrength: 0.5
216+
TAAQuality: 1
217+
taaHistorySharpening: 0.35
218+
taaAntiFlicker: 0.5
219+
taaMotionVectorRejection: 0
220+
taaAntiHistoryRinging: 0
213221
physicalParameters:
214222
m_Iso: 200
215223
m_ShutterSpeed: 0.005
@@ -219,21 +227,29 @@ MonoBehaviour:
219227
m_BarrelClipping: 0.25
220228
m_Anamorphism: 0
221229
flipYMode: 0
230+
xrRendering: 1
222231
fullscreenPassthrough: 0
223232
allowDynamicResolution: 0
224233
customRenderingSettings: 0
225234
invertFaceCulling: 0
226235
probeLayerMask:
227236
serializedVersion: 2
228237
m_Bits: 4294967295
238+
hasPersistentHistory: 0
229239
m_RenderingPathCustomFrameSettings:
230240
bitDatas:
231-
data1: 69456055238429
241+
data1: 70005811052381
232242
data2: 4539628424657829888
233243
lodBias: 1
234244
lodBiasMode: 0
245+
lodBiasQualityLevel: 0
235246
maximumLODLevel: 0
236247
maximumLODLevelMode: 0
248+
maximumLODLevelQualityLevel: 0
249+
sssQualityMode: 0
250+
sssQualityLevel: 0
251+
sssCustomSampleBudget: 20
252+
materialQuality: 0
237253
renderingPathCustomFrameSettingsOverrideMask:
238254
mask:
239255
data1: 0
@@ -304,6 +320,57 @@ Transform:
304320
m_Father: {fileID: 0}
305321
m_RootOrder: 0
306322
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
323+
--- !u!1 &903789260
324+
GameObject:
325+
m_ObjectHideFlags: 0
326+
m_CorrespondingSourceObject: {fileID: 0}
327+
m_PrefabInstance: {fileID: 0}
328+
m_PrefabAsset: {fileID: 0}
329+
serializedVersion: 6
330+
m_Component:
331+
- component: {fileID: 903789262}
332+
- component: {fileID: 903789261}
333+
m_Layer: 0
334+
m_Name: TestSettings
335+
m_TagString: Untagged
336+
m_Icon: {fileID: 0}
337+
m_NavMeshLayer: 0
338+
m_StaticEditorFlags: 0
339+
m_IsActive: 1
340+
--- !u!114 &903789261
341+
MonoBehaviour:
342+
m_ObjectHideFlags: 0
343+
m_CorrespondingSourceObject: {fileID: 0}
344+
m_PrefabInstance: {fileID: 0}
345+
m_PrefabAsset: {fileID: 0}
346+
m_GameObject: {fileID: 903789260}
347+
m_Enabled: 1
348+
m_EditorHideFlags: 0
349+
m_Script: {fileID: 11500000, guid: ea0c24060324bed47851dcbecd754031, type: 3}
350+
m_Name:
351+
m_EditorClassIdentifier:
352+
ImageComparisonSettings:
353+
TargetWidth: 512
354+
TargetHeight: 512
355+
PerPixelCorrectnessThreshold: 0
356+
AverageCorrectnessThreshold: 0.0008
357+
UseHDR: 0
358+
captureFrameRate: 20
359+
simulateTime: 5.95
360+
--- !u!4 &903789262
361+
Transform:
362+
m_ObjectHideFlags: 0
363+
m_CorrespondingSourceObject: {fileID: 0}
364+
m_PrefabInstance: {fileID: 0}
365+
m_PrefabAsset: {fileID: 0}
366+
m_GameObject: {fileID: 903789260}
367+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
368+
m_LocalPosition: {x: 0, y: 0, z: 0}
369+
m_LocalScale: {x: 1, y: 1, z: 1}
370+
m_Children: []
371+
m_Father: {fileID: 0}
372+
m_RootOrder: 2
373+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
307374
--- !u!1 &1001802346
308375
GameObject:
309376
m_ObjectHideFlags: 0
@@ -337,6 +404,7 @@ VFXRenderer:
337404
m_LightProbeUsage: 0
338405
m_ReflectionProbeUsage: 0
339406
m_RayTracingMode: 0
407+
m_RayTraceProcedural: 0
340408
m_RenderingLayerMask: 1
341409
m_RendererPriority: 0
342410
m_Materials:

com.unity.render-pipelines.high-definition/Editor/VFXGraph/Outputs/VFXAbstractParticleHDRPLitOutput.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public class HDRPLitInputProperties
105105
public class StandardProperties
106106
{
107107
[Range(0, 1), Tooltip("Controls the scale factor for the particle’s metallicity.")]
108-
public float metallic = 0.5f;
108+
public float metallic = 0.0f;
109109
}
110110

111111
public class SpecularColorProperties

com.unity.visualeffectgraph/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
102102
- Prevent from creating a context in VisualEffectSugraphOperator by draggingfrom an output slot.
103103
- Avoid NullReferenceException when VisualEffectAsset is null if VFXPropertyBinder [Case 1219061](https://issuetracker.unity3d.com/product/unity/issues/guid/1219061/)
104104
- Missing Reset function in VFXPropertyBinder [Case 1219063](https://issuetracker.unity3d.com/product/unity/issues/guid/1219063/)
105+
- Fix issue with strips outputs that could cause too many vertices to be renderered
106+
- SpawnIndex attribute returns correct value in update and outputs contexts
105107

106108
## [7.1.1] - 2019-09-05
107109
### Added

com.unity.visualeffectgraph/Editor/Data/VFXData.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,9 @@ private void ComputeLayer()
381381

382382
protected bool HasImplicitInit(VFXAttribute attrib)
383383
{
384-
return (attrib.Equals(VFXAttribute.Seed) || attrib.Equals(VFXAttribute.ParticleId));
384+
return attrib.Equals(VFXAttribute.Seed)
385+
|| attrib.Equals(VFXAttribute.ParticleId)
386+
|| attrib.Equals(VFXAttribute.SpawnIndex);
385387
}
386388

387389
private void ProcessAttributes()

com.unity.visualeffectgraph/Editor/Models/Contexts/Implementations/VFXAbstractParticleOutput.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,8 @@ public override IEnumerable<VFXMapping> additionalMappings
461461
yield return new VFXMapping("sortPriority", sortPriority);
462462
if (HasIndirectDraw())
463463
yield return new VFXMapping("indirectDraw", 1);
464+
if (HasStrips(false))
465+
yield return new VFXMapping("strips", 1);
464466
}
465467
}
466468
}

0 commit comments

Comments
 (0)