Skip to content

Commit 0d213f7

Browse files
Remove monitor (#3372)
* Removing the monitor * Editing the migrating docs * Readding the Monitor in the examples folder * Editing the Migrating doc
1 parent f9c05a6 commit 0d213f7

File tree

6 files changed

+9
-16
lines changed

6 files changed

+9
-16
lines changed

Project/Assets/ML-Agents/Examples/FoodCollector/Scripts/FoodCollectorAgent.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public override void InitializeAgent()
3232
{
3333
base.InitializeAgent();
3434
m_AgentRb = GetComponent<Rigidbody>();
35-
Monitor.verticalOffset = 1f;
3635
m_MyArea = area.GetComponent<FoodCollectorArea>();
3736
m_FoodCollecterSettings = FindObjectOfType<FoodCollectorSettings>();
3837

com.unity.ml-agents/Runtime/Monitor.cs renamed to Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Monitor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Collections.Generic;
1+
using System.Collections.Generic;
22
using System.Linq;
33
using UnityEngine;
44

@@ -561,4 +561,4 @@ void Initialize()
561561
s_RedStyle = s_ColorStyle[5];
562562
}
563563
}
564-
}
564+
}

com.unity.ml-agents/Runtime/Monitor.cs.meta renamed to Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Monitor.cs.meta

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

Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/ProjectSettingsOverrides.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace MLAgentsExamples
66
public class ProjectSettingsOverrides : MonoBehaviour
77
{
88
// Original values
9-
float m_OriginalMonitorVerticalOffset;
9+
1010
Vector3 m_OriginalGravity;
1111
float m_OriginalFixedDeltaTime;
1212
float m_OriginalMaximumDeltaTime;
@@ -16,9 +16,6 @@ public class ProjectSettingsOverrides : MonoBehaviour
1616
[Tooltip("Increase or decrease the scene gravity. Use ~3x to make things less floaty")]
1717
public float gravityMultiplier = 1.0f;
1818

19-
[Header("Display Settings")]
20-
public float monitorVerticalOffset;
21-
2219
[Header("Advanced physics settings")]
2320
[Tooltip("The interval in seconds at which physics and other fixed frame rate updates (like MonoBehaviour's FixedUpdate) are performed.")]
2421
public float fixedDeltaTime = .02f;
@@ -32,15 +29,13 @@ public class ProjectSettingsOverrides : MonoBehaviour
3229
public void Awake()
3330
{
3431
// Save the original values
35-
m_OriginalMonitorVerticalOffset = Monitor.verticalOffset;
3632
m_OriginalGravity = Physics.gravity;
3733
m_OriginalFixedDeltaTime = Time.fixedDeltaTime;
3834
m_OriginalMaximumDeltaTime = Time.maximumDeltaTime;
3935
m_OriginalSolverIterations = Physics.defaultSolverIterations;
4036
m_OriginalSolverVelocityIterations = Physics.defaultSolverVelocityIterations;
4137

4238
// Override
43-
Monitor.verticalOffset = monitorVerticalOffset;
4439
Physics.gravity *= gravityMultiplier;
4540
Time.fixedDeltaTime = fixedDeltaTime;
4641
Time.maximumDeltaTime = maximumDeltaTime;
@@ -52,7 +47,6 @@ public void Awake()
5247

5348
public void OnDestroy()
5449
{
55-
Monitor.verticalOffset = m_OriginalMonitorVerticalOffset;
5650
Physics.gravity = m_OriginalGravity;
5751
Time.fixedDeltaTime = m_OriginalFixedDeltaTime;
5852
Time.maximumDeltaTime = m_OriginalMaximumDeltaTime;

com.unity.ml-agents/Runtime/DemonstrationRecorder.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public class DemonstrationRecorder : MonoBehaviour
1515
{
1616
public bool record;
1717
public string demonstrationName;
18-
Agent m_RecordingAgent;
1918
string m_FilePath;
2019
DemonstrationStore m_DemoStore;
2120
public const int MaxNameLength = 16;
@@ -41,15 +40,13 @@ void Update()
4140
/// </summary>
4241
public void InitializeDemoStore(IFileSystem fileSystem = null)
4342
{
44-
m_RecordingAgent = GetComponent<Agent>();
4543
m_DemoStore = new DemonstrationStore(fileSystem);
4644
var behaviorParams = GetComponent<BehaviorParameters>();
4745
demonstrationName = SanitizeName(demonstrationName, MaxNameLength);
4846
m_DemoStore.Initialize(
4947
demonstrationName,
5048
behaviorParams.brainParameters,
5149
behaviorParams.fullyQualifiedBehaviorName);
52-
Monitor.Log("Recording Demonstration of Agent: ", m_RecordingAgent.name);
5350
}
5451

5552
/// <summary>

docs/Migrating.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ The versions can be found in
88
# Migrating
99

1010
## Migrating from 0.14 to latest
11+
1112
### Important changes
13+
* The `Monitor` class has been moved to the Examples Project. (It was prone to errors during testing)
14+
1215
### Steps to Migrate
1316

17+
1418
## Migrating from 0.13 to 0.14
1519

1620
### Important changes

0 commit comments

Comments
 (0)