Fixes missing camera resolution info in demos #2523
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chriselion
reviewed
Sep 10, 2019
| /// <summary> | ||
| /// Converts Resolution array protobuf to C# Resolution array. | ||
| /// </summary> | ||
| static Resolution[] CameraProtoToNative(CommunicatorObjects.ResolutionProto[] resolutionProtos) |
There was a problem hiding this comment.
nit: ResolutionProtoToNative ?
vincentpierre
approved these changes
Sep 10, 2019
mmattar
suggested changes
Sep 10, 2019
| @@ -1,4 +1,5 @@ | |||
| using System.Text; | |||
| using System.Net.NetworkInformation; | |||
| /// <summary> | ||
| /// Constructs complex label for each CameraResolution object. | ||
| /// </summary> | ||
| static string BuildCameraResolutionLabel(SerializedProperty cameraArray) |
| static string BuildCameraResolutionLabel(SerializedProperty cameraArray) | ||
| { | ||
| var numCameras = cameraArray.arraySize; | ||
| StringBuilder cameraLabel = new StringBuilder("[ "); |
| { | ||
| var numCameras = cameraArray.arraySize; | ||
| StringBuilder cameraLabel = new StringBuilder("[ "); | ||
| for (int i = 0; i < numCameras; i++) |
|
|
||
| cameraLabel.Append(" ]"); | ||
| return cameraLabel.ToString(); | ||
|
|
| public BrainParameters(CommunicatorObjects.BrainParametersProto brainParametersProto) | ||
| { | ||
| vectorObservationSize = brainParametersProto.VectorObservationSize; | ||
| cameraResolutions = ResolutionProtoToNative(brainParametersProto.CameraResolutions.ToArray()); |
| /// </summary> | ||
| static Resolution[] ResolutionProtoToNative(CommunicatorObjects.ResolutionProto[] resolutionProtos) | ||
| { | ||
| Resolution[] localCameraResolutions = new Resolution[resolutionProtos.Length]; |
| static Resolution[] ResolutionProtoToNative(CommunicatorObjects.ResolutionProto[] resolutionProtos) | ||
| { | ||
| Resolution[] localCameraResolutions = new Resolution[resolutionProtos.Length]; | ||
| for (int i = 0; i < resolutionProtos.Length; i++) |
| /// <summary> | ||
| /// Converts Resolution protobuf array to C# Resolution array. | ||
| /// </summary> | ||
| static Resolution[] ResolutionProtoToNative(CommunicatorObjects.ResolutionProto[] resolutionProtos) |
|
@mmattar Comments addressed. |
mmattar
reviewed
Sep 11, 2019
| @@ -92,4 +122,4 @@ public override void OnInspectorGUI() | |||
| MakeBrainParametersProperty(brainParameters); | |||
| serializedObject.ApplyModifiedProperties(); | |||
| } | |||
| } | |||
| } | |||
| @@ -121,4 +144,4 @@ public BrainParameters Clone() | |||
| }; | |||
| } | |||
| } | |||
| } | |||
| } | |||
mmattar
approved these changes
Sep 12, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We were not reporting camera resolution information in the demonstration file. This addresses this, and ensures it is printed in the inspector correctly as well.