diff --git a/Assets/Materials/Mat_PointCloud.mat b/Assets/Materials/Mat_PointCloud.mat
index 6068f373dfa8707ef88aeb85e69276b69753f632..f326dc423ea1c012c31bab12bc0adf04a1f9acf7 100644
--- a/Assets/Materials/Mat_PointCloud.mat
+++ b/Assets/Materials/Mat_PointCloud.mat
@@ -103,8 +103,12 @@ Material:
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
+ - _DecalMeshBiasType: 0
+ - _DecalMeshDepthBias: 0
+ - _DecalMeshViewBias: 0
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
+ - _DrawOrder: 0
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
@@ -113,6 +117,7 @@ Material:
- _GlossyReflections: 1
- _Metallic: 0
- _OcclusionStrength: 1
+ - _Opacity: 1
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
diff --git a/Assets/Prefabs/Quad.prefab b/Assets/Prefabs/Quad.prefab
deleted file mode 100644
index 8994326c23a363a6359d4a135dd23ab58382cb31..0000000000000000000000000000000000000000
--- a/Assets/Prefabs/Quad.prefab
+++ /dev/null
@@ -1,328 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &2720765159515821108
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6932357064353144026}
- - component: {fileID: 7011188564143932531}
- - component: {fileID: 7968349410991391766}
- - component: {fileID: 4353599475975138122}
- - component: {fileID: 8583429270821239024}
- - component: {fileID: 418805287641421752}
- - component: {fileID: 3156276543328460730}
- - component: {fileID: 6584571414324418003}
- m_Layer: 0
- m_Name: Quad
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &6932357064353144026
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2720765159515821108}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0.61, y: 0.2525534, z: 3.7599}
- m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
- m_ConstrainProportionsScale: 1
- m_Children: []
- m_Father: {fileID: 0}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &7011188564143932531
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2720765159515821108}
- m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &7968349410991391766
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2720765159515821108}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 7a7e0214bd11cb24aaeff6edf52a139a, 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
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &4353599475975138122
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2720765159515821108}
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_IsTrigger: 0
- m_ProvidesContacts: 0
- m_Enabled: 1
- serializedVersion: 5
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
---- !u!54 &8583429270821239024
-Rigidbody:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2720765159515821108}
- serializedVersion: 4
- m_Mass: 1
- m_Drag: 0
- m_AngularDrag: 0.05
- m_CenterOfMass: {x: 0, y: 0, z: 0}
- m_InertiaTensor: {x: 1, y: 1, z: 1}
- m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ImplicitCom: 1
- m_ImplicitTensor: 1
- m_UseGravity: 0
- m_IsKinematic: 1
- m_Interpolate: 0
- m_Constraints: 112
- m_CollisionDetection: 0
---- !u!114 &418805287641421752
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2720765159515821108}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_InteractionManager: {fileID: 0}
- m_Colliders: []
- m_InteractionLayerMask:
- serializedVersion: 2
- m_Bits: 4294967295
- m_InteractionLayers:
- m_Bits: 1
- m_DistanceCalculationMode: 1
- m_SelectMode: 0
- m_FocusMode: 1
- m_CustomReticle: {fileID: 0}
- m_AllowGazeInteraction: 0
- m_AllowGazeSelect: 0
- m_OverrideGazeTimeToSelect: 0
- m_GazeTimeToSelect: 0.5
- m_OverrideTimeToAutoDeselectGaze: 0
- m_TimeToAutoDeselectGaze: 3
- m_AllowGazeAssistance: 0
- m_FirstHoverEntered:
- m_PersistentCalls:
- m_Calls: []
- m_LastHoverExited:
- m_PersistentCalls:
- m_Calls: []
- m_HoverEntered:
- m_PersistentCalls:
- m_Calls: []
- m_HoverExited:
- m_PersistentCalls:
- m_Calls: []
- m_FirstSelectEntered:
- m_PersistentCalls:
- m_Calls: []
- m_LastSelectExited:
- m_PersistentCalls:
- m_Calls: []
- m_SelectEntered:
- m_PersistentCalls:
- m_Calls: []
- m_SelectExited:
- m_PersistentCalls:
- m_Calls: []
- m_FirstFocusEntered:
- m_PersistentCalls:
- m_Calls: []
- m_LastFocusExited:
- m_PersistentCalls:
- m_Calls: []
- m_FocusEntered:
- m_PersistentCalls:
- m_Calls: []
- m_FocusExited:
- m_PersistentCalls:
- m_Calls: []
- m_Activated:
- m_PersistentCalls:
- m_Calls: []
- m_Deactivated:
- m_PersistentCalls:
- m_Calls: []
- m_StartingHoverFilters: []
- m_StartingSelectFilters: []
- m_StartingInteractionStrengthFilters: []
- m_OnFirstHoverEntered:
- m_PersistentCalls:
- m_Calls: []
- m_OnLastHoverExited:
- m_PersistentCalls:
- m_Calls: []
- m_OnHoverEntered:
- m_PersistentCalls:
- m_Calls: []
- m_OnHoverExited:
- m_PersistentCalls:
- m_Calls: []
- m_OnSelectEntered:
- m_PersistentCalls:
- m_Calls: []
- m_OnSelectExited:
- m_PersistentCalls:
- m_Calls: []
- m_OnSelectCanceled:
- m_PersistentCalls:
- m_Calls: []
- m_OnActivate:
- m_PersistentCalls:
- m_Calls: []
- m_OnDeactivate:
- m_PersistentCalls:
- m_Calls: []
- m_AttachTransform: {fileID: 0}
- m_SecondaryAttachTransform: {fileID: 0}
- m_UseDynamicAttach: 0
- m_MatchAttachPosition: 1
- m_MatchAttachRotation: 1
- m_SnapToColliderVolume: 1
- m_ReinitializeDynamicAttachEverySingleGrab: 1
- m_AttachEaseInTime: 0.15
- m_MovementType: 1
- m_VelocityDamping: 1
- m_VelocityScale: 1
- m_AngularVelocityDamping: 1
- m_AngularVelocityScale: 1
- m_TrackPosition: 1
- m_SmoothPosition: 1
- m_SmoothPositionAmount: 8
- m_TightenPosition: 0.1
- m_TrackRotation: 0
- m_SmoothRotation: 0
- m_SmoothRotationAmount: 8
- m_TightenRotation: 0.1
- m_TrackScale: 0
- m_SmoothScale: 0
- m_SmoothScaleAmount: 8
- m_TightenScale: 0.1
- m_ThrowOnDetach: 0
- m_ThrowSmoothingDuration: 0.25
- m_ThrowSmoothingCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 1
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0
- outWeight: 0
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- m_ThrowVelocityScale: 1.5
- m_ThrowAngularVelocityScale: 1
- m_ForceGravityOnDetach: 0
- m_RetainTransformParent: 1
- m_AttachPointCompatibilityMode: 0
- m_StartingSingleGrabTransformers: []
- m_StartingMultipleGrabTransformers: []
- m_AddDefaultGrabTransformers: 1
---- !u!114 &3156276543328460730
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2720765159515821108}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d0a1302d0d134fa8a2a5b3bf4aec3c20, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_PermittedDisplacementAxes: -1
- m_ConstrainedAxisDisplacementMode: 1
- m_TwoHandedRotationMode: 1
- m_AllowOneHandedScaling: 1
- m_AllowTwoHandedScaling: 0
- m_OneHandedScaleSpeed: 0.5
- m_ThresholdMoveRatioForScale: 0.05
- m_ClampScaling: 1
- m_MinimumScaleRatio: 0.25
- m_MaximumScaleRatio: 2
- m_ScaleMultiplier: 0.25
---- !u!114 &6584571414324418003
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2720765159515821108}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 98b85445213936746822c3b05e91cac9, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- parentBlockDeform: {fileID: 0}
- normal: {x: 0, y: 0, z: 0}
diff --git a/Assets/Prefabs/Quad.prefab.meta b/Assets/Prefabs/Quad.prefab.meta
deleted file mode 100644
index 9ecfa5fbc7cff2537ccda4f1e95c1b82e9460571..0000000000000000000000000000000000000000
--- a/Assets/Prefabs/Quad.prefab.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 6039eb6aec463c148a50da59f2274aa7
-PrefabImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/VRModellingScene.unity
similarity index 99%
rename from Assets/Scenes/SampleScene.unity
rename to Assets/Scenes/VRModellingScene.unity
index d0ef86ee9ef595c3c8c4d8c705210841db7ea092..c17dcdb13ce7feeda865e20134639380c55a8d07 100644
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/VRModellingScene.unity
@@ -583,7 +583,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
- m_TransformParent: {fileID: 449044966}
+ m_TransformParent: {fileID: 720670189}
m_Modifications:
- target: {fileID: 169305219790147484, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_Enabled
@@ -599,7 +599,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1248386867110803025, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_SizeDelta.x
- value: 220
+ value: 170
objectReference: {fileID: 0}
- target: {fileID: 1248386867110803025, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -639,7 +639,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431700, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 180
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431700, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_SizeDelta.y
@@ -663,15 +663,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431700, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431700, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431700, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431700, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -1304,7 +1304,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2179057468902719979, guid: f47ad6ac315a3ea428b59e2cac6f2a2e, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -178
+ value: -379
objectReference: {fileID: 0}
- target: {fileID: 2179057468902719979, guid: f47ad6ac315a3ea428b59e2cac6f2a2e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -3724,6 +3724,10 @@ PrefabInstance:
propertyPath: m_text
value: Main Menu
objectReference: {fileID: 0}
+ - target: {fileID: 2758455749949792183, guid: 085ce58b196caa446a8545c9dd388793, type: 3}
+ propertyPath: m_ShowMaskGraphic
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 3060619106468608791, guid: 085ce58b196caa446a8545c9dd388793, type: 3}
propertyPath: m_PresetInfoIsWorld
value: 1
@@ -3904,10 +3908,7 @@ PrefabInstance:
addedObject: {fileID: 685654681}
- targetCorrespondingSourceObject: {fileID: 1035790433963668018, guid: 085ce58b196caa446a8545c9dd388793, type: 3}
insertIndex: -1
- addedObject: {fileID: 841805422}
- - targetCorrespondingSourceObject: {fileID: 1035790433963668018, guid: 085ce58b196caa446a8545c9dd388793, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1146522988}
+ addedObject: {fileID: 720670189}
- targetCorrespondingSourceObject: {fileID: 1035790433963668018, guid: 085ce58b196caa446a8545c9dd388793, type: 3}
insertIndex: -1
addedObject: {fileID: 1855450724}
@@ -5637,56 +5638,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
---- !u!1 &423529120
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 423529121}
- - component: {fileID: 423529122}
- m_Layer: 0
- m_Name: Light Probe Group
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &423529121
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 423529120}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.4547317, y: 0.27271938, z: -0.72758746}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1703568386}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!220 &423529122
-LightProbeGroup:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 423529120}
- m_Enabled: 1
- m_SourcePositions:
- - {x: 2.146144, y: 2.1454465, z: 2.767537}
- - {x: 2.146144, y: 2.1454465, z: -1}
- - {x: 2.146144, y: 0.13248897, z: 2.767537}
- - {x: 2.146144, y: 0.13248897, z: -1}
- - {x: -2.4144797, y: 2.1454465, z: 2.767537}
- - {x: -2.4144797, y: 2.1454465, z: -1}
- - {x: -2.4144797, y: 0.13248897, z: 2.767537}
- - {x: -2.4144797, y: 0.13248897, z: -1}
- m_Dering: 1
--- !u!1 &426651918
GameObject:
m_ObjectHideFlags: 0
@@ -6991,7 +6942,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2179057468902719979, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2179057468902719979, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
propertyPath: m_AnchorMin.x
@@ -6999,11 +6950,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2179057468902719979, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2179057468902719979, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
propertyPath: m_SizeDelta.x
- value: 352
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2179057468902719979, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
propertyPath: m_SizeDelta.y
@@ -7039,11 +6990,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2179057468902719979, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 200
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2179057468902719979, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -44
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2179057468902719979, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -7063,27 +7014,135 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2179057468902719980, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2179057469866936249, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_text
+ value: Point Cloud Opacity
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Value
+ value: 0.759
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_NormalColor.b
+ value: 0.30938667
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_NormalColor.g
+ value: 0.14978638
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_NormalColor.r
+ value: 0.3207547
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_PressedColor.b
+ value: 0.3979299
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_PressedColor.g
+ value: 0.24684052
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_PressedColor.r
+ value: 0.4056604
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_ColorMultiplier
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_DisabledColor.b
+ value: 0.6320754
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_DisabledColor.g
+ value: 0.6320754
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_DisabledColor.r
+ value: 0.6320754
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_SelectedColor.b
+ value: 0.4433962
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_SelectedColor.g
+ value: 0.26980242
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_SelectedColor.r
+ value: 0.37557942
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_HighlightedColor.b
+ value: 0.7075472
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_HighlightedColor.g
+ value: 0.46391067
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_Colors.m_HighlightedColor.r
+ value: 0.5821313
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 426651924}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: SetOpacity
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+ value: SelectPointsController, Assembly-CSharp
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892515873890, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840892729805100, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_text
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7081840893004531709, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
propertyPath: m_AnchorMax.x
- value: 0.495
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7081840893004531709, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7081840893004531709, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
propertyPath: m_AnchorMin.x
- value: 0.495
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7081840893024566376, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
+ propertyPath: m_text
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 7081840893373687796, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
propertyPath: m_AnchorMax.x
- value: 0.495
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7081840893373687796, guid: 41d89b59fe3e9964a83686ff24b7d0c5, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@@ -9350,6 +9409,85 @@ MonoBehaviour:
m_Image: {fileID: 2018379307}
m_CanvasGroup: {fileID: 0}
m_IgnoreAlpha: 0
+--- !u!1 &720670188
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 720670189}
+ - component: {fileID: 720670191}
+ - component: {fileID: 720670190}
+ m_Layer: 5
+ m_Name: Horizontal content
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &720670189
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 720670188}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 841805422}
+ - {fileID: 1146522988}
+ m_Father: {fileID: 449044966}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &720670190
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 720670188}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 2
+ m_VerticalFit: 1
+--- !u!114 &720670191
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 720670188}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 4
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 1
+ m_ChildForceExpandHeight: 1
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 0
+ m_ChildScaleWidth: 0
+ m_ChildScaleHeight: 0
+ m_ReverseArrangement: 0
--- !u!1 &732956838
GameObject:
m_ObjectHideFlags: 0
@@ -16288,7 +16426,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431699, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_Name
- value: Export List Item Button (2)
+ value: Clear Selection List Item Button
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431700, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_Pivot.x
@@ -18401,7 +18539,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
- m_TransformParent: {fileID: 449044966}
+ m_TransformParent: {fileID: 720670189}
m_Modifications:
- target: {fileID: 169305219790147484, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_Enabled
@@ -18417,7 +18555,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1248386867110803025, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_SizeDelta.x
- value: 220
+ value: 170
objectReference: {fileID: 0}
- target: {fileID: 1248386867110803025, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -18457,7 +18595,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431700, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_SizeDelta.x
- value: 0
+ value: 180
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431700, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_SizeDelta.y
@@ -18481,15 +18619,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431700, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431700, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431700, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431700, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -18893,55 +19031,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1533900678}
m_CullTransparentMesh: 1
---- !u!1 &1548251155
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1548251156}
- - component: {fileID: 1548251157}
- m_Layer: 0
- m_Name: Post Process Volume
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &1548251156
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1548251155}
- serializedVersion: 2
- 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_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1703568386}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1548251157
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1548251155}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_IsGlobal: 1
- priority: 0
- blendDistance: 0
- weight: 1
- sharedProfile: {fileID: 11400000, guid: 12bd4b8ecc486d84b9e059255860c49b, type: 2}
--- !u!1 &1555512242
GameObject:
m_ObjectHideFlags: 0
@@ -19691,71 +19780,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1595563443}
m_CullTransparentMesh: 1
---- !u!1 &1598269138
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1598269139}
- - component: {fileID: 1598269140}
- m_Layer: 0
- m_Name: Reflection Probe
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1598269139
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1598269138}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0.888, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1703568386}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!215 &1598269140
-ReflectionProbe:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1598269138}
- m_Enabled: 1
- serializedVersion: 2
- m_Type: 0
- m_Mode: 0
- m_RefreshMode: 0
- m_TimeSlicingMode: 0
- m_Resolution: 128
- m_UpdateFrequency: 0
- m_BoxSize: {x: 20, y: 10, z: 20}
- m_BoxOffset: {x: 0, y: 0, z: 0}
- m_NearClip: 0.3
- m_FarClip: 1000
- m_ShadowDistance: 100
- m_ClearFlags: 1
- m_BackGroundColor: {r: 0.0047169924, g: 0.39177144, b: 1, a: 1}
- m_CullingMask:
- serializedVersion: 2
- m_Bits: 4294967295
- m_IntensityMultiplier: 1.5
- m_BlendDistance: 1
- m_HDR: 1
- m_BoxProjection: 0
- m_RenderDynamicObjects: 0
- m_UseOcclusionCulling: 1
- m_Importance: 1
- m_CustomBakedTexture: {fileID: 0}
--- !u!1 &1608969156
GameObject:
m_ObjectHideFlags: 0
@@ -20794,41 +20818,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1702963519}
m_CullTransparentMesh: 0
---- !u!1 &1703568385
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1703568386}
- m_Layer: 0
- m_Name: Lighting
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &1703568386
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1703568385}
- serializedVersion: 2
- 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_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 1548251156}
- - {fileID: 1815318737}
- - {fileID: 1598269139}
- - {fileID: 423529121}
- m_Father: {fileID: 0}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!224 &1714251360 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1035790433963668018, guid: 085ce58b196caa446a8545c9dd388793, type: 3}
@@ -21342,124 +21331,6 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 2179057468902719979, guid: f47ad6ac315a3ea428b59e2cac6f2a2e, type: 3}
m_PrefabInstance: {fileID: 358224100}
m_PrefabAsset: {fileID: 0}
---- !u!1 &1815318735
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1815318737}
- - component: {fileID: 1815318736}
- - component: {fileID: 1815318738}
- m_Layer: 0
- m_Name: Directional Light
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 2147483647
- m_IsActive: 1
---- !u!108 &1815318736
-Light:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1815318735}
- m_Enabled: 1
- serializedVersion: 10
- m_Type: 1
- m_Shape: 0
- m_Color: {r: 1, g: 0.9456522, b: 0.85, a: 1}
- m_Intensity: 0.5
- m_Range: 10
- m_SpotAngle: 30
- m_InnerSpotAngle: 21.80208
- m_CookieSize: 10
- m_Shadows:
- m_Type: 1
- m_Resolution: -1
- m_CustomResolution: -1
- m_Strength: 1
- m_Bias: 0.05
- m_NormalBias: 0.4
- m_NearPlane: 0.2
- m_CullingMatrixOverride:
- e00: 1
- e01: 0
- e02: 0
- e03: 0
- e10: 0
- e11: 1
- e12: 0
- e13: 0
- e20: 0
- e21: 0
- e22: 1
- e23: 0
- e30: 0
- e31: 0
- e32: 0
- e33: 1
- m_UseCullingMatrixOverride: 0
- m_Cookie: {fileID: 0}
- m_DrawHalo: 0
- m_Flare: {fileID: 0}
- m_RenderMode: 0
- m_CullingMask:
- serializedVersion: 2
- m_Bits: 4294967295
- m_RenderingLayerMask: 1
- m_Lightmapping: 1
- m_LightShadowCasterMode: 0
- m_AreaSize: {x: 1, y: 1}
- m_BounceIntensity: 1
- m_ColorTemperature: 6570
- m_UseColorTemperature: 0
- m_BoundingSphereOverride: {x: 1.02e-43, y: 3e-45, z: 4.784e-42, w: 0}
- m_UseBoundingSphereOverride: 0
- m_UseViewFrustumForShadowCasterCull: 1
- m_ShadowRadius: 0
- m_ShadowAngle: 0
---- !u!4 &1815318737
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1815318735}
- serializedVersion: 2
- m_LocalRotation: {x: 0.17646448, y: 0.7790459, z: -0.5465076, w: 0.25154987}
- m_LocalPosition: {x: 0, y: 3, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1703568386}
- m_LocalEulerAnglesHint: {x: 70.1, y: 144.21, z: 0}
---- !u!114 &1815318738
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1815318735}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Version: 3
- m_UsePipelineSettings: 1
- m_AdditionalLightsShadowResolutionTier: 2
- m_LightLayerMask: 1
- m_RenderingLayers: 1
- m_CustomShadowLayers: 0
- m_ShadowLayerMask: 1
- m_ShadowRenderingLayers: 1
- m_LightCookieSize: {x: 1, y: 1}
- m_LightCookieOffset: {x: 0, y: 0}
- m_SoftShadowQuality: 1
--- !u!1 &1823426888 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 99cc2a1856d1d8f40954668ce0ee3a7e, type: 3}
@@ -22074,7 +21945,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431699, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_Name
- value: Export List Item Button (1)
+ value: Export List Item Button
objectReference: {fileID: 0}
- target: {fileID: 2397425259038431700, guid: fa5ef3b56cfeb4f4ba855cdf2610a578, type: 3}
propertyPath: m_Pivot.x
@@ -27992,5 +27863,4 @@ SceneRoots:
- {fileID: 2046629159}
- {fileID: 1783572214}
- {fileID: 1565887663878291441}
- - {fileID: 1703568386}
- {fileID: 426651920}
diff --git a/Assets/Scenes/SampleScene.unity.meta b/Assets/Scenes/VRModellingScene.unity.meta
similarity index 100%
rename from Assets/Scenes/SampleScene.unity.meta
rename to Assets/Scenes/VRModellingScene.unity.meta
diff --git a/Assets/Scrips/Components/Block/BlockRotate.cs b/Assets/Scrips/Components/Block/BlockRotate.cs
index 47f2f9479d14982f3630fe5fb2d6e9f4d40042a3..78a46f62f2575bee152227a787a700e6a5389b2a 100644
--- a/Assets/Scrips/Components/Block/BlockRotate.cs
+++ b/Assets/Scrips/Components/Block/BlockRotate.cs
@@ -89,18 +89,22 @@ public class BlockRotate : MonoBehaviour
{
_rotateAnchor = Instantiate(RotateAnchorPrefab, this.transform.position, Quaternion.identity);
_rotateAnchor.GetComponent<RotateAnchor>().Initialize(this);
+ _rotateAnchor.SetActive(false);
EditState.Instance.RegisterListener(EditStateHandler);
- EditStateHandler();
}
private void OnDestroy()
{
EditState.Instance.RemoveListener(EditStateHandler);
+ Destroy(_rotateAnchor);
}
private void EditStateHandler()
{
EditState.EditType mode = EditState.Instance.ActiveEditState;
- _rotateAnchor.SetActive(mode == EditState.EditType.Rotate);
+ if (mode != EditState.EditType.Rotate)
+ {
+ _rotateAnchor.SetActive(false);
+ }
}
}
diff --git a/Assets/Scrips/Components/Block/RotateAnchor.cs b/Assets/Scrips/Components/Block/RotateAnchor.cs
index cbc3d369a11c3ec4e8649846a81a7fa0bb2a9616..5ac33099353d1d6a6ce952a31de06ea41ccf8ed6 100644
--- a/Assets/Scrips/Components/Block/RotateAnchor.cs
+++ b/Assets/Scrips/Components/Block/RotateAnchor.cs
@@ -63,11 +63,6 @@ public class RotateAnchor : MonoBehaviour
}
}
- // Update is called once per frame
- void Update()
- {
-
- }
public void Initialize(BlockRotate blockRotate)
{
diff --git a/Assets/Scrips/Controllers/SelectPointsController.cs b/Assets/Scrips/Controllers/SelectPointsController.cs
index fc839d2ee9ba35a7ca5535727eb1bb0161bb25b7..5b8c06899399ddbd2e11c09dc9c4b484d5685b69 100644
--- a/Assets/Scrips/Controllers/SelectPointsController.cs
+++ b/Assets/Scrips/Controllers/SelectPointsController.cs
@@ -239,6 +239,22 @@ public class SelectPointsController : MonoBehaviour
// }
}
+ public void SetOpacity(float opacity)
+ {
+ foreach (GameObject cloud in pointClouds)
+ {
+ try
+ {
+ Material mat = cloud.GetComponent<MeshRenderer>().material;
+ mat.SetFloat("_Opacity", opacity);
+ }
+ catch
+ {
+ Debug.LogWarning("No material found on point cloud GameObject.");
+ }
+ }
+ }
+
private void CalculateRealPoints()
{
_recalculatedPoints = new();
diff --git a/Assets/Shaders/vertex-shader-graph.shadergraph b/Assets/Shaders/vertex-shader-graph.shadergraph
index 928f6d207711ac7b37a26bc3677f397e553ff756..bbaa6ec1146d46cda9698d2c4b99c7801735f1a4 100644
--- a/Assets/Shaders/vertex-shader-graph.shadergraph
+++ b/Assets/Shaders/vertex-shader-graph.shadergraph
@@ -5,6 +5,9 @@
"m_Properties": [
{
"m_Id": "a4fdeb58fa074432ae460be87d2f4c20"
+ },
+ {
+ "m_Id": "7452bba68b254627bb94cdb60990af0d"
}
],
"m_Keywords": [],
@@ -16,33 +19,62 @@
],
"m_Nodes": [
{
- "m_Id": "b2d3311631744801bd758fd1db1abd7f"
+ "m_Id": "4bf7dd6c4adf4673ac59e61a6b55b7a1"
},
{
- "m_Id": "70fd93d7fd8641dab1b0d623db758b0a"
+ "m_Id": "3f94c0aa883d42109112d8ddbe1d372a"
},
{
- "m_Id": "2cf7e97c132540f0a34f1ce1688b6916"
+ "m_Id": "67130bba711645bb87a30948972ed0e3"
},
{
- "m_Id": "4bf7dd6c4adf4673ac59e61a6b55b7a1"
+ "m_Id": "6f0d054225c84b07a1c9fa945e6cb267"
},
{
- "m_Id": "3f94c0aa883d42109112d8ddbe1d372a"
+ "m_Id": "4a32c911378e4904a7a99895b072b28b"
},
{
- "m_Id": "67130bba711645bb87a30948972ed0e3"
+ "m_Id": "6af1a9f9b24b4c94ae84fd857c3716e0"
},
{
- "m_Id": "6f0d054225c84b07a1c9fa945e6cb267"
+ "m_Id": "ac97a9308d474feb98bf085879c7c9b6"
},
{
- "m_Id": "4a32c911378e4904a7a99895b072b28b"
+ "m_Id": "dc27fb88428c4b0aa4e0e682d61001f9"
+ },
+ {
+ "m_Id": "2ed12ef08a0249958433130fb4f8d1d0"
+ },
+ {
+ "m_Id": "a37f2afa095e4ad7862c0837c842737c"
+ },
+ {
+ "m_Id": "f54fe137e4be4b11966e7a6d0a42f98d"
+ },
+ {
+ "m_Id": "ce23fc8d582744c88196cf6ed33a6e64"
+ },
+ {
+ "m_Id": "35fbcade712c422397516cb8996a6e9f"
}
],
"m_GroupDatas": [],
"m_StickyNoteDatas": [],
"m_Edges": [
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "35fbcade712c422397516cb8996a6e9f"
+ },
+ "m_SlotId": 2
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "f54fe137e4be4b11966e7a6d0a42f98d"
+ },
+ "m_SlotId": 0
+ }
+ },
{
"m_OutputSlot": {
"m_Node": {
@@ -112,33 +144,67 @@
},
"m_SlotId": 0
}
+ },
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "ce23fc8d582744c88196cf6ed33a6e64"
+ },
+ "m_SlotId": 0
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "35fbcade712c422397516cb8996a6e9f"
+ },
+ "m_SlotId": 1
+ }
+ },
+ {
+ "m_OutputSlot": {
+ "m_Node": {
+ "m_Id": "f54fe137e4be4b11966e7a6d0a42f98d"
+ },
+ "m_SlotId": 2
+ },
+ "m_InputSlot": {
+ "m_Node": {
+ "m_Id": "a37f2afa095e4ad7862c0837c842737c"
+ },
+ "m_SlotId": 0
+ }
}
],
"m_VertexContext": {
"m_Position": {
- "x": 0.0,
- "y": 0.0
+ "x": 142.00003051757813,
+ "y": -26.999996185302736
},
"m_Blocks": [
{
- "m_Id": "b2d3311631744801bd758fd1db1abd7f"
+ "m_Id": "6af1a9f9b24b4c94ae84fd857c3716e0"
},
{
- "m_Id": "70fd93d7fd8641dab1b0d623db758b0a"
+ "m_Id": "ac97a9308d474feb98bf085879c7c9b6"
},
{
- "m_Id": "2cf7e97c132540f0a34f1ce1688b6916"
+ "m_Id": "dc27fb88428c4b0aa4e0e682d61001f9"
}
]
},
"m_FragmentContext": {
"m_Position": {
- "x": -0.000015974044799804688,
- "y": 221.00001525878907
+ "x": 141.99998474121095,
+ "y": 190.00001525878907
},
"m_Blocks": [
{
"m_Id": "4bf7dd6c4adf4673ac59e61a6b55b7a1"
+ },
+ {
+ "m_Id": "2ed12ef08a0249958433130fb4f8d1d0"
+ },
+ {
+ "m_Id": "a37f2afa095e4ad7862c0837c842737c"
}
]
},
@@ -150,7 +216,7 @@
"preventRotation": false
},
"m_Path": "Shader Graphs",
- "m_GraphPrecision": 1,
+ "m_GraphPrecision": 0,
"m_PreviewMode": 2,
"m_OutputNode": {
"m_Id": ""
@@ -163,38 +229,44 @@
]
}
+{
+ "m_SGVersion": 2,
+ "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget",
+ "m_ObjectId": "07b2d9fd3dde42538ef8b0ef24b0d57b"
+}
+
{
"m_SGVersion": 0,
- "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
- "m_ObjectId": "29968c6eda724c6384d90a5553663c09",
+ "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+ "m_ObjectId": "1d7f75242fc04a3890d6c3cf36d06877",
"m_Id": 0,
- "m_DisplayName": "Normal",
+ "m_DisplayName": "A",
"m_SlotType": 0,
"m_Hidden": false,
- "m_ShaderOutputName": "Normal",
- "m_StageCapability": 1,
+ "m_ShaderOutputName": "A",
+ "m_StageCapability": 3,
"m_Value": {
- "x": 0.0,
- "y": 0.0,
- "z": 0.0
+ "x": 1.0,
+ "y": 1.0,
+ "z": 1.0,
+ "w": 1.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
- "z": 0.0
- },
- "m_Labels": [],
- "m_Space": 0
+ "z": 0.0,
+ "w": 0.0
+ }
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
- "m_ObjectId": "2cf7e97c132540f0a34f1ce1688b6916",
+ "m_ObjectId": "2ed12ef08a0249958433130fb4f8d1d0",
"m_Group": {
"m_Id": ""
},
- "m_Name": "VertexDescription.Tangent",
+ "m_Name": "SurfaceDescription.Alpha",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
@@ -207,7 +279,7 @@
},
"m_Slots": [
{
- "m_Id": "988e4efa4fa942e4bc85366ffb4b7754"
+ "m_Id": "7ed1ac489e2041419065f1029405a0e0"
}
],
"synonyms": [],
@@ -218,7 +290,75 @@
"m_CustomColors": {
"m_SerializableColors": []
},
- "m_SerializedDescriptor": "VertexDescription.Tangent"
+ "m_SerializedDescriptor": "SurfaceDescription.Alpha"
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+ "m_ObjectId": "30f6f2ae84e948e49d73ca5cbb0eae6b",
+ "m_Id": 0,
+ "m_DisplayName": "In",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "In",
+ "m_StageCapability": 3,
+ "m_Value": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0,
+ "w": 0.0
+ },
+ "m_DefaultValue": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0,
+ "w": 0.0
+ }
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.SubtractNode",
+ "m_ObjectId": "35fbcade712c422397516cb8996a6e9f",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Subtract",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": -293.0000915527344,
+ "y": 463.9999694824219,
+ "width": 126.0,
+ "height": 118.00003051757813
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "1d7f75242fc04a3890d6c3cf36d06877"
+ },
+ {
+ "m_Id": "c5fd8065088541adb589bec801442eea"
+ },
+ {
+ "m_Id": "dcb6dd176a4742d98ed4288ff51e3f1a"
+ }
+ ],
+ "synonyms": [
+ "subtraction",
+ "remove",
+ "minus",
+ "take away"
+ ],
+ "m_Precision": 0,
+ "m_PreviewExpanded": false,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ }
}
{
@@ -256,10 +396,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": -654.0,
- "y": 241.0,
+ "x": -644.0,
+ "y": 207.99998474121095,
"width": 118.0,
- "height": 94.0
+ "height": 94.00001525878906
}
},
"m_Slots": [
@@ -385,10 +525,28 @@
"m_ChildObjectList": [
{
"m_Id": "a4fdeb58fa074432ae460be87d2f4c20"
+ },
+ {
+ "m_Id": "7452bba68b254627bb94cdb60990af0d"
}
]
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "5fbee1d9a2ec4c6b8a2fd9fcda3629ec",
+ "m_Id": 0,
+ "m_DisplayName": "Opacity",
+ "m_SlotType": 1,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Out",
+ "m_StageCapability": 3,
+ "m_Value": 0.0,
+ "m_DefaultValue": 0.0,
+ "m_Labels": []
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.ColorspaceConversionNode",
@@ -401,10 +559,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": -489.0,
- "y": 335.0,
+ "x": -489.0000305175781,
+ "y": 274.9999694824219,
"width": 213.0,
- "height": 131.0
+ "height": 131.00003051757813
}
},
"m_Slots": [
@@ -431,82 +589,82 @@
{
"m_SGVersion": 0,
- "m_Type": "UnityEditor.ShaderGraph.BranchNode",
- "m_ObjectId": "6f0d054225c84b07a1c9fa945e6cb267",
+ "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+ "m_ObjectId": "6af1a9f9b24b4c94ae84fd857c3716e0",
"m_Group": {
"m_Id": ""
},
- "m_Name": "Branch",
+ "m_Name": "VertexDescription.Position",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": -227.0,
- "y": 221.0,
- "width": 172.0,
- "height": 142.0
+ "x": 0.0,
+ "y": 0.0,
+ "width": 0.0,
+ "height": 0.0
}
},
"m_Slots": [
{
- "m_Id": "c1d248fd39d646f7aa51e8befcc980ad"
- },
- {
- "m_Id": "b70a497f3f3f4ef5ad625b68d97f19bd"
- },
- {
- "m_Id": "a9bc5ea12f8a4877aad161a0e8359b67"
- },
- {
- "m_Id": "732e70c9909d4388bde355ad03d1ee24"
+ "m_Id": "d006a75d852e46d7b4d51f891846b55a"
}
],
- "synonyms": [
- "switch",
- "if",
- "else"
- ],
+ "synonyms": [],
"m_Precision": 0,
- "m_PreviewExpanded": false,
+ "m_PreviewExpanded": true,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
- }
+ },
+ "m_SerializedDescriptor": "VertexDescription.Position"
}
{
"m_SGVersion": 0,
- "m_Type": "UnityEditor.ShaderGraph.BlockNode",
- "m_ObjectId": "70fd93d7fd8641dab1b0d623db758b0a",
+ "m_Type": "UnityEditor.ShaderGraph.BranchNode",
+ "m_ObjectId": "6f0d054225c84b07a1c9fa945e6cb267",
"m_Group": {
"m_Id": ""
},
- "m_Name": "VertexDescription.Normal",
+ "m_Name": "Branch",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
- "x": 0.0,
- "y": 0.0,
- "width": 0.0,
- "height": 0.0
+ "x": -230.0,
+ "y": 184.00001525878907,
+ "width": 172.0000457763672,
+ "height": 141.99998474121095
}
},
"m_Slots": [
{
- "m_Id": "29968c6eda724c6384d90a5553663c09"
+ "m_Id": "c1d248fd39d646f7aa51e8befcc980ad"
+ },
+ {
+ "m_Id": "b70a497f3f3f4ef5ad625b68d97f19bd"
+ },
+ {
+ "m_Id": "a9bc5ea12f8a4877aad161a0e8359b67"
+ },
+ {
+ "m_Id": "732e70c9909d4388bde355ad03d1ee24"
}
],
- "synonyms": [],
+ "synonyms": [
+ "switch",
+ "if",
+ "else"
+ ],
"m_Precision": 0,
- "m_PreviewExpanded": true,
+ "m_PreviewExpanded": false,
"m_DismissedVersion": 0,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
- },
- "m_SerializedDescriptor": "VertexDescription.Normal"
+ }
}
{
@@ -533,37 +691,104 @@
}
}
+{
+ "m_SGVersion": 1,
+ "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
+ "m_ObjectId": "7452bba68b254627bb94cdb60990af0d",
+ "m_Guid": {
+ "m_GuidSerialized": "c7f95eea-67ea-462d-836c-d6511a629ba5"
+ },
+ "m_Name": "Opacity",
+ "m_DefaultRefNameVersion": 1,
+ "m_RefNameGeneratedByDisplayName": "Opacity",
+ "m_DefaultReferenceName": "_Opacity",
+ "m_OverrideReferenceName": "",
+ "m_GeneratePropertyBlock": true,
+ "m_UseCustomSlotLabel": false,
+ "m_CustomSlotLabel": "",
+ "m_DismissedVersion": 0,
+ "m_Precision": 0,
+ "overrideHLSLDeclaration": true,
+ "hlslDeclarationOverride": 2,
+ "m_Hidden": false,
+ "m_Value": 1.0,
+ "m_FloatType": 1,
+ "m_RangeValues": {
+ "x": 0.0,
+ "y": 1.0
+ }
+}
+
{
"m_SGVersion": 0,
- "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
- "m_ObjectId": "8e4a13181ba445afbe1338a389af1ff1",
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "7ed1ac489e2041419065f1029405a0e0",
"m_Id": 0,
- "m_DisplayName": "Out",
- "m_SlotType": 1,
+ "m_DisplayName": "Alpha",
+ "m_SlotType": 0,
"m_Hidden": false,
- "m_ShaderOutputName": "Out",
- "m_StageCapability": 3,
- "m_Value": {
- "x": 1.0,
- "y": 1.0,
- "z": 1.0,
- "w": 1.0
- },
- "m_DefaultValue": {
- "x": 0.0,
- "y": 0.0,
- "z": 0.0,
- "w": 0.0
- },
+ "m_ShaderOutputName": "Alpha",
+ "m_StageCapability": 2,
+ "m_Value": 0.0,
+ "m_DefaultValue": 1.0,
"m_Labels": []
}
{
"m_SGVersion": 0,
- "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
- "m_ObjectId": "988e4efa4fa942e4bc85366ffb4b7754",
+ "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
+ "m_ObjectId": "8a22601339f64f0897259de1612ec747",
"m_Id": 0,
- "m_DisplayName": "Tangent",
+ "m_DisplayName": "Normal",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Normal",
+ "m_StageCapability": 1,
+ "m_Value": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0
+ },
+ "m_DefaultValue": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0
+ },
+ "m_Labels": [],
+ "m_Space": 0
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+ "m_ObjectId": "8e4a13181ba445afbe1338a389af1ff1",
+ "m_Id": 0,
+ "m_DisplayName": "Out",
+ "m_SlotType": 1,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Out",
+ "m_StageCapability": 3,
+ "m_Value": {
+ "x": 1.0,
+ "y": 1.0,
+ "z": 1.0,
+ "w": 1.0
+ },
+ "m_DefaultValue": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0,
+ "w": 0.0
+ },
+ "m_Labels": []
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
+ "m_ObjectId": "8fa900b5c3bf420c9d5912444ebebf9f",
+ "m_Id": 0,
+ "m_DisplayName": "Tangent",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Tangent",
@@ -583,9 +808,29 @@
}
{
- "m_SGVersion": 2,
- "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget",
- "m_ObjectId": "995bfbbb9da74561ac3e355c82806944"
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.ScreenPositionMaterialSlot",
+ "m_ObjectId": "96b788451d6b430f8277b3a4faceffd6",
+ "m_Id": 1,
+ "m_DisplayName": "Screen Position",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "ScreenPosition",
+ "m_StageCapability": 3,
+ "m_Value": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0,
+ "w": 0.0
+ },
+ "m_DefaultValue": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0,
+ "w": 0.0
+ },
+ "m_Labels": [],
+ "m_ScreenSpaceType": 0
}
{
@@ -594,7 +839,7 @@
"m_ObjectId": "9b67cb6ac150495da14d272e89dcec5e",
"m_Datas": [],
"m_ActiveSubTarget": {
- "m_Id": "995bfbbb9da74561ac3e355c82806944"
+ "m_Id": "07b2d9fd3dde42538ef8b0ef24b0d57b"
},
"m_AllowMaterialOverride": false,
"m_SurfaceType": 0,
@@ -602,9 +847,9 @@
"m_ZWriteControl": 0,
"m_AlphaMode": 0,
"m_RenderFace": 2,
- "m_AlphaClip": false,
+ "m_AlphaClip": true,
"m_CastShadows": false,
- "m_ReceiveShadows": true,
+ "m_ReceiveShadows": false,
"m_SupportsLODCrossFade": false,
"m_CustomEditorGUI": "",
"m_SupportVFX": false
@@ -612,26 +857,51 @@
{
"m_SGVersion": 0,
- "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
- "m_ObjectId": "9d21c212a5d046fe8599c558947a5064",
+ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+ "m_ObjectId": "9d43197b568f44c1bd949edebb828f17",
"m_Id": 0,
- "m_DisplayName": "Position",
+ "m_DisplayName": "Alpha Clip Threshold",
"m_SlotType": 0,
"m_Hidden": false,
- "m_ShaderOutputName": "Position",
- "m_StageCapability": 1,
- "m_Value": {
- "x": 0.0,
- "y": 0.0,
- "z": 0.0
+ "m_ShaderOutputName": "AlphaClipThreshold",
+ "m_StageCapability": 2,
+ "m_Value": 0.15000000596046449,
+ "m_DefaultValue": 0.5,
+ "m_Labels": []
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+ "m_ObjectId": "a37f2afa095e4ad7862c0837c842737c",
+ "m_Group": {
+ "m_Id": ""
},
- "m_DefaultValue": {
- "x": 0.0,
- "y": 0.0,
- "z": 0.0
+ "m_Name": "SurfaceDescription.AlphaClipThreshold",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": 0.0,
+ "y": 0.0,
+ "width": 0.0,
+ "height": 0.0
+ }
},
- "m_Labels": [],
- "m_Space": 0
+ "m_Slots": [
+ {
+ "m_Id": "9d43197b568f44c1bd949edebb828f17"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold"
}
{
@@ -684,11 +954,11 @@
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
- "m_ObjectId": "b2d3311631744801bd758fd1db1abd7f",
+ "m_ObjectId": "ac97a9308d474feb98bf085879c7c9b6",
"m_Group": {
"m_Id": ""
},
- "m_Name": "VertexDescription.Position",
+ "m_Name": "VertexDescription.Normal",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
@@ -701,7 +971,7 @@
},
"m_Slots": [
{
- "m_Id": "9d21c212a5d046fe8599c558947a5064"
+ "m_Id": "8a22601339f64f0897259de1612ec747"
}
],
"synonyms": [],
@@ -712,7 +982,7 @@
"m_CustomColors": {
"m_SerializableColors": []
},
- "m_SerializedDescriptor": "VertexDescription.Position"
+ "m_SerializedDescriptor": "VertexDescription.Normal"
}
{
@@ -753,6 +1023,114 @@
"m_DefaultValue": false
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+ "m_ObjectId": "c5fd8065088541adb589bec801442eea",
+ "m_Id": 1,
+ "m_DisplayName": "B",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "B",
+ "m_StageCapability": 3,
+ "m_Value": {
+ "x": 1.0,
+ "y": 1.0,
+ "z": 1.0,
+ "w": 1.0
+ },
+ "m_DefaultValue": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0,
+ "w": 0.0
+ }
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+ "m_ObjectId": "ce23fc8d582744c88196cf6ed33a6e64",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Property",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": -408.99993896484377,
+ "y": 529.0,
+ "width": 115.99993896484375,
+ "height": 34.0
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "5fbee1d9a2ec4c6b8a2fd9fcda3629ec"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_Property": {
+ "m_Id": "7452bba68b254627bb94cdb60990af0d"
+ }
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
+ "m_ObjectId": "d006a75d852e46d7b4d51f891846b55a",
+ "m_Id": 0,
+ "m_DisplayName": "Position",
+ "m_SlotType": 0,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Position",
+ "m_StageCapability": 1,
+ "m_Value": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0
+ },
+ "m_DefaultValue": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0
+ },
+ "m_Labels": [],
+ "m_Space": 0
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+ "m_ObjectId": "d275331ed04d429c9ab30684dae55862",
+ "m_Id": 2,
+ "m_DisplayName": "Out",
+ "m_SlotType": 1,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Out",
+ "m_StageCapability": 3,
+ "m_Value": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0,
+ "w": 0.0
+ },
+ "m_DefaultValue": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0,
+ "w": 0.0
+ }
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot",
@@ -767,6 +1145,64 @@
"m_DefaultValue": false
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+ "m_ObjectId": "dc27fb88428c4b0aa4e0e682d61001f9",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "VertexDescription.Tangent",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": 0.0,
+ "y": 0.0,
+ "width": 0.0,
+ "height": 0.0
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "8fa900b5c3bf420c9d5912444ebebf9f"
+ }
+ ],
+ "synonyms": [],
+ "m_Precision": 0,
+ "m_PreviewExpanded": true,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ },
+ "m_SerializedDescriptor": "VertexDescription.Tangent"
+}
+
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+ "m_ObjectId": "dcb6dd176a4742d98ed4288ff51e3f1a",
+ "m_Id": 2,
+ "m_DisplayName": "Out",
+ "m_SlotType": 1,
+ "m_Hidden": false,
+ "m_ShaderOutputName": "Out",
+ "m_StageCapability": 3,
+ "m_Value": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0,
+ "w": 0.0
+ },
+ "m_DefaultValue": {
+ "x": 0.0,
+ "y": 0.0,
+ "z": 0.0,
+ "w": 0.0
+ }
+}
+
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
@@ -790,3 +1226,45 @@
"m_Labels": []
}
+{
+ "m_SGVersion": 0,
+ "m_Type": "UnityEditor.ShaderGraph.DitherNode",
+ "m_ObjectId": "f54fe137e4be4b11966e7a6d0a42f98d",
+ "m_Group": {
+ "m_Id": ""
+ },
+ "m_Name": "Dither",
+ "m_DrawState": {
+ "m_Expanded": true,
+ "m_Position": {
+ "serializedVersion": "2",
+ "x": -77.00001525878906,
+ "y": 463.9999694824219,
+ "width": 201.99993896484376,
+ "height": 118.00003051757813
+ }
+ },
+ "m_Slots": [
+ {
+ "m_Id": "30f6f2ae84e948e49d73ca5cbb0eae6b"
+ },
+ {
+ "m_Id": "96b788451d6b430f8277b3a4faceffd6"
+ },
+ {
+ "m_Id": "d275331ed04d429c9ab30684dae55862"
+ }
+ ],
+ "synonyms": [
+ "blue noise",
+ "half tone"
+ ],
+ "m_Precision": 1,
+ "m_PreviewExpanded": false,
+ "m_DismissedVersion": 0,
+ "m_PreviewMode": 0,
+ "m_CustomColors": {
+ "m_SerializableColors": []
+ }
+}
+
diff --git a/Assets/VRTemplateAssets/Prefabs/UI/Spatial Panel Scroll.prefab b/Assets/VRTemplateAssets/Prefabs/UI/Spatial Panel Scroll.prefab
index f8726970383c531764a2e85e3f0d0e7bac16bd4d..e15a724eac85ff67a0ef5ff4eb3dcc910bb26e34 100644
--- a/Assets/VRTemplateAssets/Prefabs/UI/Spatial Panel Scroll.prefab
+++ b/Assets/VRTemplateAssets/Prefabs/UI/Spatial Panel Scroll.prefab
@@ -1007,7 +1007,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 0
+ m_PresetInfoIsWorld: 1
--- !u!114 &3181781652842806179
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 87710ade74bc54fd7f195fa5681fb8c24323a580..602f2b685956369150ae782c697581e2f0b09503 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -6,18 +6,12 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
- path: Assets/Scenes/SampleScene.unity
+ path: Assets/Scenes/VRModellingScene.unity
guid: 55daccc09a3b69647bbab145b54a3ab3
m_configObjects:
- Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260,
- type: 2}
- Unity.XR.WindowsMR.Settings: {fileID: 11400000, guid: dc5a169419fa04987b057f65238cf3ba,
- type: 2}
- UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 9bec1ce6a03ccba4b9a8215241b32e63,
- type: 2}
- UnityEditor.XR.ARKit.ARKitSettings: {fileID: 11400000, guid: a49cadc1a815591479693b955ccf08c1,
- type: 2}
- com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 1a4c68ca72a83449f938d669337cb305,
- type: 2}
- com.unity.xr.openxr.settings4: {fileID: 11400000, guid: a9a6963505ddf7f4d886008c6dc86122,
- type: 2}
+ Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2}
+ Unity.XR.WindowsMR.Settings: {fileID: 11400000, guid: dc5a169419fa04987b057f65238cf3ba, type: 2}
+ UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 9bec1ce6a03ccba4b9a8215241b32e63, type: 2}
+ UnityEditor.XR.ARKit.ARKitSettings: {fileID: 11400000, guid: a49cadc1a815591479693b955ccf08c1, type: 2}
+ com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 1a4c68ca72a83449f938d669337cb305, type: 2}
+ com.unity.xr.openxr.settings4: {fileID: 11400000, guid: a9a6963505ddf7f4d886008c6dc86122, type: 2}