Skip to content

Commit

Permalink
リリース 0.05
Browse files Browse the repository at this point in the history
・ショートカットキー機能
・ハンドジェスチャー設定
・表情設定
・機能キー設定
・手の角度の補正機能
・キャリブレーション時にコントローラーのトリガーで開始できるように
・UIをWinFormsからWPFの別アプリに変更
・自動まばたきが完全に閉じなかったり開かなかったりする問題修正
・使用しているVRIKCalibrator.csが直接編集されてしまっていたので修正
その他軽微なバグやnullチェックの追加
  • Loading branch information
sh-akira committed Jul 29, 2018
1 parent ff6e88e commit e546d39
Show file tree
Hide file tree
Showing 95 changed files with 7,659 additions and 4,769 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ VirtualMotionCapture.sln
ControlWindow/bin*
ControlWindow/ControlWindowTester/bin*
VirtualMotionCapture/
HandPresets/
VMCPipeServerTest/
ShortcutKeyPresets/
UnityNamedPipe.dll
default.json
ControlWindowWPF.exe

# Visual Studio cache directory
.vs/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public static OpenVRWrapper Instance
public event EventHandler<OVRConnectedEventArgs> OnOVRConnected;
public event EventHandler<OVREventArgs> OnOVREvent;

private CVRSystem openVR { get; set; } = null;
public CVRSystem openVR { get; set; } = null;

public bool Setup()
{
Expand Down
8 changes: 8 additions & 0 deletions Assets/ExternalPlugins/UnityNamedPipe.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 60 additions & 0 deletions Assets/ExternalPlugins/UnityNamedPipe/MainThreadInvoker.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
using System;
using System.Collections;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Threading.Tasks;
using UnityEngine;

public class MainThreadInvoker : MonoBehaviour {

private class ActionInfo
{
private Action runAction;
public bool Finished;
public ActionInfo(Action action)
{
runAction = action;
}
public void Execute()
{
runAction();
Finished = true;
}
}
private ConcurrentQueue<ActionInfo> actionQueue = new ConcurrentQueue<ActionInfo>();

void Start()
{
StartCoroutine(InvokeLoop());
}

public async Task InvokeAsync(Action action)
{
Debug.Log("InvokeAsync:" + action.GetType().ToString());
var actionInfo = new ActionInfo(action);
actionQueue.Enqueue(actionInfo);
while(actionInfo.Finished == false)
{
await Task.Delay(10);
}
}

public void BeginInvoke(Action action)
{
actionQueue.Enqueue(new ActionInfo(action));
}

IEnumerator InvokeLoop()
{
while (true)
{
yield return new WaitForSeconds(0.01f);

ActionInfo actionInfo;
while (actionQueue.TryDequeue(out actionInfo))
{
actionInfo.Execute();
}
}
}
}
11 changes: 11 additions & 0 deletions Assets/ExternalPlugins/UnityNamedPipe/MainThreadInvoker.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions Assets/ExternalPlugins/UnityNamedPipe/UnityNamedPipe.dll.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Plugins/ControlWindow.dll
Binary file not shown.
Loading

0 comments on commit e546d39

Please sign in to comment.