Skip to content

Commit 6333981

Browse files
committed
feat(Examples): consolidate example scenes and provide descriptions
The example scenes have been reduced in number to fewer scenes that better show off the capabilities and provide text to understand what each section of the scene is showcasing. A number of hotfixes have been applied to certain scripts as they were not working correctly if the SDK Manager was additively loaded in from another scene. All original example files have been moved to the `LegacyExampleFiles` directory.
1 parent 34fbe88 commit 6333981

File tree

669 files changed

+148353
-4365
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

669 files changed

+148353
-4365
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
/[Aa]ssets/[Oo]culus[Pp]latform.meta
1414
/[Aa]ssets/[Oo][Vv][Rr][Aa]vatar/*
1515
/[Aa]ssets/[Oo][Vv][Rr][Aa]vatar.meta
16+
/[Aa]ssets/[Oo][Vv][Rr][Aa]udio[Mm]anager/*
17+
/[Aa]ssets/[Oo][Vv][Rr][Aa]udio[Mm]anager.meta
18+
/[Aa]ssets/[Oo][Ss][Pp][Nn]ative/*
19+
/[Aa]ssets/[Oo][Ss][Pp][Nn]ative.meta
1620
/[Aa]ssets/[Rr]esources/OculusPlatformSettings.asset
1721
/[Aa]ssets/[Rr]esources/OculusPlatformSettings.asset.meta
1822
/[Aa]ssets/[Rr]esources/OvrAvatarSettings.asset

Assets/VRTK/Documentation/API.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3878,6 +3878,17 @@ The AttemptGrab method will attempt to grab the currently touched Interactable O
38783878

38793879
The GetGrabbedObject method returns the current Interactable Object being grabbed by the this Interact Grab.
38803880

3881+
#### ForceControllerAttachPoint/1
3882+
3883+
> `public virtual void ForceControllerAttachPoint(Rigidbody forcedAttachPoint)`
3884+
3885+
* Parameters
3886+
* `Rigidbody forcedAttachPoint` - The rigidbody to use as the controller attach point.
3887+
* Returns
3888+
* _none_
3889+
3890+
The ForceControllerAttachPoint method updates the rigidbody being used as the controller grab attach position.
3891+
38813892
### Example
38823893

38833894
`VRTK/Examples/005_Controller/BasicObjectGrabbing` demonstrates the grabbing of interactable objects that have the `VRTK_InteractableObject` script attached to them. The objects can be picked up and thrown around.

Assets/VRTK/Examples/ExampleResources/Models/Materials/LightRing.mat

Lines changed: 0 additions & 128 deletions
This file was deleted.

Assets/VRTK/Examples/ExampleResources/SceneResources.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/VRTK/Examples/ExampleResources/SceneResources/[001 - Interactions] ControllerEvents.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/VRTK/Examples/ExampleResources/SceneResources/[001 - Interactions] ControllerEvents/Scripts.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)