-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from namark/improved-package-structure
General project structure improvements.
- Loading branch information
Showing
45 changed files
with
1,593 additions
and
66 deletions.
There are no files selected for viewing
This file contains 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains 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
2 changes: 1 addition & 1 deletion
2
Assets/TestScene.unity.meta → ...ts/DomainServerConnectionScene.unity.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
153 changes: 153 additions & 0 deletions
153
Assets/Samples/DomainServerConnection/Assets/DomainServerConnectionScript.cs
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| // | ||
| // DomainServerConnectionScript.cs | ||
| // Samples/DomainServerConnection | ||
| // | ||
| // Created by Nshan G. on 03 Mar 2022. | ||
| // Copyright 2022 Vircadia contributors. | ||
| // | ||
| // Distributed under the Apache License, Version 2.0. | ||
| // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html | ||
| // | ||
|
|
||
| using System.Collections; | ||
| using System.Collections.Generic; | ||
| using UnityEngine; | ||
|
|
||
| [System.Serializable] | ||
| public class ApplicationInfo | ||
| { | ||
|
|
||
| private string _name; | ||
| public string name | ||
| { | ||
| get { return _name ?? Application.productName; } | ||
| set { _name = value; } | ||
| } | ||
|
|
||
| private string _organization; | ||
| public string organization | ||
| { | ||
| get { return _organization ?? Application.companyName; } | ||
| set { _organization = value; } | ||
| } | ||
|
|
||
| public string domain; | ||
|
|
||
| private string _version; | ||
| public string version | ||
| { | ||
| get { return _version ?? Application.version; } | ||
| set { _version = value; } | ||
| } | ||
| } | ||
|
|
||
| [System.Serializable] | ||
| public struct MessageData | ||
| { | ||
| public string displayName; | ||
| public string message; | ||
| public string type; | ||
| public string channel; | ||
| } | ||
|
|
||
| public class DomainServerConnectionScript : MonoBehaviour | ||
| { | ||
| private Vircadia.DomainServer _domainServer; | ||
| private bool _connected = false; | ||
| private int _nodesSeen = 0; | ||
| private bool _testMessageSent = false; | ||
| private bool _messagesMixerActive = false; | ||
|
|
||
| public string location = "localhost"; | ||
| public ApplicationInfo applicationInfo; | ||
|
|
||
| void Start() | ||
| { | ||
| Debug.Log("Vircadia SDK native API version: " + Vircadia.Info.NativeVersion().full); | ||
|
|
||
| _domainServer = new Vircadia.DomainServer( | ||
| appName: applicationInfo.name, | ||
| appOrganization: applicationInfo.organization, | ||
| appDomain: applicationInfo.domain, | ||
| appVersion: applicationInfo.version); | ||
|
|
||
| if (!string.IsNullOrEmpty(location)) | ||
| { | ||
| _domainServer.Connect(location); | ||
| _domainServer.Messages.Enable(Vircadia.MessageType.Text); | ||
| _domainServer.Messages.Subscribe("Chat"); | ||
| } | ||
| } | ||
|
|
||
| void FixedUpdate() | ||
| { | ||
| if (!_connected) | ||
| { | ||
| Debug.Log("[vircadia-unity-example] Connecting"); | ||
| if (_domainServer.Status == Vircadia.DomainServerStatus.Connected) | ||
| { | ||
| Debug.Log("[vircadia-unity-example] Successfully connected to " + location); | ||
| _connected = true; | ||
| } | ||
| } | ||
| else | ||
| { | ||
| var nodes = _domainServer.Nodes; | ||
| if (nodes.Length != _nodesSeen) | ||
| { | ||
| Debug.Log("[vircadia-unity-example] Updated node list:"); | ||
| foreach (var node in nodes) | ||
| { | ||
| Debug.Log("[vircadia-unity-example] UUID: " + node.uuid.ToString()); | ||
| Debug.Log("[vircadia-unity-example] Type: " + node.type.ToString()); | ||
| Debug.Log("[vircadia-unity-example] Active: " + node.active.ToString()); | ||
| Debug.Log("[vircadia-unity-example]"); | ||
| } | ||
| _nodesSeen = nodes.Length; | ||
| } | ||
|
|
||
| if (!_messagesMixerActive) | ||
| { | ||
| foreach (var node in nodes) | ||
| { | ||
| if (node.type == Vircadia.NodeType.MessagesMixer) | ||
| { | ||
| _messagesMixerActive = node.active; | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| if (!_testMessageSent && _messagesMixerActive) | ||
| { | ||
| _domainServer.Messages.SendTextMessage("Chat", JsonUtility.ToJson(new MessageData{ | ||
| displayName = "Unity SDK Example", | ||
| message = "This is Vircadia Unity SDK example speaking.", | ||
| channel = "Domain", | ||
| type = "TransmitChatMessage" | ||
| })); | ||
| _testMessageSent = true; | ||
| } | ||
|
|
||
| _domainServer.Messages.Update(); | ||
|
|
||
| foreach (var message in _domainServer.Messages.TextMessages) | ||
| { | ||
| var data = JsonUtility.FromJson<MessageData>(message.Text); | ||
| Debug.Log("[vircadia-unity-example] Received a chat message: \n" + | ||
| " Sender UUID: " + message.Sender.ToString() + "\n" + | ||
| " Display Name: " + data.displayName + "\n" + | ||
| " Channel: " + data.channel + "\n" + | ||
| " Type: " + data.type + "\n" + | ||
| " Text: " + data.message + "\n"); | ||
| } | ||
|
|
||
| } | ||
| } | ||
|
|
||
| void OnDestroy() | ||
| { | ||
| _domainServer.Destroy(); | ||
| } | ||
|
|
||
| } |
2 changes: 1 addition & 1 deletion
2
Assets/TestScript.cs.meta → ...sets/DomainServerConnectionScript.cs.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| ## Version 2022.0.1 | ||
|
|
||
| ### Features | ||
| * Domain Server connection and node enumeration. | ||
| * Sending and receiving messages using the message mixer. | ||
| * A simple example script. | ||
|
|
||
| ### Developer Features | ||
| * Project setup as an embedded UPM package. | ||
| * A Makefile to support automation and UPM package creation. |
This file contains 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
Oops, something went wrong.