Skip to content

Develop one to one scene edits #2744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -608,18 +608,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: edf26e11cf4ed42eaa3ffb7b91bb4676, type: 3}
m_Name:
m_EditorClassIdentifier:
m_BrainFactoryParameters:
behaviorName: MyBehaviorHard
brainParameters:
vectorObservationSize: 5
numStackedVectorObservations: 1
vectorActionSize: 02000000
cameraResolutions: []
vectorActionDescriptions: []
vectorActionSpaceType: 1
model: {fileID: 0}
inferenceDevice: 0
useHeuristic: 0
m_BrainParameters:
vectorObservationSize: 5
numStackedVectorObservations: 9
vectorActionSize: 02000000
cameraResolutions: []
vectorActionDescriptions: []
vectorActionSpaceType: 1
m_Model: {fileID: 11400000, guid: cee7d20369b814d549573de7e76c4a81, type: 3}
m_InferenceDevice: 0
m_UseHeuristic: 0
m_BehaviorName: 3DBallHard
agentParameters:
agentCameras: []
agentRenderTextures: []
Expand Down
8 changes: 0 additions & 8 deletions UnitySDK/Assets/ML-Agents/Examples/Basic/Brains.meta

This file was deleted.

This file was deleted.

This file was deleted.

30 changes: 0 additions & 30 deletions UnitySDK/Assets/ML-Agents/Examples/Basic/Brains/BasicPlayer.asset

This file was deleted.

This file was deleted.

12 changes: 11 additions & 1 deletion UnitySDK/Assets/ML-Agents/Examples/Basic/Prefabs/Basic.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 624480a72e46148118ab2e2d89b537de, type: 3}
m_Name:
m_EditorClassIdentifier:
brain: {fileID: 11400000, guid: e5cf0e35e16264ea483f8863e5115c3c, type: 2}
m_BrainParameters:
vectorObservationSize: 20
numStackedVectorObservations: 1
vectorActionSize: 03000000
cameraResolutions: []
vectorActionDescriptions: []
vectorActionSpaceType: 0
m_Model: {fileID: 11400000, guid: 53fa7c392ce3c492281be273668f6aaf, type: 3}
m_InferenceDevice: 0
m_UseHeuristic: 0
m_BehaviorName: Basic
agentParameters:
agentCameras: []
agentRenderTextures: []
Expand Down
13 changes: 13 additions & 0 deletions UnitySDK/Assets/ML-Agents/Examples/Basic/Scripts/BasicAgent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,19 @@ public override void AgentReset()
largeGoal.transform.position = new Vector3(m_LargeGoalPosition - 10f, 0f, 0f);
}

public override float[] Heuristic()
{
if (Input.GetKey(KeyCode.D))
{
return new float[] { 2 };
}
if (Input.GetKey(KeyCode.A))
{
return new float[] { 1 };
}
return new float[] { 0 };
}

public override void AgentOnDone()
{
}
Expand Down
8 changes: 0 additions & 8 deletions UnitySDK/Assets/ML-Agents/Examples/Bouncer/Brains.meta

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0f09741cbce2e44bc88d3e92917eea0e, type: 3}
m_Name:
m_EditorClassIdentifier:
brain: {fileID: 11400000, guid: 573920e3a672d40038169c7ffdbdca05, type: 2}
m_BrainParameters:
vectorObservationSize: 6
numStackedVectorObservations: 3
vectorActionSize: 03000000
cameraResolutions: []
vectorActionDescriptions: []
vectorActionSpaceType: 1
m_Model: {fileID: 11400000, guid: f5250a39cb2134db49b833e3c92527a1, type: 3}
m_InferenceDevice: 0
m_UseHeuristic: 0
m_BehaviorName: Bouncer
agentParameters:
agentCameras: []
agentRenderTextures: []
Expand Down
10 changes: 10 additions & 0 deletions UnitySDK/Assets/ML-Agents/Examples/Bouncer/Scripts/BouncerAgent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,16 @@ private void FixedUpdate()
}
}

public override float[] Heuristic()
{
var action = new float[3];

action[0] = Input.GetAxis("Horizontal");
action[1] = Input.GetKey(KeyCode.Space) ? 1.0f : 0.0f;
action[2] = Input.GetAxis("Vertical");
return action;
}

private void Update()
{
if (m_LookDir.magnitude > float.Epsilon)
Expand Down
8 changes: 0 additions & 8 deletions UnitySDK/Assets/ML-Agents/Examples/Crawler/Brains.meta

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading