Skip to content

Commit c0070b1

Browse files
eshvkawjuliani
authored andcommitted
[Basic] Added models, fixed Player scene and corebrain internal (#1156)
1 parent 91082d0 commit c0070b1

File tree

4 files changed

+68
-73
lines changed

4 files changed

+68
-73
lines changed

MLAgentsSDK/Assets/ML-Agents/Examples/Basic/Scenes/Basic.unity

Lines changed: 60 additions & 73 deletions
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: 9
16+
serializedVersion: 8
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -39,7 +39,6 @@ RenderSettings:
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
4141
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
42-
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
4544
m_ObjectHideFlags: 0
@@ -55,10 +54,11 @@ LightmapSettings:
5554
m_EnableBakedLightmaps: 1
5655
m_EnableRealtimeLightmaps: 1
5756
m_LightmapEditorSettings:
58-
serializedVersion: 10
57+
serializedVersion: 9
5958
m_Resolution: 2
6059
m_BakeResolution: 40
61-
m_AtlasSize: 1024
60+
m_TextureWidth: 1024
61+
m_TextureHeight: 1024
6262
m_AO: 0
6363
m_AOMaxDistance: 1
6464
m_CompAOExponent: 1
@@ -88,7 +88,6 @@ LightmapSettings:
8888
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
8989
m_PVRFilteringAtrousPositionSigmaIndirect: 2
9090
m_PVRFilteringAtrousPositionSigmaAO: 1
91-
m_ShowResolutionOverlay: 1
9291
m_LightingDataAsset: {fileID: 0}
9392
m_UseShadowmask: 1
9493
--- !u!196 &4
@@ -110,22 +109,7 @@ NavMeshSettings:
110109
manualTileSize: 0
111110
tileSize: 256
112111
accuratePlacement: 0
113-
debug:
114-
m_Flags: 0
115112
m_NavMeshData: {fileID: 0}
116-
--- !u!114 &157306268
117-
MonoBehaviour:
118-
m_ObjectHideFlags: 0
119-
m_PrefabParentObject: {fileID: 0}
120-
m_PrefabInternal: {fileID: 0}
121-
m_GameObject: {fileID: 0}
122-
m_Enabled: 1
123-
m_EditorHideFlags: 0
124-
m_Script: {fileID: 11500000, guid: 943466ab374444748a364f9d6c3e2fe2, type: 3}
125-
m_Name: (Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
126-
m_EditorClassIdentifier:
127-
broadcast: 1
128-
brain: {fileID: 0}
129113
--- !u!1 &282272644
130114
GameObject:
131115
m_ObjectHideFlags: 0
@@ -154,11 +138,9 @@ MeshRenderer:
154138
m_Enabled: 1
155139
m_CastShadows: 1
156140
m_ReceiveShadows: 1
157-
m_DynamicOccludee: 1
158141
m_MotionVectors: 1
159142
m_LightProbeUsage: 1
160143
m_ReflectionProbeUsage: 1
161-
m_RenderingLayerMask: 4294967295
162144
m_Materials:
163145
- {fileID: 2100000, guid: 260483cdfc6b14e26823a02f23bd8baa, type: 2}
164146
m_StaticBatchInfo:
@@ -171,7 +153,6 @@ MeshRenderer:
171153
m_PreserveUVs: 1
172154
m_IgnoreNormalsForChartDetection: 0
173155
m_ImportantGI: 0
174-
m_StitchLightmapSeams: 0
175156
m_SelectedEditorRenderState: 3
176157
m_MinimumChartSize: 4
177158
m_AutoUVMaxDistance: 0.5
@@ -233,7 +214,7 @@ MonoBehaviour:
233214
timeBetweenDecisionsAtInference: 0.15
234215
largeGoal: {fileID: 984725368}
235216
smallGoal: {fileID: 1178588871}
236-
--- !u!114 &654256430
217+
--- !u!114 &392789020
237218
MonoBehaviour:
238219
m_ObjectHideFlags: 0
239220
m_PrefabParentObject: {fileID: 0}
@@ -242,7 +223,7 @@ MonoBehaviour:
242223
m_Enabled: 1
243224
m_EditorHideFlags: 0
244225
m_Script: {fileID: 11500000, guid: 8b23992c8eb17439887f5e944bf04a40, type: 3}
245-
m_Name: (Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
226+
m_Name: (Clone)
246227
m_EditorClassIdentifier:
247228
broadcast: 1
248229
graphModel: {fileID: 4900000, guid: 8786b6500d406497c959f24c2a8b59ac, type: 3}
@@ -256,18 +237,6 @@ MonoBehaviour:
256237
ActionPlaceholderName: action
257238
PreviousActionPlaceholderName: prev_action
258239
brain: {fileID: 846768605}
259-
--- !u!114 &693677374
260-
MonoBehaviour:
261-
m_ObjectHideFlags: 0
262-
m_PrefabParentObject: {fileID: 0}
263-
m_PrefabInternal: {fileID: 0}
264-
m_GameObject: {fileID: 0}
265-
m_Enabled: 1
266-
m_EditorHideFlags: 0
267-
m_Script: {fileID: 11500000, guid: 35813a1be64e144f887d7d5f15b963fa, type: 3}
268-
m_Name: (Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
269-
m_EditorClassIdentifier:
270-
brain: {fileID: 846768605}
271240
--- !u!1 &762086410
272241
GameObject:
273242
m_ObjectHideFlags: 0
@@ -377,18 +346,17 @@ MonoBehaviour:
377346
vectorObservationSize: 20
378347
numStackedVectorObservations: 1
379348
vectorActionSize: 03000000
380-
test: 010000000200000003000000
381349
cameraResolutions: []
382350
vectorActionDescriptions:
383351
-
384352
vectorActionSpaceType: 0
385-
brainType: 0
353+
brainType: 3
386354
CoreBrains:
387-
- {fileID: 1412023800}
388-
- {fileID: 157306268}
389-
- {fileID: 693677374}
390-
- {fileID: 654256430}
391-
instanceID: 100772
355+
- {fileID: 2134903643}
356+
- {fileID: 1102452117}
357+
- {fileID: 2059692008}
358+
- {fileID: 392789020}
359+
instanceID: 12490
392360
--- !u!1 &984725368
393361
GameObject:
394362
m_ObjectHideFlags: 0
@@ -416,11 +384,9 @@ MeshRenderer:
416384
m_Enabled: 1
417385
m_CastShadows: 1
418386
m_ReceiveShadows: 1
419-
m_DynamicOccludee: 1
420387
m_MotionVectors: 1
421388
m_LightProbeUsage: 1
422389
m_ReflectionProbeUsage: 1
423-
m_RenderingLayerMask: 4294967295
424390
m_Materials:
425391
- {fileID: 2100000, guid: 624b24bbec31f44babfb57ef2dfbc537, type: 2}
426392
m_StaticBatchInfo:
@@ -433,7 +399,6 @@ MeshRenderer:
433399
m_PreserveUVs: 1
434400
m_IgnoreNormalsForChartDetection: 0
435401
m_ImportantGI: 0
436-
m_StitchLightmapSeams: 0
437402
m_SelectedEditorRenderState: 3
438403
m_MinimumChartSize: 4
439404
m_AutoUVMaxDistance: 0.5
@@ -474,6 +439,19 @@ Transform:
474439
m_Father: {fileID: 0}
475440
m_RootOrder: 4
476441
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
442+
--- !u!114 &1102452117
443+
MonoBehaviour:
444+
m_ObjectHideFlags: 0
445+
m_PrefabParentObject: {fileID: 0}
446+
m_PrefabInternal: {fileID: 0}
447+
m_GameObject: {fileID: 0}
448+
m_Enabled: 1
449+
m_EditorHideFlags: 0
450+
m_Script: {fileID: 11500000, guid: 943466ab374444748a364f9d6c3e2fe2, type: 3}
451+
m_Name: (Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
452+
m_EditorClassIdentifier:
453+
broadcast: 1
454+
brain: {fileID: 846768605}
477455
--- !u!1 &1178588871
478456
GameObject:
479457
m_ObjectHideFlags: 0
@@ -501,11 +479,9 @@ MeshRenderer:
501479
m_Enabled: 1
502480
m_CastShadows: 1
503481
m_ReceiveShadows: 1
504-
m_DynamicOccludee: 1
505482
m_MotionVectors: 1
506483
m_LightProbeUsage: 1
507484
m_ReflectionProbeUsage: 1
508-
m_RenderingLayerMask: 4294967295
509485
m_Materials:
510486
- {fileID: 2100000, guid: 624b24bbec31f44babfb57ef2dfbc537, type: 2}
511487
m_StaticBatchInfo:
@@ -518,7 +494,6 @@ MeshRenderer:
518494
m_PreserveUVs: 1
519495
m_IgnoreNormalsForChartDetection: 0
520496
m_ImportantGI: 0
521-
m_StitchLightmapSeams: 0
522497
m_SelectedEditorRenderState: 3
523498
m_MinimumChartSize: 4
524499
m_AutoUVMaxDistance: 0.5
@@ -559,28 +534,6 @@ Transform:
559534
m_Father: {fileID: 0}
560535
m_RootOrder: 5
561536
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
562-
--- !u!114 &1412023800
563-
MonoBehaviour:
564-
m_ObjectHideFlags: 0
565-
m_PrefabParentObject: {fileID: 0}
566-
m_PrefabInternal: {fileID: 0}
567-
m_GameObject: {fileID: 0}
568-
m_Enabled: 1
569-
m_EditorHideFlags: 0
570-
m_Script: {fileID: 11500000, guid: 41e9bda8f3cf1492fa74926a530f6f70, type: 3}
571-
m_Name: (Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
572-
m_EditorClassIdentifier:
573-
broadcast: 1
574-
keyContinuousPlayerActions: []
575-
axisContinuousPlayerActions: []
576-
discretePlayerActions:
577-
- key: 97
578-
branchIndex: 0
579-
value: 0
580-
- key: 100
581-
branchIndex: 0
582-
value: 1
583-
brain: {fileID: 846768605}
584537
--- !u!1 &1574236047
585538
GameObject:
586539
m_ObjectHideFlags: 0
@@ -708,11 +661,11 @@ Camera:
708661
m_TargetEye: 3
709662
m_HDR: 1
710663
m_AllowMSAA: 1
711-
m_AllowDynamicResolution: 0
712664
m_ForceIntoRT: 0
713665
m_OcclusionCulling: 1
714666
m_StereoConvergence: 10
715667
m_StereoSeparation: 0.022
668+
m_StereoMirrorMode: 0
716669
--- !u!4 &1715640925
717670
Transform:
718671
m_ObjectHideFlags: 0
@@ -726,3 +679,37 @@ Transform:
726679
m_Father: {fileID: 0}
727680
m_RootOrder: 0
728681
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
682+
--- !u!114 &2059692008
683+
MonoBehaviour:
684+
m_ObjectHideFlags: 0
685+
m_PrefabParentObject: {fileID: 0}
686+
m_PrefabInternal: {fileID: 0}
687+
m_GameObject: {fileID: 0}
688+
m_Enabled: 1
689+
m_EditorHideFlags: 0
690+
m_Script: {fileID: 11500000, guid: 35813a1be64e144f887d7d5f15b963fa, type: 3}
691+
m_Name: (Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
692+
m_EditorClassIdentifier:
693+
brain: {fileID: 846768605}
694+
--- !u!114 &2134903643
695+
MonoBehaviour:
696+
m_ObjectHideFlags: 0
697+
m_PrefabParentObject: {fileID: 0}
698+
m_PrefabInternal: {fileID: 0}
699+
m_GameObject: {fileID: 0}
700+
m_Enabled: 1
701+
m_EditorHideFlags: 0
702+
m_Script: {fileID: 11500000, guid: 41e9bda8f3cf1492fa74926a530f6f70, type: 3}
703+
m_Name: (Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)
704+
m_EditorClassIdentifier:
705+
broadcast: 1
706+
keyContinuousPlayerActions: []
707+
axisContinuousPlayerActions: []
708+
discretePlayerActions:
709+
- key: 97
710+
branchIndex: 0
711+
value: 1
712+
- key: 100
713+
branchIndex: 0
714+
value: 2
715+
brain: {fileID: 846768605}
5.57 KB
Binary file not shown.

MLAgentsSDK/Assets/ML-Agents/Examples/Basic/basic.bytes.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

MLAgentsSDK/Assets/ML-Agents/Scripts/CoreBrainInternal.cs.meta

100755100644
File mode changed.

0 commit comments

Comments
 (0)