diff --git a/MLAgentsSDK/Assets/ML-Agents/Examples/Basic/Scenes/Basic.unity b/MLAgentsSDK/Assets/ML-Agents/Examples/Basic/Scenes/Basic.unity index 5667821e0a..f77aab5da1 100644 --- a/MLAgentsSDK/Assets/ML-Agents/Examples/Basic/Scenes/Basic.unity +++ b/MLAgentsSDK/Assets/ML-Agents/Examples/Basic/Scenes/Basic.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 8 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,7 +39,6 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -55,10 +54,11 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 9 m_Resolution: 2 m_BakeResolution: 40 - m_AtlasSize: 1024 + m_TextureWidth: 1024 + m_TextureHeight: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -88,7 +88,6 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -110,22 +109,7 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - debug: - m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &157306268 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 943466ab374444748a364f9d6c3e2fe2, type: 3} - m_Name: (Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone) - m_EditorClassIdentifier: - broadcast: 1 - brain: {fileID: 0} --- !u!1 &282272644 GameObject: m_ObjectHideFlags: 0 @@ -154,11 +138,9 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 - m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 260483cdfc6b14e26823a02f23bd8baa, type: 2} m_StaticBatchInfo: @@ -171,7 +153,6 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -233,7 +214,7 @@ MonoBehaviour: timeBetweenDecisionsAtInference: 0.15 largeGoal: {fileID: 984725368} smallGoal: {fileID: 1178588871} ---- !u!114 &654256430 +--- !u!114 &392789020 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -242,7 +223,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8b23992c8eb17439887f5e944bf04a40, type: 3} - m_Name: (Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone) + m_Name: (Clone) m_EditorClassIdentifier: broadcast: 1 graphModel: {fileID: 4900000, guid: 8786b6500d406497c959f24c2a8b59ac, type: 3} @@ -256,18 +237,6 @@ MonoBehaviour: ActionPlaceholderName: action PreviousActionPlaceholderName: prev_action brain: {fileID: 846768605} ---- !u!114 &693677374 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 35813a1be64e144f887d7d5f15b963fa, type: 3} - m_Name: (Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone) - m_EditorClassIdentifier: - brain: {fileID: 846768605} --- !u!1 &762086410 GameObject: m_ObjectHideFlags: 0 @@ -377,18 +346,17 @@ MonoBehaviour: vectorObservationSize: 20 numStackedVectorObservations: 1 vectorActionSize: 03000000 - test: 010000000200000003000000 cameraResolutions: [] vectorActionDescriptions: - vectorActionSpaceType: 0 - brainType: 0 + brainType: 3 CoreBrains: - - {fileID: 1412023800} - - {fileID: 157306268} - - {fileID: 693677374} - - {fileID: 654256430} - instanceID: 100772 + - {fileID: 2134903643} + - {fileID: 1102452117} + - {fileID: 2059692008} + - {fileID: 392789020} + instanceID: 12490 --- !u!1 &984725368 GameObject: m_ObjectHideFlags: 0 @@ -416,11 +384,9 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 - m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 624b24bbec31f44babfb57ef2dfbc537, type: 2} m_StaticBatchInfo: @@ -433,7 +399,6 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -474,6 +439,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1102452117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 943466ab374444748a364f9d6c3e2fe2, type: 3} + m_Name: (Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone) + m_EditorClassIdentifier: + broadcast: 1 + brain: {fileID: 846768605} --- !u!1 &1178588871 GameObject: m_ObjectHideFlags: 0 @@ -501,11 +479,9 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 - m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: 624b24bbec31f44babfb57ef2dfbc537, type: 2} m_StaticBatchInfo: @@ -518,7 +494,6 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -559,28 +534,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1412023800 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41e9bda8f3cf1492fa74926a530f6f70, type: 3} - m_Name: (Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone) - m_EditorClassIdentifier: - broadcast: 1 - keyContinuousPlayerActions: [] - axisContinuousPlayerActions: [] - discretePlayerActions: - - key: 97 - branchIndex: 0 - value: 0 - - key: 100 - branchIndex: 0 - value: 1 - brain: {fileID: 846768605} --- !u!1 &1574236047 GameObject: m_ObjectHideFlags: 0 @@ -708,11 +661,11 @@ Camera: m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 --- !u!4 &1715640925 Transform: m_ObjectHideFlags: 0 @@ -726,3 +679,37 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2059692008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35813a1be64e144f887d7d5f15b963fa, type: 3} + m_Name: (Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone) + m_EditorClassIdentifier: + brain: {fileID: 846768605} +--- !u!114 &2134903643 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41e9bda8f3cf1492fa74926a530f6f70, type: 3} + m_Name: (Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone)(Clone) + m_EditorClassIdentifier: + broadcast: 1 + keyContinuousPlayerActions: [] + axisContinuousPlayerActions: [] + discretePlayerActions: + - key: 97 + branchIndex: 0 + value: 1 + - key: 100 + branchIndex: 0 + value: 2 + brain: {fileID: 846768605} diff --git a/MLAgentsSDK/Assets/ML-Agents/Examples/Basic/basic.bytes b/MLAgentsSDK/Assets/ML-Agents/Examples/Basic/basic.bytes new file mode 100644 index 0000000000..432177b7b6 Binary files /dev/null and b/MLAgentsSDK/Assets/ML-Agents/Examples/Basic/basic.bytes differ diff --git a/MLAgentsSDK/Assets/ML-Agents/Examples/Basic/basic.bytes.meta b/MLAgentsSDK/Assets/ML-Agents/Examples/Basic/basic.bytes.meta new file mode 100644 index 0000000000..c88008ffb1 --- /dev/null +++ b/MLAgentsSDK/Assets/ML-Agents/Examples/Basic/basic.bytes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2cefb2f06cd764b119e9fc22a1273e2f +timeCreated: 1535588497 +licenseType: Pro +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MLAgentsSDK/Assets/ML-Agents/Scripts/CoreBrainInternal.cs.meta b/MLAgentsSDK/Assets/ML-Agents/Scripts/CoreBrainInternal.cs.meta old mode 100755 new mode 100644