From 1d9c9b252b5946ef5cf88af5e439c5558ec58963 Mon Sep 17 00:00:00 2001 From: eshvk <807898+eshvk@users.noreply.github.com> Date: Wed, 29 Aug 2018 17:24:39 -0700 Subject: [PATCH] [Basic] Added models, fixed Player scene and corebrain internal --- .../Examples/Basic/Scenes/Basic.unity | 133 ++++++++---------- .../ML-Agents/Examples/Basic/basic.bytes | Bin 0 -> 5703 bytes .../ML-Agents/Examples/Basic/basic.bytes.meta | 8 ++ .../Scripts/CoreBrainInternal.cs.meta | 0 4 files changed, 68 insertions(+), 73 deletions(-) create mode 100644 MLAgentsSDK/Assets/ML-Agents/Examples/Basic/basic.bytes create mode 100644 MLAgentsSDK/Assets/ML-Agents/Examples/Basic/basic.bytes.meta mode change 100755 => 100644 MLAgentsSDK/Assets/ML-Agents/Scripts/CoreBrainInternal.cs.meta 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 0000000000000000000000000000000000000000..432177b7b6d03b283d4f7e6e59754db9f99f7f44 GIT binary patch literal 5703 zcmcgwd0bRw_vbRK5Bo(>M-&BniP1ul)R23w;gSm&3T34<49pD%Wr)iz9PJ(MMY}jPm_HP4 z>(oW&LhO}>8RD$%0E#SiBYql%N-Iy!P^72G2ZW@kluAx34$`;`EvKgKN9eSAgY1$k zvCmSdGda4#HS(mZ6Gc0jz)atOQrESc6F~Qc8$PRl71mUJxo=sSE0bDagzL#GFnaM8 zym@3DFUu8}!E>JSZ-vgsf{?=fhEacnr+ntZoQ&1usPjuOY^gndc>G&fnz#{G+*!qc zAPmQt#UuA`bMoh9BPL_PmJK*=V1L+s@er<`&4SNP8+=?-jt39-!yejntSTG=h0+cC z7f${G-hbB_*WQhX$wy{m{-!QW$e20slW{N{eDgP)_1anHv-4G8c+i{AD$4*S{|ukD zYO%58vIj!_D7^9UU7VG=40ip*L(q4>M{KW;#lEjD#jTfk^wY0}>g+%`TzDD`-xuSI zRd3)D&+GhK!ETWEV;xBQPQwW2yLeK5kKdK(3_iPSn7GXk`6HEcjPEU)hnX{nqg(A0 zd})Cv=I^Q5&(HSa`^U|Np3n9$e!B1R=8{|dE_E<$ld2(l{=ebq!>{1IUY|n3jEzQ0 z`Z0`EX^g!Ss$fil90O<0gf-r*JrsEPbPi*) z<7a-r{t_7CbTC}9=MHmp)I~-$?FU@>NCBQ}s`#7zKW0W1q+(CwVlaODHGcPE5#H|A z57Q$KFuPJ$FrVg}1Zvd=*nIChW^B2@JiC4w6;lT?B}x@++nK=B``%}4)=gmSCYJI( z4}###oJlw>ei@C>s)N^c@@zW$85YwCqhh z_4x)UwdX*nE*y3#{0HblCNk&07>tsQ)9^v}ulY{~)-#L8{~uPl_Qrv6{!IAi2zQSc z;@$(_@bnw!n02eWq5sf)98F?y%CVhz?~2|y#E@s)T{;`08s3B}`#tb%<#rf)W&yva zX!pLASBjXjmzMG8UN3;tHBXq8C)Pl|x`>Z`91iindg0l}*%42tKZG-v2ZLtYR$jGm zBo_J2fjtdbJiY81BY$NCTw1o(c))ibY|*aXcjeRGjGHzGCXFkCu4k(;bX`vzJI`I{ z*6SeSaPoG$X6@@1tOAp&#ot>m`^vc@%5U zQv!EAgUJytgEWU{ep%m3cuL=6>QCh2nmsP;CqMrPm&(1^%r_pvvRO3i`Vl4gS6$?D zQqJ=?SKb46zXf13r~+Qw&BNdU_hJ2$(@5>w3=e}O?1ig0z+G2|rBIF&J{pPaPrhuP zx&U4d$b;p<_Uz?8LF~Grl&~c=oWJoT7e|yHW0r)ihgZETz-P!@$cl)9iPeK}=gj%= zTciV96=uiYm4pg)`3C-c)B?i~72<#S@LNFUXk0#??%?&??;`yc#YTE~f=j+PYqOvZ)*Yvq;@g|BzY~qMQ4(A^@(Bb~+=j9> zl`wW;GE97S3a-bb;Z$3OeM5q9!1EDke_hVskIBYk=qk9M-^u(Z`USSmqZIU?oP>4i z^$*Cw;PPlnJPy6!Zr*F{t%=8)rY_DqQQ&D zkMY^Ejd*hKQ2Zt9&am&}z2UA`5P#&O5=@V(z~ZjA_Ai`U3NII&Fs7eM#Y*WWUhuuf zpD?_S$0qrK(~jTyO;@$XfE_(?OlS#H`IQ~)TE}5|jsPmd%MoWX$HRLErb5!jQvUIz zLVltqfRDQJIYgWt3Tta)_$&J^@Z7f7@XPs!nUCrw;kM)R&?z<*A03}!JXWe=%EQ(& z#}6L?&)jOLoIacxZ{G#)C4Yb}fd`rBy3z38;eNa{H33@Zq0=9+G(tq zrwl5?3~8qcOy)?aI8&;Vg%AgMl3JnH)6bDWx{q3y6h6E&F{Fqh()Jf5suX&2X5`F? zacbn-Vp_CoOo=hurv$TXTmbvwi2iIZCWPh3%h(g+JcQjxeAxqo0@(P9msq+l5gz0{ z#=_t1gxYSw?72!A`{FfV_m}&#ss+!phpO#`z3vV|c=2{@ZJ}J^-!ZYa=IKNSi*a6P zF-{=qL;H7P9Fy*35!F%I5UnsoXR2w3rhjQWwTkqwoh$PqE`|(+R-dlZbMi#m_IVo% z)mC!~(;O+JNYC~S5-GBMMX976n+F{omS(ztWmXFdAL61^7!>k%br~9kfp(znCXAUp zg2Z%0BvzHI(Wyit%>!xYgj)oWWYWET)l6oVh(CXU)X{V^4~w83w!~EoDLvPw^jlA!CTQ-jJbEa!R>gtxDoT^ae#zn)!b1X+C{jB55Z{lDEyv&mVoFU- z`Ke`bTZ37ahl+13G803ln}f^89Q3Y{L`*m~GCLcaJk~m>DAJEe#67emHZxJ$v|HM# z08OSkWJbpV8h*X_Vrv2ZL?Z5K(!nH3YTpQ9VcnBR6k=^55ep1yV(PezDcoJ!dg zh#tf_jpNegN|i=0)<%?t&U3`kkdetLRavy-Bu=3osmf|XHQ`&9`4LH!E}1s{NX;88 zv(Y3_)X|{Q>NF~aIwaa^tj*NO^$Jb8+M;1QN?Ds&Vk+Fac7R8_Sb<9$>HHnhBEFrT z<3z7?dt|bzt1i=!o@tPqUwJvV=wf1GS{W+dj4>pPI3($`Nn$ByX)HRTW`=MkfyALH zXIkxQ#<46~LJ{}I^e#qy>$hquv(pnI-?6HzsDPN^U(e>fm1p^`WqJr3xfXVH@4?LI zHXKpo%WCe4U1Qb+EXeqnmlXL4-^@IXv7aBspRtD5qXQH_91n}GEkW(}9Q-Wq96UMY z+$MCU5bxH6+7>Qt_?mU0WPMsnm#)Nz_O_HRExHk=xp)zuSocZY&ANIORDDWZJ9OIBF&Q)ULBTH%_~W^#Rq@CsA|tj7MXvqtcoWdW?TQM8EG+d p6Q$-N&RTO>`+Y_W3Gv*zH@=sZb9#eHqcCt*C$X*ImR+>X{{WXN_D=u+ literal 0 HcmV?d00001 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