Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeskydev committed Dec 4, 2023
1 parent dfe1ba3 commit 6294664
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 31 deletions.
12 changes: 6 additions & 6 deletions Assets/OculusMR/AnchorToGuide.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ public class AnchorToGuide : MonoBehaviour
void Start()
{
m_SceneComponentVolume = GetComponent<OVRSceneVolume>();
if(m_SceneComponentVolume)

if (m_SceneComponentVolume)
{
var dimentions = m_SceneComponentVolume.Dimensions;

var pos = App.Scene.transform.InverseTransformPoint(this.transform.position);
pos.y /= 2.0f;
var tr = TrTransform.TR(pos, this.transform.rotation);

CreateWidgetCommand createCommand = new CreateWidgetCommand(
WidgetManager.m_Instance.GetStencilPrefab(StencilType.Cube), tr, null, true);
SketchMemoryScript.m_Instance.PerformAndRecordCommand(createCommand);
Expand All @@ -56,9 +56,9 @@ void Start()
// if(m_SceneComponentPlane)
// {
// var dimentions = m_SceneComponentPlane.Dimensions;

// var tr = TrTransform.TR(this.transform.position, this.transform.rotation);

// CreateWidgetCommand createCommand = new CreateWidgetCommand(
// WidgetManager.m_Instance.GetStencilPrefab(StencilType.Plane), tr, null, true);
// SketchMemoryScript.m_Instance.PerformAndRecordCommand(createCommand);
Expand Down
3 changes: 2 additions & 1 deletion Assets/OculusMR/OculusMRController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ void RequestScenePermission()
{
const string permissionString = "com.oculus.permission.USE_SCENE";
bool hasUserAuthorizedPermission = UnityEngine.Android.Permission.HasUserAuthorizedPermission(permissionString);
if (!hasUserAuthorizedPermission) {
if (!hasUserAuthorizedPermission)
{
UnityEngine.Android.Permission.RequestUserPermission(permissionString);
}
}
Expand Down
30 changes: 15 additions & 15 deletions Assets/OculusMR/SpatialAnchorManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ async Task<bool> SaveAnchor()
Debug.Log("Anchor saved to device!");
PlayerPrefs.SetString(kOriginSpatialAnchorPref, m_Anchor.Uuid.ToString());

success = await m_Anchor.SaveAsync(saveOptions: new OVRSpatialAnchor.SaveOptions{ Storage = OVRSpace.StorageLocation.Cloud });
success = await m_Anchor.SaveAsync(saveOptions: new OVRSpatialAnchor.SaveOptions { Storage = OVRSpace.StorageLocation.Cloud });
if (!success)
{
return false;
Expand All @@ -82,11 +82,11 @@ public async Task<bool> LoadSpatialAnchor()
var guid = new Guid(guidString);

var data = await OVRSpatialAnchor.LoadUnboundAnchorsAsync(new OVRSpatialAnchor.LoadOptions()
{
StorageLocation = OVRSpace.StorageLocation.Local,
Timeout = 0,
Uuids = new List<Guid>() { guid }
}
{
StorageLocation = OVRSpace.StorageLocation.Local,
Timeout = 0,
Uuids = new List<Guid>() { guid }
}
);

return await BindAnchors(data);
Expand All @@ -109,7 +109,7 @@ public bool SceneLocalizeToAnchor()
var newPose = SketchControlsScript.MakeValidScenePose(m_anchorTr,
SceneSettings.m_Instance.HardBoundsRadiusMeters_SS);
App.Scene.Pose = newPose;

Debug.Log("Anchor localized!");
return true;
}
Expand All @@ -119,11 +119,11 @@ public async Task<bool> SyncToRemoteAnchor(string uuid, OVRSpace.StorageLocation
var guid = new Guid(uuid);

var data = await OVRSpatialAnchor.LoadUnboundAnchorsAsync(new OVRSpatialAnchor.LoadOptions()
{
StorageLocation = defaultStorageLocation,
Timeout = 0,
Uuids = new List<Guid>() { guid }
}
{
StorageLocation = defaultStorageLocation,
Timeout = 0,
Uuids = new List<Guid>() { guid }
}
);

Debug.Log("Remote anchor recieved!");
Expand Down Expand Up @@ -162,13 +162,13 @@ async Task<bool> BindAnchors(OVRSpatialAnchor.UnboundAnchor[] anchors)

public async Task<bool> ShareAnchors(List<ulong> playerIds)
{
if(m_Anchor == null)
if (m_Anchor == null)
{
return false;
}

var spaceUserList = new List<OVRSpaceUser>();
foreach(var id in playerIds)
foreach (var id in playerIds)
{
Debug.Log($"new share id: {id}");
spaceUserList.Add(new OVRSpaceUser(id));
Expand All @@ -177,7 +177,7 @@ public async Task<bool> ShareAnchors(List<ulong> playerIds)
// TODO: Check anchor exists and is in cloud storage.
var result = await m_Anchor.ShareAsync(spaceUserList);

if(result == OVRSpatialAnchor.OperationResult.Success)
if (result == OVRSpatialAnchor.OperationResult.Success)
{
Debug.Log($"Share complete!");
return true;
Expand Down
4 changes: 2 additions & 2 deletions Assets/Scripts/Multiplayer/MultiplayerDataStructs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ public struct PlayerRigData

public BrushData BrushData;
public ExtraData ExtraData;

}

[System.Serializable]
public struct BrushData
{
public Color Color;
public string Guid;
public float Size;
public float Size;
}

[System.Serializable]
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scripts/Multiplayer/MultiplayerInterfaces.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public interface IConnectionHandler
Task<bool> Disconnect(bool force = false);

void Update();

Task<bool> PerformCommand(BaseCommand command);
Task<bool> UndoCommand(BaseCommand command);
Task<bool> RedoCommand(BaseCommand command);
Expand Down
6 changes: 3 additions & 3 deletions Assets/Scripts/Multiplayer/MultiplayerManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public async void Connect()

void Update()
{
if(App.CurrentState != App.AppState.Standard || m_Manager == null)
if (App.CurrentState != App.AppState.Standard || m_Manager == null)
{
return;
}
Expand All @@ -124,7 +124,7 @@ void Update()
{
Color = PointerManager.m_Instance.MainPointer.GetCurrentColor(),
Size = PointerManager.m_Instance.MainPointer.BrushSize01,
Guid = BrushController.m_Instance.ActiveBrush.m_Guid.ToString(),
Guid = BrushController.m_Instance.ActiveBrush.m_Guid.ToString(),
},
ExtraData = new ExtraData
{
Expand Down Expand Up @@ -202,7 +202,7 @@ async void ShareAnchors()

if (success)
{
if(!OculusMRController.m_Instance.m_SpatialAnchorManager.AnchorUuid.Equals(String.Empty))
if (!OculusMRController.m_Instance.m_SpatialAnchorManager.AnchorUuid.Equals(String.Empty))
{
await m_Manager.RpcSyncToSharedAnchor(OculusMRController.m_Instance.m_SpatialAnchorManager.AnchorUuid);
}
Expand Down
6 changes: 3 additions & 3 deletions Assets/Scripts/SketchMemoryScript.cs
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ public void PerformAndRecordCommand(BaseCommand command, bool discardIfNotMerged
m_OperationStack.Push(command);
OperationStackChanged?.Invoke();

if(propegate)
if (propegate)
{
CommandPerformed?.Invoke(command);
}
Expand Down Expand Up @@ -920,7 +920,7 @@ public void StepBack(bool propegate = true)
m_RedoStack.Push(comm);
OperationStackChanged?.Invoke();

if(propegate)
if (propegate)
{
CommandUndo?.Invoke(comm);
}
Expand All @@ -933,7 +933,7 @@ public void StepForward(bool propegate = true)
m_OperationStack.Push(comm);
OperationStackChanged?.Invoke();

if(propegate)
if (propegate)
{
CommandRedo?.Invoke(comm);
}
Expand Down

0 comments on commit 6294664

Please sign in to comment.