Skip to content
Snippets Groups Projects
Commit 535757d7 authored by John Schihada's avatar John Schihada
Browse files

Fixed TextMeshPro-Issue with Line-Prefab AND Fixed Delete-Functionality, by... 

Fixed TextMeshPro-Issue with Line-Prefab AND Fixed Delete-Functionality, by Facts.find before removal
parent 6f4db616
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 637 additions and 172 deletions
Assets/FactManager.cs
+ 7
− 5
View file @ 535757d7
......@@ -71,11 +71,13 @@ AngleFact AddAngleFact(int pid1, int pid2, int pid3, int id)
void DeleteFact(Fact fact)
{
if (Facts.Contains(fact)) {
NextEmptyStack.Push(fact.Id);
Facts.RemoveAt(fact.Id);
//Facts.RemoveAt(fact.Id);
Facts.Remove(Facts.Find(x => x.Id == fact.Id));
CommunicationEvents.RemoveFactEvent.Invoke(fact);
}
}
public int GetFirstEmptyID()
{
......@@ -218,7 +220,7 @@ public void OnHit(RaycastHit hit)
//If the hit GameObject was a Point/Line/Angle
if (hit.transform.gameObject.layer == LayerMask.NameToLayer("Point") || hit.transform.gameObject.layer == LayerMask.NameToLayer("Line") || hit.transform.gameObject.layer == LayerMask.NameToLayer("Angle")){
//Search for the suitable fact from the List
this.DeleteFact(Facts[hit.transform.GetComponent<FactObject>().Id]);
this.DeleteFact(Facts.Find(x => x.Id == hit.transform.GetComponent<FactObject>().Id));
}
break;
//If Left-Mouse-Button was pressed in ExtraMode
......
Assets/InteractionEngine/AlignText.cs
+ 4
− 3
View file @ 535757d7
......@@ -6,7 +6,7 @@ public class AlignText : MonoBehaviour
{
// Start is called before the first frame update
Camera Cam;
public Camera Cam;
void Start()
{
......@@ -16,8 +16,9 @@ void Start()
// Update is called once per frame
void Update()
{
transform.forward = Cam.transform.forward;
//Not yet the perfect solution
//Problem is the relative rotation of the TextMesh to the Line-Parent
//transform.rotation = Quaternion.Lerp(transform.parent.transform.rotation, Cam.transform.rotation, 0);
}
}
Assets/InteractionEngine/FactSpawner.cs
+ 26
− 26
View file @ 535757d7
......@@ -58,46 +58,46 @@ public void SpawnPoint(PointFact fact)
}
public void DeleteObject(Fact fact)
public void SpawnLine(LineFact lineFact)
{
Debug.Log("delete obj");
GameObject factRepresentation = fact.Representation;
GameObject.Destroy(factRepresentation);
}
public void SpawnLine(LineFact lineFact) {
Vector3 point1 = (Facts[lineFact.Pid1] as PointFact).Point;
Vector3 point2 = (Facts[lineFact.Pid2] as PointFact).Point;
//Change FactRepresentation to Line
this.FactRepresentation = (GameObject)Resources.Load("Prefabs/Line2", typeof(GameObject));
this.FactRepresentation = (GameObject)Resources.Load("Prefabs/Line", 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);
//Change scale and rotation, so that the two points are connected by the line
//Get the Line-GameObject as the first Child of the Line-Prefab -> That's the Collider
var v3T = line.transform.GetChild(0).localScale;
v3T.x = (point2 - point1).magnitude;
//For every Coordinate x,y,z we have to devide it by the LocalScale of the Child,
//because actually the Child should be of this length and not the parent, which is only the Collider
v3T.x = v3T.x / line.transform.GetChild(0).GetChild(0).localScale.x;
//y and z of the line/Cube-GameObject here hard coded = ratio of sphere-prefab
v3T.y = 0.1f / line.transform.GetChild(0).GetChild(0).localScale.y;
v3T.z = 0.1f / line.transform.GetChild(0).GetChild(0).localScale.z;
//Change Scale/Rotation of the Line-GameObject without affecting Scale of the Text
line.transform.GetChild(0).localScale = v3T;
line.transform.GetChild(0).rotation = Quaternion.FromToRotation(Vector3.right, point2 - point1);
string letter = ((Char)(64 + lineFact.Id + 1)).ToString();
line.GetComponentInChildren<TextMeshPro>().text = letter;
line.GetComponent<FactObject>().Id = lineFact.Id;
line.GetComponentInChildren<FactObject>().Id = lineFact.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;
//Deactivate the Collider of the Line itself
line.transform.GetComponentInChildren<BoxCollider>().enabled = false;
lineFact.Representation = line;
}
public void DeleteObject(Fact fact)
{
Debug.Log("delete obj");
GameObject factRepresentation = fact.Representation;
GameObject.Destroy(factRepresentation);
}
}
Assets/InteractionEngine/ShinyThings.cs
+ 18
− 6
View file @ 535757d7
......@@ -22,8 +22,8 @@ public class ShinyThings : MonoBehaviour
public void Start()
{
if(Cursor == null)Cursor = GetComponent<WorldCursor>();
CommunicationEvents.StartLineRendererEvent.AddListener(ActivateLineRenderer);
CommunicationEvents.StopLineRendererEvent.AddListener(DeactivateLineRenderer);
CommunicationEvents.StartLineRendererEvent.AddListener(ActivateLineDrawing);
CommunicationEvents.StopLineRendererEvent.AddListener(DeactivateLineDrawing);
}
// Update is called once per frame
......@@ -59,7 +59,7 @@ public void Update()
//LineRendering-Part
if (this.lineRendererActivated)
UpdateLineRenderer(Hit.point);
UpdateLineDrawing(Hit.point);
}
......@@ -92,7 +92,7 @@ public void OnMouseOverFactEnd(Transform selection)
}
}
public void ActivateLineRenderer(Fact startFact) {
public void ActivateLineDrawing(Fact startFact) {
//Set LineRenderer activated
this.lineRendererActivated = true;
//Add the position of the Fact for the start of the Line
......@@ -106,14 +106,14 @@ public void ActivateLineRenderer(Fact startFact) {
}
//Updates the second-point of the Line when First Point was selected in LineMode
public void UpdateLineRenderer(Vector3 currentPosition)
public void UpdateLineDrawing(Vector3 currentPosition)
{
this.linePositions[1] = currentPosition;
this.lineRenderer.SetPosition(1, this.linePositions[1]);
}
//Deactivate LineRenderer so that no Line gets drawn when Cursor changes
public void DeactivateLineRenderer(Fact startFact)
public void DeactivateLineDrawing(Fact startFact)
{
//Reset the first points
this.lineRenderer.SetPosition(0, Vector3.zero);
......@@ -122,4 +122,16 @@ public void DeactivateLineRenderer(Fact startFact)
this.linePositions.Clear();
this.lineRendererActivated = false;
}
public void ActivateCurveDrawing(Fact startFact) {
}
public void UpdateCurveDrawing(Vector3 currentPosition) {
}
public void DeactivateCurveDrawing(Fact startFact) {
}
}
Assets/Resources/Prefabs/Line.prefab
+ 141
− 125
View file @ 535757d7
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2496690874987854574
--- !u!1 &2317807655120713368
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -8,91 +8,31 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6125026673793904494}
- component: {fileID: 5317438232530275707}
- component: {fileID: 1432417995795110366}
- component: {fileID: 7118368545746548941}
- component: {fileID: 5818562496562931847}
m_Layer: 11
m_Name: Line
m_TagString: Untagged
m_TagString: Selectable
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6125026673793904494
--- !u!4 &5818562496562931847
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_GameObject: {fileID: 2317807655120713368}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.329, y: 2.805062, z: -4.33}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3517099398133763913}
- {fileID: 7972877566157790116}
m_Father: {fileID: 0}
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
--- !u!1 &4853696702160906218
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -100,45 +40,45 @@ GameObject:
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
- component: {fileID: 7972877566157790116}
- component: {fileID: 2096909858734684758}
- component: {fileID: 6001947194413960154}
- component: {fileID: 2573920697083612823}
- component: {fileID: 1723009895384754658}
- component: {fileID: 1586728893263614116}
m_Layer: 11
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8833812500703695140
--- !u!224 &7972877566157790116
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_GameObject: {fileID: 4853696702160906218}
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_Children: []
m_Father: {fileID: 5046695354663855305}
m_Father: {fileID: 5818562496562931847}
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_AnchoredPosition: {x: 0, y: 0.7}
m_SizeDelta: {x: 2, y: 0.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!23 &7808131783401781287
--- !u!23 &2096909858734684758
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5888795777962911503}
m_GameObject: {fileID: 4853696702160906218}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
......@@ -169,29 +109,29 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &7437245633462291148
--- !u!33 &6001947194413960154
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5888795777962911503}
m_GameObject: {fileID: 4853696702160906218}
m_Mesh: {fileID: 0}
--- !u!222 &6195704479152853629
--- !u!222 &2573920697083612823
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5888795777962911503}
m_GameObject: {fileID: 4853696702160906218}
m_CullTransparentMesh: 0
--- !u!114 &1290941253797543648
--- !u!114 &1723009895384754658
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5888795777962911503}
m_GameObject: {fileID: 4853696702160906218}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
......@@ -271,7 +211,7 @@ MonoBehaviour:
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_textInfo:
textComponent: {fileID: 1290941253797543648}
textComponent: {fileID: 1723009895384754658}
characterCount: 4
spriteCount: 0
spaceCount: 0
......@@ -284,7 +224,7 @@ MonoBehaviour:
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_hasFontAssetChanged: 0
m_renderer: {fileID: 7808131783401781287}
m_renderer: {fileID: 2096909858734684758}
m_subTextObjects:
- {fileID: 0}
- {fileID: 0}
......@@ -295,19 +235,20 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
m_maskType: 0
--- !u!114 &220183192139048276
--- !u!114 &1586728893263614116
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5888795777962911503}
m_GameObject: {fileID: 4853696702160906218}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8cf5a358dacd3b54ab093ee289dd9ba2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6830281752141360198
Cam: {fileID: 0}
--- !u!1 &6378548342073962023
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -315,11 +256,11 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5046695354663855305}
- component: {fileID: 5644830416772593419}
- component: {fileID: 5493632383604360425}
- component: {fileID: 3370574915953842469}
- component: {fileID: 2468919236736664347}
- component: {fileID: 3517099398133763913}
- component: {fileID: 6398251481098695290}
- component: {fileID: 6015977261426572496}
- component: {fileID: 9069160241511124499}
- component: {fileID: 6179051021116985022}
m_Layer: 11
m_Name: Line
m_TagString: Selectable
......@@ -327,37 +268,36 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5046695354663855305
--- !u!4 &3517099398133763913
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_GameObject: {fileID: 6378548342073962023}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 0.02, z: 0.02}
m_Children:
- {fileID: 6125026673793904494}
- {fileID: 8833812500703695140}
m_Father: {fileID: 0}
- {fileID: 2374130608748553515}
m_Father: {fileID: 5818562496562931847}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
--- !u!33 &5644830416772593419
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6398251481098695290
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
m_GameObject: {fileID: 6378548342073962023}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &6015977261426572496
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830281752141360198}
m_GameObject: {fileID: 6378548342073962023}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
......@@ -388,30 +328,106 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!114 &3370574915953842469
--- !u!114 &9069160241511124499
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830281752141360198}
m_GameObject: {fileID: 6378548342073962023}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
m_Name:
m_EditorClassIdentifier:
Id: 0
--- !u!136 &2468919236736664347
CapsuleCollider:
--- !u!65 &6179051021116985022
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6830281752141360198}
m_GameObject: {fileID: 6378548342073962023}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
m_Radius: 0.5
m_Height: 2
m_Direction: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &8536634090652517107
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2374130608748553515}
- component: {fileID: 8620665629189134186}
- component: {fileID: 2279887988868225897}
m_Layer: 11
m_Name: Line
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2374130608748553515
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8536634090652517107}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.95, y: 0.5, z: 0.5}
m_Children: []
m_Father: {fileID: 3517099398133763913}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8620665629189134186
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8536634090652517107}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &2279887988868225897
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8536634090652517107}
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
Assets/Resources/Prefabs/Line.prefab.meta
+ 1
− 1
View file @ 535757d7
fileFormatVersion: 2
guid: 6f12e3bd17dc0d64b96ff7d56e7f7df7
guid: 40cb67df39988e8499ecf4d88171c358
PrefabImporter:
externalObjects: {}
userData:
......
Assets/Resources/Prefabs/Sphere.prefab
+ 2
− 1
View file @ 535757d7
......@@ -107,6 +107,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
m_Name:
m_EditorClassIdentifier:
Id: 0
--- !u!1 &942938646191423391
GameObject:
m_ObjectHideFlags: 0
......@@ -220,7 +221,7 @@ MonoBehaviour:
m_Calls: []
m_text: Test
m_isRightToLeft: 0
m_fontAsset: {fileID: 0}
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
......
Assets/Resources/Prefabs/TestPrefabs.meta 0 → 100644
+ 8
− 0
View file @ 535757d7
fileFormatVersion: 2
guid: 0e4c2dc2beaa48646a35fc95dfbceae9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Prefabs/TestPrefabs/LineTest1.prefab 0 → 100644
+ 417
− 0
View file @ 535757d7
%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}
Assets/Resources/Prefabs/TestPrefabs/LineTest1.prefab.meta 0 → 100644
+ 7
− 0
View file @ 535757d7
fileFormatVersion: 2
guid: 6f12e3bd17dc0d64b96ff7d56e7f7df7
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Resources/Prefabs/Line2.prefab → Assets/Resources/Prefabs/TestPrefabs/LineTest2.prefab
+ 4
− 4
View file @ 535757d7
......@@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 3220019359573147980}
- component: {fileID: 7618590508060530576}
- component: {fileID: 7499960066105896670}
m_Layer: 0
m_Layer: 11
m_Name: Line2
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -104,9 +104,9 @@ GameObject:
- component: {fileID: 8146294365389967245}
- component: {fileID: 3611341480574512664}
- component: {fileID: 8425449359525720750}
m_Layer: 0
m_Layer: 11
m_Name: Line2
m_TagString: Untagged
m_TagString: Selectable
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......@@ -212,7 +212,7 @@ GameObject:
- component: {fileID: 7478825983925792131}
- component: {fileID: 5168652854564093290}
- component: {fileID: 4999511783545229280}
m_Layer: 0
m_Layer: 11
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
......
Assets/TreeWorld.unity
+ 1
− 0
View file @ 535757d7
......@@ -1258,6 +1258,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
SmartMenu: {fileID: 5601740127768851631, guid: e693bf633c633d243b0254d117ec3893,
type: 3}
lineModeFirstPointSelected: 0
--- !u!1 &1675643434
GameObject:
m_ObjectHideFlags: 0
......
ProjectSettings/TagManager.asset
+ 1
− 1
View file @ 535757d7
......@@ -18,7 +18,7 @@ TagManager:
- PostProcessing
- Player
- Point
-
- Line
-
-
-
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment