diff --git a/Project/Assets/ML-Agents/Examples/FoodCollector/Scripts/FoodCollectorAgent.cs b/Project/Assets/ML-Agents/Examples/FoodCollector/Scripts/FoodCollectorAgent.cs index c4f304124a..cad3cb9757 100644 --- a/Project/Assets/ML-Agents/Examples/FoodCollector/Scripts/FoodCollectorAgent.cs +++ b/Project/Assets/ML-Agents/Examples/FoodCollector/Scripts/FoodCollectorAgent.cs @@ -32,7 +32,6 @@ public override void InitializeAgent() { base.InitializeAgent(); m_AgentRb = GetComponent(); - Monitor.verticalOffset = 1f; m_MyArea = area.GetComponent(); m_FoodCollecterSettings = FindObjectOfType(); diff --git a/com.unity.ml-agents/Runtime/Monitor.cs b/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Monitor.cs similarity index 99% rename from com.unity.ml-agents/Runtime/Monitor.cs rename to Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Monitor.cs index e6ff5991a8..eedeb57a82 100644 --- a/com.unity.ml-agents/Runtime/Monitor.cs +++ b/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Monitor.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using UnityEngine; @@ -561,4 +561,4 @@ void Initialize() s_RedStyle = s_ColorStyle[5]; } } -} +} \ No newline at end of file diff --git a/com.unity.ml-agents/Runtime/Monitor.cs.meta b/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Monitor.cs.meta similarity index 69% rename from com.unity.ml-agents/Runtime/Monitor.cs.meta rename to Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Monitor.cs.meta index 74c210c11f..e10bd36d98 100644 --- a/com.unity.ml-agents/Runtime/Monitor.cs.meta +++ b/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Monitor.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: e59a31a1cc2f5464d9a61bef0bc9a53b -timeCreated: 1508031727 -licenseType: Free +guid: eca114d0a5b45439384024291ba7d40a MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/ProjectSettingsOverrides.cs b/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/ProjectSettingsOverrides.cs index 1d98050617..7f529cd3de 100644 --- a/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/ProjectSettingsOverrides.cs +++ b/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/ProjectSettingsOverrides.cs @@ -6,7 +6,7 @@ namespace MLAgentsExamples public class ProjectSettingsOverrides : MonoBehaviour { // Original values - float m_OriginalMonitorVerticalOffset; + Vector3 m_OriginalGravity; float m_OriginalFixedDeltaTime; float m_OriginalMaximumDeltaTime; @@ -16,9 +16,6 @@ public class ProjectSettingsOverrides : MonoBehaviour [Tooltip("Increase or decrease the scene gravity. Use ~3x to make things less floaty")] public float gravityMultiplier = 1.0f; - [Header("Display Settings")] - public float monitorVerticalOffset; - [Header("Advanced physics settings")] [Tooltip("The interval in seconds at which physics and other fixed frame rate updates (like MonoBehaviour's FixedUpdate) are performed.")] public float fixedDeltaTime = .02f; @@ -32,7 +29,6 @@ public class ProjectSettingsOverrides : MonoBehaviour public void Awake() { // Save the original values - m_OriginalMonitorVerticalOffset = Monitor.verticalOffset; m_OriginalGravity = Physics.gravity; m_OriginalFixedDeltaTime = Time.fixedDeltaTime; m_OriginalMaximumDeltaTime = Time.maximumDeltaTime; @@ -40,7 +36,6 @@ public void Awake() m_OriginalSolverVelocityIterations = Physics.defaultSolverVelocityIterations; // Override - Monitor.verticalOffset = monitorVerticalOffset; Physics.gravity *= gravityMultiplier; Time.fixedDeltaTime = fixedDeltaTime; Time.maximumDeltaTime = maximumDeltaTime; @@ -52,7 +47,6 @@ public void Awake() public void OnDestroy() { - Monitor.verticalOffset = m_OriginalMonitorVerticalOffset; Physics.gravity = m_OriginalGravity; Time.fixedDeltaTime = m_OriginalFixedDeltaTime; Time.maximumDeltaTime = m_OriginalMaximumDeltaTime; diff --git a/com.unity.ml-agents/Runtime/DemonstrationRecorder.cs b/com.unity.ml-agents/Runtime/DemonstrationRecorder.cs index 313cdbe8b4..62c28be592 100644 --- a/com.unity.ml-agents/Runtime/DemonstrationRecorder.cs +++ b/com.unity.ml-agents/Runtime/DemonstrationRecorder.cs @@ -15,7 +15,6 @@ public class DemonstrationRecorder : MonoBehaviour { public bool record; public string demonstrationName; - Agent m_RecordingAgent; string m_FilePath; DemonstrationStore m_DemoStore; public const int MaxNameLength = 16; @@ -41,7 +40,6 @@ void Update() /// public void InitializeDemoStore(IFileSystem fileSystem = null) { - m_RecordingAgent = GetComponent(); m_DemoStore = new DemonstrationStore(fileSystem); var behaviorParams = GetComponent(); demonstrationName = SanitizeName(demonstrationName, MaxNameLength); @@ -49,7 +47,6 @@ public void InitializeDemoStore(IFileSystem fileSystem = null) demonstrationName, behaviorParams.brainParameters, behaviorParams.fullyQualifiedBehaviorName); - Monitor.Log("Recording Demonstration of Agent: ", m_RecordingAgent.name); } /// diff --git a/docs/Migrating.md b/docs/Migrating.md index 3d82adac32..0fcba40451 100644 --- a/docs/Migrating.md +++ b/docs/Migrating.md @@ -8,9 +8,13 @@ The versions can be found in # Migrating ## Migrating from 0.14 to latest + ### Important changes +* The `Monitor` class has been moved to the Examples Project. (It was prone to errors during testing) + ### Steps to Migrate + ## Migrating from 0.13 to 0.14 ### Important changes