Skip to content

Commit 8298804

Browse files
ArvteshArvtesh
committed
Enabled rendering outlines on renderers with no materials assigned (#33)
1 parent 9cf87f6 commit 8298804

File tree

3 files changed

+177
-27
lines changed

3 files changed

+177
-27
lines changed

‎Outline.Core/Assets/Examples/SimplePerCamera/Outline.unity‎

Lines changed: 145 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
41+
m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -54,14 +54,15 @@ LightmapSettings:
5454
m_EnableBakedLightmaps: 1
5555
m_EnableRealtimeLightmaps: 1
5656
m_LightmapEditorSettings:
57-
serializedVersion: 10
57+
serializedVersion: 12
5858
m_Resolution: 2
5959
m_BakeResolution: 40
6060
m_AtlasSize: 1024
6161
m_AO: 0
6262
m_AOMaxDistance: 1
6363
m_CompAOExponent: 1
6464
m_CompAOExponentDirect: 0
65+
m_ExtractAmbientOcclusion: 0
6566
m_Padding: 2
6667
m_LightmapParameters: {fileID: 0}
6768
m_LightmapsBakeMode: 1
@@ -76,18 +77,26 @@ LightmapSettings:
7677
m_PVRDirectSampleCount: 32
7778
m_PVRSampleCount: 500
7879
m_PVRBounces: 2
80+
m_PVREnvironmentSampleCount: 500
81+
m_PVREnvironmentReferencePointCount: 2048
82+
m_PVRFilteringMode: 2
83+
m_PVRDenoiserTypeDirect: 0
84+
m_PVRDenoiserTypeIndirect: 0
85+
m_PVRDenoiserTypeAO: 0
7986
m_PVRFilterTypeDirect: 0
8087
m_PVRFilterTypeIndirect: 0
8188
m_PVRFilterTypeAO: 0
82-
m_PVRFilteringMode: 2
89+
m_PVREnvironmentMIS: 0
8390
m_PVRCulling: 1
8491
m_PVRFilteringGaussRadiusDirect: 1
8592
m_PVRFilteringGaussRadiusIndirect: 5
8693
m_PVRFilteringGaussRadiusAO: 2
8794
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
8895
m_PVRFilteringAtrousPositionSigmaIndirect: 2
8996
m_PVRFilteringAtrousPositionSigmaAO: 1
90-
m_ShowResolutionOverlay: 1
97+
m_ExportTrainingData: 0
98+
m_TrainingDataDestination: TrainingData
99+
m_LightProbeSampleCountMultiplier: 4
91100
m_LightingDataAsset: {fileID: 0}
92101
m_UseShadowmask: 1
93102
--- !u!196 &4
@@ -137,12 +146,14 @@ Light:
137146
m_PrefabAsset: {fileID: 0}
138147
m_GameObject: {fileID: 167171210}
139148
m_Enabled: 1
140-
serializedVersion: 8
149+
serializedVersion: 10
141150
m_Type: 1
151+
m_Shape: 0
142152
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
143153
m_Intensity: 0.5
144154
m_Range: 10
145155
m_SpotAngle: 30
156+
m_InnerSpotAngle: 21.80208
146157
m_CookieSize: 10
147158
m_Shadows:
148159
m_Type: 2
@@ -152,19 +163,40 @@ Light:
152163
m_Bias: 0.05
153164
m_NormalBias: 0.4
154165
m_NearPlane: 0.2
166+
m_CullingMatrixOverride:
167+
e00: 1
168+
e01: 0
169+
e02: 0
170+
e03: 0
171+
e10: 0
172+
e11: 1
173+
e12: 0
174+
e13: 0
175+
e20: 0
176+
e21: 0
177+
e22: 1
178+
e23: 0
179+
e30: 0
180+
e31: 0
181+
e32: 0
182+
e33: 1
183+
m_UseCullingMatrixOverride: 0
155184
m_Cookie: {fileID: 0}
156185
m_DrawHalo: 0
157186
m_Flare: {fileID: 0}
158187
m_RenderMode: 0
159188
m_CullingMask:
160189
serializedVersion: 2
161190
m_Bits: 4294967295
191+
m_RenderingLayerMask: 1
162192
m_Lightmapping: 4
163193
m_LightShadowCasterMode: 0
164194
m_AreaSize: {x: 1, y: 1}
165195
m_BounceIntensity: 1
166196
m_ColorTemperature: 6570
167197
m_UseColorTemperature: 0
198+
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
199+
m_UseBoundingSphereOverride: 0
168200
m_ShadowRadius: 0
169201
m_ShadowAngle: 0
170202
--- !u!4 &167171212
@@ -235,6 +267,8 @@ MonoBehaviour:
235267
LayerIndex: 1
236268
- Go: {fileID: 1150463983}
237269
LayerIndex: 2
270+
- Go: {fileID: 1254612184}
271+
LayerIndex: 0
238272
--- !u!20 &692811815
239273
Camera:
240274
m_ObjectHideFlags: 0
@@ -247,9 +281,10 @@ Camera:
247281
m_ClearFlags: 1
248282
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
249283
m_projectionMatrixMode: 1
284+
m_GateFitMode: 2
285+
m_FOVAxisMode: 0
250286
m_SensorSize: {x: 36, y: 24}
251287
m_LensShift: {x: 0, y: 0}
252-
m_GateFitMode: 2
253288
m_FocalLength: 50
254289
m_NormalizedViewPortRect:
255290
serializedVersion: 2
@@ -293,6 +328,7 @@ Transform:
293328
- {fileID: 1789341921}
294329
- {fileID: 1150463984}
295330
- {fileID: 1244590625}
331+
- {fileID: 1254612185}
296332
m_Father: {fileID: 0}
297333
m_RootOrder: 0
298334
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -344,6 +380,7 @@ MeshRenderer:
344380
m_MotionVectors: 1
345381
m_LightProbeUsage: 1
346382
m_ReflectionProbeUsage: 1
383+
m_RayTracingMode: 2
347384
m_RenderingLayerMask: 1
348385
m_RendererPriority: 0
349386
m_Materials:
@@ -355,6 +392,7 @@ MeshRenderer:
355392
m_ProbeAnchor: {fileID: 0}
356393
m_LightProbeVolumeOverride: {fileID: 0}
357394
m_ScaleInLightmap: 1
395+
m_ReceiveGI: 1
358396
m_PreserveUVs: 1
359397
m_IgnoreNormalsForChartDetection: 0
360398
m_ImportantGI: 0
@@ -448,6 +486,7 @@ MeshRenderer:
448486
m_MotionVectors: 1
449487
m_LightProbeUsage: 1
450488
m_ReflectionProbeUsage: 1
489+
m_RayTracingMode: 2
451490
m_RenderingLayerMask: 1
452491
m_RendererPriority: 0
453492
m_Materials:
@@ -459,6 +498,7 @@ MeshRenderer:
459498
m_ProbeAnchor: {fileID: 0}
460499
m_LightProbeVolumeOverride: {fileID: 0}
461500
m_ScaleInLightmap: 1
501+
m_ReceiveGI: 1
462502
m_PreserveUVs: 0
463503
m_IgnoreNormalsForChartDetection: 0
464504
m_ImportantGI: 0
@@ -526,6 +566,7 @@ MeshRenderer:
526566
m_MotionVectors: 1
527567
m_LightProbeUsage: 1
528568
m_ReflectionProbeUsage: 1
569+
m_RayTracingMode: 2
529570
m_RenderingLayerMask: 1
530571
m_RendererPriority: 0
531572
m_Materials:
@@ -537,6 +578,7 @@ MeshRenderer:
537578
m_ProbeAnchor: {fileID: 0}
538579
m_LightProbeVolumeOverride: {fileID: 0}
539580
m_ScaleInLightmap: 1
581+
m_ReceiveGI: 1
540582
m_PreserveUVs: 0
541583
m_IgnoreNormalsForChartDetection: 0
542584
m_ImportantGI: 0
@@ -571,6 +613,98 @@ Transform:
571613
m_Father: {fileID: 692811816}
572614
m_RootOrder: 4
573615
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
616+
--- !u!1 &1254612184
617+
GameObject:
618+
m_ObjectHideFlags: 0
619+
m_CorrespondingSourceObject: {fileID: 0}
620+
m_PrefabInstance: {fileID: 0}
621+
m_PrefabAsset: {fileID: 0}
622+
serializedVersion: 6
623+
m_Component:
624+
- component: {fileID: 1254612185}
625+
- component: {fileID: 1254612188}
626+
- component: {fileID: 1254612187}
627+
- component: {fileID: 1254612186}
628+
m_Layer: 0
629+
m_Name: InvisibleCube
630+
m_TagString: Untagged
631+
m_Icon: {fileID: 0}
632+
m_NavMeshLayer: 0
633+
m_StaticEditorFlags: 0
634+
m_IsActive: 1
635+
--- !u!4 &1254612185
636+
Transform:
637+
m_ObjectHideFlags: 0
638+
m_CorrespondingSourceObject: {fileID: 0}
639+
m_PrefabInstance: {fileID: 0}
640+
m_PrefabAsset: {fileID: 0}
641+
m_GameObject: {fileID: 1254612184}
642+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
643+
m_LocalPosition: {x: -2.46, y: 0, z: 4.85}
644+
m_LocalScale: {x: 1, y: 1, z: 1}
645+
m_Children: []
646+
m_Father: {fileID: 692811816}
647+
m_RootOrder: 5
648+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
649+
--- !u!65 &1254612186
650+
BoxCollider:
651+
m_ObjectHideFlags: 0
652+
m_CorrespondingSourceObject: {fileID: 0}
653+
m_PrefabInstance: {fileID: 0}
654+
m_PrefabAsset: {fileID: 0}
655+
m_GameObject: {fileID: 1254612184}
656+
m_Material: {fileID: 0}
657+
m_IsTrigger: 0
658+
m_Enabled: 1
659+
serializedVersion: 2
660+
m_Size: {x: 1, y: 1, z: 1}
661+
m_Center: {x: 0, y: 0, z: 0}
662+
--- !u!23 &1254612187
663+
MeshRenderer:
664+
m_ObjectHideFlags: 0
665+
m_CorrespondingSourceObject: {fileID: 0}
666+
m_PrefabInstance: {fileID: 0}
667+
m_PrefabAsset: {fileID: 0}
668+
m_GameObject: {fileID: 1254612184}
669+
m_Enabled: 1
670+
m_CastShadows: 1
671+
m_ReceiveShadows: 1
672+
m_DynamicOccludee: 1
673+
m_MotionVectors: 1
674+
m_LightProbeUsage: 1
675+
m_ReflectionProbeUsage: 1
676+
m_RayTracingMode: 2
677+
m_RenderingLayerMask: 1
678+
m_RendererPriority: 0
679+
m_Materials: []
680+
m_StaticBatchInfo:
681+
firstSubMesh: 0
682+
subMeshCount: 0
683+
m_StaticBatchRoot: {fileID: 0}
684+
m_ProbeAnchor: {fileID: 0}
685+
m_LightProbeVolumeOverride: {fileID: 0}
686+
m_ScaleInLightmap: 1
687+
m_ReceiveGI: 1
688+
m_PreserveUVs: 0
689+
m_IgnoreNormalsForChartDetection: 0
690+
m_ImportantGI: 0
691+
m_StitchLightmapSeams: 1
692+
m_SelectedEditorRenderState: 3
693+
m_MinimumChartSize: 4
694+
m_AutoUVMaxDistance: 0.5
695+
m_AutoUVMaxAngle: 89
696+
m_LightmapParameters: {fileID: 0}
697+
m_SortingLayerID: 0
698+
m_SortingLayer: 0
699+
m_SortingOrder: 0
700+
--- !u!33 &1254612188
701+
MeshFilter:
702+
m_ObjectHideFlags: 0
703+
m_CorrespondingSourceObject: {fileID: 0}
704+
m_PrefabInstance: {fileID: 0}
705+
m_PrefabAsset: {fileID: 0}
706+
m_GameObject: {fileID: 1254612184}
707+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
574708
--- !u!1 &1579373802
575709
GameObject:
576710
m_ObjectHideFlags: 0
@@ -604,6 +738,7 @@ MeshRenderer:
604738
m_MotionVectors: 1
605739
m_LightProbeUsage: 1
606740
m_ReflectionProbeUsage: 1
741+
m_RayTracingMode: 2
607742
m_RenderingLayerMask: 1
608743
m_RendererPriority: 0
609744
m_Materials:
@@ -615,6 +750,7 @@ MeshRenderer:
615750
m_ProbeAnchor: {fileID: 0}
616751
m_LightProbeVolumeOverride: {fileID: 0}
617752
m_ScaleInLightmap: 1
753+
m_ReceiveGI: 1
618754
m_PreserveUVs: 1
619755
m_IgnoreNormalsForChartDetection: 0
620756
m_ImportantGI: 0
@@ -716,7 +852,7 @@ MonoBehaviour:
716852
_outlineIntensity: 2
717853
_outlineAlphaCutoff: 0.9
718854
_outlineMode: 1
719-
_layerMask: 0
855+
_ignoreLayerMask: 0
720856
_cameraEvent: 15
721857
_targetCamera: {fileID: 0}
722858
_updateRenderers: 0
@@ -734,6 +870,7 @@ MeshRenderer:
734870
m_MotionVectors: 1
735871
m_LightProbeUsage: 1
736872
m_ReflectionProbeUsage: 1
873+
m_RayTracingMode: 2
737874
m_RenderingLayerMask: 1
738875
m_RendererPriority: 0
739876
m_Materials:
@@ -745,6 +882,7 @@ MeshRenderer:
745882
m_ProbeAnchor: {fileID: 0}
746883
m_LightProbeVolumeOverride: {fileID: 0}
747884
m_ScaleInLightmap: 1
885+
m_ReceiveGI: 1
748886
m_PreserveUVs: 1
749887
m_IgnoreNormalsForChartDetection: 0
750888
m_ImportantGI: 0

‎Outline.Core/Packages/UnityFx.Outline/Runtime/Scripts/OutlineResources.cs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public sealed class OutlineResources : ScriptableObject
241241
internal readonly List<Material> TmpMaterials = new List<Material>();
242242

243243
/// <summary>
244-
/// Gets or sets a <see cref="Shader"/> that renders objects outlined with a solid while color.
244+
/// Gets a <see cref="Shader"/> that renders objects outlined with a solid while color.
245245
/// </summary>
246246
public Shader RenderShader
247247
{
@@ -252,7 +252,7 @@ public Shader RenderShader
252252
}
253253

254254
/// <summary>
255-
/// Gets or sets a <see cref="Shader"/> that renders outline around the mask, that was generated with <see cref="RenderShader"/>.
255+
/// Gets a <see cref="Shader"/> that renders outline around the mask, that was generated with <see cref="RenderShader"/>.
256256
/// </summary>
257257
public Shader OutlineShader
258258
{
@@ -271,7 +271,9 @@ public Material RenderMaterial
271271
{
272272
if (_renderMaterial == null)
273273
{
274-
_renderMaterial = new Material(RenderShader)
274+
UnityEngine.Debug.Assert(_renderShader != null, "No RenderShader is set in outline resources.", this);
275+
276+
_renderMaterial = new Material(_renderShader)
275277
{
276278
name = "Outline - RenderColor",
277279
hideFlags = HideFlags.HideAndDontSave
@@ -291,7 +293,9 @@ public Material OutlineMaterial
291293
{
292294
if (_outlineMaterial == null)
293295
{
294-
_outlineMaterial = new Material(OutlineShader)
296+
UnityEngine.Debug.Assert(_outlineShader != null, "No OutlineShader is set in outline resources.", this);
297+
298+
_outlineMaterial = new Material(_outlineShader)
295299
{
296300
name = "Outline - Main",
297301
hideFlags = HideFlags.HideAndDontSave

0 commit comments

Comments
 (0)