Skip to content

Commit c70e521

Browse files
adding namespaces, fixing colliding scene GUID , adding starter docs
1 parent 357f822 commit c70e521

16 files changed

+954
-806
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/[Bb]uilds/
1010
/[Ll]ogs/
1111
/[Uu]ser[Ss]ettings/
12+
/[Pp]ackages/com.unity.asset-store-tools/
1213

1314
# MemoryCaptures can get excessive in size.
1415
# They also could contain extremely sensitive data

Assets/SimpleWebRTC/Scenes/WebSocket-TestConnection.unity.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/SimpleWebRTC/Scripts/Connections/WebRTCConnection.cs

Lines changed: 205 additions & 203 deletions
Large diffs are not rendered by default.

Assets/SimpleWebRTC/Scripts/Connections/WebRTCManager.cs

Lines changed: 366 additions & 364 deletions
Large diffs are not rendered by default.
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using System;
22

3-
public interface IJsonObject<T> {
4-
string ConvertToJSON();
5-
static T FromJSON(string jsonString) => throw new NotImplementedException();
3+
namespace SimpleWebRTC {
4+
public interface IJsonObject<T> {
5+
string ConvertToJSON();
6+
static T FromJSON(string jsonString) => throw new NotImplementedException();
7+
}
68
}
Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
using System;
22
using UnityEngine;
33

4-
[Serializable]
5-
public class CandidateInit : IJsonObject<CandidateInit> {
6-
public string Candidate;
7-
public string SdpMid;
8-
public int SdpMLineIndex;
4+
namespace SimpleWebRTC {
5+
[Serializable]
6+
public class CandidateInit : IJsonObject<CandidateInit> {
7+
public string Candidate;
8+
public string SdpMid;
9+
public int SdpMLineIndex;
910

10-
public static CandidateInit FromJSON(string jsonString) {
11-
return JsonUtility.FromJson<CandidateInit>(jsonString);
12-
}
11+
public static CandidateInit FromJSON(string jsonString) {
12+
return JsonUtility.FromJson<CandidateInit>(jsonString);
13+
}
1314

14-
public string ConvertToJSON() {
15-
return JsonUtility.ToJson(this);
15+
public string ConvertToJSON() {
16+
return JsonUtility.ToJson(this);
17+
}
1618
}
1719
}
Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
using System;
22
using UnityEngine;
33

4-
[Serializable]
5-
public class SessionDescription : IJsonObject<SessionDescription> {
6-
public string SessionType;
7-
public string Sdp;
4+
namespace SimpleWebRTC {
5+
[Serializable]
6+
public class SessionDescription : IJsonObject<SessionDescription> {
7+
public string SessionType;
8+
public string Sdp;
89

9-
public string ConvertToJSON() {
10-
return JsonUtility.ToJson(this);
11-
}
10+
public string ConvertToJSON() {
11+
return JsonUtility.ToJson(this);
12+
}
1213

13-
public static SessionDescription FromJSON(string jsonString) {
14-
return JsonUtility.FromJson<SessionDescription>(jsonString);
14+
public static SessionDescription FromJSON(string jsonString) {
15+
return JsonUtility.FromJson<SessionDescription>(jsonString);
16+
}
1517
}
1618
}
Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
using System;
22

3-
public class SignalingMessage {
3+
namespace SimpleWebRTC {
4+
public class SignalingMessage {
45

5-
private const int minMessageParts = 4;
6+
private const int minMessageParts = 4;
67

7-
public readonly SignalingMessageType Type = SignalingMessageType.OTHER;
8-
public readonly string SenderPeerId = "NOID";
9-
public readonly string ReceiverPeerId = "NOID";
10-
public readonly string Message = "Default Value";
8+
public readonly SignalingMessageType Type = SignalingMessageType.OTHER;
9+
public readonly string SenderPeerId = "NOID";
10+
public readonly string ReceiverPeerId = "NOID";
11+
public readonly string Message = "Default Value";
1112

12-
public SignalingMessage(string messageString) {
13+
public SignalingMessage(string messageString) {
1314

14-
var messageArray = messageString.Split("|");
15+
var messageArray = messageString.Split("|");
1516

16-
if ((messageArray.Length >= minMessageParts) && Enum.TryParse(messageArray[0], out SignalingMessageType resultType)) {
17-
Type = resultType;
18-
SenderPeerId = messageArray[1];
19-
ReceiverPeerId = messageArray[2];
20-
Message = messageArray[3];
17+
if ((messageArray.Length >= minMessageParts) && Enum.TryParse(messageArray[0], out SignalingMessageType resultType)) {
18+
Type = resultType;
19+
SenderPeerId = messageArray[1];
20+
ReceiverPeerId = messageArray[2];
21+
Message = messageArray[3];
22+
}
2123
}
2224
}
2325
}
Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
using System;
22

3-
[Serializable]
4-
public enum SignalingMessageType {
5-
NEWPEER,
6-
NEWPEERACK,
7-
OFFER,
8-
ANSWER,
9-
CANDIDATE,
10-
DATA,
11-
DISPOSE,
12-
COMPLETE,
13-
OTHER
3+
namespace SimpleWebRTC {
4+
[Serializable]
5+
public enum SignalingMessageType {
6+
NEWPEER,
7+
NEWPEERACK,
8+
OFFER,
9+
ANSWER,
10+
CANDIDATE,
11+
DATA,
12+
DISPOSE,
13+
COMPLETE,
14+
OTHER
15+
}
1416
}
Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
using UnityEngine;
22

3-
public class ContinuousRotation : MonoBehaviour {
4-
[Header("Rotation Speed (Degrees per Second)")]
5-
[SerializeField] private Vector3 rotationSpeed = new Vector3(0, 36, 0);
3+
namespace SimpleWebRTC {
4+
public class ContinuousRotation : MonoBehaviour {
5+
[Header("Rotation Speed (Degrees per Second)")]
6+
[SerializeField] private Vector3 rotationSpeed = new Vector3(0, 36, 0);
67

7-
[SerializeField] private bool randomColor = false;
8+
[SerializeField] private bool randomColor = false;
89

9-
private void Start() {
10-
if (randomColor) {
11-
GetComponent<MeshRenderer>().material.color = Random.ColorHSV();
10+
private void Start() {
11+
if (randomColor) {
12+
GetComponent<MeshRenderer>().material.color = Random.ColorHSV();
13+
}
1214
}
13-
}
1415

15-
private void Update() {
16-
transform.Rotate(rotationSpeed * Time.deltaTime);
16+
private void Update() {
17+
transform.Rotate(rotationSpeed * Time.deltaTime);
18+
}
1719
}
1820
}

0 commit comments

Comments
 (0)