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

Commit

Permalink
Feature/hand examples (#13)
Browse files Browse the repository at this point in the history
* Move hands demos to examples (WIP)

* Reference TMPro assembly

* Some more work on hands demos

* Restore input system profile

* Save demos updates

* Add custom grabbable script just for testing

* Add tracked pose demo script

* Update pose demo (WIP)

* Update hand demos

* First round of cleanup for hand demos

* More demo updates

* Update examples

* Fix physics pendulum

* Fix demo tracked pose output format

* Update table asset

* Adjust demo room a bit

* Update text for preview demo

* Update tracked pose demo station handler

* Hide mesh rendering mode for now

* Remove textures

* Fix demo grabbable

* Updated some environment assets

* Add dumbbells props for grabbing demo

* Fox grabbable demo

* Update demos

* Update table textures

* Fix reflection probe

* Update demo a bit

* Minor demo update

Co-authored-by: Dino Fejzagic <dino.f@live.de>
  • Loading branch information
StephenHodgson and FejZa authored Sep 22, 2020
1 parent ff51415 commit d6037de
Show file tree
Hide file tree
Showing 172 changed files with 16,817 additions and 23 deletions.
8 changes: 8 additions & 0 deletions XRTK.Examples/Assets/XRTK.Examples/BaseScene.meta

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

38 changes: 19 additions & 19 deletions XRTK.Examples/Assets/XRTK.Examples/BaseScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ RenderSettings:
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientSkyColor: {r: 1, g: 1, b: 1, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
m_AmbientMode: 3
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
Expand Down Expand Up @@ -56,14 +56,14 @@ LightmapSettings:
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_BakeResolution: 50
m_AtlasSize: 1024
m_AO: 0
m_AO: 1
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_Padding: 16
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
Expand All @@ -72,7 +72,7 @@ LightmapSettings:
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_BakeBackend: 2
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
Expand Down Expand Up @@ -120,66 +120,66 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &726698796
--- !u!1 &286292020
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 726698797}
- component: {fileID: 286292021}
m_Layer: 0
m_Name: MixedRealityPlayspace
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &726698797
--- !u!4 &286292021
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 726698796}
m_GameObject: {fileID: 286292020}
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: 1858573978}
- {fileID: 855595942}
- {fileID: 1145328236}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &855595941
--- !u!1 &1145328235
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 855595942}
- component: {fileID: 1145328236}
m_Layer: 0
m_Name: PlayerBody
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &855595942
--- !u!4 &1145328236
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 855595941}
m_GameObject: {fileID: 1145328235}
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: 726698797}
m_Father: {fileID: 286292021}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1510210794
Expand Down Expand Up @@ -335,7 +335,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1510210795}
m_Father: {fileID: 726698797}
m_Father: {fileID: 286292021}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!81 &1858573979
Expand Down Expand Up @@ -402,11 +402,11 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
playspaceName: MixedRealityPlayspace
playspaceTransform: {fileID: 726698797}
playspaceTransform: {fileID: 286292021}
playerCamera: {fileID: 1858573980}
cameraPoseDriver: {fileID: 1858573984}
playerBodyName: PlayerBody
bodyTransform: {fileID: 855595942}
bodyTransform: {fileID: 1145328236}
--- !u!114 &1858573982
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down

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

Loading

0 comments on commit d6037de

Please sign in to comment.