Skip to content

Commit 2e1d204

Browse files
author
Cippo
committed
Merge branch 'minor_changes'
2 parents 36dc112 + 301fd98 commit 2e1d204

File tree

7 files changed

+64
-38
lines changed

7 files changed

+64
-38
lines changed

‎InterfaceReference/Examples/Examples.unity‎

Lines changed: 56 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ LightmapSettings:
5050
m_BounceScale: 1
5151
m_IndirectOutputScale: 1
5252
m_AlbedoBoost: 1
53-
m_TemporalCoherenceThreshold: 1
5453
m_EnvironmentLightingMode: 0
5554
m_EnableBakedLightmaps: 0
5655
m_EnableRealtimeLightmaps: 0
@@ -117,7 +116,8 @@ NavMeshSettings:
117116
GameObject:
118117
m_ObjectHideFlags: 0
119118
m_CorrespondingSourceObject: {fileID: 0}
120-
m_PrefabInternal: {fileID: 0}
119+
m_PrefabInstance: {fileID: 0}
120+
m_PrefabAsset: {fileID: 0}
121121
serializedVersion: 6
122122
m_Component:
123123
- component: {fileID: 122467413}
@@ -132,7 +132,8 @@ GameObject:
132132
Transform:
133133
m_ObjectHideFlags: 0
134134
m_CorrespondingSourceObject: {fileID: 0}
135-
m_PrefabInternal: {fileID: 0}
135+
m_PrefabInstance: {fileID: 0}
136+
m_PrefabAsset: {fileID: 0}
136137
m_GameObject: {fileID: 122467412}
137138
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
138139
m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -145,7 +146,8 @@ Transform:
145146
GameObject:
146147
m_ObjectHideFlags: 0
147148
m_CorrespondingSourceObject: {fileID: 0}
148-
m_PrefabInternal: {fileID: 0}
149+
m_PrefabInstance: {fileID: 0}
150+
m_PrefabAsset: {fileID: 0}
149151
serializedVersion: 6
150152
m_Component:
151153
- component: {fileID: 257792219}
@@ -162,14 +164,16 @@ GameObject:
162164
AudioListener:
163165
m_ObjectHideFlags: 0
164166
m_CorrespondingSourceObject: {fileID: 0}
165-
m_PrefabInternal: {fileID: 0}
167+
m_PrefabInstance: {fileID: 0}
168+
m_PrefabAsset: {fileID: 0}
166169
m_GameObject: {fileID: 257792216}
167170
m_Enabled: 1
168171
--- !u!20 &257792218
169172
Camera:
170173
m_ObjectHideFlags: 0
171174
m_CorrespondingSourceObject: {fileID: 0}
172-
m_PrefabInternal: {fileID: 0}
175+
m_PrefabInstance: {fileID: 0}
176+
m_PrefabAsset: {fileID: 0}
173177
m_GameObject: {fileID: 257792216}
174178
m_Enabled: 1
175179
serializedVersion: 2
@@ -178,6 +182,7 @@ Camera:
178182
m_projectionMatrixMode: 1
179183
m_SensorSize: {x: 36, y: 24}
180184
m_LensShift: {x: 0, y: 0}
185+
m_GateFitMode: 2
181186
m_FocalLength: 50
182187
m_NormalizedViewPortRect:
183188
serializedVersion: 2
@@ -209,7 +214,8 @@ Camera:
209214
Transform:
210215
m_ObjectHideFlags: 0
211216
m_CorrespondingSourceObject: {fileID: 0}
212-
m_PrefabInternal: {fileID: 0}
217+
m_PrefabInstance: {fileID: 0}
218+
m_PrefabAsset: {fileID: 0}
213219
m_GameObject: {fileID: 257792216}
214220
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
215221
m_LocalPosition: {x: 0, y: 0, z: -10}
@@ -222,7 +228,8 @@ Transform:
222228
GameObject:
223229
m_ObjectHideFlags: 0
224230
m_CorrespondingSourceObject: {fileID: 0}
225-
m_PrefabInternal: {fileID: 0}
231+
m_PrefabInstance: {fileID: 0}
232+
m_PrefabAsset: {fileID: 0}
226233
serializedVersion: 6
227234
m_Component:
228235
- component: {fileID: 358149322}
@@ -237,7 +244,8 @@ GameObject:
237244
Transform:
238245
m_ObjectHideFlags: 0
239246
m_CorrespondingSourceObject: {fileID: 0}
240-
m_PrefabInternal: {fileID: 0}
247+
m_PrefabInstance: {fileID: 0}
248+
m_PrefabAsset: {fileID: 0}
241249
m_GameObject: {fileID: 358149321}
242250
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
243251
m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -250,7 +258,8 @@ Transform:
250258
GameObject:
251259
m_ObjectHideFlags: 0
252260
m_CorrespondingSourceObject: {fileID: 0}
253-
m_PrefabInternal: {fileID: 0}
261+
m_PrefabInstance: {fileID: 0}
262+
m_PrefabAsset: {fileID: 0}
254263
serializedVersion: 6
255264
m_Component:
256265
- component: {fileID: 506120583}
@@ -265,7 +274,8 @@ GameObject:
265274
Transform:
266275
m_ObjectHideFlags: 0
267276
m_CorrespondingSourceObject: {fileID: 0}
268-
m_PrefabInternal: {fileID: 0}
277+
m_PrefabInstance: {fileID: 0}
278+
m_PrefabAsset: {fileID: 0}
269279
m_GameObject: {fileID: 506120582}
270280
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
271281
m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -278,7 +288,8 @@ Transform:
278288
GameObject:
279289
m_ObjectHideFlags: 0
280290
m_CorrespondingSourceObject: {fileID: 0}
281-
m_PrefabInternal: {fileID: 0}
291+
m_PrefabInstance: {fileID: 0}
292+
m_PrefabAsset: {fileID: 0}
282293
serializedVersion: 6
283294
m_Component:
284295
- component: {fileID: 793930335}
@@ -294,7 +305,8 @@ GameObject:
294305
MonoBehaviour:
295306
m_ObjectHideFlags: 0
296307
m_CorrespondingSourceObject: {fileID: 0}
297-
m_PrefabInternal: {fileID: 0}
308+
m_PrefabInstance: {fileID: 0}
309+
m_PrefabAsset: {fileID: 0}
298310
m_GameObject: {fileID: 793930333}
299311
m_Enabled: 1
300312
m_EditorHideFlags: 0
@@ -306,7 +318,8 @@ MonoBehaviour:
306318
Transform:
307319
m_ObjectHideFlags: 0
308320
m_CorrespondingSourceObject: {fileID: 0}
309-
m_PrefabInternal: {fileID: 0}
321+
m_PrefabInstance: {fileID: 0}
322+
m_PrefabAsset: {fileID: 0}
310323
m_GameObject: {fileID: 793930333}
311324
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
312325
m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -319,13 +332,14 @@ Transform:
319332
GameObject:
320333
m_ObjectHideFlags: 0
321334
m_CorrespondingSourceObject: {fileID: 0}
322-
m_PrefabInternal: {fileID: 0}
335+
m_PrefabInstance: {fileID: 0}
336+
m_PrefabAsset: {fileID: 0}
323337
serializedVersion: 6
324338
m_Component:
325339
- component: {fileID: 908261138}
326340
- component: {fileID: 908261139}
327341
m_Layer: 0
328-
m_Name: Component has Interface Reference
342+
m_Name: Component that has Interface Reference
329343
m_TagString: Untagged
330344
m_Icon: {fileID: 0}
331345
m_NavMeshLayer: 0
@@ -335,7 +349,8 @@ GameObject:
335349
Transform:
336350
m_ObjectHideFlags: 0
337351
m_CorrespondingSourceObject: {fileID: 0}
338-
m_PrefabInternal: {fileID: 0}
352+
m_PrefabInstance: {fileID: 0}
353+
m_PrefabAsset: {fileID: 0}
339354
m_GameObject: {fileID: 908261137}
340355
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
341356
m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -348,7 +363,8 @@ Transform:
348363
MonoBehaviour:
349364
m_ObjectHideFlags: 0
350365
m_CorrespondingSourceObject: {fileID: 0}
351-
m_PrefabInternal: {fileID: 0}
366+
m_PrefabInstance: {fileID: 0}
367+
m_PrefabAsset: {fileID: 0}
352368
m_GameObject: {fileID: 908261137}
353369
m_Enabled: 1
354370
m_EditorHideFlags: 0
@@ -362,7 +378,8 @@ MonoBehaviour:
362378
GameObject:
363379
m_ObjectHideFlags: 19
364380
m_CorrespondingSourceObject: {fileID: 0}
365-
m_PrefabInternal: {fileID: 0}
381+
m_PrefabInstance: {fileID: 0}
382+
m_PrefabAsset: {fileID: 0}
366383
serializedVersion: 6
367384
m_Component:
368385
- component: {fileID: 1007650331}
@@ -378,7 +395,8 @@ GameObject:
378395
MonoBehaviour:
379396
m_ObjectHideFlags: 19
380397
m_CorrespondingSourceObject: {fileID: 0}
381-
m_PrefabInternal: {fileID: 0}
398+
m_PrefabInstance: {fileID: 0}
399+
m_PrefabAsset: {fileID: 0}
382400
m_GameObject: {fileID: 1007650329}
383401
m_Enabled: 1
384402
m_EditorHideFlags: 0
@@ -519,7 +537,8 @@ MonoBehaviour:
519537
Transform:
520538
m_ObjectHideFlags: 19
521539
m_CorrespondingSourceObject: {fileID: 0}
522-
m_PrefabInternal: {fileID: 0}
540+
m_PrefabInstance: {fileID: 0}
541+
m_PrefabAsset: {fileID: 0}
523542
m_GameObject: {fileID: 1007650329}
524543
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
525544
m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -532,7 +551,8 @@ Transform:
532551
GameObject:
533552
m_ObjectHideFlags: 0
534553
m_CorrespondingSourceObject: {fileID: 0}
535-
m_PrefabInternal: {fileID: 0}
554+
m_PrefabInstance: {fileID: 0}
555+
m_PrefabAsset: {fileID: 0}
536556
serializedVersion: 6
537557
m_Component:
538558
- component: {fileID: 1308923935}
@@ -548,7 +568,8 @@ GameObject:
548568
Transform:
549569
m_ObjectHideFlags: 0
550570
m_CorrespondingSourceObject: {fileID: 0}
551-
m_PrefabInternal: {fileID: 0}
571+
m_PrefabInstance: {fileID: 0}
572+
m_PrefabAsset: {fileID: 0}
552573
m_GameObject: {fileID: 1308923934}
553574
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
554575
m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -561,7 +582,8 @@ Transform:
561582
MonoBehaviour:
562583
m_ObjectHideFlags: 0
563584
m_CorrespondingSourceObject: {fileID: 0}
564-
m_PrefabInternal: {fileID: 0}
585+
m_PrefabInstance: {fileID: 0}
586+
m_PrefabAsset: {fileID: 0}
565587
m_GameObject: {fileID: 1308923934}
566588
m_Enabled: 1
567589
m_EditorHideFlags: 0
@@ -572,7 +594,8 @@ MonoBehaviour:
572594
GameObject:
573595
m_ObjectHideFlags: 0
574596
m_CorrespondingSourceObject: {fileID: 0}
575-
m_PrefabInternal: {fileID: 0}
597+
m_PrefabInstance: {fileID: 0}
598+
m_PrefabAsset: {fileID: 0}
576599
serializedVersion: 6
577600
m_Component:
578601
- component: {fileID: 1824733538}
@@ -587,7 +610,8 @@ GameObject:
587610
Transform:
588611
m_ObjectHideFlags: 0
589612
m_CorrespondingSourceObject: {fileID: 0}
590-
m_PrefabInternal: {fileID: 0}
613+
m_PrefabInstance: {fileID: 0}
614+
m_PrefabAsset: {fileID: 0}
591615
m_GameObject: {fileID: 1824733537}
592616
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
593617
m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -600,7 +624,8 @@ Transform:
600624
GameObject:
601625
m_ObjectHideFlags: 0
602626
m_CorrespondingSourceObject: {fileID: 0}
603-
m_PrefabInternal: {fileID: 0}
627+
m_PrefabInstance: {fileID: 0}
628+
m_PrefabAsset: {fileID: 0}
604629
serializedVersion: 6
605630
m_Component:
606631
- component: {fileID: 1968288555}
@@ -616,7 +641,8 @@ GameObject:
616641
MonoBehaviour:
617642
m_ObjectHideFlags: 0
618643
m_CorrespondingSourceObject: {fileID: 0}
619-
m_PrefabInternal: {fileID: 0}
644+
m_PrefabInstance: {fileID: 0}
645+
m_PrefabAsset: {fileID: 0}
620646
m_GameObject: {fileID: 1968288553}
621647
m_Enabled: 1
622648
m_EditorHideFlags: 0
@@ -630,7 +656,8 @@ MonoBehaviour:
630656
Transform:
631657
m_ObjectHideFlags: 0
632658
m_CorrespondingSourceObject: {fileID: 0}
633-
m_PrefabInternal: {fileID: 0}
659+
m_PrefabInstance: {fileID: 0}
660+
m_PrefabAsset: {fileID: 0}
634661
m_GameObject: {fileID: 1968288553}
635662
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
636663
m_LocalPosition: {x: 0, y: 0, z: 0}

