diff --git a/Assets/InteractionEngine/CommunicationEvents.cs b/Assets/InteractionEngine/CommunicationEvents.cs
index 1827a7d83d6c2945b6dd0e2354fab13288e5b185..3a3afcffa46ea8dbabc0f6e73cb370f4d30f3ab7 100644
--- a/Assets/InteractionEngine/CommunicationEvents.cs
+++ b/Assets/InteractionEngine/CommunicationEvents.cs
@@ -13,6 +13,11 @@ public class HitEvent : UnityEvent<RaycastHit>
{
}
+ public class FactEvent : UnityEvent<int>
+ {
+
+ }
+
public class MouseOverFactEvent : UnityEvent<Transform>
{
@@ -26,6 +31,6 @@ public class ToolModeEvent : UnityEvent<ToolMode> {
public static MouseOverFactEvent EndHighlightEvent = new MouseOverFactEvent();
public static ToolModeEvent ToolModeChangedEvent = new ToolModeEvent();
public static PointEvent AddEvent = new PointEvent();
- public static PointEvent RemoveEvent = new PointEvent();
-
+ public static FactEvent RemoveEvent = new FactEvent();
+ public static ToolMode ActiveToolMode { get; set; }
}
diff --git a/Assets/InteractionEngine/FactObject.cs b/Assets/InteractionEngine/FactObject.cs
new file mode 100644
index 0000000000000000000000000000000000000000..31b6adf991ce084cbe504a23acd4a55ae65e9244
--- /dev/null
+++ b/Assets/InteractionEngine/FactObject.cs
@@ -0,0 +1,19 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class FactObject : MonoBehaviour
+{
+ public int Id;
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/InteractionEngine/FactObject.cs.meta b/Assets/InteractionEngine/FactObject.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..231482e768a2afb200f1cc7bca1ec3772f85b7a9
--- /dev/null
+++ b/Assets/InteractionEngine/FactObject.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 626c435b76e0d334f959ede8b54b07ac
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/InteractionEngine/FactSpawner.cs b/Assets/InteractionEngine/FactSpawner.cs
index a30a28dec3749065ae4b3b6ecfe96f75caba979f..bae3376c815d4fd401b521217f6ef20b40c17481 100644
--- a/Assets/InteractionEngine/FactSpawner.cs
+++ b/Assets/InteractionEngine/FactSpawner.cs
@@ -14,6 +14,8 @@ public class FactSpawner : MonoBehaviour
public Material defaultMaterial;
public Material highlightMaterial;
+ public GameObject SmartMenu;
+
void Start()
{
CommunicationEvents.HighlightEvent.AddListener(OnMouseOverFact);
@@ -22,6 +24,9 @@ void Start()
CommunicationEvents.ToolModeChangedEvent.AddListener(OnToolModeChanged);
CommunicationEvents.AddEvent.AddListener(SpawnFact);
CommunicationEvents.RemoveEvent.AddListener(DeletePoint);
+
+
+
}
public int GetFirstEmptyID()
@@ -49,18 +54,20 @@ public void SpawnPoint(RaycastHit hit, int id)
point.transform.up = hit.normal;
string letter = ((Char)(64+id+1)).ToString();
point.GetComponentInChildren<TextMeshPro>().text = letter;
+ point.GetComponent<FactObject>().Id = id;
//If a new Point was spawned -> We are in MarkPointMode -> Then we want the collider to be disabled
//Hint: Thats why by now, if we mark a Point in an other mode than MarkPointMode, the
//Collider will be set disabled
- point.GetComponentInChildren<SphereCollider>().enabled = false;
+ if(CommunicationEvents.ActiveToolMode != ToolMode.ExtraMode)
+ point.GetComponentInChildren<SphereCollider>().enabled = false;
Facts[id] = letter;
GameObjectFacts[id] = point;
}
- public void DeletePoint(RaycastHit hit, int id)
+ public void DeletePoint(int id)
{
- GameObject point = hit.transform.gameObject;
+ GameObject point = GameObjectFacts[id];
GameObject.Destroy(point);
Facts[id] = "";
}
@@ -93,13 +100,24 @@ public void OnMouseOverFact(Transform selection)
public void OnHit(RaycastHit hit)
{
-
+ Debug.Log(CommunicationEvents.ActiveToolMode);
if (hit.transform.gameObject.layer == LayerMask.NameToLayer("Point"))
{
//hit existing point, so delete it
- char letter = hit.transform.gameObject.GetComponentInChildren<TextMeshPro>().text.ToCharArray()[0];
- int id = letter - 65;
- CommunicationEvents.RemoveEvent.Invoke(hit, id);
+ if(CommunicationEvents.ActiveToolMode == ToolMode.ExtraMode)
+ {
+ var menu =GameObject.Instantiate(SmartMenu);
+ menu.GetComponent<Canvas>().worldCamera = Camera.main;
+ menu.transform.SetParent(hit.transform);
+ menu.transform.localPosition = Vector3.up- Camera.main.transform.forward;
+ }
+ else
+ {
+ char letter = hit.transform.gameObject.GetComponentInChildren<TextMeshPro>().text.ToCharArray()[0];
+ int id = letter - 65;
+ CommunicationEvents.RemoveEvent.Invoke(id);
+ }
+
}
else
{
@@ -154,6 +172,15 @@ public void OnToolModeChanged(ToolMode ActiveToolMode) {
GameObjectFact.GetComponentInChildren<Collider>().enabled = true;
}
break;
+ case ToolMode.ExtraMode:
+ foreach (GameObject GameObjectFact in this.GameObjectFacts)
+ {
+
+ }
+ break;
+
+
+
}
}
diff --git a/Assets/InteractionEngine/MMTInterface.cs b/Assets/InteractionEngine/MMTInterface.cs
index 9d73363bea57ad9bcb1b5f3c6b5fde5dc0e8fea0..fbc917a8f3aa24d1fa8d4fd51ca5bce6fc5bcadd 100644
--- a/Assets/InteractionEngine/MMTInterface.cs
+++ b/Assets/InteractionEngine/MMTInterface.cs
@@ -39,7 +39,7 @@ void AddFactToMMT(RaycastHit hit, int id )
UnityEngine.Debug.Log("add fact"+ id);
}
- void RemoveFactFromMMT(RaycastHit hit, int id)
+ void RemoveFactFromMMT( int id)
{
UnityEngine.Debug.Log("remove fact"+ id);
}
diff --git a/Assets/InteractionEngine/SmartMenu.cs b/Assets/InteractionEngine/SmartMenu.cs
new file mode 100644
index 0000000000000000000000000000000000000000..48c6821a01fc2a3025756165afc5c982c521240c
--- /dev/null
+++ b/Assets/InteractionEngine/SmartMenu.cs
@@ -0,0 +1,15 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SmartMenu : MonoBehaviour
+{
+
+ public void DestroyObject()
+ {
+ CommunicationEvents.RemoveEvent.Invoke(transform.parent.GetComponent<FactObject>().Id);
+
+ }
+
+
+}
diff --git a/Assets/InteractionEngine/SmartMenu.cs.meta b/Assets/InteractionEngine/SmartMenu.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..594f7e820a4d4221adb4f882a7b9f7214cf67984
--- /dev/null
+++ b/Assets/InteractionEngine/SmartMenu.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5e8bc92b0d19f87479152a3e57320e00
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/InteractionEngine/ToolMode.cs b/Assets/InteractionEngine/ToolMode.cs
index 11961dcda31760fbf7259452679d5fc743187d20..dea04950faa129f9af8d447277b13da2c95e2227 100644
--- a/Assets/InteractionEngine/ToolMode.cs
+++ b/Assets/InteractionEngine/ToolMode.cs
@@ -7,5 +7,6 @@ public enum ToolMode
MarkPointMode,
CreateLineMode,
CreateAngleMode,
- DeleteMode
+ DeleteMode,
+ ExtraMode
}
diff --git a/Assets/InteractionEngine/WorldCursor.cs b/Assets/InteractionEngine/WorldCursor.cs
index 9f302bea3d7646a3560ca5d2441379b0c12bfb5f..7dd3cc4f3036c507355c3527d4e95177c84e8f28 100644
--- a/Assets/InteractionEngine/WorldCursor.cs
+++ b/Assets/InteractionEngine/WorldCursor.cs
@@ -3,6 +3,7 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Events;
+using UnityEngine.EventSystems;
public class WorldCursor : MonoBehaviour
{
@@ -13,11 +14,17 @@ public class WorldCursor : MonoBehaviour
private string selectableTag = "Selectable";
private Transform lastFactSelection;
+
void Start()
{
+
Cam = Camera.main;
//Set MarkPointMode as the default ActiveToolMode
- this.ActiveToolMode = ToolMode.MarkPointMode;
+ this.ActiveToolMode = ToolMode.ExtraMode;//ToolMode.MarkPointMode;
+ CommunicationEvents.ToolModeChangedEvent.Invoke(this.ActiveToolMode);
+ //TODO: we probably can configure these things to automatically trigger when the variable is changed...
+ CommunicationEvents.ActiveToolMode = this.ActiveToolMode;
+ //redundant for now, but we probably want to have the activetool mode available globally
}
// Update is called once per frame
@@ -29,6 +36,8 @@ void Update()
int layerMask = 1 << LayerMask.NameToLayer("Player"); //only hit player
layerMask = ~layerMask; //ignore Player
+
+
if(Physics.Raycast(ray, out Hit, 30f, layerMask)){
transform.position = Hit.point;
transform.up = Hit.normal;
@@ -60,7 +69,7 @@ void Update()
}
else
{
- transform.position = Cam.transform.position + Cam.transform.forward * 10;
+ transform.position = Cam.ScreenToWorldPoint(Input.mousePosition);
transform.up = -Cam.transform.forward;
}
@@ -71,9 +80,11 @@ void Update()
void CheckMouseButtons()
{
+
//send HitEvent
if (Input.GetMouseButtonDown(0)){
- CommunicationEvents.TriggerEvent.Invoke(Hit);
+ if (EventSystem.current.IsPointerOverGameObject()) return;
+ CommunicationEvents.TriggerEvent.Invoke(Hit);
}
}
@@ -88,7 +99,7 @@ void CheckToolModeSelection() {
else {
this.ActiveToolMode++;
}
-
+ CommunicationEvents.ActiveToolMode = this.ActiveToolMode;
//Invoke the Handler for the Facts
CommunicationEvents.ToolModeChangedEvent.Invoke(this.ActiveToolMode);
}
diff --git a/Assets/Prefabs/New Terrain.asset b/Assets/Prefabs/New Terrain.asset
deleted file mode 100644
index 1d5c042950bbf4599dac4d2686df188722adbc05..0000000000000000000000000000000000000000
Binary files a/Assets/Prefabs/New Terrain.asset and /dev/null differ
diff --git a/Assets/Prefabs/New Terrain.asset.meta b/Assets/Prefabs/New Terrain.asset.meta
deleted file mode 100644
index 3281466e476f63d696e2be57ce7d237de8c6d8db..0000000000000000000000000000000000000000
--- a/Assets/Prefabs/New Terrain.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d33b1182ba3ebaa48baf365628078367
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 15600000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Prefabs/SmartMenu.prefab b/Assets/Prefabs/SmartMenu.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..2cf45781a35f46f5d4e72818a4c9826e2066f3fb
--- /dev/null
+++ b/Assets/Prefabs/SmartMenu.prefab
@@ -0,0 +1,480 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5601740127768851631
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5601740127768851627}
+ - component: {fileID: 5601740127768851624}
+ - component: {fileID: 5601740127768851625}
+ - component: {fileID: 5601740127768851630}
+ - component: {fileID: 5601740127768851626}
+ - component: {fileID: 114859892409957288}
+ m_Layer: 5
+ m_Name: SmartMenu
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5601740127768851627
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5601740127768851631}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+ m_Children:
+ - {fileID: 9180776612935969689}
+ - {fileID: 5601740128677177918}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 20, y: 10}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &5601740127768851624
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5601740127768851631}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 2
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 25
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!114 &5601740127768851625
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5601740127768851631}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 0
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 800, y: 600}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+--- !u!114 &5601740127768851630
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5601740127768851631}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 0
+--- !u!114 &5601740127768851626
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5601740127768851631}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 8cf5a358dacd3b54ab093ee289dd9ba2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &114859892409957288
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5601740127768851631}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5e8bc92b0d19f87479152a3e57320e00, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &5601740128677177922
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5601740128677177918}
+ - component: {fileID: 5601740128677177919}
+ - component: {fileID: 5601740128677177916}
+ - component: {fileID: 5601740128677177917}
+ m_Layer: 5
+ m_Name: DeleteButton
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5601740128677177918
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5601740128677177922}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+ m_Children:
+ - {fileID: 5601740129596515291}
+ m_Father: {fileID: 5601740127768851627}
+ 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: -0, y: 2.4}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5601740128677177919
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5601740128677177922}
+ m_CullTransparentMesh: 0
+--- !u!114 &5601740128677177916
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5601740128677177922}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!114 &5601740128677177917
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5601740128677177922}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 5601740128677177916}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 114859892409957288}
+ m_MethodName: DestroyObject
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+--- !u!1 &5601740129596515288
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5601740129596515291}
+ - component: {fileID: 5601740129596515285}
+ - component: {fileID: 5601740129596515290}
+ m_Layer: 5
+ m_Name: Text (TMP)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5601740129596515291
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5601740129596515288}
+ 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: 5601740128677177918}
+ m_RootOrder: 0
+ 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}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5601740129596515285
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5601740129596515288}
+ m_CullTransparentMesh: 0
+--- !u!114 &5601740129596515290
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5601740129596515288}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: Delete
+ 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: 4281479730
+ m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24
+ m_fontSizeBase: 24
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_textAlignment: 514
+ 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: 1
+ 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: 5601740129596515290}
+ characterCount: 6
+ 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_subTextObjects:
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &6457885187467257697
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 9180776612935969689}
+ - component: {fileID: 3017256895560571996}
+ - component: {fileID: 3887524811768707580}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &9180776612935969689
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6457885187467257697}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+ m_Children: []
+ m_Father: {fileID: 5601740127768851627}
+ 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: 0}
+ m_SizeDelta: {x: 200, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3017256895560571996
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6457885187467257697}
+ m_CullTransparentMesh: 0
+--- !u!114 &3887524811768707580
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6457885187467257697}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.6981132, g: 0.6406048, b: 0.26673195, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
diff --git a/Assets/Graphics.meta b/Assets/Prefabs/SmartMenu.prefab.meta
similarity index 57%
rename from Assets/Graphics.meta
rename to Assets/Prefabs/SmartMenu.prefab.meta
index 2f27852dee817f89c3c9f3c670d67c4e8a201894..11d3acd97c9c0ba01991af9c57406dc7145c7f52 100644
--- a/Assets/Graphics.meta
+++ b/Assets/Prefabs/SmartMenu.prefab.meta
@@ -1,7 +1,6 @@
fileFormatVersion: 2
-guid: eec83b50c1e0c604aa91430f72c8dbb0
-folderAsset: yes
-DefaultImporter:
+guid: e693bf633c633d243b0254d117ec3893
+PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
diff --git a/Assets/Prefabs/Sphere.prefab b/Assets/Prefabs/Sphere.prefab
index 27638db68ea1ebe17c2e89d36e41ee599201dfdb..14d50c827f6d2e5cc2c5540ef0722a2f6976f480 100644
--- a/Assets/Prefabs/Sphere.prefab
+++ b/Assets/Prefabs/Sphere.prefab
@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 1900283440179814243}
- component: {fileID: 1075046474335495899}
- component: {fileID: 8087426936968725520}
+ - component: {fileID: 114239372808020652}
m_Layer: 10
m_Name: Sphere
m_TagString: Selectable
@@ -94,6 +95,18 @@ SphereCollider:
serializedVersion: 2
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &114239372808020652
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 537518992981541273}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &942938646191423391
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes.meta b/Assets/Scenes.meta
deleted file mode 100644
index 157e8818897d6ed29501f87f879801a120255f46..0000000000000000000000000000000000000000
--- a/Assets/Scenes.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ac72be71662640f4ab0aaf102090fb95
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/TreeWorld.unity b/Assets/TreeWorld.unity
index c315c8f085e733cce62282d0ec6f940f3923b0cd..60c30083cfb6aead66b301bf54feb9c4b652de44 100644
--- a/Assets/TreeWorld.unity
+++ b/Assets/TreeWorld.unity
@@ -157,7 +157,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5e9e851c0e142814dac026a256ba2ac0, type: 3}
propertyPath: m_RootOrder
- value: 2
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 5e9e851c0e142814dac026a256ba2ac0, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -179,6 +179,14 @@ PrefabInstance:
propertyPath: m_Layer
value: 9
objectReference: {fileID: 0}
+ - target: {fileID: 11400000, guid: 5e9e851c0e142814dac026a256ba2ac0, type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 11400000, guid: 5e9e851c0e142814dac026a256ba2ac0, type: 3}
+ propertyPath: m_MouseLook.lockCursor
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5e9e851c0e142814dac026a256ba2ac0, type: 3}
--- !u!1 &138245305
@@ -248,7 +256,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 45.118004, y: 115.065, z: 146.117}
--- !u!1001 &154206643
PrefabInstance:
@@ -451,7 +459,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &422404977
GameObject:
@@ -608,7 +616,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &535944724
GameObject:
@@ -793,86 +801,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &662531908
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 662531911}
- - component: {fileID: 662531910}
- - component: {fileID: 662531909}
- m_Layer: 0
- m_Name: Terrain
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 4294967295
- m_IsActive: 0
---- !u!154 &662531909
-TerrainCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 662531908}
- m_Material: {fileID: 0}
- m_Enabled: 1
- m_TerrainData: {fileID: 15600000, guid: d33b1182ba3ebaa48baf365628078367, type: 2}
- m_EnableTreeColliders: 1
---- !u!218 &662531910
-Terrain:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 662531908}
- m_Enabled: 1
- serializedVersion: 3
- m_TerrainData: {fileID: 15600000, guid: d33b1182ba3ebaa48baf365628078367, type: 2}
- m_TreeDistance: 5000
- m_TreeBillboardDistance: 50
- m_TreeCrossFadeLength: 0
- m_TreeMaximumFullLODCount: 50
- m_DetailObjectDistance: 130.6
- m_DetailObjectDensity: 0.261
- m_HeightmapPixelError: 5
- m_SplatMapDistance: 1000
- m_HeightmapMaximumLOD: 0
- m_CastShadows: 1
- m_DrawHeightmap: 1
- m_DrawInstanced: 0
- m_DrawTreesAndFoliage: 1
- m_ReflectionProbeUsage: 1
- m_MaterialType: 0
- m_LegacySpecular:
- serializedVersion: 2
- rgba: 4286545791
- m_LegacyShininess: 0.078125
- m_MaterialTemplate: {fileID: 0}
- m_BakeLightProbesForTrees: 1
- m_PreserveTreePrototypeLayers: 0
- m_DeringLightProbesForTrees: 0
- m_ScaleInLightmap: 0.0512
- m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0}
- m_GroupingID: 0
- m_AllowAutoConnect: 1
---- !u!4 &662531911
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 662531908}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -25, y: 0, z: -25}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 3
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &684756691
GameObject:
m_ObjectHideFlags: 0
@@ -903,7 +831,7 @@ Transform:
- {fileID: 1675643438}
- {fileID: 1451305264}
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1140713983
PrefabInstance:
@@ -1013,10 +941,16 @@ PrefabInstance:
propertyPath: RemoveEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
+ - target: {fileID: 1324548122521590688, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
+ type: 3}
+ propertyPath: SmartMenu
+ value:
+ objectReference: {fileID: 5601740127768851631, guid: e693bf633c633d243b0254d117ec3893,
+ type: 3}
- target: {fileID: 3052661700889384477, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
type: 3}
propertyPath: m_RootOrder
- value: 6
+ value: 4
objectReference: {fileID: 0}
- target: {fileID: 3052661700889384477, guid: 9cb473a50d07f1245b0f6a7ee2557d4f,
type: 3}
@@ -1400,6 +1334,8 @@ MonoBehaviour:
- {fileID: 0}
defaultMaterial: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
highlightMaterial: {fileID: 2100000, guid: c7daa82e15f0cf04d92d0f41ce84f9df, type: 2}
+ SmartMenu: {fileID: 5601740127768851631, guid: e693bf633c633d243b0254d117ec3893,
+ type: 3}
--- !u!1 &1675643434
GameObject:
m_ObjectHideFlags: 0
@@ -1566,7 +1502,7 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
- m_AdditionalShaderChannelsFlag: 0
+ m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
@@ -1583,7 +1519,7 @@ RectTransform:
m_Children:
- {fileID: 1143784614}
m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset
index b82e822f91679ec5fb84f9a71ab3ca612845ba5e..080dc5ee86a6dbbec79de033a0a7a3e215b2a0cc 100644
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
@@ -216,4 +216,5 @@ QualitySettings:
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
excludedTargetPlatforms: []
- m_PerPlatformDefaultQuality: {}
+ m_PerPlatformDefaultQuality:
+ Standalone: 0