Skip to content

Commit

Permalink
Merge branch 'SolverExampleUpdates' into june18_dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Ecnassianer authored Jun 4, 2018
2 parents cba36c7 + adb897b commit 6aac3a8
Show file tree
Hide file tree
Showing 33 changed files with 4,481 additions and 1,512 deletions.
10 changes: 10 additions & 0 deletions Assets/HoloToolkit-Examples/Utilities/Prefabs/SolverExample.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
@@ -0,0 +1,126 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1644659546057122}
m_IsPrefabParent: 1
--- !u!1 &1644659546057122
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4901806931539292}
- component: {fileID: 33633702823728314}
- component: {fileID: 23345689241976446}
- component: {fileID: 114474594170136286}
- component: {fileID: 114785721768203206}
m_Layer: 0
m_Name: Body Locked
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4901806931539292
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1644659546057122}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.906, y: 1.09, z: 0.987}
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23345689241976446
MeshRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1644659546057122}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: 8b4fa37d32efc2547b4954812f85e246, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &33633702823728314
MeshFilter:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1644659546057122}
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &114474594170136286
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1644659546057122}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c87713fbad4edbc46a3cc23770b0b4c3, type: 3}
m_Name:
m_EditorClassIdentifier:
element: 6
handedness: 1
trackedObjectToReference: 0
transformTarget: {fileID: 0}
--- !u!114 &114785721768203206
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1644659546057122}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b5d497bc39a2e294b86ffe2fdab27cef, type: 3}
m_Name:
m_EditorClassIdentifier:
UpdateLinkedTransform: 0
MoveLerpTime: 0.1
RotateLerpTime: 0.1
ScaleLerpTime: 0
MaintainScale: 1
GoalPosition: {x: 0, y: 0, z: 0}
GoalRotation: {x: 0, y: 0, z: 0, w: 0}
GoalScale: {x: 0, y: 0, z: 0}
Smoothing: 1
Lifetime: 0
Orientation: 1
offset: {x: 0, y: -0.6, z: 1}
RotationTether: 1
TetherAngleSteps: 10

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

Loading

0 comments on commit 6aac3a8

Please sign in to comment.