diff --git a/Assets/InteractionEngine/CommunicationEvents.cs b/Assets/InteractionEngine/CommunicationEvents.cs
index 3a3afcffa46ea8dbabc0f6e73cb370f4d30f3ab7..c4a80da18ed5aafc2e9200d5343cb7011ff021b2 100644
--- a/Assets/InteractionEngine/CommunicationEvents.cs
+++ b/Assets/InteractionEngine/CommunicationEvents.cs
@@ -9,6 +9,11 @@ public class PointEvent : UnityEvent<RaycastHit,int>
{
}
+
+ public class LineEvent : UnityEvent<Vector3, Vector3> {
+
+ }
+
public class HitEvent : UnityEvent<RaycastHit>
{
@@ -30,7 +35,8 @@ public class ToolModeEvent : UnityEvent<ToolMode> {
public static MouseOverFactEvent HighlightEvent = new MouseOverFactEvent();
public static MouseOverFactEvent EndHighlightEvent = new MouseOverFactEvent();
public static ToolModeEvent ToolModeChangedEvent = new ToolModeEvent();
- public static PointEvent AddEvent = new PointEvent();
+ public static PointEvent AddPointEvent = new PointEvent();
+ public static LineEvent AddLineEvent = new LineEvent();
public static FactEvent RemoveEvent = new FactEvent();
public static ToolMode ActiveToolMode { get; set; }
}
diff --git a/Assets/InteractionEngine/FactSpawner.cs b/Assets/InteractionEngine/FactSpawner.cs
index bae3376c815d4fd401b521217f6ef20b40c17481..e2111703e68499f279619361df5a74152d7c1130 100644
--- a/Assets/InteractionEngine/FactSpawner.cs
+++ b/Assets/InteractionEngine/FactSpawner.cs
@@ -6,7 +6,7 @@
public class FactSpawner : MonoBehaviour
{
- public GameObject FactRepresentation;
+ private GameObject FactRepresentation;
public string[] Facts = new String[100];
public GameObject[] GameObjectFacts = new GameObject[100];
@@ -22,10 +22,12 @@ void Start()
CommunicationEvents.EndHighlightEvent.AddListener(OnMouseOverFactEnd);
CommunicationEvents.TriggerEvent.AddListener(OnHit);
CommunicationEvents.ToolModeChangedEvent.AddListener(OnToolModeChanged);
- CommunicationEvents.AddEvent.AddListener(SpawnFact);
+ CommunicationEvents.AddPointEvent.AddListener(SpawnPoint);
+ CommunicationEvents.AddLineEvent.AddListener(SpawnLine);
CommunicationEvents.RemoveEvent.AddListener(DeletePoint);
-
+ //Default FactRepresenation = Sphere-Prefab for Points
+ this.FactRepresentation = (GameObject) Resources.Load("Prefabs/Sphere", typeof(GameObject));
}
@@ -41,13 +43,9 @@ public int GetFirstEmptyID()
}
- public void SpawnFact(RaycastHit hit, int id) {
- SpawnPoint(hit, id);
- }
-
-
public void SpawnPoint(RaycastHit hit, int id)
{
+ this.FactRepresentation = (GameObject)Resources.Load("Prefabs/Sphere", typeof(GameObject));
Debug.Log(id);
GameObject point = GameObject.Instantiate(FactRepresentation);
point.transform.position = hit.point;
@@ -72,6 +70,33 @@ public void DeletePoint(int id)
Facts[id] = "";
}
+ public void SpawnLine(Vector3 point1, Vector3 point2) {
+ int id = GetFirstEmptyID();
+ Debug.Log(id);
+ //Change FactRepresentation to Line
+ this.FactRepresentation = (GameObject)Resources.Load("Prefabs/Line2", typeof(GameObject));
+ GameObject line = GameObject.Instantiate(FactRepresentation);
+ //Place the Line in the centre of the two points
+ //and change scale and rotation, so that the two points are connected by the line
+ line.transform.position = Vector3.Lerp(point1, point2, 0.5f);
+ var v3T = line.transform.localScale;
+ v3T.y = (point2 - point1).magnitude;
+ //x and z of the line/Cube-GameObject here hard coded = ratio of sphere-prefab
+ v3T.x = 0.1f;
+ v3T.z = 0.1f;
+ line.transform.localScale = v3T;
+ line.transform.rotation = Quaternion.FromToRotation(Vector3.up, point2 - point1);
+
+ string letter = ((Char)(64 + id + 1)).ToString();
+ line.GetComponentInChildren<TextMeshPro>().text = letter;
+ line.GetComponent<FactObject>().Id = id;
+ //If a new Line was spawned -> We are in CreateLineMode -> Then we want the collider to be disabled
+ if (CommunicationEvents.ActiveToolMode != ToolMode.ExtraMode)
+ line.GetComponentInChildren<BoxCollider>().enabled = false;
+ Facts[id] = letter;
+ GameObjectFacts[id] = line;
+ }
+
public void OnMouseOverFactEnd(Transform selection)
{
Renderer selectionRenderer;
@@ -122,7 +147,7 @@ public void OnHit(RaycastHit hit)
else
{
- CommunicationEvents.AddEvent.Invoke(hit, GetFirstEmptyID());
+ CommunicationEvents.AddPointEvent.Invoke(hit, GetFirstEmptyID());
}
}
diff --git a/Assets/InteractionEngine/MMTInterface.cs b/Assets/InteractionEngine/MMTInterface.cs
index fbc917a8f3aa24d1fa8d4fd51ca5bce6fc5bcadd..37a25b95dabc3078e6ac1d48f990d1283c9bd6aa 100644
--- a/Assets/InteractionEngine/MMTInterface.cs
+++ b/Assets/InteractionEngine/MMTInterface.cs
@@ -27,7 +27,7 @@ void Start()
mmtServerProcess = Process.Start(mmtServerProcessInfo);
*/
- CommunicationEvents.AddEvent.AddListener(AddFactToMMT);
+ CommunicationEvents.AddPointEvent.AddListener(AddFactToMMT);
CommunicationEvents.RemoveEvent.AddListener(RemoveFactFromMMT);
diff --git a/Assets/InteractionEngine/WorldCursor.cs b/Assets/InteractionEngine/WorldCursor.cs
index 7dd3cc4f3036c507355c3527d4e95177c84e8f28..1bae810bcfb8635ba24830acc31be6b170142ffc 100644
--- a/Assets/InteractionEngine/WorldCursor.cs
+++ b/Assets/InteractionEngine/WorldCursor.cs
@@ -11,9 +11,14 @@ public class WorldCursor : MonoBehaviour
private Camera Cam;
private ToolMode ActiveToolMode{get; set;}
+ //Attributes for Highlighting of Facts when Mouse-Over
private string selectableTag = "Selectable";
private Transform lastFactSelection;
+ //Attributes for simulating the drawing of a line
+ public LineRenderer lineRenderer;
+ private List<Vector3> linePositions = new List<Vector3>();
+ private bool lineRendererActivated;
void Start()
{
@@ -64,7 +69,9 @@ void Update()
}
//SELECTION-HIGHLIGHTING-PART-END
- CheckMouseButtons();
+ CheckMouseButtons(ray);
+
+ UpdateLineRenderer(transform.position);
}
else
@@ -78,15 +85,112 @@ void Update()
}
- void CheckMouseButtons()
+ //Deactivate LineRenderer so that no Line gets drawn when Cursor changes
+ void DeactivateLineRenderer()
{
-
- //send HitEvent
- if (Input.GetMouseButtonDown(0)){
- if (EventSystem.current.IsPointerOverGameObject()) return;
- CommunicationEvents.TriggerEvent.Invoke(Hit);
+ //Reset the first points
+ this.lineRenderer.SetPosition(0, Vector3.zero);
+ this.lineRenderer.SetPosition(1, Vector3.zero);
+ if (linePositions.Count > 0)
+ this.linePositions.Clear();
+ this.lineRendererActivated = false;
+ }
+
+ //Check if left Mouse-Button was pressed and handle it
+ void CheckMouseButtons(Ray ray)
+ {
+ if (Input.GetMouseButtonDown(0))
+ {
+ switch (this.ActiveToolMode)
+ {
+ case ToolMode.MarkPointMode:
+ //send HitEvent
+ CommunicationEvents.TriggerEvent.Invoke(Hit);
+ break;
+ case ToolMode.ExtraMode:
+ //send HitEvent
+ CommunicationEvents.TriggerEvent.Invoke(Hit);
+ break;
+ case ToolMode.DeleteMode:
+ //send HitEvent
+ CommunicationEvents.TriggerEvent.Invoke(Hit);
+ break;
+ case ToolMode.CreateLineMode:
+ //Je nachdem ob erster oder der zweite Punkt angeklickt wurde behandeln
+
+ //Wenn erster Punkt einen Point-Collider erwischt hat:
+ //Linie aktivieren und Cursor folgen
+ //Wenn erster Punkt keinen Point-Collider erwischt hat:
+ //Nichts tun -> Evtl Hint einblenden
+
+ //Wenn zweiter Punkt einen Point-Collider erwischt hat:
+ //Event senden um GameObject-Line zu erzeugen
+ //Wenn zweiter Punkt keinen Point-Collider erwischt hat:
+ //Linie deaktivieren -> Evtl Hint einblenden
+
+ //LayerMask for Points
+ int layerMask = 1 << LayerMask.NameToLayer("Point"); //only hit Point
+
+ //Wenn bereits der erste Punkt markiert wurde
+ if (this.lineRendererActivated)
+ {
+ //If a second Point was Hit
+ if (Physics.Raycast(ray, out Hit, 30f, layerMask))
+ {
+ //Event for Creating the Line
+ Vector3 point1 = this.linePositions[0];
+ Vector3 point2 = Hit.transform.gameObject.transform.position;
+ this.DeactivateLineRenderer();
+ CommunicationEvents.AddLineEvent.Invoke(point1, point2);
+ break;
+ }
+ //If no Point was hit
+ else
+ {
+ //TODO: Hint that only a line can be drawn between already existing points
+ this.DeactivateLineRenderer();
+ }
+ }
+ //Wenn der erste Punkt noch nicht markiert wurde
+ else
+ {
+ //Check if a Point was hit
+ if (Physics.Raycast(ray, out Hit, 30f, layerMask))
+ {
+ //Set LineRenderer activated
+ this.lineRendererActivated = true;
+ //Add the position of the hit Point for the start of the Line
+ Vector3 temp = Hit.transform.gameObject.transform.position;
+ //temp += Vector3.up;
+
+ linePositions.Add(temp);
+ //The second point is the same point at the moment
+ linePositions.Add(temp);
+ this.lineRenderer.SetPosition(0, linePositions[0]);
+ this.lineRenderer.SetPosition(1, linePositions[1]);
+ }
+ else
+ {
+ //TODO: Hint that only a line can be drawn between already existing points
+ }
+ }
+
+ break;
+ }
}
+ }
+ //Updates the second-point of the Line when First Point was selected in LineMode
+ void UpdateLineRenderer(Vector3 currentPosition)
+ {
+ if (this.ActiveToolMode == ToolMode.CreateLineMode)
+ {
+ if (this.lineRendererActivated)
+ {
+ this.linePositions[1] = currentPosition;
+ this.lineRenderer.SetPosition(1, this.linePositions[1]);
+ }
+ }
}
void CheckToolModeSelection() {
diff --git a/Assets/Materials/Crosshair.mat b/Assets/Materials/Crosshair.mat
new file mode 100644
index 0000000000000000000000000000000000000000..a333d75604bd508bbc104248680fb5d5a8d24e9e
--- /dev/null
+++ b/Assets/Materials/Crosshair.mat
@@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Crosshair
+ m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_ShaderKeywords:
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Materials/Crosshair.mat.meta b/Assets/Materials/Crosshair.mat.meta
new file mode 100644
index 0000000000000000000000000000000000000000..28cea9880bf2e84d4d8680cb3a4a569a4dd22908
--- /dev/null
+++ b/Assets/Materials/Crosshair.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a09c41e07a71f7145bde02d9edc5c747
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/LineMaterial.mat b/Assets/Materials/LineMaterial.mat
new file mode 100644
index 0000000000000000000000000000000000000000..e088dcea7a4b45dd93aadb423d24c0bd201a03cc
--- /dev/null
+++ b/Assets/Materials/LineMaterial.mat
@@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: LineMaterial
+ m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0}
+ m_ShaderKeywords:
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 4000
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 0.990566, g: 0.97702986, b: 0, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Materials/LineMaterial.mat.meta b/Assets/Materials/LineMaterial.mat.meta
new file mode 100644
index 0000000000000000000000000000000000000000..c6340241f557565ec34b5c9f59b9068799d8b596
--- /dev/null
+++ b/Assets/Materials/LineMaterial.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a8a7bf60a30970f469a9c9d3ae2de6ef
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources.meta b/Assets/Resources.meta
new file mode 100644
index 0000000000000000000000000000000000000000..c3b315feb1fe5d8a1a1280bae930a5b4adb61088
--- /dev/null
+++ b/Assets/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f89bd8b5ca144814885dc5929e10c1ec
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs.meta b/Assets/Resources/Prefabs.meta
similarity index 100%
rename from Assets/Prefabs.meta
rename to Assets/Resources/Prefabs.meta
diff --git a/Assets/Prefabs/AngleDisplay.prefab b/Assets/Resources/Prefabs/AngleDisplay.prefab
similarity index 100%
rename from Assets/Prefabs/AngleDisplay.prefab
rename to Assets/Resources/Prefabs/AngleDisplay.prefab
diff --git a/Assets/Prefabs/AngleDisplay.prefab.meta b/Assets/Resources/Prefabs/AngleDisplay.prefab.meta
similarity index 100%
rename from Assets/Prefabs/AngleDisplay.prefab.meta
rename to Assets/Resources/Prefabs/AngleDisplay.prefab.meta
diff --git a/Assets/Prefabs/Cursor.prefab b/Assets/Resources/Prefabs/Cursor.prefab
similarity index 100%
rename from Assets/Prefabs/Cursor.prefab
rename to Assets/Resources/Prefabs/Cursor.prefab
diff --git a/Assets/Prefabs/Cursor.prefab.meta b/Assets/Resources/Prefabs/Cursor.prefab.meta
similarity index 100%
rename from Assets/Prefabs/Cursor.prefab.meta
rename to Assets/Resources/Prefabs/Cursor.prefab.meta
diff --git a/Assets/Prefabs/DisplayPoint.prefab b/Assets/Resources/Prefabs/DisplayPoint.prefab
similarity index 100%
rename from Assets/Prefabs/DisplayPoint.prefab
rename to Assets/Resources/Prefabs/DisplayPoint.prefab
diff --git a/Assets/Prefabs/DisplayPoint.prefab.meta b/Assets/Resources/Prefabs/DisplayPoint.prefab.meta
similarity index 100%
rename from Assets/Prefabs/DisplayPoint.prefab.meta
rename to Assets/Resources/Prefabs/DisplayPoint.prefab.meta
diff --git a/Assets/Prefabs/DistanceDisplay.prefab b/Assets/Resources/Prefabs/DistanceDisplay.prefab
similarity index 100%
rename from Assets/Prefabs/DistanceDisplay.prefab
rename to Assets/Resources/Prefabs/DistanceDisplay.prefab
diff --git a/Assets/Prefabs/DistanceDisplay.prefab.meta b/Assets/Resources/Prefabs/DistanceDisplay.prefab.meta
similarity index 100%
rename from Assets/Prefabs/DistanceDisplay.prefab.meta
rename to Assets/Resources/Prefabs/DistanceDisplay.prefab.meta
diff --git a/Assets/Prefabs/FactDisplay.prefab b/Assets/Resources/Prefabs/FactDisplay.prefab
similarity index 100%
rename from Assets/Prefabs/FactDisplay.prefab
rename to Assets/Resources/Prefabs/FactDisplay.prefab
diff --git a/Assets/Prefabs/FactDisplay.prefab.meta b/Assets/Resources/Prefabs/FactDisplay.prefab.meta
similarity index 100%
rename from Assets/Prefabs/FactDisplay.prefab.meta
rename to Assets/Resources/Prefabs/FactDisplay.prefab.meta
diff --git a/Assets/Resources/Prefabs/Line.prefab b/Assets/Resources/Prefabs/Line.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..327a0ae4c93b82f68d2e86b8901839958c118002
--- /dev/null
+++ b/Assets/Resources/Prefabs/Line.prefab
@@ -0,0 +1,417 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2496690874987854574
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6125026673793904494}
+ - component: {fileID: 5317438232530275707}
+ - component: {fileID: 1432417995795110366}
+ - component: {fileID: 7118368545746548941}
+ m_Layer: 11
+ m_Name: Line
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &6125026673793904494
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2496690874987854574}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.1, y: 1, z: 0.1}
+ m_Children: []
+ m_Father: {fileID: 5046695354663855305}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &5317438232530275707
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2496690874987854574}
+ m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &1432417995795110366
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2496690874987854574}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: a8a7bf60a30970f469a9c9d3ae2de6ef, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!136 &7118368545746548941
+CapsuleCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2496690874987854574}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ m_Radius: 0.5
+ m_Height: 2
+ m_Direction: 1
+ m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &5888795777962911503
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8833812500703695140}
+ - component: {fileID: 7808131783401781287}
+ - component: {fileID: 7437245633462291148}
+ - component: {fileID: 6195704479152853629}
+ - component: {fileID: 1290941253797543648}
+ - component: {fileID: 220183192139048276}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8833812500703695140
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5888795777962911503}
+ m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 5046695354663855305}
+ m_RootOrder: 1
+ 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: 1, y: 0}
+ m_SizeDelta: {x: 2, y: 0.5}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!23 &7808131783401781287
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5888795777962911503}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ 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_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!33 &7437245633462291148
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5888795777962911503}
+ m_Mesh: {fileID: 0}
+--- !u!222 &6195704479152853629
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5888795777962911503}
+ m_CullTransparentMesh: 0
+--- !u!114 &1290941253797543648
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5888795777962911503}
+ 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_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_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_outlineColor:
+ serializedVersion: 2
+ rgba: 4278190080
+ m_fontSize: 4
+ m_fontSizeBase: 4
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_textAlignment: 258
+ 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_firstOverflowCharacterIndex: -1
+ m_linkedTextComponent: {fileID: 0}
+ m_isLinkedTextComponent: 0
+ m_isTextTruncated: 0
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 0
+ m_isCullingEnabled: 0
+ m_ignoreRectMaskCulling: 0
+ m_ignoreCulling: 1
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_VertexBufferAutoSizeReduction: 1
+ m_firstVisibleCharacter: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_textInfo:
+ textComponent: {fileID: 1290941253797543648}
+ characterCount: 4
+ spriteCount: 0
+ spaceCount: 0
+ wordCount: 1
+ linkCount: 0
+ lineCount: 1
+ pageCount: 1
+ materialCount: 1
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_spriteAnimator: {fileID: 0}
+ m_hasFontAssetChanged: 0
+ m_renderer: {fileID: 7808131783401781287}
+ m_subTextObjects:
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ m_maskType: 0
+--- !u!114 &220183192139048276
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5888795777962911503}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 8cf5a358dacd3b54ab093ee289dd9ba2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &6830281752141360198
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5046695354663855305}
+ - component: {fileID: 5644830416772593419}
+ - component: {fileID: 5493632383604360425}
+ - component: {fileID: 3370574915953842469}
+ - component: {fileID: 2468919236736664347}
+ m_Layer: 11
+ m_Name: Line
+ m_TagString: Selectable
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &5046695354663855305
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6830281752141360198}
+ m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
+ m_LocalPosition: {x: 0, y: 2, z: -6}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 6125026673793904494}
+ - {fileID: 8833812500703695140}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
+--- !u!33 &5644830416772593419
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6830281752141360198}
+ m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &5493632383604360425
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6830281752141360198}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ 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_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!114 &3370574915953842469
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6830281752141360198}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ Id: 0
+--- !u!136 &2468919236736664347
+CapsuleCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6830281752141360198}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ m_Radius: 0.5
+ m_Height: 2
+ m_Direction: 1
+ m_Center: {x: 0, y: 0, z: 0}
diff --git a/Assets/Resources/Prefabs/Line.prefab.meta b/Assets/Resources/Prefabs/Line.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..f706e9f28a9afad7aeefa3e7231b7fd56976c016
--- /dev/null
+++ b/Assets/Resources/Prefabs/Line.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6f12e3bd17dc0d64b96ff7d56e7f7df7
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Prefabs/Line2.prefab b/Assets/Resources/Prefabs/Line2.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..ca264e24f3a34cc66b5c88260dbd4c92d360915f
--- /dev/null
+++ b/Assets/Resources/Prefabs/Line2.prefab
@@ -0,0 +1,415 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1642750355639039392
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7026512136386970768}
+ - component: {fileID: 3220019359573147980}
+ - component: {fileID: 7618590508060530576}
+ - component: {fileID: 7499960066105896670}
+ m_Layer: 0
+ m_Name: Line2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &7026512136386970768
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1642750355639039392}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1.0002, y: 1.05, z: 1.05}
+ m_Children: []
+ m_Father: {fileID: 4994761628293246923}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &3220019359573147980
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1642750355639039392}
+ m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &7618590508060530576
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1642750355639039392}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ 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_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!65 &7499960066105896670
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1642750355639039392}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 1, y: 1, z: 1}
+ m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &6565923630592245158
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4994761628293246923}
+ - component: {fileID: 9033866668886366687}
+ - component: {fileID: 8146294365389967245}
+ - component: {fileID: 3611341480574512664}
+ - component: {fileID: 8425449359525720750}
+ m_Layer: 0
+ m_Name: Line2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4994761628293246923
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6565923630592245158}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -0.329, y: 2.8050623, z: -4.33}
+ m_LocalScale: {x: 0.5, y: 0.01, z: 0.01}
+ m_Children:
+ - {fileID: 2755875361523697569}
+ - {fileID: 7026512136386970768}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &9033866668886366687
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6565923630592245158}
+ m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &8146294365389967245
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6565923630592245158}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: a8a7bf60a30970f469a9c9d3ae2de6ef, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!114 &3611341480574512664
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6565923630592245158}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ Id: 0
+--- !u!65 &8425449359525720750
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6565923630592245158}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 1, y: 1, z: 1}
+ m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &7609357958344002982
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2755875361523697569}
+ - component: {fileID: 7463666500330994570}
+ - component: {fileID: 1938863688864945331}
+ - component: {fileID: 7478825983925792131}
+ - component: {fileID: 5168652854564093290}
+ - component: {fileID: 4999511783545229280}
+ m_Layer: 0
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2755875361523697569
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7609357958344002982}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.1810925, y: 14.499966, z: 20}
+ m_Children: []
+ m_Father: {fileID: 4994761628293246923}
+ m_RootOrder: 0
+ 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: 3.5}
+ m_SizeDelta: {x: 2, y: 0.5}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!23 &7463666500330994570
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7609357958344002982}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ 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_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!33 &1938863688864945331
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7609357958344002982}
+ m_Mesh: {fileID: 0}
+--- !u!222 &7478825983925792131
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7609357958344002982}
+ m_CullTransparentMesh: 0
+--- !u!114 &5168652854564093290
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7609357958344002982}
+ 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_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_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_outlineColor:
+ serializedVersion: 2
+ rgba: 4278190080
+ m_fontSize: 4
+ m_fontSizeBase: 4
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_textAlignment: 258
+ 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_firstOverflowCharacterIndex: -1
+ m_linkedTextComponent: {fileID: 0}
+ m_isLinkedTextComponent: 0
+ m_isTextTruncated: 0
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 0
+ m_isCullingEnabled: 0
+ m_ignoreRectMaskCulling: 0
+ m_ignoreCulling: 1
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_VertexBufferAutoSizeReduction: 1
+ m_firstVisibleCharacter: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_textInfo:
+ textComponent: {fileID: 5168652854564093290}
+ characterCount: 4
+ spriteCount: 0
+ spaceCount: 0
+ wordCount: 1
+ linkCount: 0
+ lineCount: 1
+ pageCount: 1
+ materialCount: 1
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_spriteAnimator: {fileID: 0}
+ m_hasFontAssetChanged: 0
+ m_renderer: {fileID: 7463666500330994570}
+ m_subTextObjects:
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ m_maskType: 0
+--- !u!114 &4999511783545229280
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7609357958344002982}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 8cf5a358dacd3b54ab093ee289dd9ba2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
diff --git a/Assets/Resources/Prefabs/Line2.prefab.meta b/Assets/Resources/Prefabs/Line2.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..74d20275824874c0d497cff21a615d5da6e40537
--- /dev/null
+++ b/Assets/Resources/Prefabs/Line2.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ed84c52b35e6d7142a7facb01b995d8c
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/PythagorasDisplay.prefab b/Assets/Resources/Prefabs/PythagorasDisplay.prefab
similarity index 100%
rename from Assets/Prefabs/PythagorasDisplay.prefab
rename to Assets/Resources/Prefabs/PythagorasDisplay.prefab
diff --git a/Assets/Prefabs/PythagorasDisplay.prefab.meta b/Assets/Resources/Prefabs/PythagorasDisplay.prefab.meta
similarity index 100%
rename from Assets/Prefabs/PythagorasDisplay.prefab.meta
rename to Assets/Resources/Prefabs/PythagorasDisplay.prefab.meta
diff --git a/Assets/Prefabs/PythagorasMagic.prefab b/Assets/Resources/Prefabs/PythagorasMagic.prefab
similarity index 100%
rename from Assets/Prefabs/PythagorasMagic.prefab
rename to Assets/Resources/Prefabs/PythagorasMagic.prefab
diff --git a/Assets/Prefabs/PythagorasMagic.prefab.meta b/Assets/Resources/Prefabs/PythagorasMagic.prefab.meta
similarity index 100%
rename from Assets/Prefabs/PythagorasMagic.prefab.meta
rename to Assets/Resources/Prefabs/PythagorasMagic.prefab.meta
diff --git a/Assets/Prefabs/ScrollDisplay.prefab b/Assets/Resources/Prefabs/ScrollDisplay.prefab
similarity index 100%
rename from Assets/Prefabs/ScrollDisplay.prefab
rename to Assets/Resources/Prefabs/ScrollDisplay.prefab
diff --git a/Assets/Prefabs/ScrollDisplay.prefab.meta b/Assets/Resources/Prefabs/ScrollDisplay.prefab.meta
similarity index 100%
rename from Assets/Prefabs/ScrollDisplay.prefab.meta
rename to Assets/Resources/Prefabs/ScrollDisplay.prefab.meta
diff --git a/Assets/Prefabs/SmartMenu.prefab b/Assets/Resources/Prefabs/SmartMenu.prefab
similarity index 100%
rename from Assets/Prefabs/SmartMenu.prefab
rename to Assets/Resources/Prefabs/SmartMenu.prefab
diff --git a/Assets/Prefabs/SmartMenu.prefab.meta b/Assets/Resources/Prefabs/SmartMenu.prefab.meta
similarity index 100%
rename from Assets/Prefabs/SmartMenu.prefab.meta
rename to Assets/Resources/Prefabs/SmartMenu.prefab.meta
diff --git a/Assets/Prefabs/Sphere.prefab b/Assets/Resources/Prefabs/Sphere.prefab
similarity index 100%
rename from Assets/Prefabs/Sphere.prefab
rename to Assets/Resources/Prefabs/Sphere.prefab
diff --git a/Assets/Prefabs/Sphere.prefab.meta b/Assets/Resources/Prefabs/Sphere.prefab.meta
similarity index 100%
rename from Assets/Prefabs/Sphere.prefab.meta
rename to Assets/Resources/Prefabs/Sphere.prefab.meta
diff --git a/Assets/TreeWorld.unity b/Assets/TreeWorld.unity
index 60c30083cfb6aead66b301bf54feb9c4b652de44..3b6983ea4c31d8e96dd1ebf94ff34d18d4ff994f 100644
--- a/Assets/TreeWorld.unity
+++ b/Assets/TreeWorld.unity
@@ -947,6 +947,11 @@ PrefabInstance:
value:
objectReference: {fileID: 5601740127768851631, guid: e693bf633c633d243b0254d117ec3893,
type: 3}
+ - target: {fileID: 1324548122521590688, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
+ type: 3}
+ propertyPath: lineRenderer
+ value:
+ objectReference: {fileID: 1661088668}
- target: {fileID: 3052661700889384477, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
type: 3}
propertyPath: m_RootOrder
@@ -1128,8 +1133,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5c41d44ed1851e14089a3b6e37cba740, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactRepresentation: {fileID: 537518992981541273, guid: 8174216d5fd9a9744ad2e05d475c071a,
- type: 3}
Facts:
-
-
@@ -1336,6 +1339,101 @@ MonoBehaviour:
highlightMaterial: {fileID: 2100000, guid: c7daa82e15f0cf04d92d0f41ce84f9df, type: 2}
SmartMenu: {fileID: 5601740127768851631, guid: e693bf633c633d243b0254d117ec3893,
type: 3}
+--- !u!120 &1661088668
+LineRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1661088665}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 0
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: a8a7bf60a30970f469a9c9d3ae2de6ef, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 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_Positions:
+ - {x: 0, y: 0, z: 0}
+ - {x: 0, y: 0, z: 1}
+ m_Parameters:
+ serializedVersion: 3
+ widthMultiplier: 1
+ widthCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0.0102005005
+ value: 0.16666985
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ colorGradient:
+ serializedVersion: 2
+ key0: {r: 1, g: 1, b: 1, a: 1}
+ key1: {r: 1, g: 1, b: 1, a: 1}
+ key2: {r: 0, g: 0, b: 0, a: 0}
+ key3: {r: 0, g: 0, b: 0, a: 0}
+ key4: {r: 0, g: 0, b: 0, a: 0}
+ key5: {r: 0, g: 0, b: 0, a: 0}
+ key6: {r: 0, g: 0, b: 0, a: 0}
+ key7: {r: 0, g: 0, b: 0, a: 0}
+ ctime0: 0
+ ctime1: 65535
+ ctime2: 0
+ ctime3: 0
+ ctime4: 0
+ ctime5: 0
+ ctime6: 0
+ ctime7: 0
+ atime0: 0
+ atime1: 65535
+ atime2: 0
+ atime3: 0
+ atime4: 0
+ atime5: 0
+ atime6: 0
+ atime7: 0
+ m_Mode: 0
+ m_NumColorKeys: 2
+ m_NumAlphaKeys: 2
+ numCornerVertices: 0
+ numCapVertices: 0
+ alignment: 0
+ textureMode: 0
+ shadowBias: 0.5
+ generateLightingData: 0
+ m_UseWorldSpace: 1
+ m_Loop: 0
--- !u!1 &1675643434
GameObject:
m_ObjectHideFlags: 0