diff --git a/Assets/Resources/Prefabs/Cylinder.prefab b/Assets/Resources/Prefabs/Cylinder.prefab new file mode 100644 index 0000000000000000000000000000000000000000..905c3049b0aef23e1e40ae032b73793c467845dd --- /dev/null +++ b/Assets/Resources/Prefabs/Cylinder.prefab @@ -0,0 +1,477 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &499764482912493548 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8579792659402561882} + - component: {fileID: 3750903719697985053} + - component: {fileID: 3206379526402010796} + - component: {fileID: 3857471551455922074} + - component: {fileID: 7337751399146344349} + m_Layer: 20 + m_Name: TopSnapZone (1) + m_TagString: SnapZone + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8579792659402561882 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 499764482912493548} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -1, z: 0.5} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 5820827822255915852} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &3750903719697985053 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 499764482912493548} + 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!33 &3206379526402010796 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 499764482912493548} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3857471551455922074 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 499764482912493548} + m_Enabled: 0 + 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: e3750cc498409144f8fd06ac559355b8, 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 &7337751399146344349 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 499764482912493548} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03387d215a8db5c47985ef548da953d8, type: 3} + m_Name: + m_EditorClassIdentifier: + ColliderRadius: 0 + Collidersize_ID: 1 + use_ColliderRadius: 0 + myCollider: {fileID: 3750903719697985053} +--- !u!1 &3866437301823722513 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 311546232007540432} + - component: {fileID: 5653548468105314531} + - component: {fileID: 6030911991135810328} + - component: {fileID: 5933672697630910801} + - component: {fileID: 2890212257774513492} + m_Layer: 20 + m_Name: TopSnapZone (4) + m_TagString: SnapZone + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &311546232007540432 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3866437301823722513} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 5820827822255915852} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &5653548468105314531 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3866437301823722513} + 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!33 &6030911991135810328 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3866437301823722513} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5933672697630910801 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3866437301823722513} + m_Enabled: 0 + 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: e3750cc498409144f8fd06ac559355b8, 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 &2890212257774513492 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3866437301823722513} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03387d215a8db5c47985ef548da953d8, type: 3} + m_Name: + m_EditorClassIdentifier: + ColliderRadius: 0 + Collidersize_ID: 1 + use_ColliderRadius: 0 + myCollider: {fileID: 5653548468105314531} +--- !u!1 &3992787084245164670 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5820827822255915852} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5820827822255915852 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3992787084245164670} + 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: 1647950407119886145} + - {fileID: 6767478369596858719} + - {fileID: 8579792659402561882} + - {fileID: 311546232007540432} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4447510611932133534 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1647950407119886145} + - component: {fileID: 562142800694232009} + - component: {fileID: 9205627670369982577} + - component: {fileID: 3267934554819444773} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1647950407119886145 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4447510611932133534} + 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: 5820827822255915852} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &562142800694232009 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4447510611932133534} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &9205627670369982577 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4447510611932133534} + 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: 10303, guid: 0000000000000000f000000000000000, type: 0} + 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 &3267934554819444773 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4447510611932133534} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &8304270432027977780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6767478369596858719} + - component: {fileID: 3657590496487530057} + - component: {fileID: 1033083840726480843} + - component: {fileID: 3866808018947153933} + - component: {fileID: 6021895227464149147} + m_Layer: 20 + m_Name: TopSnapZone + m_TagString: SnapZone + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6767478369596858719 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8304270432027977780} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -1, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 5820827822255915852} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &3657590496487530057 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8304270432027977780} + 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!33 &1033083840726480843 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8304270432027977780} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3866808018947153933 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8304270432027977780} + m_Enabled: 0 + 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: e3750cc498409144f8fd06ac559355b8, 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 &6021895227464149147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8304270432027977780} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03387d215a8db5c47985ef548da953d8, type: 3} + m_Name: + m_EditorClassIdentifier: + ColliderRadius: 0 + Collidersize_ID: 1 + use_ColliderRadius: 0 + myCollider: {fileID: 3657590496487530057} diff --git a/Assets/Resources/Prefabs/Cylinder.prefab.meta b/Assets/Resources/Prefabs/Cylinder.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..cb15e5f6e08ee8d9a0de24a725db3a39793bb9c2 --- /dev/null +++ b/Assets/Resources/Prefabs/Cylinder.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9a9f6ab3f96c02f4bbbbe892bee53819 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Facts/Cylinder.prefab b/Assets/Resources/Prefabs/Facts/Cylinder.prefab index 702a12e41fe4245ca502b172ccbb313a57d905f6..5c2e695f1d286a613bb2f469f4969c03a5b1b2ed 100644 --- a/Assets/Resources/Prefabs/Facts/Cylinder.prefab +++ b/Assets/Resources/Prefabs/Facts/Cylinder.prefab @@ -25,7 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6069774532129100082} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 0.5, z: 1} m_ConstrainProportionsScale: 0 diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity index 39ac84768241c975acb61889d93b99457fc84791..16ced10b3e2ed563e6a8f0e867939933e233d7a6 100644 --- a/Assets/Scenes/Worlds/RiverWorld.unity +++ b/Assets/Scenes/Worlds/RiverWorld.unity @@ -3871,7 +3871,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh97366 + m_Name: pb_Mesh133532 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -15923,7 +15923,7 @@ Transform: - {fileID: 544246699} - {fileID: 312391688} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &645585536 PrefabInstance: @@ -21357,6 +21357,75 @@ Transform: type: 3} m_PrefabInstance: {fileID: 876805620} m_PrefabAsset: {fileID: 0} +--- !u!1001 &877626215 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3992787084245164670, guid: 9a9f6ab3f96c02f4bbbbe892bee53819, + type: 3} + propertyPath: m_Name + value: Cylinder + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 9a9f6ab3f96c02f4bbbbe892bee53819, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 9a9f6ab3f96c02f4bbbbe892bee53819, + type: 3} + propertyPath: m_LocalPosition.x + value: -11.829174 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 9a9f6ab3f96c02f4bbbbe892bee53819, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.43 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 9a9f6ab3f96c02f4bbbbe892bee53819, + type: 3} + propertyPath: m_LocalPosition.z + value: 36.36 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 9a9f6ab3f96c02f4bbbbe892bee53819, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.8067074 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 9a9f6ab3f96c02f4bbbbe892bee53819, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.5648625 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 9a9f6ab3f96c02f4bbbbe892bee53819, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.14224426 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 9a9f6ab3f96c02f4bbbbe892bee53819, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.09960049 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 9a9f6ab3f96c02f4bbbbe892bee53819, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 70 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 9a9f6ab3f96c02f4bbbbe892bee53819, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5820827822255915852, guid: 9a9f6ab3f96c02f4bbbbe892bee53819, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9a9f6ab3f96c02f4bbbbe892bee53819, type: 3} --- !u!1001 &883881641 PrefabInstance: m_ObjectHideFlags: 0 @@ -26170,7 +26239,7 @@ PrefabInstance: - target: {fileID: 8728653376014859777, guid: 4980f9f58bcf8e54d83337578e021bdd, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8728653376014859777, guid: 4980f9f58bcf8e54d83337578e021bdd, type: 3} @@ -26564,7 +26633,7 @@ PrefabInstance: - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 2685535731263505864, guid: f95a31fc6dbf0c04fba0fcf2bb48b74e, type: 3} @@ -40535,7 +40604,7 @@ PrefabInstance: - target: {fileID: 3754651480998489923, guid: caf448c160a07214f8cf74da91506980, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 3754651480998489923, guid: caf448c160a07214f8cf74da91506980, type: 3} @@ -60960,7 +61029,7 @@ PrefabInstance: - target: {fileID: 3020720017683626808, guid: b07552db700124a4680401e6fb94c186, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3020720017683626808, guid: b07552db700124a4680401e6fb94c186, type: 3} diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/CylinderFact.cs b/Assets/Scripts/InteractionEngine/FactHandling/Facts/CylinderFact.cs index af997e430211362ec9d9f9433394a0feb74a6a15..7595dc213831a5b6c6abd331400e703b5e0a83b5 100644 --- a/Assets/Scripts/InteractionEngine/FactHandling/Facts/CylinderFact.cs +++ b/Assets/Scripts/InteractionEngine/FactHandling/Facts/CylinderFact.cs @@ -32,16 +32,18 @@ protected void calculate_vectors(){ T = ((PointFact)FactRecorder.AllFacts[PidT]).Point + Vector3.zero; //Rotation = Quaternion.LookRotation(forward, new Vector3(1.0F, 0.0F, 0.0F)); - Position = M + 0.5F * ((T - M) + (E - M)); - Radius = Vector3.Distance(M, E) / 2; + Position = M + 0.5F * ((T - M)); + Radius = Vector3.Distance(M, E); Height = Vector3.Distance(T, M); - LocalScale = new Vector3(Radius*2, Height, Radius*2); + LocalScale = new Vector3(Radius*2 + 0.1F, Height + 0.1F, Radius*2 + 0.1F); - Vector3 LookVector = Vector3.Cross((T - M), (E - M)); + Vector3 LookVector = E - M; Rotation = Quaternion.LookRotation(LookVector, Vector3.up); + Volume = Mathf.PI * Radius * Radius * Height; + }