diff --git a/Assets/Resources/Prefabs/Facts/Ring.prefab b/Assets/Resources/Prefabs/Facts/Ring.prefab index da4ef280fe05d78ddab91efc533e8a97c85c8af9..9d550071c805579389564cd9d8c2fc9ba58a2e66 100644 --- a/Assets/Resources/Prefabs/Facts/Ring.prefab +++ b/Assets/Resources/Prefabs/Facts/Ring.prefab @@ -35,8 +35,8 @@ RectTransform: 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: 1} - m_SizeDelta: {x: 4, y: 1} + m_AnchoredPosition: {x: 0, y: 1.5} + m_SizeDelta: {x: 2, y: 0.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &154494299464322201 MeshRenderer: diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs index 54e40d0eba4db2e13ac106886acd1ea1bf785371..44ec5398f40848a65d92aea296a1f4e23129e9bd 100644 --- a/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs +++ b/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs @@ -227,16 +227,12 @@ public Fact SpawnRing(Fact fact) string text = $"○{middlePointFact.Label}"; tmpText.text = text; - //move TMP Text so it is on the edge of the circle - tmpText.rectTransform.position = tmpText.rectTransform.position - new Vector3(0, 0, -radius); + ////move TMP Text so it is on the edge of the circle + //tmpText.rectTransform.position = tmpText.rectTransform.position - new Vector3(0, 0, -radius); FactObj.URI = circleFact.Id; circleFact.Representation = ring; - //update MeshCollider to fit torus - MeshCollider meshCol = ring.GetComponentInChildren<MeshCollider>(); - meshCol.sharedMesh = meshCol.gameObject.GetComponent<MeshFilter>().sharedMesh; - return circleFact; } diff --git a/Assets/Scripts/MeshGenerator/TorusGenerator.cs b/Assets/Scripts/MeshGenerator/TorusGenerator.cs index 607f783b525d2d3d42e94321ca07337e45aa7594..95ef7746d9b72022d148fa987423136440778261 100644 --- a/Assets/Scripts/MeshGenerator/TorusGenerator.cs +++ b/Assets/Scripts/MeshGenerator/TorusGenerator.cs @@ -25,6 +25,9 @@ protected override void GenerateShape() if (torusMesh.sharedMesh != null) torusMesh.sharedMesh.Clear(); torusMesh.mesh = CreateMesh(CreateTorus(torusRadius, ringRadius, ringSegmentCount, segmentSideCount)); + + if (torusMesh.transform.TryGetComponent(out MeshCollider meshCol)) + meshCol.sharedMesh = torusMesh.sharedMesh; } private static (Vector3[] vertices, int[] triangles) CreateTorus(float torusRadius, float ringRadius, int ringSegmentCount, int segmentSideCount)