Skip to content

Commit

Permalink
Add Plane Guide (#149)
Browse files Browse the repository at this point in the history
* Implemented Plane Guide.  Fixed stencil button name typo.

* Fixed plane guide having the wrong tooltip.

* Updated copyright year.

* Fixed attribute naming.

* Fixed layered painting not working correctly (including z-fighting).

* Changed to negative offset so that brush strokes appear in front rather than behind.
  • Loading branch information
insominx authored Aug 11, 2021
1 parent cad1d39 commit b7ceac5
Show file tree
Hide file tree
Showing 9 changed files with 1,137 additions and 550 deletions.
166 changes: 156 additions & 10 deletions Assets/Prefabs/Panels/GuideToolsPanel.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Transform:
- {fileID: 406342}
- {fileID: 432918}
- {fileID: 4000013828497108}
- {fileID: 1740165316512057755}
- {fileID: 4000010889664432}
- {fileID: 4000013338876414}
- {fileID: 4000012518913856}
Expand Down Expand Up @@ -334,11 +335,11 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1000010407002122}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.416, y: 0.21000004, z: 0.05}
m_LocalPosition: {x: 0, y: 0.21000004, z: 0.05}
m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
m_Children: []
m_Father: {fileID: 417900}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33000010974736674
MeshFilter:
Expand All @@ -362,6 +363,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -373,6 +375,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
Expand Down Expand Up @@ -424,6 +427,7 @@ MonoBehaviour:
m_ZAdjustHover: -0.02
m_ZAdjustClick: 0.05
m_HoverScale: 1.1
m_HoverBoxColliderGrow: 0.2
m_AddOverlay: 0
m_Type: 2
--- !u!1 &1000011539968446
Expand Down Expand Up @@ -454,11 +458,11 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1000011539968446}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.21000004, z: 0.05}
m_LocalPosition: {x: 0.416, y: 0.21000004, z: 0.05}
m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
m_Children: []
m_Father: {fileID: 417900}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33000010139712078
MeshFilter:
Expand All @@ -482,6 +486,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -493,6 +498,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
Expand Down Expand Up @@ -544,6 +550,7 @@ MonoBehaviour:
m_ZAdjustHover: -0.02
m_ZAdjustClick: 0.05
m_HoverScale: 1.1
m_HoverBoxColliderGrow: 0.2
m_AddOverlay: 0
m_Type: 1
--- !u!1 &1000011773655602
Expand Down Expand Up @@ -577,7 +584,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 417900}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33000010254827896
MeshFilter:
Expand All @@ -601,6 +608,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -612,6 +620,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
Expand Down Expand Up @@ -693,6 +702,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -704,6 +714,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
Expand Down Expand Up @@ -755,6 +766,7 @@ MonoBehaviour:
m_ZAdjustHover: -0.02
m_ZAdjustClick: 0.05
m_HoverScale: 1.1
m_HoverBoxColliderGrow: 0.2
m_AddOverlay: 0
m_Command: 28
m_CommandParam: -1
Expand Down Expand Up @@ -821,6 +833,7 @@ MeshRenderer:
m_MotionVectors: 0
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -832,6 +845,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 1
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
Expand Down Expand Up @@ -872,11 +886,11 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1000012314343422}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.416, y: 0, z: 0.05}
m_LocalPosition: {x: 0.416, y: -0.21, z: 0.05}
m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
m_Children: []
m_Father: {fileID: 417900}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33000013658333808
MeshFilter:
Expand All @@ -900,6 +914,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -911,6 +926,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
Expand Down Expand Up @@ -962,6 +978,7 @@ MonoBehaviour:
m_ZAdjustHover: -0.02
m_ZAdjustClick: 0.05
m_HoverScale: 1.1
m_HoverBoxColliderGrow: 0.2
m_AddOverlay: 0
m_Command: 38
m_CommandParam: -1
Expand Down Expand Up @@ -1006,7 +1023,7 @@ Transform:
m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
m_Children: []
m_Father: {fileID: 417900}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33000013915695756
MeshFilter:
Expand All @@ -1030,6 +1047,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -1041,6 +1059,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
Expand Down Expand Up @@ -1092,6 +1111,7 @@ MonoBehaviour:
m_ZAdjustHover: -0.02
m_ZAdjustClick: 0.05
m_HoverScale: 1.1
m_HoverBoxColliderGrow: 0.2
m_AddOverlay: 0
m_Type: 8
--- !u!1 &1000013984474622
Expand All @@ -1108,7 +1128,7 @@ GameObject:
- component: {fileID: 65000012076310584}
- component: {fileID: 114000011264458296}
m_Layer: 16
m_Name: PanelButton_GuideStencil
m_Name: PanelButton_GuideCapsule
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand All @@ -1126,7 +1146,7 @@ Transform:
m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
m_Children: []
m_Father: {fileID: 417900}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &33000010068933098
MeshFilter:
Expand All @@ -1150,6 +1170,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
Expand All @@ -1161,6 +1182,7 @@ MeshRenderer:
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
Expand Down Expand Up @@ -1212,5 +1234,129 @@ MonoBehaviour:
m_ZAdjustHover: -0.02
m_ZAdjustClick: 0.05
m_HoverScale: 1.1
m_HoverBoxColliderGrow: 0.2
m_AddOverlay: 0
m_Type: 3
--- !u!1 &4099382765129129040
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1740165316512057755}
- component: {fileID: 1304738839580606656}
- component: {fileID: 8912230613168107705}
- component: {fileID: 5045411833944777428}
- component: {fileID: 4909323277910679879}
m_Layer: 16
m_Name: PanelButton_GuidePlane
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1740165316512057755
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4099382765129129040}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.416, y: 0.21000004, z: 0.05}
m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
m_Children: []
m_Father: {fileID: 417900}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1304738839580606656
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4099382765129129040}
m_Mesh: {fileID: 4300000, guid: 5501f437160666942ae970f3648fbeb8, type: 3}
--- !u!23 &8912230613168107705
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4099382765129129040}
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: 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 &5045411833944777428
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4099382765129129040}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 0.1}
m_Center: {x: -0.000000074505806, y: 0.000000022351742, z: 0.01}
--- !u!114 &4909323277910679879
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4099382765129129040}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 483352d8a6ca1b64999b70a7a617fc54, type: 3}
m_Name:
m_EditorClassIdentifier:
m_DescriptionType: 0
m_DescriptionYOffset: 0
m_DescriptionText: Plane Guide
m_DescriptionTextExtra:
m_DescriptionActivateSpeed: 12
m_DescriptionZScale: 1
m_ButtonTexture: {fileID: 2800000, guid: d5133db99d7b8724b9a844f44753ee83, type: 3}
m_AtlasTexture: 1
m_ToggleButton: 0
m_LongPressReleaseButton: 0
m_ButtonHasPressedAudio: 1
m_ZAdjustHover: -0.02
m_ZAdjustClick: 0.05
m_HoverScale: 1.1
m_HoverBoxColliderGrow: 0.2
m_AddOverlay: 0
m_Type: 0
Loading

0 comments on commit b7ceac5

Please sign in to comment.