Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing a bug the causes FaceOrigin collections to face the wrong direction when collections are rotated (and some bonuses) TAKE 2 #2246

Merged
merged 24 commits into from
Jun 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
9454011
Fixed an object collection bug that caused FaceOrigin collections to …
May 31, 2018
134251b
Fixed a merge mistake that put a , in the wrong spot
May 31, 2018
2f89074
Merge pull request #3 from Microsoft/june18_dev
Ecnassianer Jun 1, 2018
792fa0c
Merge pull request #5 from Microsoft/june18_dev
Ecnassianer Jun 1, 2018
bc8ecd6
Updated the collection examples map to use the new orientation types
Jun 1, 2018
00e3266
added a rotated cylinder collection
Jun 1, 2018
a4f03ba
Added an example of a radial collection to the object collection scene
Jun 1, 2018
4c2b8bf
Multiply by half instead of dividing by two
Jun 1, 2018
a2dcecd
tabs--> spaces
Jun 1, 2018
3ca8c06
fixed extraneous spaces in prefab names
Jun 2, 2018
6eb0cb4
cleaned up public properties
Jun 2, 2018
4fea185
tabs --> spaces
Jun 2, 2018
3afe7f3
updated the radial solver example with new public properties
Jun 2, 2018
23a7c55
new Vector3() --> default(Vector3) and some comment cleanup
Jun 2, 2018
cba36c7
added some comments explaining the enum rename
Jun 4, 2018
5837eca
Merge pull request #11 from Microsoft/june18_dev
Ecnassianer Jun 4, 2018
0aabb8d
cleaned up handedness
Jun 5, 2018
edb06fb
fixed line spacing
Jun 5, 2018
0ed30d1
redid code review fixes
Jun 5, 2018
f97727f
clarfied comments on orientation types
Jun 5, 2018
98273eb
Updating based on feedback
keveleigh Jun 11, 2018
3732633
Merge pull request #17 from keveleigh/Ecnassianer-collectionfacing
Ecnassianer Jun 11, 2018
43f0c77
Reverting some breaking changes
keveleigh Jun 11, 2018
64f46d8
Merge pull request #19 from keveleigh/Ecnassianer-collectionfacing
Ecnassianer Jun 12, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 142 additions & 0 deletions Assets/HoloToolkit-Examples/UX/Models/Model_Tetra.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
%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: 1518205972025162}
m_IsPrefabParent: 1
--- !u!1 &1370976729975188
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4993226159038490}
- component: {fileID: 33872725522972866}
- component: {fileID: 23438222969575584}
m_Layer: 0
m_Name: Platonic
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1518205972025162
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4479957502932928}
m_Layer: 0
m_Name: Model_Tetra
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1627669683963282
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4953339597329370}
m_Layer: 0
m_Name: CINEMA_4D_Editor
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4479957502932928
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1518205972025162}
m_LocalRotation: {x: -0, y: -0.19536461, z: -0, w: 0.98073065}
m_LocalPosition: {x: -0.29837453, y: -0.43106988, z: 0.71920186}
m_LocalScale: {x: 0.1, y: 0.15, z: 0.1}
m_Children:
- {fileID: 4953339597329370}
- {fileID: 4993226159038490}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4953339597329370
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1627669683963282}
m_LocalRotation: {x: -0.14040467, y: -0.7287883, z: 0.12678394, w: 0.6580881}
m_LocalPosition: {x: -0.849495, y: 3.3469186, z: 8.316336}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4479957502932928}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4993226159038490
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1370976729975188}
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: 4479957502932928}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23438222969575584
MeshRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1370976729975188}
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: 97b73006130d05b4c90034845c44e88d, 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 &33872725522972866
MeshFilter:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1370976729975188}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
10 changes: 10 additions & 0 deletions Assets/HoloToolkit-Examples/UX/Models/Model_Tetra.prefab.meta

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

113 changes: 113 additions & 0 deletions Assets/HoloToolkit-Examples/UX/Prefabs/BaseWedge.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
%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: 1813968316392310}
m_IsPrefabParent: 1
--- !u!1 &1131884656028906
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4865115451194496}
- component: {fileID: 33231007548501734}
- component: {fileID: 23425263732841188}
m_Layer: 0
m_Name: Wedge Closed
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1813968316392310
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4119857227660218}
m_Layer: 0
m_Name: BaseWedge
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4119857227660218
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1813968316392310}
m_LocalRotation: {x: -0, y: -0.35836792, z: 0.000000044703484, w: 0.9335805}
m_LocalPosition: {x: -0.19404785, y: 0, z: 0.215512}
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_Children:
- {fileID: 4865115451194496}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4865115451194496
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1131884656028906}
m_LocalRotation: {x: 0.5870724, y: -0.402045, z: 0.3767309, w: 0.59311026}
m_LocalPosition: {x: 0.04, y: -0, z: 0.26}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_Children: []
m_Father: {fileID: 4119857227660218}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 87.89101, y: -110.004005, z: -43.165}
--- !u!23 &23425263732841188
MeshRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1131884656028906}
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: 522573f9741466f4f9eb698bce4a266a, 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 &33231007548501734
MeshFilter:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1131884656028906}
m_Mesh: {fileID: 4300000, guid: 703cf294947fd9e48a73ef1135d37fab, type: 3}
10 changes: 10 additions & 0 deletions Assets/HoloToolkit-Examples/UX/Prefabs/BaseWedge.prefab.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
Expand Up @@ -326,9 +326,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e77a98cf320fe9340a55eecfe4567ca4, type: 3}
m_Name:
m_EditorClassIdentifier:
ButtonState: 4
ButtonPressFilter: 1
RequireGaze: 1
buttonState: 4
buttonPressFilter: 1
requireGaze: 1
MainCollider: {fileID: 0}
MainRenderer: {fileID: 0}
--- !u!114 &114471478630299092
Expand Down
Loading