Skip to content

Commit d1d8b5f

Browse files
EnoxSoftwareEnoxSoftware
committed
update 2.6.0
1 parent 72ee238 commit d1d8b5f

File tree

89 files changed

+9743
-4745
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+9743
-4745
lines changed

‎Assets/OpenCVForUnity/Examples/Advanced/AlphaBlendingExample/AlphaBlendingExample.unity

+1,062-665
Large diffs are not rendered by default.

‎Assets/OpenCVForUnity/Examples/Advanced/ComicFilterExample/ComicFilterExample.unity

+33-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RenderSettings:
4343
--- !u!157 &4
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,8 @@ LightmapSettings:
9898
m_TrainingDataDestination: TrainingData
9999
m_LightProbeSampleCountMultiplier: 4
100100
m_LightingDataAsset: {fileID: 0}
101-
m_UseShadowmask: 0
101+
m_LightingSettings: {fileID: 4890085278179872738, guid: 6a57db5c2a14fef488b3e483ac091912,
102+
type: 2}
102103
--- !u!196 &5
103104
NavMeshSettings:
104105
serializedVersion: 2
@@ -118,6 +119,8 @@ NavMeshSettings:
118119
manualTileSize: 0
119120
tileSize: 256
120121
accuratePlacement: 0
122+
maxJobWorkers: 0
123+
preserveTilesOutsideBounds: 0
121124
debug:
122125
m_Flags: 0
123126
m_NavMeshData: {fileID: 0}
@@ -179,6 +182,7 @@ MonoBehaviour:
179182
m_EditorClassIdentifier:
180183
m_Navigation:
181184
m_Mode: 3
185+
m_WrapAround: 0
182186
m_SelectOnUp: {fileID: 0}
183187
m_SelectOnDown: {fileID: 0}
184188
m_SelectOnLeft: {fileID: 0}
@@ -209,6 +213,7 @@ MonoBehaviour:
209213
m_PersistentCalls:
210214
m_Calls:
211215
- m_Target: {fileID: 1076083695}
216+
m_TargetAssemblyTypeName:
212217
m_MethodName: OnBackButtonClick
213218
m_Mode: 1
214219
m_Arguments:
@@ -235,6 +240,7 @@ MonoBehaviour:
235240
m_Material: {fileID: 0}
236241
m_Color: {r: 1, g: 1, b: 1, a: 1}
237242
m_RaycastTarget: 1
243+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
238244
m_Maskable: 1
239245
m_OnCullStateChanged:
240246
m_PersistentCalls:
@@ -275,6 +281,7 @@ MonoBehaviour:
275281
m_ChildControlHeight: 1
276282
m_ChildScaleWidth: 0
277283
m_ChildScaleHeight: 0
284+
m_ReverseArrangement: 0
278285
--- !u!222 &68990089
279286
CanvasRenderer:
280287
m_ObjectHideFlags: 0
@@ -362,6 +369,7 @@ MonoBehaviour:
362369
m_EditorClassIdentifier:
363370
m_Navigation:
364371
m_Mode: 3
372+
m_WrapAround: 0
365373
m_SelectOnUp: {fileID: 0}
366374
m_SelectOnDown: {fileID: 0}
367375
m_SelectOnLeft: {fileID: 0}
@@ -392,6 +400,7 @@ MonoBehaviour:
392400
m_PersistentCalls:
393401
m_Calls:
394402
- m_Target: {fileID: 1076083695}
403+
m_TargetAssemblyTypeName:
395404
m_MethodName: OnPlayButtonClick
396405
m_Mode: 1
397406
m_Arguments:
@@ -418,6 +427,7 @@ MonoBehaviour:
418427
m_Material: {fileID: 0}
419428
m_Color: {r: 1, g: 1, b: 1, a: 1}
420429
m_RaycastTarget: 1
430+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
421431
m_Maskable: 1
422432
m_OnCullStateChanged:
423433
m_PersistentCalls:
@@ -496,6 +506,7 @@ MonoBehaviour:
496506
m_Material: {fileID: 0}
497507
m_Color: {r: 0.196, g: 0.196, b: 0.196, a: 1}
498508
m_RaycastTarget: 1
509+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
499510
m_Maskable: 1
500511
m_OnCullStateChanged:
501512
m_PersistentCalls:
@@ -601,6 +612,7 @@ MonoBehaviour:
601612
m_EditorClassIdentifier:
602613
m_Navigation:
603614
m_Mode: 3
615+
m_WrapAround: 0
604616
m_SelectOnUp: {fileID: 0}
605617
m_SelectOnDown: {fileID: 0}
606618
m_SelectOnLeft: {fileID: 0}
@@ -631,6 +643,7 @@ MonoBehaviour:
631643
m_PersistentCalls:
632644
m_Calls:
633645
- m_Target: {fileID: 1076083695}
646+
m_TargetAssemblyTypeName:
634647
m_MethodName: OnPauseButtonClick
635648
m_Mode: 1
636649
m_Arguments:
@@ -657,6 +670,7 @@ MonoBehaviour:
657670
m_Material: {fileID: 0}
658671
m_Color: {r: 1, g: 1, b: 1, a: 1}
659672
m_RaycastTarget: 1
673+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
660674
m_Maskable: 1
661675
m_OnCullStateChanged:
662676
m_PersistentCalls:
@@ -735,6 +749,7 @@ MonoBehaviour:
735749
m_Material: {fileID: 0}
736750
m_Color: {r: 0.196, g: 0.196, b: 0.196, a: 1}
737751
m_RaycastTarget: 1
752+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
738753
m_Maskable: 1
739754
m_OnCullStateChanged:
740755
m_PersistentCalls:
@@ -914,6 +929,7 @@ MeshRenderer:
914929
m_LightProbeUsage: 0
915930
m_ReflectionProbeUsage: 1
916931
m_RayTracingMode: 2
932+
m_RayTraceProcedural: 0
917933
m_RenderingLayerMask: 1
918934
m_RendererPriority: 0
919935
m_Materials:
@@ -938,6 +954,7 @@ MeshRenderer:
938954
m_SortingLayerID: 0
939955
m_SortingLayer: 0
940956
m_SortingOrder: 0
957+
m_AdditionalVertexStreams: {fileID: 0}
941958
--- !u!64 &1076083697
942959
MeshCollider:
943960
m_ObjectHideFlags: 0
@@ -1000,6 +1017,7 @@ MonoBehaviour:
10001017
m_PersistentCalls:
10011018
m_Calls:
10021019
- m_Target: {fileID: 1076083695}
1020+
m_TargetAssemblyTypeName:
10031021
m_MethodName: OnWebCamTextureToMatHelperInitialized
10041022
m_Mode: 1
10051023
m_Arguments:
@@ -1014,6 +1032,7 @@ MonoBehaviour:
10141032
m_PersistentCalls:
10151033
m_Calls:
10161034
- m_Target: {fileID: 1076083695}
1035+
m_TargetAssemblyTypeName:
10171036
m_MethodName: OnWebCamTextureToMatHelperDisposed
10181037
m_Mode: 1
10191038
m_Arguments:
@@ -1028,6 +1047,7 @@ MonoBehaviour:
10281047
m_PersistentCalls:
10291048
m_Calls:
10301049
- m_Target: {fileID: 1076083695}
1050+
m_TargetAssemblyTypeName:
10311051
m_MethodName: OnWebCamTextureToMatHelperErrorOccurred
10321052
m_Mode: 0
10331053
m_Arguments:
@@ -1122,6 +1142,7 @@ MonoBehaviour:
11221142
m_FallbackScreenDPI: 96
11231143
m_DefaultSpriteDPI: 96
11241144
m_DynamicPixelsPerUnit: 1
1145+
m_PresetInfoIsWorld: 0
11251146
--- !u!1 &1197189831
11261147
GameObject:
11271148
m_ObjectHideFlags: 0
@@ -1200,6 +1221,7 @@ MonoBehaviour:
12001221
m_EditorClassIdentifier:
12011222
m_Navigation:
12021223
m_Mode: 3
1224+
m_WrapAround: 0
12031225
m_SelectOnUp: {fileID: 0}
12041226
m_SelectOnDown: {fileID: 0}
12051227
m_SelectOnLeft: {fileID: 0}
@@ -1230,6 +1252,7 @@ MonoBehaviour:
12301252
m_PersistentCalls:
12311253
m_Calls:
12321254
- m_Target: {fileID: 1076083695}
1255+
m_TargetAssemblyTypeName:
12331256
m_MethodName: OnChangeCameraButtonClick
12341257
m_Mode: 1
12351258
m_Arguments:
@@ -1256,6 +1279,7 @@ MonoBehaviour:
12561279
m_Material: {fileID: 0}
12571280
m_Color: {r: 1, g: 1, b: 1, a: 1}
12581281
m_RaycastTarget: 1
1282+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
12591283
m_Maskable: 1
12601284
m_OnCullStateChanged:
12611285
m_PersistentCalls:
@@ -1334,6 +1358,7 @@ MonoBehaviour:
13341358
m_Material: {fileID: 0}
13351359
m_Color: {r: 0.196, g: 0.196, b: 0.196, a: 1}
13361360
m_RaycastTarget: 1
1361+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
13371362
m_Maskable: 1
13381363
m_OnCullStateChanged:
13391364
m_PersistentCalls:
@@ -1416,6 +1441,7 @@ MonoBehaviour:
14161441
m_Material: {fileID: 0}
14171442
m_Color: {r: 0.196, g: 0.196, b: 0.196, a: 1}
14181443
m_RaycastTarget: 1
1444+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
14191445
m_Maskable: 1
14201446
m_OnCullStateChanged:
14211447
m_PersistentCalls:
@@ -1521,6 +1547,7 @@ MonoBehaviour:
15211547
m_EditorClassIdentifier:
15221548
m_Navigation:
15231549
m_Mode: 3
1550+
m_WrapAround: 0
15241551
m_SelectOnUp: {fileID: 0}
15251552
m_SelectOnDown: {fileID: 0}
15261553
m_SelectOnLeft: {fileID: 0}
@@ -1551,6 +1578,7 @@ MonoBehaviour:
15511578
m_PersistentCalls:
15521579
m_Calls:
15531580
- m_Target: {fileID: 1076083695}
1581+
m_TargetAssemblyTypeName:
15541582
m_MethodName: OnStopButtonClick
15551583
m_Mode: 1
15561584
m_Arguments:
@@ -1577,6 +1605,7 @@ MonoBehaviour:
15771605
m_Material: {fileID: 0}
15781606
m_Color: {r: 1, g: 1, b: 1, a: 1}
15791607
m_RaycastTarget: 1
1608+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
15801609
m_Maskable: 1
15811610
m_OnCullStateChanged:
15821611
m_PersistentCalls:
@@ -1741,7 +1770,7 @@ Camera:
17411770
m_TargetTexture: {fileID: 0}
17421771
m_TargetDisplay: 0
17431772
m_TargetEye: 3
1744-
m_HDR: 0
1773+
m_HDR: 1
17451774
m_AllowMSAA: 1
17461775
m_AllowDynamicResolution: 0
17471776
m_ForceIntoRT: 0
@@ -1797,6 +1826,7 @@ MonoBehaviour:
17971826
m_Material: {fileID: 0}
17981827
m_Color: {r: 0.196, g: 0.196, b: 0.196, a: 1}
17991828
m_RaycastTarget: 1
1829+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
18001830
m_Maskable: 1
18011831
m_OnCullStateChanged:
18021832
m_PersistentCalls:

0 commit comments

Comments
 (0)