Skip to content

Commit

Permalink
Merge pull request #1280 from thestonefox/feat/sdk-transform-modifier
Browse files Browse the repository at this point in the history
feat(Utilities): ability to modify transform orientation based on sdk - fixes #1268
  • Loading branch information
thestonefox authored Jun 14, 2017
2 parents c14d36f + e0e258e commit 3e8c7c9
Show file tree
Hide file tree
Showing 58 changed files with 35,555 additions and 3,509 deletions.
186 changes: 154 additions & 32 deletions Assets/VRTK/Examples/001_CameraRig_VRPlayArea.unity

Large diffs are not rendered by default.

454 changes: 437 additions & 17 deletions Assets/VRTK/Examples/002_Controller_Events.unity

Large diffs are not rendered by default.

9,733 changes: 8,963 additions & 770 deletions Assets/VRTK/Examples/003_Controller_SimplePointer.unity

Large diffs are not rendered by default.

471 changes: 445 additions & 26 deletions Assets/VRTK/Examples/004_CameraRig_BasicTeleport.unity

Large diffs are not rendered by default.

450 changes: 433 additions & 17 deletions Assets/VRTK/Examples/005_Controller_BasicObjectGrabbing.unity

Large diffs are not rendered by default.

450 changes: 433 additions & 17 deletions Assets/VRTK/Examples/006_Controller_UsingADoor.unity

Large diffs are not rendered by default.

463 changes: 443 additions & 20 deletions Assets/VRTK/Examples/007_CameraRig_HeightAdjustTeleport.unity

Large diffs are not rendered by default.

464 changes: 440 additions & 24 deletions Assets/VRTK/Examples/008_Controller_UsingAGrabbedObject.unity

Large diffs are not rendered by default.

461 changes: 442 additions & 19 deletions Assets/VRTK/Examples/009_Controller_BezierPointer.unity

Large diffs are not rendered by default.

469 changes: 446 additions & 23 deletions Assets/VRTK/Examples/010_CameraRig_TerrainTeleporting.unity

Large diffs are not rendered by default.

449 changes: 434 additions & 15 deletions Assets/VRTK/Examples/011_Camera_HeadSetCollisionFading.unity

Large diffs are not rendered by default.

476 changes: 452 additions & 24 deletions Assets/VRTK/Examples/012_Controller_PointerWithAreaCollision.unity

Large diffs are not rendered by default.

Large diffs are not rendered by default.

562 changes: 537 additions & 25 deletions Assets/VRTK/Examples/014_Controller_SnappingObjectsOnGrab.unity

Large diffs are not rendered by default.

448 changes: 432 additions & 16 deletions Assets/VRTK/Examples/015_Controller_TouchpadAxisControl.unity

Large diffs are not rendered by default.

448 changes: 429 additions & 19 deletions Assets/VRTK/Examples/016_Controller_HapticRumble.unity

Large diffs are not rendered by default.

190 changes: 166 additions & 24 deletions Assets/VRTK/Examples/017_CameraRig_TouchpadWalking.unity

Large diffs are not rendered by default.

452 changes: 434 additions & 18 deletions Assets/VRTK/Examples/018_CameraRig_FramesPerSecondCounter.unity

Large diffs are not rendered by default.

460 changes: 439 additions & 21 deletions Assets/VRTK/Examples/019_Controller_InteractingWithPointer.unity

Large diffs are not rendered by default.

465 changes: 444 additions & 21 deletions Assets/VRTK/Examples/020_CameraRig_MeshTeleporting.unity

Large diffs are not rendered by default.

570 changes: 541 additions & 29 deletions Assets/VRTK/Examples/021_Controller_GrabbingObjectsWithJoints.unity

Large diffs are not rendered by default.

463 changes: 443 additions & 20 deletions Assets/VRTK/Examples/022_Controller_CustomBezierPointer.unity

Large diffs are not rendered by default.