‎InterfaceReference/Scripts/Attributes/Expose.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
* Author: Alessandro Salani (Cippman)
33
*/
44

5-
using CippSharp.Interfaces;
65
using UnityEngine;
76

87
#if UNITY_EDITOR
8+
using CippSharp.Interfaces;
99
using UnityEditor;
1010
#endif
1111

@@ -17,7 +17,6 @@ public class ExposeAttribute : PropertyAttribute
1717
}
1818
}
1919

20-
2120
#if UNITY_EDITOR
2221
namespace CippSharpEditor.Interfaces
2322
{
@@ -68,4 +67,3 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
6867
}
6968
}
7069
#endif
71-

‎InterfaceReference/Scripts/Attributes/NotEditable.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
* Author: Alessandro Salani (Cippman)
33
*/
44

5-
6-
using CippSharp.Interfaces;
75
using UnityEngine;
86

97
#if UNITY_EDITOR
8+
using CippSharp.Interfaces;
109
using UnityEditor;
1110
#endif
1211

‎InterfaceReference/Scripts/Attributes/TypeFilter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
using System;
66
using System.Linq;
7-
using CippSharp.Interfaces;
87
using UnityEngine;
98
using Object = UnityEngine.Object;
109

1110
#if UNITY_EDITOR
11+
using CippSharp.Interfaces;
1212
using UnityEditor;
1313
#endif
1414

‎InterfaceReference/Scripts/EditorGUIUtils.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public static void DrawNotEditableProperty(Rect rect, SerializedProperty propert
3838
{
3939
EditorGUI.PropertyField(rect, property, label, property.hasChildren);
4040
}
41-
4241
GUI.enabled = guiEnabled;
4342
}
4443
}

‎InterfaceReference/Scripts/Examples/ComponentImplementingCustomInterface.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-

1+
/*
2+
* Author: Alessandro Salani (Cippman)
3+
*/
4+
25
using UnityEngine;
36

47
namespace CippSharp.Interfaces.Examples

‎InterfaceReference/Scripts/InterfaceReference.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private void SetTarget(Object value)
5353
}
5454
else
5555
{
56-
target = null;
56+
target = null;
5757
Debug.LogWarning(string.Format("You should set an Object that implements <i>{0}</i>.", typeof(I).FullName));
5858
}
5959
}

0 commit comments

Comments
 (0)