Skip to content
This repository has been archived by the owner on Apr 27, 2024. It is now read-only.

Commit

Permalink
Updating HoloToolkit structure in Voice Completed (part of #3)
Browse files Browse the repository at this point in the history
  • Loading branch information
keveleigh committed May 9, 2016
1 parent dbe8e95 commit 687f7d0
Show file tree
Hide file tree
Showing 93 changed files with 47 additions and 194 deletions.

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

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

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

Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ Transform:
m_Children: []
m_Father: {fileID: 461510}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &419164
Transform:
m_ObjectHideFlags: 1
Expand All @@ -120,6 +121,7 @@ Transform:
m_Children: []
m_Father: {fileID: 499980}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &419746
Transform:
m_ObjectHideFlags: 1
Expand All @@ -134,6 +136,7 @@ Transform:
- {fileID: 499980}
m_Father: {fileID: 461510}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &461510
Transform:
m_ObjectHideFlags: 1
Expand All @@ -148,6 +151,7 @@ Transform:
- {fileID: 400602}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &487118
Transform:
m_ObjectHideFlags: 1
Expand All @@ -161,6 +165,7 @@ Transform:
- {fileID: 4000012769894500}
m_Father: {fileID: 419746}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &499980
Transform:
m_ObjectHideFlags: 1
Expand All @@ -174,6 +179,7 @@ Transform:
- {fileID: 419164}
m_Father: {fileID: 419746}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &2308126
MeshRenderer:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -338,6 +344,7 @@ Transform:
m_Children: []
m_Father: {fileID: 487118}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23000012823670630
MeshRenderer:
m_ObjectHideFlags: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23000011064610852
MeshRenderer:
m_ObjectHideFlags: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23000013018540608
MeshRenderer:
m_ObjectHideFlags: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23000011572353174
MeshRenderer:
m_ObjectHideFlags: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23000010137267438
MeshRenderer:
m_ObjectHideFlags: 1
Expand Down
9 changes: 9 additions & 0 deletions Completed/ModelExplorer/Assets/HoloToolkit/Input/Scripts.meta

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

Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using UnityEngine;

/// <summary>
/// CursorStates class takes GameObjects to give cursor feedback
/// CursorFeedback class takes GameObjects to give cursor feedback
/// to users based on different states.
/// </summary>
public class CursorStates : MonoBehaviour
public class CursorFeedback : MonoBehaviour
{
[Tooltip("Drag a prefab object to display when a hand is detected.")]
public GameObject HandDetectedAsset;
Expand Down

This file was deleted.

This file was deleted.

116 changes: 0 additions & 116 deletions Completed/ModelExplorer/Assets/HoloToolkit/Shaders/Wireframe.shader

This file was deleted.

This file was deleted.

9 changes: 9 additions & 0 deletions Completed/ModelExplorer/Assets/HoloToolkit/Utilities.meta

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

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

Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &2035550
Camera:
m_ObjectHideFlags: 1
Expand Down

0 comments on commit 687f7d0

Please sign in to comment.