Skip to content

Unity5.6 and SteamVR unity plugin updates #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paddymahoney wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Unity5.6 and SteamVR unity plugin updates #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1e863c7
Update for unity 1.6
paddymahoney Jun 2, 2017
a5b50fd
Assets/Plugins/openvr_api.bundle.meta - import with unity 5.6
paddymahoney Jun 2, 2017
0ba6237
Assets/Plugins/openvr_api.cs
paddymahoney Jun 2, 2017
9e551cc
More updates for the steamVr unity asset.
paddymahoney Jun 2, 2017
62807f6
More SteamVR.cs file changes. Some metadata files may have slipped in
paddymahoney Jun 2, 2017
33f858f
update .meta files and remove some shaders
paddymahoney Jun 2, 2017
142791b
just the readme.txt
paddymahoney Jun 2, 2017
d9d8fff
update every other script that was tracked
paddymahoney Jun 2, 2017
fe79770
steamvr - additional files - this corrects the compilation warnings
paddymahoney Jun 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Assets/HOTK/HOTK_Overlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ private void UpdateOverlay()
var tex = new Texture_t
{
handle = OverlayTexture.GetNativeTexturePtr(),
eType = SteamVR.instance.graphicsAPI,
eType = SteamVR.instance.textureType,
eColorSpace = EColorSpace.Auto
};
overlay.SetOverlayColor(_handle, 1f, 1f, 1f);
Expand Down Expand Up @@ -708,7 +708,7 @@ private void UpdateRenderTexture()
var tex = new Texture_t
{
handle = OverlayTexture.GetNativeTexturePtr(),
eType = SteamVR.instance.graphicsAPI,
eType = SteamVR.instance.textureType,
eColorSpace = EColorSpace.Auto
};

Expand Down
8 changes: 4 additions & 4 deletions Assets/HOTK/HOTK_TrackedDevice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public enum EType

private EType _type;

private void OnNewPoses(params object[] args)
private void OnNewPoses(params TrackedDevicePose_t[] args)
{
if (_type != Type)
{
Expand Down Expand Up @@ -79,7 +79,7 @@ private void OnNewPoses(params object[] args)

var i = (int) Index;

var poses = (TrackedDevicePose_t[]) args[0];
var poses = args;
if (poses.Length <= i)
return;

Expand Down Expand Up @@ -130,12 +130,12 @@ private void OnControllerIndexChanged(ETrackedControllerRole role, uint index)
public void OnEnable()
{
Reset();
SteamVR_Utils.Event.Listen("new_poses", OnNewPoses);
SteamVR_Events.NewPoses.Listen(OnNewPoses);
}

public void OnDisable()
{
SteamVR_Utils.Event.Remove("new_poses", OnNewPoses);
SteamVR_Events.NewPoses.Remove(OnNewPoses);
Reset();
}

Expand Down
4 changes: 2 additions & 2 deletions Assets/HOTK/HOTK_TrackedDeviceManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ private void UpdatePoses()
var compositor = OpenVR.Compositor;
if (compositor == null) return;
compositor.GetLastPoses(_poses, _gamePoses);
SteamVR_Utils.Event.Send("new_poses", _poses);
SteamVR_Utils.Event.Send("new_poses_applied");
SteamVR_Events.NewPoses.Send(_poses);
SteamVR_Events.NewPosesApplied.Send();
}

/// <summary>
Expand Down
37 changes: 33 additions & 4 deletions Assets/Plugins/openvr_api.bundle.meta
View file
Open in desktop

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

Loading