Skip to content

Commit f343af9

Browse files
mediumTajmediumTaj
authored
Merge pull request #470 from watson-developer-cloud/rc-2.11.0
Watson SDK for Unity v2.11.0
2 parents 5bee7c1 + 0d696f1 commit f343af9

21 files changed

+750
-769
lines changed

‎Doxyfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "IBM Watson SDK for Unity"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 2.10.0
41+
PROJECT_NUMBER = 2.11.0
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

‎Examples/ServiceExamples/ExampleStreaming.unity

+63-44
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 8
16+
serializedVersion: 9
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -38,7 +38,8 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.4465934, g: 0.49642956, b: 0.57482487, a: 1}
41+
m_IndirectSpecularColor: {r: 0.44657898, g: 0.496413, b: 0.5748175, a: 1}
42+
m_UseRadianceAmbientProbe: 0
4243
--- !u!157 &3
4344
LightmapSettings:
4445
m_ObjectHideFlags: 0
@@ -54,11 +55,10 @@ LightmapSettings:
5455
m_EnableBakedLightmaps: 1
5556
m_EnableRealtimeLightmaps: 1
5657
m_LightmapEditorSettings:
57-
serializedVersion: 9
58+
serializedVersion: 10
5859
m_Resolution: 2
5960
m_BakeResolution: 40
60-
m_TextureWidth: 1024
61-
m_TextureHeight: 1024
61+
m_AtlasSize: 1024
6262
m_AO: 0
6363
m_AOMaxDistance: 1
6464
m_CompAOExponent: 1
@@ -88,8 +88,9 @@ LightmapSettings:
8888
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
8989
m_PVRFilteringAtrousPositionSigmaIndirect: 2
9090
m_PVRFilteringAtrousPositionSigmaAO: 1
91+
m_ShowResolutionOverlay: 1
9192
m_LightingDataAsset: {fileID: 0}
92-
m_UseShadowmask: 1
93+
m_UseShadowmask: 0
9394
--- !u!196 &4
9495
NavMeshSettings:
9596
serializedVersion: 2
@@ -115,9 +116,9 @@ NavMeshSettings:
115116
--- !u!1 &249853924
116117
GameObject:
117118
m_ObjectHideFlags: 0
118-
m_PrefabParentObject: {fileID: 0}
119+
m_CorrespondingSourceObject: {fileID: 0}
119120
m_PrefabInternal: {fileID: 0}
120-
serializedVersion: 5
121+
serializedVersion: 6
121122
m_Component:
122123
- component: {fileID: 249853926}
123124
- component: {fileID: 249853925}
@@ -131,19 +132,24 @@ GameObject:
131132
--- !u!114 &249853925
132133
MonoBehaviour:
133134
m_ObjectHideFlags: 0
134-
m_PrefabParentObject: {fileID: 0}
135+
m_CorrespondingSourceObject: {fileID: 0}
135136
m_PrefabInternal: {fileID: 0}
136137
m_GameObject: {fileID: 249853924}
137138
m_Enabled: 1
138139
m_EditorHideFlags: 0
139140
m_Script: {fileID: 11500000, guid: 3f827eb7b6004438d9b3ae3bb063c1a2, type: 3}
140141
m_Name:
141142
m_EditorClassIdentifier:
143+
_serviceUrl:
142144
ResultsField: {fileID: 1863902092}
145+
_username:
146+
_password:
147+
_iamApikey:
148+
_iamUrl:
143149
--- !u!4 &249853926
144150
Transform:
145151
m_ObjectHideFlags: 0
146-
m_PrefabParentObject: {fileID: 0}
152+
m_CorrespondingSourceObject: {fileID: 0}
147153
m_PrefabInternal: {fileID: 0}
148154
m_GameObject: {fileID: 249853924}
149155
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
@@ -156,9 +162,9 @@ Transform:
156162
--- !u!1 &278297820
157163
GameObject:
158164
m_ObjectHideFlags: 0
159-
m_PrefabParentObject: {fileID: 0}
165+
m_CorrespondingSourceObject: {fileID: 0}
160166
m_PrefabInternal: {fileID: 0}
161-
serializedVersion: 5
167+
serializedVersion: 6
162168
m_Component:
163169
- component: {fileID: 278297824}
164170
- component: {fileID: 278297823}
@@ -174,7 +180,7 @@ GameObject:
174180
--- !u!114 &278297821
175181
MonoBehaviour:
176182
m_ObjectHideFlags: 0
177-
m_PrefabParentObject: {fileID: 0}
183+
m_CorrespondingSourceObject: {fileID: 0}
178184
m_PrefabInternal: {fileID: 0}
179185
m_GameObject: {fileID: 278297820}
180186
m_Enabled: 1
@@ -190,7 +196,7 @@ MonoBehaviour:
190196
--- !u!114 &278297822
191197
MonoBehaviour:
192198
m_ObjectHideFlags: 0
193-
m_PrefabParentObject: {fileID: 0}
199+
m_CorrespondingSourceObject: {fileID: 0}
194200
m_PrefabInternal: {fileID: 0}
195201
m_GameObject: {fileID: 278297820}
196202
m_Enabled: 1
@@ -211,7 +217,7 @@ MonoBehaviour:
211217
--- !u!223 &278297823
212218
Canvas:
213219
m_ObjectHideFlags: 0
214-
m_PrefabParentObject: {fileID: 0}
220+
m_CorrespondingSourceObject: {fileID: 0}
215221
m_PrefabInternal: {fileID: 0}
216222
m_GameObject: {fileID: 278297820}
217223
m_Enabled: 1
@@ -231,12 +237,12 @@ Canvas:
231237
--- !u!224 &278297824
232238
RectTransform:
233239
m_ObjectHideFlags: 0
234-
m_PrefabParentObject: {fileID: 0}
240+
m_CorrespondingSourceObject: {fileID: 0}
235241
m_PrefabInternal: {fileID: 0}
236242
m_GameObject: {fileID: 278297820}
237243
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
238-
m_LocalPosition: {x: 574, y: 278, z: 0}
239-
m_LocalScale: {x: 1, y: 1, z: 1}
244+
m_LocalPosition: {x: 0, y: 0, z: 0}
245+
m_LocalScale: {x: 0, y: 0, z: 0}
240246
m_Children:
241247
- {fileID: 1863902090}
242248
m_Father: {fileID: 0}
@@ -250,9 +256,9 @@ RectTransform:
250256
--- !u!1 &1159842907
251257
GameObject:
252258
m_ObjectHideFlags: 0
253-
m_PrefabParentObject: {fileID: 0}
259+
m_CorrespondingSourceObject: {fileID: 0}
254260
m_PrefabInternal: {fileID: 0}
255-
serializedVersion: 5
261+
serializedVersion: 6
256262
m_Component:
257263
- component: {fileID: 1159842909}
258264
- component: {fileID: 1159842908}
@@ -266,7 +272,7 @@ GameObject:
266272
--- !u!108 &1159842908
267273
Light:
268274
m_ObjectHideFlags: 0
269-
m_PrefabParentObject: {fileID: 0}
275+
m_CorrespondingSourceObject: {fileID: 0}
270276
m_PrefabInternal: {fileID: 0}
271277
m_GameObject: {fileID: 1159842907}
272278
m_Enabled: 1
@@ -293,6 +299,7 @@ Light:
293299
serializedVersion: 2
294300
m_Bits: 4294967295
295301
m_Lightmapping: 4
302+
m_LightShadowCasterMode: 0
296303
m_AreaSize: {x: 1, y: 1}
297304
m_BounceIntensity: 1
298305
m_ColorTemperature: 6570
@@ -302,7 +309,7 @@ Light:
302309
--- !u!4 &1159842909
303310
Transform:
304311
m_ObjectHideFlags: 0
305-
m_PrefabParentObject: {fileID: 0}
312+
m_CorrespondingSourceObject: {fileID: 0}
306313
m_PrefabInternal: {fileID: 0}
307314
m_GameObject: {fileID: 1159842907}
308315
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
@@ -315,9 +322,9 @@ Transform:
315322
--- !u!1 &1391086061
316323
GameObject:
317324
m_ObjectHideFlags: 0
318-
m_PrefabParentObject: {fileID: 0}
325+
m_CorrespondingSourceObject: {fileID: 0}
319326
m_PrefabInternal: {fileID: 0}
320-
serializedVersion: 5
327+
serializedVersion: 6
321328
m_Component:
322329
- component: {fileID: 1391086066}
323330
- component: {fileID: 1391086065}
@@ -334,34 +341,38 @@ GameObject:
334341
--- !u!81 &1391086062
335342
AudioListener:
336343
m_ObjectHideFlags: 0
337-
m_PrefabParentObject: {fileID: 0}
344+
m_CorrespondingSourceObject: {fileID: 0}
338345
m_PrefabInternal: {fileID: 0}
339346
m_GameObject: {fileID: 1391086061}
340347
m_Enabled: 1
341348
--- !u!124 &1391086063
342349
Behaviour:
343350
m_ObjectHideFlags: 0
344-
m_PrefabParentObject: {fileID: 0}
351+
m_CorrespondingSourceObject: {fileID: 0}
345352
m_PrefabInternal: {fileID: 0}
346353
m_GameObject: {fileID: 1391086061}
347354
m_Enabled: 1
348355
--- !u!92 &1391086064
349356
Behaviour:
350357
m_ObjectHideFlags: 0
351-
m_PrefabParentObject: {fileID: 0}
358+
m_CorrespondingSourceObject: {fileID: 0}
352359
m_PrefabInternal: {fileID: 0}
353360
m_GameObject: {fileID: 1391086061}
354361
m_Enabled: 1
355362
--- !u!20 &1391086065
356363
Camera:
357364
m_ObjectHideFlags: 0
358-
m_PrefabParentObject: {fileID: 0}
365+
m_CorrespondingSourceObject: {fileID: 0}
359366
m_PrefabInternal: {fileID: 0}
360367
m_GameObject: {fileID: 1391086061}
361368
m_Enabled: 1
362369
serializedVersion: 2
363370
m_ClearFlags: 2
364371
m_BackGroundColor: {r: 0.125, g: 0.125, b: 0.125, a: 0}
372+
m_projectionMatrixMode: 1
373+
m_SensorSize: {x: 36, y: 24}
374+
m_LensShift: {x: 0, y: 0}
375+
m_FocalLength: 50
365376
m_NormalizedViewPortRect:
366377
serializedVersion: 2
367378
x: 0
@@ -383,14 +394,15 @@ Camera:
383394
m_TargetEye: 3
384395
m_HDR: 0
385396
m_AllowMSAA: 1
397+
m_AllowDynamicResolution: 0
386398
m_ForceIntoRT: 0
387399
m_OcclusionCulling: 1
388400
m_StereoConvergence: 10
389401
m_StereoSeparation: 0.022
390402
--- !u!4 &1391086066
391403
Transform:
392404
m_ObjectHideFlags: 0
393-
m_PrefabParentObject: {fileID: 0}
405+
m_CorrespondingSourceObject: {fileID: 0}
394406
m_PrefabInternal: {fileID: 0}
395407
m_GameObject: {fileID: 1391086061}
396408
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -403,9 +415,9 @@ Transform:
403415
--- !u!1 &1428860024
404416
GameObject:
405417
m_ObjectHideFlags: 0
406-
m_PrefabParentObject: {fileID: 0}
418+
m_CorrespondingSourceObject: {fileID: 0}
407419
m_PrefabInternal: {fileID: 0}
408-
serializedVersion: 5
420+
serializedVersion: 6
409421
m_Component:
410422
- component: {fileID: 1428860027}
411423
- component: {fileID: 1428860026}
@@ -420,7 +432,7 @@ GameObject:
420432
--- !u!114 &1428860025
421433
MonoBehaviour:
422434
m_ObjectHideFlags: 0
423-
m_PrefabParentObject: {fileID: 0}
435+
m_CorrespondingSourceObject: {fileID: 0}
424436
m_PrefabInternal: {fileID: 0}
425437
m_GameObject: {fileID: 1428860024}
426438
m_Enabled: 1
@@ -438,7 +450,7 @@ MonoBehaviour:
438450
--- !u!114 &1428860026
439451
MonoBehaviour:
440452
m_ObjectHideFlags: 0
441-
m_PrefabParentObject: {fileID: 0}
453+
m_CorrespondingSourceObject: {fileID: 0}
442454
m_PrefabInternal: {fileID: 0}
443455
m_GameObject: {fileID: 1428860024}
444456
m_Enabled: 1
@@ -452,7 +464,7 @@ MonoBehaviour:
452464
--- !u!4 &1428860027
453465
Transform:
454466
m_ObjectHideFlags: 0
455-
m_PrefabParentObject: {fileID: 0}
467+
m_CorrespondingSourceObject: {fileID: 0}
456468
m_PrefabInternal: {fileID: 0}
457469
m_GameObject: {fileID: 1428860024}
458470
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -465,9 +477,9 @@ Transform:
465477
--- !u!1 &1646685149
466478
GameObject:
467479
m_ObjectHideFlags: 0
468-
m_PrefabParentObject: {fileID: 0}
480+
m_CorrespondingSourceObject: {fileID: 0}
469481
m_PrefabInternal: {fileID: 0}
470-
serializedVersion: 5
482+
serializedVersion: 6
471483
m_Component:
472484
- component: {fileID: 1646685151}
473485
- component: {fileID: 1646685150}
@@ -481,19 +493,25 @@ GameObject:
481493
--- !u!114 &1646685150
482494
MonoBehaviour:
483495
m_ObjectHideFlags: 0
484-
m_PrefabParentObject: {fileID: 0}
496+
m_CorrespondingSourceObject: {fileID: 0}
485497
m_PrefabInternal: {fileID: 0}
486498
m_GameObject: {fileID: 1646685149}
487499
m_Enabled: 1
488500
m_EditorHideFlags: 0
489501
m_Script: {fileID: 11500000, guid: 6c5299c1c838a8c44b49ecc9254704e0, type: 3}
490502
m_Name:
491503
m_EditorClassIdentifier:
504+
_serviceUrl:
492505
ResultsField: {fileID: 1863902092}
506+
_username:
507+
_password:
508+
_iamApikey:
509+
_iamUrl:
510+
_recognizeModel:
493511
--- !u!4 &1646685151
494512
Transform:
495513
m_ObjectHideFlags: 0
496-
m_PrefabParentObject: {fileID: 0}
514+
m_CorrespondingSourceObject: {fileID: 0}
497515
m_PrefabInternal: {fileID: 0}
498516
m_GameObject: {fileID: 1646685149}
499517
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -506,9 +524,9 @@ Transform:
506524
--- !u!1 &1863902089
507525
GameObject:
508526
m_ObjectHideFlags: 0
509-
m_PrefabParentObject: {fileID: 0}
527+
m_CorrespondingSourceObject: {fileID: 0}
510528
m_PrefabInternal: {fileID: 0}
511-
serializedVersion: 5
529+
serializedVersion: 6
512530
m_Component:
513531
- component: {fileID: 1863902090}
514532
- component: {fileID: 1863902093}
@@ -524,7 +542,7 @@ GameObject:
524542
--- !u!224 &1863902090
525543
RectTransform:
526544
m_ObjectHideFlags: 0
527-
m_PrefabParentObject: {fileID: 0}
545+
m_CorrespondingSourceObject: {fileID: 0}
528546
m_PrefabInternal: {fileID: 0}
529547
m_GameObject: {fileID: 1863902089}
530548
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -542,7 +560,7 @@ RectTransform:
542560
--- !u!114 &1863902091
543561
MonoBehaviour:
544562
m_ObjectHideFlags: 0
545-
m_PrefabParentObject: {fileID: 0}
563+
m_CorrespondingSourceObject: {fileID: 0}
546564
m_PrefabInternal: {fileID: 0}
547565
m_GameObject: {fileID: 1863902089}
548566
m_Enabled: 1
@@ -555,7 +573,7 @@ MonoBehaviour:
555573
--- !u!114 &1863902092
556574
MonoBehaviour:
557575
m_ObjectHideFlags: 0
558-
m_PrefabParentObject: {fileID: 0}
576+
m_CorrespondingSourceObject: {fileID: 0}
559577
m_PrefabInternal: {fileID: 0}
560578
m_GameObject: {fileID: 1863902089}
561579
m_Enabled: 1
@@ -588,6 +606,7 @@ MonoBehaviour:
588606
--- !u!222 &1863902093
589607
CanvasRenderer:
590608
m_ObjectHideFlags: 0
591-
m_PrefabParentObject: {fileID: 0}
609+
m_CorrespondingSourceObject: {fileID: 0}
592610
m_PrefabInternal: {fileID: 0}
593611
m_GameObject: {fileID: 1863902089}
612+
m_CullTransparentMesh: 0

0 commit comments

Comments
 (0)