diff --git a/Assets/Resources/Prefabs/Facts/SimpleCircle.prefab b/Assets/Resources/Prefabs/Facts/SimpleCircle.prefab deleted file mode 100644 index 1fcbb8633b082ffdbca844bafbb9bec8d6bf79a2..0000000000000000000000000000000000000000 --- a/Assets/Resources/Prefabs/Facts/SimpleCircle.prefab +++ /dev/null @@ -1,489 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &3319392661904935552 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7541265271928914416} - - component: {fileID: 1312883106029576503} - - component: {fileID: 5284903402926663935} - - component: {fileID: 2574848627300415222} - - component: {fileID: 7280041197286401157} - m_Layer: 15 - m_Name: Mesh Down - m_TagString: SnapZone - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7541265271928914416 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3319392661904935552} - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: -0.01, z: 0} - m_LocalScale: {x: 1, y: 0.01, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6787775389045427190} - m_Father: {fileID: 3390467403729316765} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!33 &1312883106029576503 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3319392661904935552} - m_Mesh: {fileID: 0} ---- !u!23 &5284903402926663935 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3319392661904935552} - 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: 8ae9adf4dc782964387385c1e8c0eb72, 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &2574848627300415222 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3319392661904935552} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 0} ---- !u!114 &7280041197286401157 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3319392661904935552} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3} - m_Name: - m_EditorClassIdentifier: - _URI: - FactText: [] - StringLabelFormats: [] - Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2} - Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2} - Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2} - Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2} - renderer: - - {fileID: 5284903402926663935} - - {fileID: 1078883255209641429} ---- !u!1 &4682201382595328041 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6787775389045427190} - - component: {fileID: 6626359674163989219} - - component: {fileID: 4818731436791451552} - m_Layer: 15 - m_Name: CircleHighlight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6787775389045427190 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4682201382595328041} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.96, y: 1, z: 0.96} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7541265271928914416} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6626359674163989219 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4682201382595328041} - m_Mesh: {fileID: 0} ---- !u!23 &4818731436791451552 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4682201382595328041} - 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: 8ae9adf4dc782964387385c1e8c0eb72, 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!1 &5866155945383417828 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8554957501859850914} - - component: {fileID: 3164742056485930267} - - component: {fileID: 1460740696286669547} - m_Layer: 15 - m_Name: CircleHighlight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8554957501859850914 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5866155945383417828} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.96, y: 1, z: 0.96} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 142224692930156368} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3164742056485930267 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5866155945383417828} - m_Mesh: {fileID: 0} ---- !u!23 &1460740696286669547 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5866155945383417828} - 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: 8ae9adf4dc782964387385c1e8c0eb72, 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!1 &6262947649539239553 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 142224692930156368} - - component: {fileID: 7167210412035754299} - - component: {fileID: 1078883255209641429} - - component: {fileID: 8526453253978894086} - - component: {fileID: -7239156242830623982} - m_Layer: 15 - m_Name: Mesh Up - m_TagString: SnapZone - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &142224692930156368 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6262947649539239553} - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0.01, z: 0} - m_LocalScale: {x: 1, y: 0.01, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8554957501859850914} - m_Father: {fileID: 3390467403729316765} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!33 &7167210412035754299 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6262947649539239553} - m_Mesh: {fileID: 0} ---- !u!23 &1078883255209641429 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6262947649539239553} - 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: 8ae9adf4dc782964387385c1e8c0eb72, 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &8526453253978894086 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6262947649539239553} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 0} ---- !u!114 &-7239156242830623982 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6262947649539239553} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3} - m_Name: - m_EditorClassIdentifier: - _URI: - FactText: [] - StringLabelFormats: [] - Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2} - Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2} - Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2} - Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2} - renderer: - - {fileID: 1078883255209641429} - - {fileID: 5284903402926663935} ---- !u!1 &6839596689016440457 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3390467403729316765} - - component: {fileID: 1812690906255965161} - - component: {fileID: 6950663371922587874} - m_Layer: 15 - m_Name: SimpleCircle - m_TagString: Selectable - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3390467403729316765 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6839596689016440457} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 142224692930156368} - - {fileID: 7541265271928914416} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1812690906255965161 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6839596689016440457} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 405087c38b8537e43bcc99727c5325ec, type: 3} - m_Name: - m_EditorClassIdentifier: - Meshs: - - {fileID: 7167210412035754299} - - {fileID: 3164742056485930267} - - {fileID: 1312883106029576503} - - {fileID: 6626359674163989219} - NormalOffset: [] - AlternateNormals: 0 - radius: 1 - sideCount: 500 ---- !u!114 &6950663371922587874 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6839596689016440457} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3} - m_Name: - m_EditorClassIdentifier: - _URI: - FactText: [] - StringLabelFormats: [] - Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2} - Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2} - Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2} - Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2} - renderer: - - {fileID: 1078883255209641429} diff --git a/Assets/Resources/Prefabs/Facts/SimpleCircle.prefab.meta b/Assets/Resources/Prefabs/Facts/SimpleCircle.prefab.meta deleted file mode 100644 index 633581020cb35c0f1bc3c4a6275876fd5f0b8592..0000000000000000000000000000000000000000 --- a/Assets/Resources/Prefabs/Facts/SimpleCircle.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ba4e0d31779023d4d8a5767fd6dccf5c -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Facts/TestPoint.prefab b/Assets/Resources/Prefabs/Facts/TestPoint.prefab deleted file mode 100644 index 6b258137579ff2e8edaeeb3d55b659cba9fb974c..0000000000000000000000000000000000000000 --- a/Assets/Resources/Prefabs/Facts/TestPoint.prefab +++ /dev/null @@ -1,494 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &537518992981541273 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7110486964728869325} - - component: {fileID: 1900283440179814243} - - component: {fileID: 1075046474335495899} - - component: {fileID: 8087426936968725520} - - component: {fileID: 114239372808020652} - - component: {fileID: 6183343481027254878} - m_Layer: 10 - m_Name: TestPoint - m_TagString: Selectable - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7110486964728869325 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 537518992981541273} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.012604177, y: 0.8909064, z: -0.31583664} - m_LocalScale: {x: 4.49, y: 4.49, z: 4.49} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 338274751687282010} - - {fileID: 5939570736350582895} - - {fileID: 206589483256967431} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1900283440179814243 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 537518992981541273} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1075046474335495899 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 537518992981541273} - 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: 8ae9adf4dc782964387385c1e8c0eb72, 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!135 &8087426936968725520 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 537518992981541273} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &114239372808020652 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 537518992981541273} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3} - m_Name: - m_EditorClassIdentifier: - _URI: - FactText: - - {fileID: 4028707725789292921} - StringLabelFormats: - - '{0}' - Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2} - Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2} - Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2} - Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2} - renderer: - - {fileID: 1075046474335495899} ---- !u!114 &6183343481027254878 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 537518992981541273} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac85f04c60d42c147be42fd4d0420c21, type: 3} - m_Name: - m_EditorClassIdentifier: - ServerScriptGObj: {fileID: 0} ---- !u!1 &942938646191423391 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 206589483256967431} - - component: {fileID: 6333161707715706899} - - component: {fileID: 4028707725789292921} - - component: {fileID: 2878035603844960510} - m_Layer: 10 - m_Name: LabelText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &206589483256967431 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 942938646191423391} - 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: 7110486964728869325} - m_RootOrder: 2 - 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.887} - m_SizeDelta: {x: 2, y: 0.5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!23 &6333161707715706899 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 942938646191423391} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - 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: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &4028707725789292921 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 942938646191423391} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: Test - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, 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: 4 - m_fontSizeBase: 4 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 - 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: 1 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - _SortingLayer: 0 - _SortingLayerID: 0 - _SortingOrder: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 6333161707715706899} - m_maskType: 0 ---- !u!114 &2878035603844960510 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 942938646191423391} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8cf5a358dacd3b54ab093ee289dd9ba2, type: 3} - m_Name: - m_EditorClassIdentifier: - Cam1: {fileID: 0} - Cam2: {fileID: 0} - BackUPCam: {fileID: 0} ---- !u!1 &7522635739010457072 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 338274751687282010} - - component: {fileID: 7801512564954744306} - - component: {fileID: 8231516868387511546} - m_Layer: 10 - m_Name: PointSphere - m_TagString: Selectable - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &338274751687282010 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7522635739010457072} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7110486964728869325} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7801512564954744306 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7522635739010457072} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &8231516868387511546 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7522635739010457072} - 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: c7daa82e15f0cf04d92d0f41ce84f9df, 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &7718914877039665658 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5939570736350582895} - - component: {fileID: 87526001619117826} - - component: {fileID: 8470693708050556402} - m_Layer: 10 - m_Name: LabelStickCylinder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5939570736350582895 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7718914877039665658} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.295, z: 0} - m_LocalScale: {x: 0.02, y: 0.3, z: 0.02} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7110486964728869325} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &87526001619117826 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7718914877039665658} - m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &8470693708050556402 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7718914877039665658} - 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: c7daa82e15f0cf04d92d0f41ce84f9df, 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 - m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Resources/Prefabs/Facts/TestPoint.prefab.meta b/Assets/Resources/Prefabs/Facts/TestPoint.prefab.meta deleted file mode 100644 index db2d9cac65d9e03dc254aca36f2263176565e431..0000000000000000000000000000000000000000 --- a/Assets/Resources/Prefabs/Facts/TestPoint.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 998991ab9f28e764691da393b005cab3 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity index 51549fca0fe26f0b0e5950cb9413cc0a6d5041ab..45555d2b40aae99c7444d735064ca11e2d374dd8 100644 --- a/Assets/Scenes/Worlds/RiverWorld.unity +++ b/Assets/Scenes/Worlds/RiverWorld.unity @@ -63077,7 +63077,7 @@ PrefabInstance: type: 3} propertyPath: PrefabDataConfig.Array.data[10] value: - objectReference: {fileID: 5287418535931939099, guid: 30d09e8685950994893b3b6388a8906c, + objectReference: {fileID: 6636443472981757786, guid: a398e760c69653d44a288bd6a95af760, type: 3} - target: {fileID: 6898471569945669422, guid: b07552db700124a4680401e6fb94c186, type: 3} @@ -63095,31 +63095,31 @@ PrefabInstance: type: 3} propertyPath: PrefabDataConfig.Array.data[29] value: - objectReference: {fileID: 3080888058940174091, guid: 78a5636dd3b386a4e82a65390ad23c7d, + objectReference: {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, type: 3} - target: {fileID: 6898471569945669422, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: PrefabDataConfig.Array.data[30] value: - objectReference: {fileID: 3080888058940174091, guid: 389563c758e86d848b3341576b90b7e4, + objectReference: {fileID: 2513701074329712390, guid: 5b54aca5b2f2bfa48968656ed3bea181, type: 3} - target: {fileID: 6898471569945669422, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: PrefabDataConfig.Array.data[32] value: - objectReference: {fileID: 3080888058940174091, guid: 78a5636dd3b386a4e82a65390ad23c7d, + objectReference: {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, type: 3} - target: {fileID: 6898471569945669422, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: PrefabDataConfig.Array.data[33] value: - objectReference: {fileID: 3080888058940174091, guid: 389563c758e86d848b3341576b90b7e4, + objectReference: {fileID: 3080888058940174091, guid: 78a5636dd3b386a4e82a65390ad23c7d, type: 3} - target: {fileID: 6898471569945669422, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: PrefabDataConfig.Array.data[34] value: - objectReference: {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, + objectReference: {fileID: 3080888058940174091, guid: 389563c758e86d848b3341576b90b7e4, type: 3} - target: {fileID: 6898471569945669422, guid: b07552db700124a4680401e6fb94c186, type: 3} @@ -63129,10 +63129,40 @@ PrefabInstance: type: 3} - target: {fileID: 6898471569945669422, guid: b07552db700124a4680401e6fb94c186, type: 3} - propertyPath: PrefabDataConfig.Array.data[40] + propertyPath: PrefabDataConfig.Array.data[36] + value: + objectReference: {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, + type: 3} + - target: {fileID: 6898471569945669422, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: PrefabDataConfig.Array.data[37] + value: + objectReference: {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, + type: 3} + - target: {fileID: 6898471569945669422, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: PrefabDataConfig.Array.data[38] value: objectReference: {fileID: 3080888058940174091, guid: 2ae89b30b18ea4b4ab86a9b7ddf21e09, type: 3} + - target: {fileID: 6898471569945669422, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: PrefabDataConfig.Array.data[39] + value: + objectReference: {fileID: 4123133807278660472, guid: 9d0019fa4b5725a49bdfc78c4d67661e, + type: 3} + - target: {fileID: 6898471569945669422, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: PrefabDataConfig.Array.data[40] + value: + objectReference: {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, + type: 3} + - target: {fileID: 6898471569945669422, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: PrefabDataConfig.Array.data[41] + value: + objectReference: {fileID: 5769925203401971992, guid: 047cd3a517f781846a1f983394b4bb7b, + type: 3} - target: {fileID: 6899268459312977207, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y @@ -63591,31 +63621,31 @@ PrefabInstance: type: 3} propertyPath: PrefabDataConfig.Array.data[29] value: - objectReference: {fileID: 3080888058940174091, guid: 78a5636dd3b386a4e82a65390ad23c7d, + objectReference: {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, type: 3} - target: {fileID: 7743735189960969443, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: PrefabDataConfig.Array.data[30] value: - objectReference: {fileID: 3080888058940174091, guid: 389563c758e86d848b3341576b90b7e4, + objectReference: {fileID: 2513701074329712390, guid: 5b54aca5b2f2bfa48968656ed3bea181, type: 3} - target: {fileID: 7743735189960969443, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: PrefabDataConfig.Array.data[32] value: - objectReference: {fileID: 3080888058940174091, guid: 78a5636dd3b386a4e82a65390ad23c7d, + objectReference: {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, type: 3} - target: {fileID: 7743735189960969443, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: PrefabDataConfig.Array.data[33] value: - objectReference: {fileID: 3080888058940174091, guid: 389563c758e86d848b3341576b90b7e4, + objectReference: {fileID: 3080888058940174091, guid: 78a5636dd3b386a4e82a65390ad23c7d, type: 3} - target: {fileID: 7743735189960969443, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: PrefabDataConfig.Array.data[34] value: - objectReference: {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, + objectReference: {fileID: 3080888058940174091, guid: 389563c758e86d848b3341576b90b7e4, type: 3} - target: {fileID: 7743735189960969443, guid: b07552db700124a4680401e6fb94c186, type: 3} @@ -63625,10 +63655,40 @@ PrefabInstance: type: 3} - target: {fileID: 7743735189960969443, guid: b07552db700124a4680401e6fb94c186, type: 3} - propertyPath: PrefabDataConfig.Array.data[40] + propertyPath: PrefabDataConfig.Array.data[36] + value: + objectReference: {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, + type: 3} + - target: {fileID: 7743735189960969443, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: PrefabDataConfig.Array.data[37] + value: + objectReference: {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, + type: 3} + - target: {fileID: 7743735189960969443, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: PrefabDataConfig.Array.data[38] value: objectReference: {fileID: 3080888058940174091, guid: 2ae89b30b18ea4b4ab86a9b7ddf21e09, type: 3} + - target: {fileID: 7743735189960969443, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: PrefabDataConfig.Array.data[39] + value: + objectReference: {fileID: 4123133807278660472, guid: 9d0019fa4b5725a49bdfc78c4d67661e, + type: 3} + - target: {fileID: 7743735189960969443, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: PrefabDataConfig.Array.data[40] + value: + objectReference: {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8, + type: 3} + - target: {fileID: 7743735189960969443, guid: b07552db700124a4680401e6fb94c186, + type: 3} + propertyPath: PrefabDataConfig.Array.data[41] + value: + objectReference: {fileID: 5769925203401971992, guid: 047cd3a517f781846a1f983394b4bb7b, + type: 3} - target: {fileID: 7748114935345543003, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_AnchorMax.y diff --git a/Assets/ScriptableObjects/Gadgets/GadgetDataContainerGadgetCollection.asset b/Assets/ScriptableObjects/Gadgets/GadgetDataContainerGadgetCollection.asset index 9310e7a27a57a3c9372f08620b33c94ae7db77b4..47177f03c4aff70e1c7b8d2d913afa1305d32420 100644 --- a/Assets/ScriptableObjects/Gadgets/GadgetDataContainerGadgetCollection.asset +++ b/Assets/ScriptableObjects/Gadgets/GadgetDataContainerGadgetCollection.asset @@ -28,7 +28,7 @@ MonoBehaviour: - {fileID: 21300000, guid: e35797aede3d7bd449ca9195a409b0cc, type: 3} - {fileID: 21300000, guid: 9831128faf2531e4cba52f58894091be, type: 3} - {fileID: 21300000, guid: e706f1d2fb068e342b1c80c357d84b40, type: 3} - GadgetType: ffffffff000000000100000002000000030000000400000005000000060000000700000008000000090000000a000000 + GadgetType: ffffffff00000000010000000200000003000000040000000500000006000000070000000800000009000000 GadgetData: - {fileID: 11400000, guid: 7431ff31b707d2a4082b65b61e15e5df, type: 2} - {fileID: 11400000, guid: c149a1e468d3b3b48a0732c2e0811856, type: 2} @@ -41,4 +41,3 @@ MonoBehaviour: - {fileID: 11400000, guid: 06736b134e21b50488990025c33c9c2e, type: 2} - {fileID: 11400000, guid: 6bc4e283502549d428d3c9ce74e91757, type: 2} - {fileID: 11400000, guid: 35d3197399dc8374280464a237271ac5, type: 2} - - {fileID: 11400000, guid: 9c857513d338e4549ad22b712627eda6, type: 2} diff --git a/Assets/ScriptableObjects/Gadgets/TestGadgetDataContainerGadgetInit.asset b/Assets/ScriptableObjects/Gadgets/TestGadgetDataContainerGadgetInit.asset deleted file mode 100644 index cef4362c5f2afeed4534c2c90b6a84b947f03595..0000000000000000000000000000000000000000 --- a/Assets/ScriptableObjects/Gadgets/TestGadgetDataContainerGadgetInit.asset +++ /dev/null @@ -1,26 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 262a3c8caea4a7741b65ef20c568f5c2, type: 3} - m_Name: TestGadgetDataContainerGadgetInit - m_EditorClassIdentifier: Assembly-CSharp::DataContainerGadgetInit - Rank: 0 - MaxRange: Infinity - MaxHeight: Infinity - UiName: Test Gadget - MaterialIndx: 0 - ButtonIndx: 11 - LayerHitMask: - serializedVersion: 2 - m_Bits: 1581105 - SecondaryLayerMask: - serializedVersion: 2 - m_Bits: 0 diff --git a/Assets/ScriptableObjects/Gadgets/TestGadgetDataContainerGadgetInit.asset.meta b/Assets/ScriptableObjects/Gadgets/TestGadgetDataContainerGadgetInit.asset.meta deleted file mode 100644 index e66aab5260a53603f9610e27c8a1bed01196644d..0000000000000000000000000000000000000000 --- a/Assets/ScriptableObjects/Gadgets/TestGadgetDataContainerGadgetInit.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9c857513d338e4549ad22b712627eda6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs index ce88f403afbc96ee46ed68715199ae5965d1769d..0e5132fcde268492e0db3efb86626e298fc68bb5 100644 --- a/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs +++ b/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs @@ -11,7 +11,6 @@ public class FactSpawner : MonoBehaviour { public GameObject - TestPoint, Line, Ray, Angle, @@ -20,7 +19,6 @@ public GameObject Cone, Rectangle, Circle, - SimpleCircle, Triangle, Sphere, ActualSphere, @@ -50,8 +48,6 @@ public void SpawnFactRepresentation(Fact fact) { case PointFact PointFact: SpawnPoint(PointFact); break; - case TestPointFact TestPointFact: - SpawnTestPoint(TestPointFact); break; case LineFact LineFact: SpawnLine(LineFact); break; //case RightAngleFact AngleFact: //needed for Hint System @@ -71,8 +67,6 @@ public void SpawnFactRepresentation(Fact fact) SpawnTruncatedCone(TruncatedConeVolumeFact); break; case RectangleFact rectangleFact: SpawnRectangle(rectangleFact); break; - case SimpleCircleFact simpleCircleFact: - SpawnSimpleCircle(simpleCircleFact); break; case TriangleFact2 triangleFact: SpawnTriangle(triangleFact); break; case SphereFact sphereFact: @@ -175,12 +169,6 @@ public void SpawnRectangle(RectangleFact fact){ } } - public void SpawnSimpleCircle(SimpleCircleFact fact){ - GameObject simpleCircle = GameObject.Instantiate(SimpleCircle); - - simpleCircle.transform.SetPositionAndRotation(fact.Position, fact.Rotation); - simpleCircle.transform.localScale = Vector3.Scale(simpleCircle.transform.localScale, fact.LocalScale); - } public void SpawnTriangle(TriangleFact2 fact) { @@ -249,14 +237,6 @@ public void SpawnPoint(PointFact fact) point.transform.SetPositionAndRotation(fact.Position, fact.Rotation); } - public void SpawnTestPoint(TestPointFact fact) - { - GameObject point = GameObject.Instantiate(TestPoint); - fact.WorldRepresentation = point.GetComponent<FactObject3D>(); - fact.WorldRepresentation.Fact = fact; - - point.transform.SetPositionAndRotation(fact.Position, fact.Rotation); - } public void SpawnLine(LineFact fact) { diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs b/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs index 5ff76e866ed5c5150bafc782d3669a791e56a187..83aa7854ffc649a2b70af504e21d6049dd551aa2 100644 --- a/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs +++ b/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs @@ -19,8 +19,6 @@ public static class ParsingDictionary GeneralFact.parseFact }, { MMTConstants.Point, PointFact.parseFact }, - { MMTConstants.TestPoint, - TestPointFact.parseFact }, { MMTConstants.Metric, LineFact.parseFact }, { MMTConstants.Angle, @@ -55,8 +53,6 @@ public static class ParsingDictionary TruncatedConeVolumeFact.parseFact }, { MMTConstants.CylinderVolume, CylinderVolumeFact.parseFact }, - { MMTConstants.TestType, - TestFact.parseFact }, { MMTConstants.EqualityCircles, EqualCirclesFact.parseFact }, { MMTConstants.UnEqualityCircles, @@ -79,10 +75,6 @@ public static class ParsingDictionary MMTConstants.TriangleType, TriangleFact2.parseFact }, - { - MMTConstants.SimpleCircleType, - SimpleCircleFact.parseFact - }, { MMTConstants.SphereType, SphereFact.parseFact @@ -115,7 +107,6 @@ public static class ParsingDictionary /// </summary> [JsonConverter(typeof(JsonSubtypes), "s_type")] [JsonSubtypes.KnownSubType(typeof(PointFact), nameof(PointFact))] -[JsonSubtypes.KnownSubType(typeof(TestPointFact), nameof(TestPointFact))] [JsonSubtypes.KnownSubType(typeof(LineFact), nameof(LineFact))] [JsonSubtypes.KnownSubType(typeof(RayFact), nameof(RayFact))] [JsonSubtypes.KnownSubType(typeof(OnLineFact), nameof(OnLineFact))] @@ -145,7 +136,6 @@ public static class ParsingDictionary [JsonSubtypes.KnownSubType(typeof(RealLitFact), nameof(RealLitFact))] [JsonSubtypes.KnownSubType(typeof(RectangleFact), nameof(RectangleFact))] [JsonSubtypes.KnownSubType(typeof(TriangleFact2), nameof(TriangleFact2))] -[JsonSubtypes.KnownSubType(typeof(SimpleCircleFact), nameof(SimpleCircleFact))] [JsonSubtypes.KnownSubType(typeof(SphereFact), nameof(SphereFact))] [JsonSubtypes.KnownSubType(typeof(CuboidFact), nameof(CuboidFact))] [JsonSubtypes.KnownSubType(typeof(PrismFact), nameof(PrismFact))] diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/SimpleCircleFact.cs b/Assets/Scripts/InteractionEngine/FactHandling/Facts/SimpleCircleFact.cs deleted file mode 100644 index 2c6b1528ff08e71ed72c1048392dc17b1516dd60..0000000000000000000000000000000000000000 --- a/Assets/Scripts/InteractionEngine/FactHandling/Facts/SimpleCircleFact.cs +++ /dev/null @@ -1,164 +0,0 @@ -using Newtonsoft.Json; -using REST_JSON_API; -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using UnityEngine; - -/// <summary> -/// Point in 3D Space -/// </summary> -public class SimpleCircleFact : FactWrappedCRTP<SimpleCircleFact> -{ - - - //used points - public string PidA, PidB, PidM; - - public Vector3 M, A, B; - - public float Area = 0.0F; - public float Radius = 0.0F; - - - - public PointFact GetA {get => (PointFact)FactRecorder.AllFacts[PidA];} - public PointFact GetB {get => (PointFact)FactRecorder.AllFacts[PidB];} - public PointFact GetM {get => (PointFact)FactRecorder.AllFacts[PidM];} - protected void calculate_vectors(){ - - A = ((PointFact)FactRecorder.AllFacts[PidA]).Point + Vector3.zero; - B = ((PointFact)FactRecorder.AllFacts[PidB]).Point + Vector3.zero; - M = ((PointFact)FactRecorder.AllFacts[PidM]).Point + Vector3.zero; - - Area = (Vector3.Distance(M, A) * Mathf.PI); - Radius = (Vector3.Distance(M, A)); - Vector3 scale = new Vector3(Radius, Radius, 1.0F); - - LocalScale = scale; - - Position = M; - - Rotation = Quaternion.LookRotation(Vector3.Cross((M-A), (A-B)), Vector3.up); - //Rotation = Quaternion.LookRotation(forward, new Vector3(1.0F, 0.0F, 0.0F)); - - } - - public SimpleCircleFact() : base(){ - this.PidA = null; - this.PidB = null; - this.PidM = null; - } - [JsonConstructor] - public SimpleCircleFact( string PidM, string PidA, string PidB) : base() - { - - this.PidA = PidA; - this.PidB = PidB; - this.PidM = PidM; - - calculate_vectors(); - - } - - /// <summary> - /// Bypasses initialization of new MMT %Fact by using existend URI, _which is not checked for existence_. - /// <see cref="Normal"/> set to <c>Vector3.up</c> - /// </summary> - /// <param name="Point">sets <see cref="Point"/></param> - /// <param name="ServerDefinition">MMT URI as OMS</param> - public SimpleCircleFact(string PidM, string PidA, string PidB, SOMDoc ServerDefinition) : base() - { - - - this.PidA = PidA; - this.PidB = PidB; - this.PidM = PidM; - - this.ServerDefinition = ServerDefinition; - - calculate_vectors(); - - } - - /// \copydoc Fact.parseFact(ScrollFact) - public new static IEnumerator parseFact(List<Fact> ret, MMTFact fact) - { - if (((MMTGeneralFact)fact).defines is not OMA df) - yield break; - - OMS pointA, pointB, pointM; - - pointM = (OMS)df.arguments[0]; - pointA = (OMS)df.arguments[1]; - pointB = (OMS)df.arguments[2]; - - string PidA = pointA.uri; - string PidB = pointB.uri; - string PidM = pointM.uri; - - - - ret.Add(new SimpleCircleFact(PidM, PidA, PidB, fact.@ref)); - - //ParsingDictionary.parseTermsToId.TryAdd(defines.ToString(), fact.@ref.uri); - //ret.Add(new PointFact(SOMDoc.MakeVector3(defines), fact.@ref)); - } - - - /// \copydoc Fact.hasDependentFacts - public override bool HasDependentFacts => true; - - /// \copydoc Fact.getDependentFactIds - protected override string[] GetDependentFactIds() - => new string[] { PidM, PidA, PidB}; - - /// \copydoc Fact.GetHashCode - /* public override int GetHashCode() - => this.Point.GetHashCode(); - */ - protected override void RecalculateTransform() - { - calculate_vectors(); - } - /// \copydoc Fact.Equivalent(Fact, Fact) - protected override bool EquivalentWrapped(SimpleCircleFact f1, SimpleCircleFact f2){ - - return ( - - Math3d.IsApproximatelyEqual(f1.A, f2.A) - && Math3d.IsApproximatelyEqual(f1.B, f2.B) - && Math3d.IsApproximatelyEqual(f1.M, f2.M) - - ); - - } - - public bool isEqual(SimpleCircleFact f2){ - return EquivalentWrapped(this, f2); - } - - protected override Fact _ReInitializeMe(Dictionary<string, string> old_to_new){ - - return new SimpleCircleFact(this.PidM, this.PidA, this.PidB); - - } - - public override MMTFact MakeMMTDeclaration() - { - SOMDoc tp = new OMS(MMTConstants.SimpleCircleType); - - return new MMTGeneralFact(_LastLabel, tp, Defines()); - } - - public override SOMDoc Defines() - => new OMA( - new OMS(MMTConstants.SimpleCircleCons), - new[] { - new OMS(PidM), - new OMS(PidA), - new OMS(PidB), - } - ); -} \ No newline at end of file diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/SimpleCircleFact.cs.meta b/Assets/Scripts/InteractionEngine/FactHandling/Facts/SimpleCircleFact.cs.meta deleted file mode 100644 index b22e8c5dcc064181ba80986bfc62f6ad3789b114..0000000000000000000000000000000000000000 --- a/Assets/Scripts/InteractionEngine/FactHandling/Facts/SimpleCircleFact.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ef5f556a10083d7409aae56a15f372a6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/TestPointFact.cs b/Assets/Scripts/InteractionEngine/FactHandling/Facts/TestPointFact.cs deleted file mode 100644 index 4eed2526db15ba383a113f7b1f8167713a9bdbda..0000000000000000000000000000000000000000 --- a/Assets/Scripts/InteractionEngine/FactHandling/Facts/TestPointFact.cs +++ /dev/null @@ -1,102 +0,0 @@ -using Newtonsoft.Json; -using REST_JSON_API; -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using UnityEngine; - -/// <summary> -/// Point in 3D Space -/// </summary> -public class TestPointFact : FactWrappedCRTP<TestPointFact> -{ - /// <summary> Position </summary> - public Vector3 Point; - /// <summary> Orientation for <see cref="Fact.WorldRepresentation"/> </summary> - [JsonProperty] - private Vector3 Normal; - - /// <summary> - /// Standard Constructor: - /// Initiates <see cref="Point"/>, <see cref="Normal"/>, <see cref="Fact._URI"/> and creates MMT %Fact Server-Side - /// </summary> - /// <param name="Point">sets <see cref="Point"/></param> - /// <param name="Normal">sets <see cref="Normal"/></param> - [JsonConstructor] - public TestPointFact(Vector3 Point, Vector3 Normal) : base() - { - this.Point = Point; - this.Normal = Normal; - } - - /// <summary> - /// Bypasses initialization of new MMT %Fact by using existend URI, _which is not checked for existence_. - /// <see cref="Normal"/> set to <c>Vector3.up</c> - /// </summary> - /// <param name="Point">sets <see cref="Point"/></param> - /// <param name="ServerDefinition">MMT URI as OMS</param> - public TestPointFact(Vector3 Point, SOMDoc ServerDefinition) : base() - { - this.Point = Point; - this.Normal = Vector3.up; - this.ServerDefinition = ServerDefinition; - } - - /// \copydoc Fact.parseFact(ScrollFact) - public new static IEnumerator parseFact(List<Fact> ret, MMTFact fact) - { - if (((MMTGeneralFact)fact).defines is not OMA defines) - yield break; - ParsingDictionary.parseTermsToId.TryAdd(defines.ToString(), fact.@ref.uri); - - ret.Add(new TestPointFact(SOMDoc.MakeVector3(defines), fact.@ref)); - } - - protected override void RecalculateTransform() - { - Position = Point; - { // Rotation - Vector3 notNormal = Vector3.forward != Normal ? Vector3.forward : Vector3.up; - Rotation = Quaternion.LookRotation( - Vector3.Cross(Normal, notNormal), - Normal - ); - } - } - - /// \copydoc Fact.hasDependentFacts - public override bool HasDependentFacts => false; - - /// \copydoc Fact.getDependentFactIds - protected override string[] GetDependentFactIds() - => new string[] { }; - - /// \copydoc Fact.GetHashCode - public override int GetHashCode() - => this.Point.GetHashCode(); - - /// \copydoc Fact.Equivalent(Fact, Fact) - protected override bool EquivalentWrapped(TestPointFact f1, TestPointFact f2) - => Math3d.IsApproximatelyEqual(f1.Point, f2.Point); - - protected override Fact _ReInitializeMe(Dictionary<string, string> old_to_new) - => new TestPointFact(this.Point, this.Normal); - - public override MMTFact MakeMMTDeclaration() - { - SOMDoc tp = new OMS(MMTConstants.Point); - - return new MMTGeneralFact(_LastLabel, tp, Defines()); - } - - public override SOMDoc Defines() - => new OMA( - new OMS(MMTConstants.Tuple), - new[] { - new OMLIT<float>(Point.x), - new OMLIT<float>(Point.y), - new OMLIT<float>(Point.z), - } - ); -} \ No newline at end of file diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/TestPointFact.cs.meta b/Assets/Scripts/InteractionEngine/FactHandling/Facts/TestPointFact.cs.meta deleted file mode 100644 index 39223b8cf39fd50e8baa0d6176c7836480e2709a..0000000000000000000000000000000000000000 --- a/Assets/Scripts/InteractionEngine/FactHandling/Facts/TestPointFact.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1f6eff440ee539143a0667b6ecc169e3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs b/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs index 826d8d48d7e212f507fb11e72acee8ddbe1355b9..ec1cfc14e2a8c65b8c0498ca4a75ff21c0dd3a01 100644 --- a/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs +++ b/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs @@ -12,7 +12,6 @@ /// </summary> [JsonConverter(typeof(JsonSubtypes), "s_type")] [JsonSubtypes.KnownSubType(typeof(Pointer), "Pointer")] -[JsonSubtypes.KnownSubType(typeof(TestGadget), "TestGadget")] [JsonSubtypes.KnownSubType(typeof(Tape), "Tape")] [JsonSubtypes.KnownSubType(typeof(LineTool), "LineTool")] [JsonSubtypes.KnownSubType(typeof(LotTool), "LotTool")] @@ -48,13 +47,12 @@ public enum GadgetIDs Remover = 7, EqualCircles = 8, MiddlePoint = 9, - TestGadget = 10, + } public static Dictionary<Type, GadgetIDs> GadgetTypeToIDs = new(){ {typeof(UndefinedGadget) , GadgetIDs.Undefined }, {typeof(Pointer) , GadgetIDs.Pointer }, - {typeof(TestGadget) , GadgetIDs.TestGadget }, {typeof(Tape) , GadgetIDs.Tape }, {typeof(AngleTool) , GadgetIDs.AngleTool }, {typeof(LineTool) , GadgetIDs.LineTool }, diff --git a/Assets/Scripts/InteractionEngine/Gadgets/TestGadget.cs b/Assets/Scripts/InteractionEngine/Gadgets/TestGadget.cs deleted file mode 100644 index d2b145768a718f6e84af34bdebfff5fa42af8af1..0000000000000000000000000000000000000000 --- a/Assets/Scripts/InteractionEngine/Gadgets/TestGadget.cs +++ /dev/null @@ -1,34 +0,0 @@ -using UnityEngine; - -public class TestGadget : Gadget -{ - /// \copydoc Gadget.s_type - [Newtonsoft.Json.JsonProperty] - protected static new string s_type = "TestGadget"; - - - protected override void _Hit(RaycastHit[] hit) - { - // string pid = FactAdder.AddPointFact(hit[0], gadget: this).Id; - string pid = ((TestPointFact) FactAdder.AddFactIfNotFound(new TestPointFact(hit[0].point, hit[0].normal), out _, false, this, null)).Id; - - for (int i = 0; i < hit.Length; i++) - { - if (!Mathf.Approximately(hit[0].distance, hit[i].distance)) - break; - - if (hit[i].transform.gameObject.layer == LayerMask.NameToLayer("Ray")) - { - Workflow.Add(hit[i].transform.GetComponent<FactObject>().URI); - FactAdder.AddOnLineFact - (pid - , Workflow[i] - , samestep: true - , gadget: this - , is_certain: false); - } - } - - ResetGadget(); - } -} diff --git a/Assets/Scripts/InteractionEngine/Gadgets/TestGadget.cs.meta b/Assets/Scripts/InteractionEngine/Gadgets/TestGadget.cs.meta deleted file mode 100644 index dfbf87af8b826e72d86c0867464a8bc5467fcbbd..0000000000000000000000000000000000000000 --- a/Assets/Scripts/InteractionEngine/Gadgets/TestGadget.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 201a7ead1e39b2d4e832db9738fb7c19 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs b/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs index 9f964aeb7d053571c8c52df8674ee01ddaf30e3c..8e3a73c4d723cf8e6db1cbf271a58dd23c2fc447 100644 --- a/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs +++ b/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs @@ -10,7 +10,6 @@ namespace REST_JSON_API public static class MMTConstants { public static readonly string Point = "http://mathhub.info/MitM/core/geometry?3DGeometry?point"; - public static readonly string TestPoint = "http://mathhub.info/MitM/core/geometry?3DGeometry?testPoint"; public static readonly string ScalarProduct = "http://mathhub.info/MitM/core/geometry?3DGeometry?scalar_productI"; public static readonly string PointSubtractI = "http://mathhub.info/MitM/core/geometry?3DGeometry?point_subtractI"; public static readonly string PointAddI = "http://mathhub.info/MitM/core/geometry?3DGeometry?point_addI"; @@ -60,10 +59,6 @@ public static class MMTConstants public static readonly string CuboidType = "http://mathhub.info/FrameIT/frameworld?CuboidType?cuboidType"; public static readonly string CuboidScroll = "http://mathhub.info/FrameIT/frameworld?CuboidScroll"; - public static readonly string SimpleCircleCons = "http://mathhub.info/FrameIT/frameworld?CircleType?circleCons"; - public static readonly string SimpleCircleType = "http://mathhub.info/FrameIT/frameworld?CircleType?circleType"; - public static readonly string SimpleCircleScroll = "http://mathhub.info/FrameIT/frameworld?SimpleCircleScroll"; - public static readonly string SphereCons = "http://mathhub.info/FrameIT/frameworld?SphereType?sphereCons"; public static readonly string SphereType = "http://mathhub.info/FrameIT/frameworld?SphereType?sphereType"; public static readonly string SphereScroll = "http://mathhub.info/FrameIT/frameworld?SphereScroll"; @@ -158,7 +153,6 @@ public static class MMTConstants public const string ScrollCircleLineAngleToAngleScroll = "http://mathhub.info/FrameIT/frameworld?CircleLineAngleToAngleScroll"; public const string ScrollMidpoint = "http://mathhub.info/FrameIT/frameworld?Midpoint"; public const string ScrollMidpoint2 = "http://mathhub.info/FrameIT/frameworld?Midpoint"; - public const string ScrollTest = "http://mathhub.info/FrameIT/frameworld?Test"; public const string ScrollCircleScroll = "http://mathhub.info/FrameIT/frameworld?CircleScroll"; public const string ScrollCircleLineAngleScroll = "http://mathhub.info/FrameIT/frameworld?CircleLineAngleScroll"; public const string ScrollCircleAreaScroll = "http://mathhub.info/FrameIT/frameworld?CircleAreaScroll"; @@ -181,10 +175,7 @@ public static class MMTConstants RectangleType, typeof(RectangleFact) }, - { - SimpleCircleType, - typeof(SimpleCircleFact) - }, + { TriangleType, typeof(TriangleFact2) @@ -229,8 +220,6 @@ public static class MMTConstants typeof(TruncatedConeVolumeFact) }, { CylinderVolume, typeof(CylinderVolumeFact) }, - { TestType, - typeof(TestFact) }, { EqualityCircles, typeof(EqualCirclesFact) }, { UnEqualityCircles,