195 changes: 169 additions & 26 deletions Assets/VRTK/Examples/023_Controller_ChildOfControllerOnGrab.unity
Original file line number Diff line number Diff line change
Expand Up @@ -233,15 +233,15 @@ Prefab:
m_Modifications:
- target: {fileID: 487352, guid: da23bdf76745c6c4f9258cd40e3d4859, type: 2}
propertyPath: m_LocalPosition.x
value: -2.4323301
value: -1.855
objectReference: {fileID: 0}
- target: {fileID: 487352, guid: da23bdf76745c6c4f9258cd40e3d4859, type: 2}
propertyPath: m_LocalPosition.y
value: -0.79582775
objectReference: {fileID: 0}
- target: {fileID: 487352, guid: da23bdf76745c6c4f9258cd40e3d4859, type: 2}
propertyPath: m_LocalPosition.z
value: -1.6567307
value: -1.831
objectReference: {fileID: 0}
- target: {fileID: 487352, guid: da23bdf76745c6c4f9258cd40e3d4859, type: 2}
propertyPath: m_LocalRotation.x
Expand Down Expand Up @@ -279,6 +279,14 @@ Prefab:
propertyPath: useOverrideButton
value: 0
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: sdkOverrides.Array.data[0].rotation.x
value: 40
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: sdkOverrides.Array.data[0].position.x
value: -0.1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: da23bdf76745c6c4f9258cd40e3d4859, type: 2}
m_IsPrefabParent: 0
Expand Down Expand Up @@ -731,7 +739,7 @@ GameObject:
m_Component:
- component: {fileID: 258307759}
m_Layer: 0
m_Name: ExampleObjects
m_Name: ExampleWorldObjects
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -895,7 +903,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 420827964}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.1003299, y: -0.71312785, z: -0.45073074}
m_LocalPosition: {x: -1.523, y: -0.71312785, z: -0.625}
m_LocalScale: {x: 0.15, y: 0.2, z: 0.15}
m_Children: []
m_Father: {fileID: 258307759}
Expand Down Expand Up @@ -1203,8 +1211,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1128634656}
m_RootOrder: 6
m_Father: {fileID: 566670856}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &464076872
MonoBehaviour:
Expand Down Expand Up @@ -1410,6 +1418,38 @@ Prefab:
Transform:
m_PrefabParentObject: {fileID: 438460, guid: 75cf7c488a12f82458c40376897dec74, type: 2}
m_PrefabInternal: {fileID: 513469656}
--- !u!1 &566670855
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 566670856}
m_Layer: 0
m_Name: '[VRTK_Scripts]'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &566670856
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 566670855}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1073158517}
- {fileID: 1133123751}
- {fileID: 1057027775}
- {fileID: 464076871}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &586982470
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2138,7 +2178,7 @@ Prefab:
- target: {fileID: 224000012623161658, guid: d46cf6b1ad9d84a48ae7548a2a6b41b3,
type: 2}
propertyPath: m_AnchoredPosition.x
value: 339
value: 660
objectReference: {fileID: 0}
- target: {fileID: 224000012623161658, guid: d46cf6b1ad9d84a48ae7548a2a6b41b3,
type: 2}
Expand Down Expand Up @@ -2222,7 +2262,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4000011368645488, guid: 41c0760bd81dd084283814f0c432b466, type: 2}
propertyPath: m_LocalPosition.y
value: 0.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4000011368645488, guid: 41c0760bd81dd084283814f0c432b466, type: 2}
propertyPath: m_LocalPosition.z
Expand Down Expand Up @@ -2252,6 +2292,36 @@ Prefab:
propertyPath: m_LocalPosition.y
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 114000010315091656, guid: 41c0760bd81dd084283814f0c432b466,
type: 2}
propertyPath: actualBoundaries
value:
objectReference: {fileID: 686392171}
- target: {fileID: 114000010315091656, guid: 41c0760bd81dd084283814f0c432b466,
type: 2}
propertyPath: actualHeadset
value:
objectReference: {fileID: 686392174}
- target: {fileID: 114000010315091656, guid: 41c0760bd81dd084283814f0c432b466,
type: 2}
propertyPath: actualLeftController
value:
objectReference: {fileID: 686392173}
- target: {fileID: 114000010315091656, guid: 41c0760bd81dd084283814f0c432b466,
type: 2}
propertyPath: actualRightController
value:
objectReference: {fileID: 686392172}
- target: {fileID: 114000010315091656, guid: 41c0760bd81dd084283814f0c432b466,
type: 2}
propertyPath: modelAliasLeftController
value:
objectReference: {fileID: 686392170}
- target: {fileID: 114000010315091656, guid: 41c0760bd81dd084283814f0c432b466,
type: 2}
propertyPath: modelAliasRightController
value:
objectReference: {fileID: 686392169}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 41c0760bd81dd084283814f0c432b466, type: 2}
m_IsPrefabParent: 0
Expand Down Expand Up @@ -2290,6 +2360,36 @@ MonoBehaviour:
type: 2}
m_PrefabInternal: {fileID: 686392162}
m_Script: {fileID: 11500000, guid: eeda6d41317f444b900e374895f14e95, type: 3}
--- !u!1 &686392169 stripped
GameObject:
m_PrefabParentObject: {fileID: 1846200688178366, guid: 41c0760bd81dd084283814f0c432b466,
type: 2}
m_PrefabInternal: {fileID: 686392162}
--- !u!1 &686392170 stripped
GameObject:
m_PrefabParentObject: {fileID: 1297872528131846, guid: 41c0760bd81dd084283814f0c432b466,
type: 2}
m_PrefabInternal: {fileID: 686392162}
--- !u!1 &686392171 stripped
GameObject:
m_PrefabParentObject: {fileID: 1000012704122952, guid: 41c0760bd81dd084283814f0c432b466,
type: 2}
m_PrefabInternal: {fileID: 686392162}
--- !u!1 &686392172 stripped
GameObject:
m_PrefabParentObject: {fileID: 1000012404417072, guid: 41c0760bd81dd084283814f0c432b466,
type: 2}
m_PrefabInternal: {fileID: 686392162}
--- !u!1 &686392173 stripped
GameObject:
m_PrefabParentObject: {fileID: 1000012074436610, guid: 41c0760bd81dd084283814f0c432b466,
type: 2}
m_PrefabInternal: {fileID: 686392162}
--- !u!1 &686392174 stripped
GameObject:
m_PrefabParentObject: {fileID: 1000013428897076, guid: 41c0760bd81dd084283814f0c432b466,
type: 2}
m_PrefabInternal: {fileID: 686392162}
--- !u!4 &696283945 stripped
Transform:
m_PrefabParentObject: {fileID: 438460, guid: 75cf7c488a12f82458c40376897dec74, type: 2}
Expand Down Expand Up @@ -2494,11 +2594,11 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 838683674}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 9.2653475, y: -12.729746, z: -33.865685}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1128634656}
m_RootOrder: 2
m_Father: {fileID: 913723266}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &838683676
MonoBehaviour:
Expand Down Expand Up @@ -2592,6 +2692,35 @@ Transform:
m_Father: {fileID: 2070027988}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &913723265
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 913723266}
m_Layer: 0
m_Name: '[ExampleSceneScripts]'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &913723266
Transform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 913723265}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 838683675}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &962788953
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2823,8 +2952,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1128634656}
m_RootOrder: 5
m_Father: {fileID: 566670856}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1057027776
MonoBehaviour:
Expand Down Expand Up @@ -2969,8 +3098,8 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 586982471}
m_Father: {fileID: 1128634656}
m_RootOrder: 3
m_Father: {fileID: 566670856}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1103168057
GameObject:
Expand Down Expand Up @@ -3063,7 +3192,7 @@ GameObject:
- component: {fileID: 1128634656}
- component: {fileID: 1128634657}
m_Layer: 0
m_Name: '[VRTK]'
m_Name: '[VRTK_SDKManager]'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -3081,11 +3210,6 @@ Transform:
m_Children:
- {fileID: 686392164}
- {fileID: 653501384}
- {fileID: 838683675}
- {fileID: 1073158517}
- {fileID: 1133123751}
- {fileID: 1057027775}
- {fileID: 464076871}
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -3137,12 +3261,12 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1133123750}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1128634656}
m_RootOrder: 4
m_Father: {fileID: 566670856}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1133123752
MonoBehaviour:
Expand Down Expand Up @@ -3663,7 +3787,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1334892808}
m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071067}
m_LocalPosition: {x: -2.04833, y: -0.7861278, z: -0.9887307}
m_LocalPosition: {x: -1.471, y: -0.7861278, z: -1.163}
m_LocalScale: {x: 1, y: 1.2999995, z: 1}
m_Children:
- {fileID: 1532274312}
Expand Down Expand Up @@ -4672,6 +4796,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 1805510856}
- component: {fileID: 1805510857}
m_Layer: 0
m_Name: SnapPoint
m_TagString: Untagged
Expand All @@ -4692,6 +4817,24 @@ Transform:
m_Father: {fileID: 1334892811}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!114 &1805510857
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1805510855}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 393a6cb30fae3e841bd85dca765098f6, type: 3}
m_Name:
m_EditorClassIdentifier:
target: {fileID: 0}
sdkOverrides:
- loadedSDKSetup: {fileID: 0}
controllerType: 5
position: {x: 0, y: 0, z: 0}
rotation: {x: 40, y: 0, z: 0}
scale: {x: 1, y: 1, z: 1}
--- !u!1001 &1836648638
Prefab:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -5060,7 +5203,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1985595246}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.1203299, y: -1.2171278, z: -0.96973073}
m_LocalPosition: {x: -1.543, y: -1.2171278, z: -1.144}
m_LocalScale: {x: 0.5, y: 0.8, z: 2}
m_Children: []
m_Father: {fileID: 258307759}
Expand Down
Loading

0 comments on commit 3e8c7c9

Please sign in to comment.