diff --git a/Assets/FactManager.cs b/Assets/FactManager.cs
index 6df34bbf6c4a1785fe1b5b26639c5225a5cf2fc3..7e388e76513d89504678a3fc0b3d5e6e5278ea2c 100644
--- a/Assets/FactManager.cs
+++ b/Assets/FactManager.cs
@@ -108,6 +108,10 @@ public void OnToolModeChanged(ToolMode ActiveToolMode)
gO.GetComponentInChildren<Collider>().enabled = false;
}
break;
+
+ case ToolMode.CreateRayMode:
+ //same as for line mode atm
+
case ToolMode.CreateLineMode:
//If CreateLineMode is activated we want to have the ability to select points for the Line
//but we don't want to have the ability to select Lines or Angles
@@ -124,6 +128,9 @@ public void OnToolModeChanged(ToolMode ActiveToolMode)
}
}
break;
+
+
+
case ToolMode.CreateAngleMode:
//If CreateAngleMode is activated we want to have the ability to select Points for the Angle
//but we don't want to have the ability to select Lines or Angles
@@ -140,6 +147,7 @@ public void OnToolModeChanged(ToolMode ActiveToolMode)
}
}
break;
+ /*
case ToolMode.DeleteMode:
//If DeleteMode is activated we want to have the ability to delete every Fact
//independent of the concrete type of fact
@@ -148,7 +156,7 @@ public void OnToolModeChanged(ToolMode ActiveToolMode)
GameObject gO = fact.Representation;
gO.GetComponentInChildren<Collider>().enabled = true;
}
- break;
+ break;*/
case ToolMode.ExtraMode:
/*foreach (Fact fact in Facts)
{
@@ -267,6 +275,9 @@ public void OnHit(RaycastHit hit)
case ToolMode.MarkPointMode:
CommunicationEvents.AddFactEvent.Invoke(this.AddPointFact(hit, this.GetFirstEmptyID()));
break;
+
+ //same as for linemode atm
+ case ToolMode.CreateRayMode:
//If Left-Mouse-Button was pressed in CreateLineMode
case ToolMode.CreateLineMode:
//Check if an existing Point was hit
@@ -423,7 +434,7 @@ public void OnHit(RaycastHit hit)
//TODO: Hint that only an angle can be created between 3 already existing points
}
break;
- //If Left-Mouse-Button was pressed in DeleteMode
+ /* //If Left-Mouse-Button was pressed in DeleteMode
case ToolMode.DeleteMode:
//Search for the Fact that was hit
//If the hit GameObject was a Point/Line/Angle
@@ -432,7 +443,7 @@ public void OnHit(RaycastHit hit)
//Search for the suitable fact from the List
this.DeleteFact(Facts.Find(x => x.Id == hit.transform.GetComponent<FactObject>().Id));
}
- break;
+ break;*/
//If Left-Mouse-Button was pressed in ExtraMode
case ToolMode.ExtraMode:
if (hit.transform.gameObject.layer == LayerMask.NameToLayer("Point")) {
diff --git a/Assets/InteractionEngine/Fact.cs b/Assets/InteractionEngine/Fact.cs
index d2da5cbc0c811dc6eb87791b2f479534d69874f7..ebc0022300900c73ced9ccc3c6a78ffb3124db08 100644
--- a/Assets/InteractionEngine/Fact.cs
+++ b/Assets/InteractionEngine/Fact.cs
@@ -111,6 +111,43 @@ public LineFact(int i, int pid1, int pid2, string uri, string valuri) {
}
+public class RayFact : Fact
+{
+ //Id's of the 2 Point-Facts that are connected
+ public int Pid1, Pid2;
+
+ //only for temporary Use of LineFacts.
+ public RayFact() { }
+
+ public RayFact(int i, int pid1, int pid2)
+ {
+ this.Id = i;
+ this.Pid1 = pid1;
+ this.Pid2 = pid2;
+ PointFact pf1 = CommunicationEvents.Facts.Find((x => x.Id == pid1)) as PointFact;
+ PointFact pf2 = CommunicationEvents.Facts.Find((x => x.Id == pid2)) as PointFact;
+ string p1URI = pf1.backendURI;
+ string p2URI = pf2.backendURI;
+ float v = (pf1.Point - pf2.Point).magnitude;
+ string body = @"{ ""pointA"":""" + p1URI + @"""," + @"""pointB"":""" + p2URI + @"""," + @"""value"":" + format(v) + "}";
+ AddFactResponse res = AddFactResponse.sendAdd("localhost:8081/fact/add/distance", body);
+ this.backendURI = res.factUri;
+ this.backendValueURI = res.factValUri;
+ }
+
+ public RayFact(int i, int pid1, int pid2, string uri, string valuri)
+ {
+ this.Id = i;
+ this.Pid1 = pid1;
+ this.Pid2 = pid2;
+ this.backendURI = uri;
+ this.backendValueURI = valuri;
+ }
+
+
+}
+
+
public class AngleFact : Fact
{
//Id's of the 3 Point-Facts, where Pid2 is the point, where the angle is
diff --git a/Assets/InteractionEngine/FactSpawner.cs b/Assets/InteractionEngine/FactSpawner.cs
index dc1c04251758ac277996bb06bef7a0b7283ce7e4..9dd2ca5c98e3a89dd050e2846519cbd504db4aa9 100644
--- a/Assets/InteractionEngine/FactSpawner.cs
+++ b/Assets/InteractionEngine/FactSpawner.cs
@@ -34,6 +34,9 @@ public void FactAction(Fact fact)
case AngleFact angleFact:
SpawnAngle(angleFact);
break;
+ case RayFact rayFact:
+ SpawnRay(rayFact);
+ break;
}
}
@@ -99,6 +102,53 @@ public void SpawnLine(LineFact lineFact)
}
+ public void SpawnRay(RayFact lineFact)
+ {
+ PointFact pointFact1 = (Facts[lineFact.Pid1] as PointFact);
+ PointFact pointFact2 = (Facts[lineFact.Pid2] as PointFact);
+
+
+ Vector3 point1 = pointFact1.Point;
+ Vector3 point2 = pointFact2.Point;
+
+ Vector3 dir = (point2 - point1).normalized;
+ point1 -= dir * 100;
+ point2 += dir * 100;
+
+ //Change FactRepresentation to Line
+ this.FactRepresentation = (GameObject)Resources.Load("Prefabs/Line", typeof(GameObject));
+ GameObject line = GameObject.Instantiate(FactRepresentation);
+ //Place the Line in the centre of the two points
+ line.transform.position = Vector3.Lerp(point1, point2, 0.5f);
+ //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.GetComponentInChildren<TextMeshPro>().text = ((Char)(64 + pointFact1.Id + 1)).ToString() + ((Char)(64 + pointFact2.Id + 1)).ToString();
+ line.GetComponentInChildren<TextMeshPro>().text += " = " + Math.Round((point1 - point2).magnitude, 2).ToString() + " m";
+ 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)
+ //Deactivate the Collider of the Line itself
+ line.transform.GetComponentInChildren<BoxCollider>().enabled = false;
+ lineFact.Representation = line;
+
+ }
+
+
+
//Spawn an angle: point with id = angleFact.Pid2 is the point where the angle gets applied
public void SpawnAngle(AngleFact angleFact)
{
diff --git a/Assets/InteractionEngine/ShinyThings.cs b/Assets/InteractionEngine/ShinyThings.cs
index f887af97a23104c26f04affbfc4701ce1a0b44c6..251a8b1382ef188e133e20dd977843d353025791 100644
--- a/Assets/InteractionEngine/ShinyThings.cs
+++ b/Assets/InteractionEngine/ShinyThings.cs
@@ -155,7 +155,7 @@ private void OnMouseOverSnapZone(Transform selection)
{
//Remove transparency
var oldCol = selectionRenderer.material.color;
- oldCol.a = 1;
+ oldCol.a = .75f;
selectionRenderer.material.color = oldCol;
//Hide Mouse cursor
diff --git a/Assets/InteractionEngine/ToolMode.cs b/Assets/InteractionEngine/ToolMode.cs
index dea04950faa129f9af8d447277b13da2c95e2227..05fe9651c05f95bb2520f6cee9a31f9d9a41f1ea 100644
--- a/Assets/InteractionEngine/ToolMode.cs
+++ b/Assets/InteractionEngine/ToolMode.cs
@@ -7,6 +7,6 @@ public enum ToolMode
MarkPointMode,
CreateLineMode,
CreateAngleMode,
- DeleteMode,
+ CreateRayMode,
ExtraMode
}
diff --git a/Assets/InteractionEngine/WorldCursor.cs b/Assets/InteractionEngine/WorldCursor.cs
index 7fe202fc989e5e8d36d49eb03bded0079a0900b7..fb14f1c92217d1060aff1e7ca6ac6c88e19af652 100644
--- a/Assets/InteractionEngine/WorldCursor.cs
+++ b/Assets/InteractionEngine/WorldCursor.cs
@@ -81,7 +81,7 @@ void CheckMouseButtons(bool OnSnap=false)
{
CommunicationEvents.TriggerEvent.Invoke(Hit);
}
- else {
+ else if(CommunicationEvents.ActiveToolMode==ToolMode.MarkPointMode){
Hit.collider.enabled = false;
CommunicationEvents.TriggerEvent.Invoke(Hit);
// CommunicationEvents.SnapEvent.Invoke(Hit);
diff --git a/Assets/InventoryStuff/Inventory.meta b/Assets/InventoryStuff/Inventory.meta
new file mode 100644
index 0000000000000000000000000000000000000000..9818e1d19efb2406338d62594c7ffb0012b023e8
--- /dev/null
+++ b/Assets/InventoryStuff/Inventory.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b543d9677cbde534ab69c0a229bfdb06
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/AngleMaterial.mat b/Assets/Materials/AngleMaterial.mat
index 64e3086fa97b9319f79006f8c85f76c3f99f865c..169cc07259e8baa2f6da415712431d77a5ac46c6 100644
--- a/Assets/Materials/AngleMaterial.mat
+++ b/Assets/Materials/AngleMaterial.mat
@@ -79,5 +79,5 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 0.9787419, g: 0.990566, b: 0.032707386, a: 0.84705883}
+ - _Color: {r: 0.9787419, g: 0.990566, b: 0.032707386, a: 0.4}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Materials/CursorMaterial.mat b/Assets/Materials/CursorMaterial.mat
index 7ae403b6d2c47e488a4a5a4a7d71b7f0459d4ce7..d9beac88cbbcea4383f4260b88c74e93dc3e29a2 100644
--- a/Assets/Materials/CursorMaterial.mat
+++ b/Assets/Materials/CursorMaterial.mat
@@ -13,7 +13,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
+ m_CustomRenderQueue: 4000
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
diff --git a/Assets/Materials/LineMaterial.mat b/Assets/Materials/LineMaterial.mat
index d70bd5813387c53ccbbf13e939ed6779a3d2b2c9..d1718cb8b84fb9f7e7c54de471c29b5472fa966a 100644
--- a/Assets/Materials/LineMaterial.mat
+++ b/Assets/Materials/LineMaterial.mat
@@ -79,5 +79,5 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 0.990566, g: 0.97702986, b: 0, a: 0.84705883}
+ - _Color: {r: 0.990566, g: 0.97702986, b: 0, a: 0.43529412}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Materials/SeeThrough 1.mat b/Assets/Materials/SeeThrough 1.mat
index 01070b4ea2d1cd9514e8578179902a7b5cd8e47a..3475beede6652362af07e9c773627fde361324ee 100644
--- a/Assets/Materials/SeeThrough 1.mat
+++ b/Assets/Materials/SeeThrough 1.mat
@@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SeeThrough 1
- m_Shader: {fileID: 10760, guid: 0000000000000000f000000000000000, type: 0}
+ m_Shader: {fileID: 4800000, guid: 2649b895a4c22d649852a0ca4c825c74, type: 3}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
@@ -80,5 +80,5 @@ Material:
- _UseUIAlphaClip: 0
- _ZWrite: 0
m_Colors:
- - _Color: {r: 0.972549, g: 0.30369413, b: 0, a: 0.2509804}
+ - _Color: {r: 0, g: 0.972549, b: 0.525112, a: 0.16078432}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Resources/Prefabs/Angle.prefab b/Assets/Resources/Prefabs/Angle.prefab
index 881acac5b434ca96c587ca99cdb4dd89ec01024c..1c9f1dea1044cf3670d6c00bde5bfb27bcf2fc29 100644
--- a/Assets/Resources/Prefabs/Angle.prefab
+++ b/Assets/Resources/Prefabs/Angle.prefab
@@ -56,7 +56,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: f6bea2473bdeaa2488a1fe2390bfbd88, type: 2}
+ - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -75,7 +75,7 @@ MeshRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 0
+ m_SortingOrder: 1
--- !u!33 &5847986162312327669
MeshFilter:
m_ObjectHideFlags: 0
@@ -113,7 +113,7 @@ MonoBehaviour:
m_text: Test
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- m_sharedMaterial: {fileID: 2100000, guid: f6bea2473bdeaa2488a1fe2390bfbd88, type: 2}
+ m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@@ -475,7 +475,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: f6bea2473bdeaa2488a1fe2390bfbd88, type: 2}
+ - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -494,7 +494,7 @@ MeshRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 0
+ m_SortingOrder: 1
--- !u!33 &9133314279872122108
MeshFilter:
m_ObjectHideFlags: 0
@@ -532,7 +532,7 @@ MonoBehaviour:
m_text: Test
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- m_sharedMaterial: {fileID: 2100000, guid: f6bea2473bdeaa2488a1fe2390bfbd88, type: 2}
+ m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
diff --git a/Assets/Resources/Prefabs/Line.prefab b/Assets/Resources/Prefabs/Line.prefab
index b33f04790fdb12d99ba6260b0542addf0fed07f1..a10ff82f85607d9e3434bd4403b5fba6744b3fa9 100644
--- a/Assets/Resources/Prefabs/Line.prefab
+++ b/Assets/Resources/Prefabs/Line.prefab
@@ -89,7 +89,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ - {fileID: 2100000, guid: dc000ff84823e7045bac15e87d6da9b2, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
diff --git a/Assets/Resources/Prefabs/Sphere.prefab b/Assets/Resources/Prefabs/Sphere.prefab
index da3afe9bd2a6dbdce57825944829691b4ef27d9a..d1c5e6e396b1464e448bd26937cb2fb5bc876be4 100644
--- a/Assets/Resources/Prefabs/Sphere.prefab
+++ b/Assets/Resources/Prefabs/Sphere.prefab
@@ -165,7 +165,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ - {fileID: 2100000, guid: dc000ff84823e7045bac15e87d6da9b2, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -323,6 +323,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8cf5a358dacd3b54ab093ee289dd9ba2, type: 3}
m_Name:
m_EditorClassIdentifier:
+ Cam: {fileID: 0}
--- !u!1 &7522635739010457072
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
index 00e1a36fda5df1de8cada292bad4e3b7829075c9..9350f7f4ad8124de9af860fdbb7a3863a0c80e36 100644
--- a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
+++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
@@ -229,6 +229,9 @@ MonoBehaviour:
m_glyphInfoList: []
m_KerningTable:
kerningPairs: []
+ m_FontFeatureTable:
+ m_GlyphPairAdjustmentRecords: []
+ fallbackFontAssets: []
m_FallbackFontAssetTable: []
m_CreationSettings:
sourceFontFileName:
diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/ontopTextMat.mat b/Assets/TextMesh Pro/Resources/Fonts & Materials/ontopTextMat.mat
new file mode 100644
index 0000000000000000000000000000000000000000..fba9231e1c0d69e5c6a257eb035cc9d986930631
--- /dev/null
+++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/ontopTextMat.mat
@@ -0,0 +1,104 @@
+%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: ontopTextMat
+ m_Shader: {fileID: 4800000, guid: dd89cf5b9246416f84610a006f916af7, type: 3}
+ m_ShaderKeywords:
+ m_LightmapFlags: 1
+ 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}
+ - _Cube:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _FaceTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 28684132378477856, guid: 8f586378b4e144a9851e7b34d9b748ee,
+ type: 2}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OutlineTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _Ambient: 0.5
+ - _Bevel: 0.5
+ - _BevelClamp: 0
+ - _BevelOffset: 0
+ - _BevelRoundness: 0
+ - _BevelWidth: 0
+ - _BumpFace: 0
+ - _BumpOutline: 0
+ - _ColorMask: 15
+ - _Diffuse: 0.5
+ - _FaceDilate: 0
+ - _FaceUVSpeedX: 0
+ - _FaceUVSpeedY: 0
+ - _GlowInner: 0.05
+ - _GlowOffset: 0
+ - _GlowOuter: 0.05
+ - _GlowPower: 0.75
+ - _GradientScale: 10
+ - _LightAngle: 3.1416
+ - _MaskSoftnessX: 0
+ - _MaskSoftnessY: 0
+ - _OutlineSoftness: 0
+ - _OutlineUVSpeedX: 0
+ - _OutlineUVSpeedY: 0
+ - _OutlineWidth: 0
+ - _PerspectiveFilter: 0.875
+ - _Reflectivity: 10
+ - _ScaleRatioA: 0.9
+ - _ScaleRatioB: 0.73125
+ - _ScaleRatioC: 0.73125
+ - _ScaleX: 1
+ - _ScaleY: 1
+ - _ShaderFlags: 0
+ - _Sharpness: 0
+ - _SpecularPower: 2
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ - _TextureHeight: 1024
+ - _TextureWidth: 1024
+ - _UnderlayDilate: 0
+ - _UnderlayOffsetX: 0
+ - _UnderlayOffsetY: 0
+ - _UnderlaySoftness: 0
+ - _VertexOffsetX: 0
+ - _VertexOffsetY: 0
+ - _WeightBold: 0.75
+ - _WeightNormal: 0
+ m_Colors:
+ - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
+ - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
+ - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
+ - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
+ - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
+ - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
+ - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
+ - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
+ - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+ - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/ontopTextMat.mat.meta b/Assets/TextMesh Pro/Resources/Fonts & Materials/ontopTextMat.mat.meta
new file mode 100644
index 0000000000000000000000000000000000000000..33bab2bf769cb4f2da3c0d6521b39434c5e7ca08
--- /dev/null
+++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/ontopTextMat.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dc000ff84823e7045bac15e87d6da9b2
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/TreeWorld.unity b/Assets/TreeWorld.unity
index e520258ea7689ac69624a1d6901455dedecfb60f..3837c442ad76f80044022b4db211a5f137a79f7c 100644
--- a/Assets/TreeWorld.unity
+++ b/Assets/TreeWorld.unity
@@ -285,7 +285,7 @@ GameObject:
- component: {fileID: 144550596}
- component: {fileID: 144550595}
m_Layer: 5
- m_Name: ToolModeUI
+ m_Name: UI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -298,7 +298,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 144550594}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c5dcea29b6606df49b7b08146b7e5b16, type: 3}
m_Name:
@@ -307,8 +307,8 @@ MonoBehaviour:
CamControl: {fileID: 89227899}
LockOnly: 1
CursorRenderer: {fileID: 1661088671}
---- !u!224 &144550596
-RectTransform:
+--- !u!4 &144550596
+Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@@ -322,11 +322,6 @@ RectTransform:
m_Father: {fileID: 0}
m_RootOrder: 10
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: 442, y: 209}
- m_SizeDelta: {x: 100, y: 100}
- m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &154206643
PrefabInstance:
m_ObjectHideFlags: 0
@@ -346,47 +341,47 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 100014, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ - target: {fileID: 100020, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 100016, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ - target: {fileID: 100022, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 100018, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ - target: {fileID: 100024, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 100020, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ - target: {fileID: 100026, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 100022, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ - target: {fileID: 100028, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 100024, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ - target: {fileID: 100030, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 100026, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ - target: {fileID: 100032, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 100028, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ - target: {fileID: 100034, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 100030, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ - target: {fileID: 100014, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 100032, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ - target: {fileID: 100016, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 100034, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
+ - target: {fileID: 100018, guid: c91c1eb85782d5748ace27eb4d7415bb, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
@@ -603,15 +598,15 @@ RectTransform:
m_GameObject: {fileID: 274389188}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.8568831, y: 0.8568831, z: 0.8568831}
+ m_LocalScale: {x: 0.85688317, y: 0.85688317, z: 0.85688317}
m_Children: []
- m_Father: {fileID: 1920747393}
- m_RootOrder: 2
+ m_Father: {fileID: 425457266}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 257.06497, y: -216.82565}
- m_SizeDelta: {x: 600, y: 506.09}
+ m_AnchoredPosition: {x: -705, y: 297}
+ m_SizeDelta: {x: 600, y: 800}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &274389190
MonoBehaviour:
@@ -670,6 +665,55 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 274389188}
m_CullTransparentMesh: 0
+--- !u!1 &278809811
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 278809812}
+ - component: {fileID: 278809813}
+ m_Layer: 0
+ m_Name: ToolModeUi
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &278809812
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 278809811}
+ 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:
+ - {fileID: 1143784614}
+ - {fileID: 1351049951}
+ m_Father: {fileID: 1920747393}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &278809813
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 278809811}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c5dcea29b6606df49b7b08146b7e5b16, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ Key: 9
+ CamControl: {fileID: 89227899}
+ LockOnly: 1
+ CursorRenderer: {fileID: 1661088671}
--- !u!1 &318619247
GameObject:
m_ObjectHideFlags: 0
@@ -961,6 +1005,56 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &425457265
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 425457266}
+ - component: {fileID: 425457267}
+ m_Layer: 0
+ m_Name: FactUI
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &425457266
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 425457265}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 1, z: 1}
+ m_Children:
+ - {fileID: 274389189}
+ - {fileID: 1181841652}
+ - {fileID: 1243429077}
+ m_Father: {fileID: 1920747393}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &425457267
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 425457265}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c5dcea29b6606df49b7b08146b7e5b16, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ Key: 9
+ CamControl: {fileID: 89227899}
+ LockOnly: 0
+ CursorRenderer: {fileID: 1661088671}
--- !u!1 &535944724
GameObject:
m_ObjectHideFlags: 0
@@ -1070,7 +1164,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!136 &638687094
CapsuleCollider:
m_ObjectHideFlags: 0
@@ -1986,16 +2080,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1143784613}
- 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: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1920747393}
- m_RootOrder: 3
+ m_Father: {fileID: 278809812}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -437.34998, y: -30}
+ m_AnchoredPosition: {x: 606.5377, y: 469.0689}
m_SizeDelta: {x: 250, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1143784615
@@ -2077,15 +2171,15 @@ RectTransform:
m_GameObject: {fileID: 1181841651}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.8568831, y: 0.8568831, z: 0.8568831}
+ m_LocalScale: {x: 0.85688317, y: 0.85688317, z: 0.85688317}
m_Children:
- {fileID: 6421936590152144000}
- m_Father: {fileID: 1920747393}
- m_RootOrder: 0
+ m_Father: {fileID: 425457266}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 257.06497, y: 257.0649}
+ m_AnchoredPosition: {x: -705.1, y: -285}
m_SizeDelta: {x: 600, y: 600}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1181841654
@@ -2101,7 +2195,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -2151,15 +2245,15 @@ RectTransform:
m_GameObject: {fileID: 1243429076}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.8568831, y: 0.8568831, z: 0.8568831}
+ m_LocalScale: {x: 0.85688317, y: 0.85688317, z: 0.85688317}
m_Children: []
- m_Father: {fileID: 1920747393}
- m_RootOrder: 1
+ m_Father: {fileID: 425457266}
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -156.21036, y: -462.71686}
- m_SizeDelta: {x: 364.6, y: 1080}
+ m_AnchoredPosition: {x: 808, y: -8}
+ m_SizeDelta: {x: 364.6, y: 1300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1243429078
MonoBehaviour:
@@ -2232,7 +2326,7 @@ GameObject:
- component: {fileID: 1351049953}
- component: {fileID: 1351049952}
m_Layer: 5
- m_Name: Panel
+ m_Name: BottomPanel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -2245,18 +2339,18 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1351049950}
- 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.15, z: 1}
+ m_LocalScale: {x: 1, y: 0.15000002, z: 1}
m_Children:
- {fileID: 1017737549}
- m_Father: {fileID: 1920747393}
- m_RootOrder: 4
+ m_Father: {fileID: 278809812}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
- m_AnchoredPosition: {x: 100.3999, y: 78.5}
- m_SizeDelta: {x: -825.5, y: 1046.5}
+ m_AnchoredPosition: {x: -3, y: -495}
+ m_SizeDelta: {x: 2000, y: 1100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1351049952
MonoBehaviour:
@@ -2354,7 +2448,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1563243733}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 2.6310663, y: 8.44, z: 2.165048}
+ m_LocalPosition: {x: 2.6310663, y: 9.48, z: 2.165048}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_Children: []
m_Father: {fileID: 0}
@@ -2790,11 +2884,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- - {fileID: 1181841652}
- - {fileID: 1243429077}
- - {fileID: 274389189}
- - {fileID: 1143784614}
- - {fileID: 1351049951}
+ - {fileID: 278809812}
+ - {fileID: 425457266}
m_Father: {fileID: 144550596}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3100,7 +3191,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0.000076293945}
+ m_AnchoredPosition: {x: 0, y: -0.0013885498}
m_SizeDelta: {x: -17, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2421006697587610782