diff --git a/Assets/Polyhydra/Prefabs/PolyTextButton.prefab b/Assets/Polyhydra/Prefabs/PolyTextButton.prefab new file mode 100644 index 0000000000..bfa5c3baf0 --- /dev/null +++ b/Assets/Polyhydra/Prefabs/PolyTextButton.prefab @@ -0,0 +1,382 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5356554084342350155 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1086507053015764154} + - component: {fileID: 338909745169955802} + - component: {fileID: 3791401445782358643} + m_Layer: 16 + m_Name: Quad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1086507053015764154 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5356554084342350155} + m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 20, y: 40, z: 40} + m_Children: [] + m_Father: {fileID: 7631838532712089505} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 90} +--- !u!33 &338909745169955802 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5356554084342350155} + m_Mesh: {fileID: 4300002, guid: dcc3e41ab91bd8e4a91e7bafc931a658, type: 3} +--- !u!23 &3791401445782358643 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5356554084342350155} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 6ea491f82329b774d8b8af4a409d8d03, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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!1 &7630606763700834929 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7631838532712089505} + - component: {fileID: 7607547799050771149} + - component: {fileID: 7617150943455370469} + - component: {fileID: 7570121149691821069} + - component: {fileID: 7879899076693153277} + m_Layer: 16 + m_Name: PolyTextButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7631838532712089505 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7630606763700834929} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.35, y: 0.35, z: 0.35} + m_Children: + - {fileID: 1086507053015764154} + - {fileID: 1091198114394518984} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7607547799050771149 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7630606763700834929} + m_Mesh: {fileID: 4300000, guid: 260cc07aabcea6d41a633a35c1103a6c, type: 3} +--- !u!23 &7617150943455370469 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7630606763700834929} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 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!65 &7570121149691821069 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7630606763700834929} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 0.2, z: 0.2} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &7879899076693153277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7630606763700834929} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4fec34370493495db8369963539a7de2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: Action + m_DescriptionTextExtra: + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: 2c39131b4066bbc44b66b24c73158828, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 0 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.02 + m_ZAdjustClick: 0.02 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 +--- !u!1 &8284857474551698643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1091198114394518984} + - component: {fileID: 7712098639572853541} + - component: {fileID: 448807298500013862} + - component: {fileID: 8353643196374566185} + m_Layer: 16 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1091198114394518984 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8284857474551698643} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_Children: [] + m_Father: {fileID: 7631838532712089505} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 22.31, y: 1.66} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &7712098639572853541 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8284857474551698643} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 21000011947829912, guid: cb60cf5a3dd8c84468b1d0a71b5d16bb, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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!222 &448807298500013862 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8284857474551698643} + m_CullTransparentMesh: 0 +--- !u!114 &8353643196374566185 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8284857474551698643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Sample text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: cb60cf5a3dd8c84468b1d0a71b5d16bb, type: 2} + m_sharedMaterial: {fileID: 21000011947829912, guid: cb60cf5a3dd8c84468b1d0a71b5d16bb, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 7.496979, y: 0, z: 7.302159, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 7712098639572853541} + m_maskType: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 diff --git a/Assets/Polyhydra/Prefabs/PolyTextButton.prefab.meta b/Assets/Polyhydra/Prefabs/PolyTextButton.prefab.meta new file mode 100644 index 0000000000..74ef263eeb --- /dev/null +++ b/Assets/Polyhydra/Prefabs/PolyTextButton.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c14df42a7335deb4c8cea658ce158c06 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Polyhydra/Prefabs/PolyhydraPanel.prefab b/Assets/Polyhydra/Prefabs/PolyhydraPanel.prefab index 2a45cbdf6a..cc0178305e 100644 --- a/Assets/Polyhydra/Prefabs/PolyhydraPanel.prefab +++ b/Assets/Polyhydra/Prefabs/PolyhydraPanel.prefab @@ -153,6 +153,8 @@ MonoBehaviour: m_Command: 101 - m_PopUpPrefab: {fileID: 197348, guid: 328fc82a268fc6f439af97fe53f8a1e2, type: 3} m_Command: 102 + - m_PopUpPrefab: {fileID: 197348, guid: bc75736d9bb05b44b863a577c9174afe, type: 3} + m_Command: 108 m_PanelDescription: Polyhydra m_PanelDescriptionPrefab: {fileID: 160918, guid: 3491f4f01ba6cac47b1633f36d7c6c84, type: 3} @@ -171,15 +173,15 @@ MonoBehaviour: m_BorderMeshAdvWidth: 0.01 m_PanelSensitivity: 0.1 m_ClampToBounds: 1 - m_ReticleBounds: {x: 1.55, y: 1.9, z: 0} + m_ReticleBounds: {x: 1.55, y: 4, z: 0} m_BorderSphereHighlightRadius: 2 m_PositioningSpheresBounds: {x: 0.8, y: 0.75} m_PositioningSphereRadius: 0.35 m_UseGazeRotation: 1 m_MaxGazeRotation: 20 m_GazeActivateSpeed: 8 - m_InitialSpawnPos: {x: 0, y: 0, z: 0} - m_InitialSpawnRotEulers: {x: 0, y: 0, z: 0} + m_InitialSpawnPos: {x: 2, y: 15, z: 5.34} + m_InitialSpawnRotEulers: {x: 37.18, y: 63.12, z: 0} m_WandAttachAngle: 0 m_WandAttachYOffset: 0 m_WandAttachHalfHeight: 1.3 @@ -189,6 +191,7 @@ MonoBehaviour: m_PopUpGazeDuration: 0.2 m_PromoBorders: - {fileID: 23000011669290354} + - {fileID: 5352209825629472804} ButtonShapeType: {fileID: 114000011377880380} ButtonUniformType: {fileID: 114000012163929814} ButtonJohnsonType: {fileID: 3576384594095847519} @@ -198,6 +201,9 @@ MonoBehaviour: ButtonsConwayOps: - {fileID: 7077284095846867029} - {fileID: 1320774484133479127} + ButtonsFaceSel: + - {fileID: 3720612949159289540} + - {fileID: 4323436247596871885} SlidersConwayOps: - {fileID: 7688705693690590343} - {fileID: 3826392786543407379} @@ -305,17 +311,17 @@ Transform: - {fileID: 5675040316750455163} - {fileID: 4473396472675370981} - {fileID: 6680474063863739742} + - {fileID: 2806053697965521323} - {fileID: 8527708936980945029} - {fileID: 3022290250871758097} - {fileID: 5692438514937617528} + - {fileID: 2148723013749198492} - {fileID: 7276579262940325426} - {fileID: 4378382595344929890} - {fileID: 4000013670140570} - {fileID: 1723887119507597305} - {fileID: 462574} - {fileID: 4000012046935194} - - {fileID: 3207722857452486412} - - {fileID: 609783172327090173} m_Father: {fileID: 460288} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -348,7 +354,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 421236} - m_RootOrder: 18 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &6539468 BoxCollider: @@ -527,7 +533,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 421236} - m_RootOrder: 16 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000013638722848 MeshFilter: @@ -752,7 +758,7 @@ Transform: m_LocalScale: {x: 0.63, y: 0.63, z: 1.5749999} m_Children: [] m_Father: {fileID: 421236} - m_RootOrder: 19 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &23000011942855136 MeshRenderer: @@ -841,8 +847,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000012833532246} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.9, y: 2.5, z: 2.4} + m_LocalPosition: {x: 0, y: -0.71, z: 0} + m_LocalScale: {x: 1.9, y: 3.8, z: 2.4} m_Children: [] m_Father: {fileID: 460288} m_RootOrder: 0 @@ -922,11 +928,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1824465057350681330} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.6, y: -2.0800006, z: 0.05} + m_LocalPosition: {x: -0.6939999, y: -2.0800006, z: 0.05} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] m_Father: {fileID: 421236} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8338219013440029973 MeshFilter: @@ -1027,6 +1033,139 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1.0000001, z: 0.1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &2259490472891151966 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2806053697965521323} + - component: {fileID: 6516039541600599781} + - component: {fileID: 2668474826901085212} + - component: {fileID: 3720612949159289540} + - component: {fileID: 6532976155611926086} + m_Layer: 16 + m_Name: Button_ConwayOp1FaceSel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2806053697965521323 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2259490472891151966} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.44900015, y: -1.653, z: 0.05} + m_LocalScale: {x: 0.125, y: 0.125, z: 0.125} + m_Children: [] + m_Father: {fileID: 421236} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6516039541600599781 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2259490472891151966} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &2668474826901085212 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2259490472891151966} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 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!114 &3720612949159289540 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2259490472891151966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 038b0de036c24ab9be7aafd97dd6edf7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: Filter Faces + m_DescriptionTextExtra: + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: 1deb6187842b22a468330ab47daf9d3c, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 1 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.01 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Command: 108 + m_CommandParam: 0 + m_CommandParam2: -1 + m_RequiresPopup: 1 + m_CenterPopupOnButton: 0 + m_PopupOffset: {x: 0, y: 0, z: 0} + m_PopupText: + m_ToggleOnDescription: + m_ToggleOnTexture: {fileID: 0} + m_AllowUnavailable: 0 + m_LinkedUIObject: {fileID: 0} +--- !u!65 &6532976155611926086 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2259490472891151966} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.8, y: 0.8, z: 0.1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &2880309418465484356 GameObject: m_ObjectHideFlags: 0 @@ -1188,7 +1327,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3835693321888168724} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.6, y: -1.56, z: 0.05} + m_LocalPosition: {x: -0.694, y: -1.56, z: 0.05} m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} m_Children: [] m_Father: {fileID: 421236} @@ -1559,6 +1698,139 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1.0000001, z: 0.1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &5719285144163855904 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2148723013749198492} + - component: {fileID: 7710292037091015087} + - component: {fileID: 5942163171115083671} + - component: {fileID: 4323436247596871885} + - component: {fileID: 4031485632419052068} + m_Layer: 16 + m_Name: Button_ConwayOp2FaceSel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2148723013749198492 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5719285144163855904} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.44900015, y: -2.17, z: 0.05} + m_LocalScale: {x: 0.125, y: 0.125, z: 0.125} + m_Children: [] + m_Father: {fileID: 421236} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7710292037091015087 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5719285144163855904} + m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3} +--- !u!23 &5942163171115083671 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5719285144163855904} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 40d29de2bdc11f04dbfa25059165916e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 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!114 &4323436247596871885 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5719285144163855904} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 038b0de036c24ab9be7aafd97dd6edf7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_DescriptionType: 0 + m_DescriptionYOffset: 0 + m_DescriptionText: Filter Faces + m_DescriptionTextExtra: + m_DescriptionActivateSpeed: 12 + m_DescriptionZScale: 1 + m_ButtonTexture: {fileID: 2800000, guid: 1deb6187842b22a468330ab47daf9d3c, type: 3} + m_AtlasTexture: 1 + m_ToggleButton: 1 + m_LongPressReleaseButton: 0 + m_ButtonHasPressedAudio: 1 + m_ZAdjustHover: -0.01 + m_ZAdjustClick: 0.05 + m_HoverScale: 1.1 + m_HoverBoxColliderGrow: 0.2 + m_AddOverlay: 0 + m_Command: 108 + m_CommandParam: 1 + m_CommandParam2: -1 + m_RequiresPopup: 1 + m_CenterPopupOnButton: 0 + m_PopupOffset: {x: 0, y: 0, z: 0} + m_PopupText: + m_ToggleOnDescription: + m_ToggleOnTexture: {fileID: 0} + m_AllowUnavailable: 0 + m_LinkedUIObject: {fileID: 0} +--- !u!65 &4031485632419052068 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5719285144163855904} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.8, y: 0.8, z: 0.1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &6314602226832363640 GameObject: m_ObjectHideFlags: 0 @@ -1723,7 +1995,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 421236} - m_RootOrder: 17 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3446966529609897578 MeshFilter: @@ -2070,6 +2342,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} +--- !u!4 &4473396472675370981 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, + type: 3} + m_PrefabInstance: {fileID: 7559455421571945} + m_PrefabAsset: {fileID: 0} --- !u!114 &2522004157252119527 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2514466698640951438, guid: 73f56870960b5564e8849fe39bdfd7c2, @@ -2082,12 +2360,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 42c914c85d400664c9df3239aafbec71, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &4473396472675370981 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, - type: 3} - m_PrefabInstance: {fileID: 7559455421571945} - m_PrefabAsset: {fileID: 0} --- !u!1001 &201899922958430446 PrefabInstance: m_ObjectHideFlags: 0 @@ -2163,7 +2435,7 @@ PrefabInstance: - target: {fileID: 2514466698640951438, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} propertyPath: m_DescriptionText - value: Amount + value: Param 2 objectReference: {fileID: 0} - target: {fileID: 2514466698640951438, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} @@ -2213,7 +2485,7 @@ PrefabInstance: - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} propertyPath: m_RootOrder - value: 15 + value: 17 objectReference: {fileID: 0} - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} @@ -2238,12 +2510,12 @@ PrefabInstance: - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} propertyPath: m_LocalPosition.y - value: -2.2080004 + value: -2.209 objectReference: {fileID: 0} - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} propertyPath: m_LocalPosition.z - value: -0.029999733 + value: 0.05 objectReference: {fileID: 0} - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} @@ -2400,106 +2672,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 201899922958430446} m_PrefabAsset: {fileID: 0} ---- !u!1001 &431429324405100491 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 421236} - m_Modifications: - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_RootOrder - value: 21 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.261 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalPosition.y - value: -1.7060003 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.029999733 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 975834435814379478, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_Name - value: SliderB - objectReference: {fileID: 0} - - target: {fileID: 975834435814379478, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 159900} - - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} ---- !u!4 &609783172327090173 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - m_PrefabInstance: {fileID: 431429324405100491} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1729168765779868061 PrefabInstance: m_ObjectHideFlags: 0 @@ -2570,7 +2742,7 @@ PrefabInstance: - target: {fileID: 2514466698640951438, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} propertyPath: m_DescriptionText - value: Amount + value: Param 2 objectReference: {fileID: 0} - target: {fileID: 2514466698640951438, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} @@ -2620,7 +2792,7 @@ PrefabInstance: - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} propertyPath: m_RootOrder - value: 12 + value: 13 objectReference: {fileID: 0} - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} @@ -2645,12 +2817,12 @@ PrefabInstance: - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} propertyPath: m_LocalPosition.y - value: -1.681 + value: -1.654 objectReference: {fileID: 0} - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} propertyPath: m_LocalPosition.z - value: -0.029999733 + value: 0.05 objectReference: {fileID: 0} - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} @@ -2807,106 +2979,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1729168765779868061} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2382055444455642938 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 421236} - m_Modifications: - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_RootOrder - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.261 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalPosition.y - value: -1.4730004 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.029999733 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 975834435814379478, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_Name - value: SliderA - objectReference: {fileID: 0} - - target: {fileID: 975834435814379478, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 159900} - - target: {fileID: 975834435824073636, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - propertyPath: OnUpdate.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ebe6fa705c559de4084f3b11e7668c61, type: 3} ---- !u!4 &3207722857452486412 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 975834435814123574, guid: ebe6fa705c559de4084f3b11e7668c61, - type: 3} - m_PrefabInstance: {fileID: 2382055444455642938} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4033229891041085526 PrefabInstance: m_ObjectHideFlags: 0 @@ -3052,7 +3124,7 @@ PrefabInstance: - target: {fileID: 2514466698640951438, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} propertyPath: m_DescriptionText - value: Amount + value: Param 1 objectReference: {fileID: 0} - target: {fileID: 2514466698640951438, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} @@ -3102,7 +3174,7 @@ PrefabInstance: - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} propertyPath: m_RootOrder - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} @@ -3132,7 +3204,7 @@ PrefabInstance: - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} propertyPath: m_LocalPosition.z - value: -0.029999733 + value: 0.05 objectReference: {fileID: 0} - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} @@ -3271,12 +3343,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} ---- !u!4 &8527708936980945029 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, - type: 3} - m_PrefabInstance: {fileID: 5212612228959206409} - m_PrefabAsset: {fileID: 0} --- !u!114 &7688705693690590343 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2514466698640951438, guid: 73f56870960b5564e8849fe39bdfd7c2, @@ -3289,6 +3355,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 42c914c85d400664c9df3239aafbec71, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &8527708936980945029 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, + type: 3} + m_PrefabInstance: {fileID: 5212612228959206409} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6554412450808857278 PrefabInstance: m_ObjectHideFlags: 0 @@ -3354,7 +3426,7 @@ PrefabInstance: - target: {fileID: 2514466698640951438, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} propertyPath: m_DescriptionText - value: Amount + value: Param 1 objectReference: {fileID: 0} - target: {fileID: 2514466698640951438, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} @@ -3404,7 +3476,7 @@ PrefabInstance: - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} propertyPath: m_RootOrder - value: 14 + value: 16 objectReference: {fileID: 0} - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} @@ -3434,7 +3506,7 @@ PrefabInstance: - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} propertyPath: m_LocalPosition.z - value: -0.029999733 + value: 0.05 objectReference: {fileID: 0} - target: {fileID: 4471627121253688460, guid: 73f56870960b5564e8849fe39bdfd7c2, type: 3} diff --git a/Assets/Polyhydra/Prefabs/PopUpWindow_PolyhydraFaceSel.prefab b/Assets/Polyhydra/Prefabs/PopUpWindow_PolyhydraFaceSel.prefab new file mode 100644 index 0000000000..7191141100 --- /dev/null +++ b/Assets/Polyhydra/Prefabs/PopUpWindow_PolyhydraFaceSel.prefab @@ -0,0 +1,655 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &149906 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 487816} + - component: {fileID: 2317498} + - component: {fileID: 10281232} + m_Layer: 0 + m_Name: TextLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &487816 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149906} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.735, y: 0.411, z: -0.002} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 461372} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &2317498 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149906} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 543b312efaeb6aa4aa25a9e07e815953, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 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!102 &10281232 +TextMesh: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149906} + m_Text: + m_OffsetZ: 0 + m_CharacterSize: 0.03 + m_LineSpacing: 1 + m_Anchor: 0 + m_Alignment: 0 + m_TabSize: 4 + m_FontSize: 64 + m_FontStyle: 0 + m_RichText: 1 + m_Font: {fileID: 12800000, guid: aa94fec06c672f74d86409a6979db921, type: 3} + m_Color: + serializedVersion: 2 + rgba: 4294967295 +--- !u!1 &161948 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 475244} + - component: {fileID: 3357478} + - component: {fileID: 2339530} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &475244 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161948} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.6, z: 0} + m_LocalScale: {x: 1.5, y: 2, z: 1.25} + m_Children: [] + m_Father: {fileID: 461372} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3357478 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161948} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2339530 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161948} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 063830079b917cf4188d2ebd898f4398, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 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!1 &163728 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 408056} + - component: {fileID: 3346038} + - component: {fileID: 2313680} + m_Layer: 0 + m_Name: TopBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &408056 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 163728} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.4, z: -0.0025} + m_LocalScale: {x: 1.5, y: 0.0125, z: 1} + m_Children: [] + m_Father: {fileID: 461372} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3346038 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 163728} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2313680 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 163728} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d153b453067a0724889fb677fef801a1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 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!1 &186270 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 461148} + - component: {fileID: 3381312} + - component: {fileID: 2341072} + m_Layer: 0 + m_Name: BottomBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &461148 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 186270} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -1.6, z: -0.0025} + m_LocalScale: {x: 1.5, y: 0.0125, z: 1} + m_Children: [] + m_Father: {fileID: 461372} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3381312 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 186270} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2341072 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 186270} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d153b453067a0724889fb677fef801a1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 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!1 &197348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 461372} + - component: {fileID: 6590698} + - component: {fileID: 11477574} + - component: {fileID: 114242525141314656} + m_Layer: 0 + m_Name: PopUpWindow_PolyhydraFaceSel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &461372 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 197348} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.804, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 408056} + - {fileID: 461148} + - {fileID: 475244} + - {fileID: 487816} + - {fileID: 7396823867553687651} + - {fileID: 3288171852070569938} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6590698 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 197348} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.5, y: 1.8, z: 0.025} + m_Center: {x: 0, y: -0.5, z: 0} +--- !u!114 &11477574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 197348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e06e7d3553634a498f42bba4764afc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Background: {fileID: 161948} + m_TopBorder: {fileID: 163728} + m_BottomBorder: {fileID: 186270} + m_WindowText: {fileID: 10281232} + m_WindowSubText: {fileID: 0} + m_CharacterWidth: 0.175 + m_SubtitleCharacterWidth: 0.05625 + m_ButtonWidth: 0.1 + m_BaseButtonOffset: {x: -0.4, y: 0, z: 0} + m_ReticleBounds: {x: 2.5, y: 2.5, z: -0.35} + m_PopUpForwardOffset: -0.25 + m_AutoPlaceButtons: [] + m_TransitionDuration: 0.1 + m_OpenDelay: 0 + m_Persistent: 0 + m_AudioOnOpen: 1 + m_BlockUndoRedo: 0 + m_IsLongPressPopUp: 0 + m_OrderedPageButtons: [] + m_PrevButton: {fileID: 0} + m_NextButton: {fileID: 0} + ButtonsPerPage: 16 + m_ColorTransitionDuration: 0 + ButtonPrefab: {fileID: 7630606763700834929, guid: c14df42a7335deb4c8cea658ce158c06, + type: 3} + xSpacing: 2.5 + ySpacing: 0.5 +--- !u!114 &114242525141314656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 197348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 739d5b1996234d64992a2ae60c3723e9, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1103224316806983618 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 461372} + m_Modifications: + - target: {fileID: 7630606763700834929, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Name + value: NextButton + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.48 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.322 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ButtonTexture + value: + objectReference: {fileID: 2800000, guid: ab8b9a0b96b6cb74ca1e518f3c56b425, type: 3} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 11477574} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: NextPage + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0963942396a615f4fb1b390436e881b8, type: 3} +--- !u!4 &7396823867553687651 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + m_PrefabInstance: {fileID: 1103224316806983618} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4920273118304108659 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 461372} + m_Modifications: + - target: {fileID: 7630606763700834929, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Name + value: PrevButton + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.y + value: -1.322 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_ButtonTexture + value: + objectReference: {fileID: 2800000, guid: f74f6eac3e3e3c640b1a343ec46ba2dd, type: 3} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 11477574} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PrevPage + objectReference: {fileID: 0} + - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0963942396a615f4fb1b390436e881b8, type: 3} +--- !u!4 &3288171852070569938 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7631838532712089505, guid: 0963942396a615f4fb1b390436e881b8, + type: 3} + m_PrefabInstance: {fileID: 4920273118304108659} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Polyhydra/Prefabs/PopUpWindow_PolyhydraFaceSel.prefab.meta b/Assets/Polyhydra/Prefabs/PopUpWindow_PolyhydraFaceSel.prefab.meta new file mode 100644 index 0000000000..6dec9e2559 --- /dev/null +++ b/Assets/Polyhydra/Prefabs/PopUpWindow_PolyhydraFaceSel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bc75736d9bb05b44b863a577c9174afe +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Polyhydra/Scripts/PolyhydraPanel.cs b/Assets/Polyhydra/Scripts/PolyhydraPanel.cs index a153af6e3e..2e14559d57 100644 --- a/Assets/Polyhydra/Scripts/PolyhydraPanel.cs +++ b/Assets/Polyhydra/Scripts/PolyhydraPanel.cs @@ -32,6 +32,7 @@ public class PolyhydraPanel : BasePanel public PolyhydraOptionButton ButtonOtherPolyType; public PolyhydraOptionButton ButtonGridShape; public PolyhydraOptionButton[] ButtonsConwayOps; + public PolyhydraOptionButton[] ButtonsFaceSel; public PolyhydraSlider[] SlidersConwayOps; public PolyhydraSlider SliderP; diff --git a/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowBase.cs b/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowBase.cs index ebe7b24609..41c4d768f3 100644 --- a/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowBase.cs +++ b/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowBase.cs @@ -39,7 +39,7 @@ override protected void BaseUpdate() } } - private List _buttons; + protected List _buttons; protected override void UpdateOpening() { @@ -72,7 +72,7 @@ public override void Init(GameObject rParent, string sText) protected abstract string[] GetButtonList(); - protected void CreateButtons() + protected virtual void CreateButtons() { foreach (var btn in _buttons) { diff --git a/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowConwayFaceSel.cs b/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowConwayFaceSel.cs new file mode 100644 index 0000000000..78e5b82d4f --- /dev/null +++ b/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowConwayFaceSel.cs @@ -0,0 +1,113 @@ +// Copyright 2020 The Tilt Brush Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System; +using System.Collections.Generic; +using System.Linq; +using Conway; +using TMPro; +using UnityEngine; + + +namespace TiltBrush +{ + + public class PolyhydraPopUpWindowConwayFaceSel : PolyhydraPopUpWindowBase + { + + [NonSerialized] protected int OpStackIndex = 0; + public float xSpacing = 2.5f; + public float ySpacing = .25f; + + protected override string[] GetButtonList() + { + return Enum.GetNames(typeof(FaceSelections)).Skip(FirstButtonIndex).Take(ButtonsPerPage).ToArray(); + } + + public override void SetPopupCommandParameters(int commandParam, int commandParam2) + { + base.SetPopupCommandParameters(commandParam, commandParam2); + OpStackIndex = commandParam; + } + + protected override string GetButtonTexturePath(int i) + { + return $"IconButtons/Spherize"; + } + + protected override void CreateButtons() + { + foreach (var btn in _buttons) + { + Destroy(btn); + } + _buttons = new List(); + string[] buttonLabels = GetButtonList(); + int columns = 2; + for (int buttonIndex = 0; buttonIndex < buttonLabels.Length; buttonIndex++) + { + + GameObject rButton = Instantiate(ButtonPrefab); + rButton.transform.parent = transform; + rButton.transform.localRotation = Quaternion.identity; + + float xOffset = buttonIndex % columns; + float yOffset = Mathf.FloorToInt(buttonIndex / (float)columns); + Vector3 position = new Vector3(xOffset * xSpacing, -yOffset * ySpacing, 0); + rButton.transform.localPosition = new Vector3(-0.52f, 0.15f, -0.08f) + (position * .35f); + + // rButton.transform.localScale = new Vector3(2, .2f, 1); + // + Renderer rButtonRenderer = rButton.GetComponent(); + // rButtonRenderer.material.mainTexture = GetButtonTexture(buttonIndex); + + PolyhydraThingButton rButtonScript = rButton.GetComponent(); + rButtonScript.ButtonIndex = buttonIndex; + rButtonScript.parentPopup = this; + rButtonScript.GetComponentInChildren().text = buttonLabels[buttonIndex]; + rButtonScript.SetDescriptionText(buttonLabels[buttonIndex]); + rButtonScript.RegisterComponent(); + _buttons.Add(rButton); + } + } + + public override void HandleButtonPress(int relativeButtonIndex) + { + int absoluteButtonIndex = relativeButtonIndex + FirstButtonIndex; + var ops = ParentPanel.PolyhydraModel.ConwayOperators; + + var op = ops[OpStackIndex]; + op.faceSelections = (FaceSelections)absoluteButtonIndex; + ops[OpStackIndex] = op; + ParentPanel.PolyhydraModel.ConwayOperators = ops; + ParentPanel.ButtonsFaceSel[OpStackIndex].SetDescriptionText(GetButtonList()[relativeButtonIndex]); + } + + public void NextPage() + { + if (FirstButtonIndex + ButtonsPerPage < Enum.GetNames(typeof(Ops)).Length) + { + FirstButtonIndex += ButtonsPerPage; + CreateButtons(); + } + } + public void PrevPage() + { + FirstButtonIndex -= ButtonsPerPage; + FirstButtonIndex = Mathf.Max(0, FirstButtonIndex); + CreateButtons(); + } + + } +} // namespace TiltBrush diff --git a/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowConwayFaceSel.cs.meta b/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowConwayFaceSel.cs.meta new file mode 100644 index 0000000000..a87fbd3fcf --- /dev/null +++ b/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowConwayFaceSel.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7e06e7d3553634a498f42bba4764afc5 +timeCreated: 1613846872 \ No newline at end of file diff --git a/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowConwayOps.cs b/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowConwayOps.cs index b5cedc1a7e..997aa84c57 100644 --- a/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowConwayOps.cs +++ b/Assets/Polyhydra/Scripts/PolyhydraPopUpWindowConwayOps.cs @@ -59,6 +59,16 @@ public override void HandleButtonPress(int relativeButtonIndex) ParentPanel.PolyhydraModel.ConwayOperators = ops; ParentPanel.ButtonsConwayOps[OpStackIndex].SetButtonTexture(GetButtonTexture(relativeButtonIndex)); ParentPanel.ButtonsConwayOps[OpStackIndex].SetDescriptionText(GetButtonList()[relativeButtonIndex]); + + if (opConfig.usesFaces) + { + ParentPanel.ButtonsFaceSel[OpStackIndex].gameObject.SetActive(true); + } + else + { + ParentPanel.ButtonsFaceSel[OpStackIndex].gameObject.SetActive(false); + } + if (opConfig.usesAmount) { ParentPanel.SlidersConwayOps[OpStackIndex * 2].gameObject.SetActive(true); diff --git a/Assets/Scripts/SketchControlsScript.cs b/Assets/Scripts/SketchControlsScript.cs index 305fd22fb8..5cb1ca77fa 100644 --- a/Assets/Scripts/SketchControlsScript.cs +++ b/Assets/Scripts/SketchControlsScript.cs @@ -149,6 +149,7 @@ public enum GlobalCommands PolyhydraJohnsonTypesPopup, PolyhydraOtherTypesPopup, PolyhydraConwayOpTypesPopup, + PolyhydraConwayOpFaceSelPopup #endif }